From a908e4ee184458114fcb8a8c13e2b0c1ab3294ca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Jun 2022 18:37:25 +0000
Subject: [PATCH 001/309] Bump ejs from 3.1.6 to 3.1.8

Bumps [ejs](https://github.com/mde/ejs) from 3.1.6 to 3.1.8.
- [Release notes](https://github.com/mde/ejs/releases)
- [Changelog](https://github.com/mde/ejs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/mde/ejs/compare/v3.1.6...v3.1.8)

---
updated-dependencies:
- dependency-name: ejs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 46 ++++++++++++----------------------------------
 1 file changed, 12 insertions(+), 34 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index b6d9a423..1cc2b576 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4676,11 +4676,6 @@ astral-regex@^2.0.0:
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
   integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
 
-async@0.9.x:
-  version "0.9.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
-  integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=
-
 async@^2.6.2:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
@@ -4689,9 +4684,9 @@ async@^2.6.2:
     lodash "^4.17.14"
 
 async@^3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/async/-/async-3.2.3.tgz#ac53dafd3f4720ee9e8a160628f18ea91df196c9"
-  integrity sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c"
+  integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==
 
 asynckit@^0.4.0:
   version "0.4.0"
@@ -5439,7 +5434,7 @@ compression@^1.7.4:
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
 concat-stream@~1.6.0:
   version "1.6.2"
@@ -6215,20 +6210,13 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-ejs@^3.1.5:
-  version "3.1.7"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.7.tgz#c544d9c7f715783dd92f0bddcf73a59e6962d006"
-  integrity sha512-BIar7R6abbUxDA3bfXrO4DSgwo8I+fB5/1zgujl3HLLjwd6+9iOnrT+t3grn2qbk9vOgBubXOFwX2m9axoFaGw==
+ejs@^3.1.5, ejs@^3.1.6:
+  version "3.1.8"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz#758d32910c78047585c7ef1f92f9ee041c1c190b"
+  integrity sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==
   dependencies:
     jake "^10.8.5"
 
-ejs@^3.1.6:
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz#5bfd0a0689743bb5268b3550cceeebbc1702822a"
-  integrity sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw==
-  dependencies:
-    jake "^10.6.1"
-
 electron-to-chromium@^1.3.649:
   version "1.3.671"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.671.tgz#8feaed6eae42d279fa4611f58c42a5a1eb81b2a0"
@@ -6935,11 +6923,11 @@ file-selector@^0.1.12:
     tslib "^2.0.1"
 
 filelist@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.2.tgz#80202f21462d4d1c2e214119b1807c1bc0380e5b"
-  integrity sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5"
+  integrity sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==
   dependencies:
-    minimatch "^3.0.4"
+    minimatch "^5.0.1"
 
 filesize@^8.0.6:
   version "8.0.7"
@@ -8133,16 +8121,6 @@ istanbul-reports@^3.1.3:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
 
-jake@^10.6.1:
-  version "10.8.4"
-  resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.4.tgz#f6a8b7bf90c6306f768aa82bb7b98bf4ca15e84a"
-  integrity sha512-MtWeTkl1qGsWUtbl/Jsca/8xSoK3x0UmS82sNbjqxxG/de/M/3b1DntdjHgPMC50enlTNwXOCRqPXLLt5cCfZA==
-  dependencies:
-    async "0.9.x"
-    chalk "^4.0.2"
-    filelist "^1.0.1"
-    minimatch "^3.0.4"
-
 jake@^10.8.5:
   version "10.8.5"
   resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46"

From 5c2400551e784cbe0017676133cbe872ebfcb087 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Jun 2022 18:37:26 +0000
Subject: [PATCH 002/309] Bump minimist from 1.2.5 to 1.2.6

Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index b6d9a423..b081bcba 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9754,12 +9754,7 @@ minimatch@^5.0.1, minimatch@^5.1.0:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimist@^1.1.1, minimist@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
-  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
-
-minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.6:
+minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
   integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==

From 070e1889db20edf93c3680381c5b52479a343aee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Jun 2022 18:37:27 +0000
Subject: [PATCH 003/309] Bump tmpl from 1.0.4 to 1.0.5

Bumps [tmpl](https://github.com/daaku/nodejs-tmpl) from 1.0.4 to 1.0.5.
- [Release notes](https://github.com/daaku/nodejs-tmpl/releases)
- [Commits](https://github.com/daaku/nodejs-tmpl/commits/v1.0.5)

---
updated-dependencies:
- dependency-name: tmpl
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index b6d9a423..902b215b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12964,9 +12964,9 @@ tmp@^0.2.1:
     rimraf "^3.0.0"
 
 tmpl@1.0.x:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
-  integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
+  integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
 
 to-fast-properties@^2.0.0:
   version "2.0.0"

From ce614cd317c0d1882dabc5b71fac3a34ca041097 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Jun 2022 18:37:28 +0000
Subject: [PATCH 004/309] Bump protobufjs from 6.11.2 to 6.11.3

Bumps [protobufjs](https://github.com/protobufjs/protobuf.js) from 6.11.2 to 6.11.3.
- [Release notes](https://github.com/protobufjs/protobuf.js/releases)
- [Changelog](https://github.com/protobufjs/protobuf.js/blob/v6.11.3/CHANGELOG.md)
- [Commits](https://github.com/protobufjs/protobuf.js/compare/v6.11.2...v6.11.3)

---
updated-dependencies:
- dependency-name: protobufjs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 45 ++++++++++++++++++++-------------------------
 1 file changed, 20 insertions(+), 25 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index b6d9a423..a58a9eed 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3100,7 +3100,7 @@
 "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf"
-  integrity sha1-m4sMxmPWaafY9vXQiToU00jzD78=
+  integrity sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==
 
 "@protobufjs/base64@^1.1.2":
   version "1.1.2"
@@ -3115,12 +3115,12 @@
 "@protobufjs/eventemitter@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz#355cbc98bafad5978f9ed095f397621f1d066b70"
-  integrity sha1-NVy8mLr61ZePntCV85diHx0Ga3A=
+  integrity sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==
 
 "@protobufjs/fetch@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@protobufjs/fetch/-/fetch-1.1.0.tgz#ba99fb598614af65700c1619ff06d454b0d84c45"
-  integrity sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=
+  integrity sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==
   dependencies:
     "@protobufjs/aspromise" "^1.1.1"
     "@protobufjs/inquire" "^1.1.0"
@@ -3128,27 +3128,27 @@
 "@protobufjs/float@^1.0.2":
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@protobufjs/float/-/float-1.0.2.tgz#5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1"
-  integrity sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E=
+  integrity sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==
 
 "@protobufjs/inquire@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@protobufjs/inquire/-/inquire-1.1.0.tgz#ff200e3e7cf2429e2dcafc1140828e8cc638f089"
-  integrity sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik=
+  integrity sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==
 
 "@protobufjs/path@^1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@protobufjs/path/-/path-1.1.2.tgz#6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d"
-  integrity sha1-bMKyDFya1q0NzP0hynZz2Nf79o0=
+  integrity sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==
 
 "@protobufjs/pool@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@protobufjs/pool/-/pool-1.1.0.tgz#09fd15f2d6d3abfa9b65bc366506d6ad7846ff54"
-  integrity sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q=
+  integrity sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==
 
 "@protobufjs/utf8@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
-  integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=
+  integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==
 
 "@react-dnd/asap@^4.0.0":
   version "4.0.1"
@@ -3836,9 +3836,9 @@
   integrity sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==
 
 "@types/long@^4.0.1":
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz#459c65fa1867dafe6a8f322c4c51695663cc55e9"
-  integrity sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a"
+  integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==
 
 "@types/mdast@^3.0.0":
   version "3.0.10"
@@ -3862,21 +3862,16 @@
   resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197"
   integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
 
-"@types/node@*":
+"@types/node@*", "@types/node@>=12.12.47", "@types/node@>=13.7.0":
+  version "18.0.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.0.0.tgz#67c7b724e1bcdd7a8821ce0d5ee184d3b4dd525a"
+  integrity sha512-cHlGmko4gWLVI27cGJntjs/Sj8th9aYwplmZFwmmgYQQvL5NUsgVJG7OddLvNfLqYS31KFN0s3qlaD9qCaxACA==
+
+"@types/node@^17.0.23":
   version "17.0.26"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.26.tgz#1bbff9b23ee5a64f87b4f30c0c854b112ee2e635"
   integrity sha512-z/FG/6DUO7pnze3AE3TBGIjGGKkvCcGcWINe1C7cADY8hKLJPDYpzsNE37uExQ4md5RFtTCvg+M8Mu1Enyeg2A==
 
-"@types/node@>=12.12.47", "@types/node@>=13.7.0":
-  version "16.4.13"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.4.13.tgz#7dfd9c14661edc65cccd43a29eb454174642370d"
-  integrity sha512-bLL69sKtd25w7p1nvg9pigE4gtKVpGTPojBFLMkGHXuUgap2sLqQt2qUnqmVCDfzGUL0DRNZP+1prIZJbMeAXg==
-
-"@types/node@^17.0.23":
-  version "17.0.23"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.23.tgz#3b41a6e643589ac6442bdbd7a4a3ded62f33f7da"
-  integrity sha512-UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw==
-
 "@types/parse-json@^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
@@ -11047,9 +11042,9 @@ property-information@^6.0.0:
   integrity sha512-hrzC564QIl0r0vy4l6MvRLhafmUowhO/O3KgVSoXIbbA2Sz4j8HGpJc6T2cubRVwMwpdiG/vKGfhT4IixmKN9w==
 
 protobufjs@^6.10.0:
-  version "6.11.2"
-  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.2.tgz#de39fabd4ed32beaa08e9bb1e30d08544c1edf8b"
-  integrity sha512-4BQJoPooKJl2G9j3XftkIXjoC9C0Av2NOrWmbLWT1vH32GcSUHjM0Arra6UfTsVyfMAuFzaLucXn1sadxJydAw==
+  version "6.11.3"
+  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.3.tgz#637a527205a35caa4f3e2a9a4a13ddffe0e7af74"
+  integrity sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg==
   dependencies:
     "@protobufjs/aspromise" "^1.1.2"
     "@protobufjs/base64" "^1.1.2"

From 28c1d678f29ce29a94ee40a71b515e24103993a2 Mon Sep 17 00:00:00 2001
From: Han Tuerker <46192266+htuerker@users.noreply.github.com>
Date: Wed, 29 Jun 2022 05:35:01 +0300
Subject: [PATCH 005/309] fix(rich-text-editor): fix dark mode ui appearance
 (#696)

* fix(rich-text-editor): fix dark mode ui appearance

* Update src/components/RichTextEditor.tsx

Co-authored-by: Sidney Alcantara <sidney@sidney.me>

* Update src/components/RichTextEditor.tsx

Co-authored-by: Sidney Alcantara <sidney@sidney.me>

* Update src/components/RichTextEditor.tsx

Co-authored-by: Sidney Alcantara <sidney@sidney.me>

* Update src/components/RichTextEditor.tsx

Co-authored-by: Sidney Alcantara <sidney@sidney.me>

* Update src/components/RichTextEditor.tsx

Co-authored-by: Sidney Alcantara <sidney@sidney.me>

* Update src/components/RichTextEditor.tsx

Co-authored-by: Sidney Alcantara <sidney@sidney.me>

* Update src/components/RichTextEditor.tsx

Co-authored-by: Sidney Alcantara <sidney@sidney.me>

* Update src/theme/RichTextEditorDarkCSS.tsx

Co-authored-by: Sidney Alcantara <sidney@sidney.me>

* Update src/theme/RichTextEditorLightCSS.tsx

Co-authored-by: Sidney Alcantara <sidney@sidney.me>

* fix(rich-text-editor): add stylings to dropdown

* fix(rich-text-editor): add toolbar stylings

* fix(rich-text-editor): reset hover&focus bg

Co-authored-by: Sidney Alcantara <sidney@sidney.me>
---
 src/components/RichTextEditor.tsx | 102 ++++++++++++++++++++++++++++--
 1 file changed, 98 insertions(+), 4 deletions(-)

diff --git a/src/components/RichTextEditor.tsx b/src/components/RichTextEditor.tsx
index 8a518620..a8e9179a 100644
--- a/src/components/RichTextEditor.tsx
+++ b/src/components/RichTextEditor.tsx
@@ -1,6 +1,6 @@
 import { useState } from "react";
-
-import { styled, useTheme } from "@mui/material";
+import { GlobalStyles } from "tss-react";
+import { alpha, styled, useTheme } from "@mui/material";
 import { Editor } from "@tinymce/tinymce-react";
 
 // TinyMCE so the global var exists
@@ -10,7 +10,9 @@ import "tinymce/themes/silver";
 // Toolbar icons
 import "tinymce/icons/default";
 // Editor styles
-import "tinymce/skins/ui/oxide/skin.min.css";
+/* eslint import/no-webpack-loader-syntax: off */
+import skinCss from "!!raw-loader!tinymce/skins/ui/oxide/skin.min.css";
+import skinDarkCss from "!!raw-loader!tinymce/skins/ui/oxide-dark/skin.min.css";
 // Content styles, including inline UI like fake cursors
 /* eslint import/no-webpack-loader-syntax: off */
 import contentCss from "!!raw-loader!tinymce/skins/content/default/content.min.css";
@@ -55,7 +57,32 @@ const Styles = styled("div", {
       },
     "& .tox-edit-area__iframe": { colorScheme: "auto" },
 
-    "& .tox-toolbar__group": { border: "none !important" },
+    "& .tox-toolbar__group": {
+      border: "none !important",
+      "& .tox-tbtn": {
+        "&:hover:": {
+          backgroundColor: "inherit",
+        },
+        "&:focus": {
+          backgroundColor: "inherit",
+        },
+      },
+      "& .tox-tbtn__select-chevron": {
+        transition: theme.transitions.create("transform", {
+          duration: theme.transitions.duration.short,
+        }),
+      },
+      "& .tox-tbtn--select": {
+        "& .tox-tbtn__select-chevron": {
+          transform: "none",
+        },
+      },
+      "& .tox-tbtn--active": {
+        "& .tox-tbtn__select-chevron": {
+          transform: "rotate(180deg)",
+        },
+      },
+    },
 
     "& .tox-tbtn": {
       borderRadius: theme.shape.borderRadius,
@@ -118,7 +145,74 @@ export default function RichTextEditor({
 
   return (
     <Styles focus={focus} disabled={disabled}>
+      <style>{theme.palette.mode === "dark" ? skinDarkCss : skinCss}</style>
+      <GlobalStyles
+        styles={{
+          ".tox": {
+            "& .tox-menu.tox-menu, &.tox-tinymce-aux .tox-toolbar__overflow.tox-toolbar__overflow":
+              {
+                backgroundColor: theme.palette.background.paper,
+                backgroundImage:
+                  "linear-gradient(rgba(255, 255, 255, 0.12), rgba(255, 255, 255, 0.12))", // elevation 8
+                boxShadow: theme.shadows[8],
+                border: "none",
+                borderRadius: (theme.shape.borderRadius as number) * 2,
+              },
+
+            "& .tox-collection--list": {
+              "& .tox-collection__group.tox-collection__group": {
+                padding: theme.spacing(0.5),
+                paddingLeft: 0,
+                paddingRight: 0,
+              },
+              "& .tox-collection__item": {
+                padding: theme.spacing(0.5),
+                marginLeft: theme.spacing(0.5),
+                marginRight: theme.spacing(0.5),
+                borderRadius: theme.shape.borderRadius,
+              },
+
+              "& .tox-collection__item--enabled": {
+                backgroundColor: theme.palette.action.hover + " !important",
+                position: "relative",
+                "&::before": {
+                  content: '""',
+                  display: "block",
+                  position: "absolute",
+                  top: theme.spacing(1),
+                  bottom: theme.spacing(1),
+                  left: 0,
+                  width: theme.spacing(0.3),
+                  borderRadius: theme.shape.borderRadius,
+                  backgroundColor: theme.palette.primary.main,
+                },
+              },
+
+              "& .tox-collection__item--active": {
+                backgroundColor:
+                  alpha(
+                    theme.palette.primary.main,
+                    theme.palette.action.selectedOpacity
+                  ) + "!important",
+              },
+              "& .tox-collection__item-checkmark": {
+                display: "none",
+              },
+            },
+
+            "&.tox-tinymce-aux .tox-toolbar__overflow.tox-toolbar__overflow": {
+              padding: theme.spacing(0.5, 0),
+            },
+            "& .tox-tbtn.tox-tbtn": {
+              borderRadius: theme.shape.borderRadius,
+              margin: 0,
+            },
+          },
+        }}
+      />
+
       <Editor
+        key={theme.palette.mode}
         disabled={disabled}
         init={{
           skin: false,

From c856211cfac0d71a9b6e333bbda5607bed2278e1 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 29 Jun 2022 15:03:30 +1000
Subject: [PATCH 006/309] update date & time filter operators for clarity

---
 .../TableToolbar/Filters/FilterInputs.tsx     | 69 +++++++++++++------
 .../TableToolbar/Filters/FiltersPopover.tsx   |  2 +-
 .../fields/DateTime/FilterCustomInput.tsx     | 14 ++++
 .../fields/DateTime/SideDrawerField.tsx       |  2 +-
 src/components/fields/DateTime/filters.ts     | 13 +++-
 src/components/fields/DateTime/index.tsx      | 12 +++-
 src/components/fields/types.ts                |  9 ++-
 7 files changed, 96 insertions(+), 25 deletions(-)
 create mode 100644 src/components/fields/DateTime/FilterCustomInput.tsx

diff --git a/src/components/TableToolbar/Filters/FilterInputs.tsx b/src/components/TableToolbar/Filters/FilterInputs.tsx
index 29ebe014..24fa1b55 100644
--- a/src/components/TableToolbar/Filters/FilterInputs.tsx
+++ b/src/components/TableToolbar/Filters/FilterInputs.tsx
@@ -1,16 +1,21 @@
 import { Suspense, createElement } from "react";
+import { ErrorBoundary } from "react-error-boundary";
 
 import {
   Grid,
   MenuItem,
   ListItemText,
+  Divider,
+  ListSubheader,
   Typography,
   TextField,
   InputLabel,
 } from "@mui/material";
+
 import ColumnSelect from "@src/components/Table/ColumnSelect";
 import FieldSkeleton from "@src/components/SideDrawer/FieldSkeleton";
 import IdFilterInput from "./IdFilterInput";
+import { InlineErrorFallback } from "@src/components/ErrorFallback";
 
 import type { useFilterInputs } from "./useFilterInputs";
 import { getFieldType, getFieldProp } from "@src/components/fields";
@@ -30,6 +35,45 @@ export default function FilterInputs({
 }: IFilterInputsProps) {
   const columnType = selectedColumn ? getFieldType(selectedColumn) : null;
 
+  const operators = availableFilters?.operators ?? [];
+  const renderedOperatorItems = operators.map((operator) => (
+    <MenuItem key={operator.value} value={operator.value}>
+      <ListItemText style={{ flexShrink: 0 }}>{operator.label}</ListItemText>
+
+      {operator.secondaryLabel && (
+        <Typography
+          variant="inherit"
+          color="text.disabled"
+          sx={{ overflow: "hidden", textOverflow: "ellipsis", ml: 1 }}
+        >
+          &nbsp;{operator.secondaryLabel}
+        </Typography>
+      )}
+    </MenuItem>
+  ));
+
+  // Insert ListSubheader components in between groups of operators
+  for (let i = 0; i < operators.length; i++) {
+    if (!operators[i].group) continue;
+
+    if (i === 0 || operators[i - 1].group !== operators[i].group) {
+      renderedOperatorItems.splice(
+        i === 0 ? 0 : i + 1,
+        0,
+        <ListSubheader key={operators[i].group}>
+          {operators[i].group}
+        </ListSubheader>
+      );
+
+      if (i > 0)
+        renderedOperatorItems.splice(
+          i + 1,
+          0,
+          <Divider key={`divider-${operators[i].group}`} variant="middle" />
+        );
+    }
+  }
+
   return (
     <Grid container spacing={2} sx={{ mb: 3 }}>
       <Grid item xs={4}>
@@ -65,29 +109,13 @@ export default function FilterInputs({
           <MenuItem disabled value="" style={{ display: "none" }}>
             Select operator
           </MenuItem>
-          {availableFilters?.operators.map((operator) => (
-            <MenuItem key={operator.value} value={operator.value}>
-              <ListItemText style={{ flexShrink: 0 }}>
-                {operator.label}
-              </ListItemText>
-
-              {operator.secondaryLabel && (
-                <Typography
-                  variant="inherit"
-                  color="text.disabled"
-                  style={{ overflow: "hidden", textOverflow: "ellipsis" }}
-                >
-                  &nbsp;{operator.secondaryLabel}
-                </Typography>
-              )}
-            </MenuItem>
-          ))}
+          {renderedOperatorItems}
         </TextField>
       </Grid>
 
-      <Grid item xs={4}>
+      <Grid item xs={4} key={query.key + query.operator}>
         {query.key && query.operator && (
-          <>
+          <ErrorBoundary FallbackComponent={InlineErrorFallback}>
             <InputLabel
               variant="filled"
               id={`filters-label-${query.key}`}
@@ -111,10 +139,11 @@ export default function FilterInputs({
                       setQuery((query) => ({ ...query, value }));
                     },
                     disabled,
+                    operator: query.operator,
                   }
                 )}
             </Suspense>
-          </>
+          </ErrorBoundary>
         )}
       </Grid>
     </Grid>
diff --git a/src/components/TableToolbar/Filters/FiltersPopover.tsx b/src/components/TableToolbar/Filters/FiltersPopover.tsx
index 5abf6c48..1346f158 100644
--- a/src/components/TableToolbar/Filters/FiltersPopover.tsx
+++ b/src/components/TableToolbar/Filters/FiltersPopover.tsx
@@ -76,7 +76,7 @@ export default function FiltersPopover({
 
           const formattedValue = availableFilters?.valueFormatter
             ? availableFilters.valueFormatter(filter.value)
-            : filter.value;
+            : filter.value.toString();
 
           return (
             <Chip
diff --git a/src/components/fields/DateTime/FilterCustomInput.tsx b/src/components/fields/DateTime/FilterCustomInput.tsx
new file mode 100644
index 00000000..8ba75fdf
--- /dev/null
+++ b/src/components/fields/DateTime/FilterCustomInput.tsx
@@ -0,0 +1,14 @@
+import { IFilterCustomInputProps } from "@src/components/fields/types";
+import DateTimeInput from "./SideDrawerField";
+import DateInput from "@src/components/fields/Date/SideDrawerField";
+
+export default function FilterCustomInput({
+  onChange,
+  operator,
+  ...props
+}: IFilterCustomInputProps) {
+  if (operator && operator.startsWith("date-"))
+    return <DateInput {...(props as any)} onChange={onChange} />;
+
+  return <DateTimeInput {...(props as any)} onChange={onChange} />;
+}
diff --git a/src/components/fields/DateTime/SideDrawerField.tsx b/src/components/fields/DateTime/SideDrawerField.tsx
index 48b87229..55a892ba 100644
--- a/src/components/fields/DateTime/SideDrawerField.tsx
+++ b/src/components/fields/DateTime/SideDrawerField.tsx
@@ -14,7 +14,7 @@ import { getFieldId } from "@src/components/SideDrawer/utils";
 
 export interface IDateProps extends ISideDrawerFieldProps {}
 
-export default function Date_({
+export default function DateTime({
   column,
   value,
   onChange,
diff --git a/src/components/fields/DateTime/filters.ts b/src/components/fields/DateTime/filters.ts
index 19455484..90f818e3 100644
--- a/src/components/fields/DateTime/filters.ts
+++ b/src/components/fields/DateTime/filters.ts
@@ -7,56 +7,67 @@ export const filterOperators: IFilterOperator[] = [
     label: "equals",
     secondaryLabel: "==",
     value: "time-minute-equal",
+    group: "Date & Time",
   },
   {
     label: "not equal to",
     secondaryLabel: "!=",
     value: "!=",
+    group: "Date & Time",
   },
   {
     label: "before",
     secondaryLabel: "<",
     value: "<",
+    group: "Date & Time",
   },
   {
     label: "after",
     secondaryLabel: ">",
     value: ">",
+    group: "Date & Time",
   },
   {
     label: "before or at",
     secondaryLabel: "<=",
     value: "<=",
+    group: "Date & Time",
   },
   {
     label: "at or after",
     secondaryLabel: ">=",
     value: ">=",
+    group: "Date & Time",
   },
   {
-    label: "where date is is",
+    label: "where date is",
     secondaryLabel: "date ==",
     value: "date-equal",
+    group: "Date",
   },
   {
     label: "where date is before",
     secondaryLabel: "date <",
     value: "date-before",
+    group: "Date",
   },
   {
     label: "where date is after",
     secondaryLabel: "date >",
     value: "date-after",
+    group: "Date",
   },
   {
     label: "where date is before or on",
     secondaryLabel: "date <=",
     value: "date-before-equal",
+    group: "Date",
   },
   {
     label: "where date is on or after",
     secondaryLabel: "date >=",
     value: "date-after-equal",
+    group: "Date",
   },
 ];
 
diff --git a/src/components/fields/DateTime/index.tsx b/src/components/fields/DateTime/index.tsx
index 4f3a134b..880557a0 100644
--- a/src/components/fields/DateTime/index.tsx
+++ b/src/components/fields/DateTime/index.tsx
@@ -21,6 +21,12 @@ const SideDrawerField = lazy(
 const Settings = lazy(
   () => import("./Settings" /* webpackChunkName: "Settings-DateTime" */)
 );
+const FilterCustomInput = lazy(
+  () =>
+    import(
+      "./FilterCustomInput" /* webpackChunkName: "FilterCustomInput-DateTime" */
+    )
+);
 
 export const config: IFieldConfig = {
   type: FieldType.dateTime,
@@ -34,7 +40,11 @@ export const config: IFieldConfig = {
   TableCell: withHeavyCell(BasicCell, TableCell),
   TableEditor: NullEditor as any,
   SideDrawerField,
-  filter: { operators: filterOperators, valueFormatter },
+  filter: {
+    operators: filterOperators,
+    valueFormatter,
+    customInput: FilterCustomInput,
+  },
   settings: Settings,
   csvImportParser: (value) => parseJSON(value).getTime(),
   csvExportFormatter: (value: any, config?: any) =>
diff --git a/src/components/fields/types.ts b/src/components/fields/types.ts
index a35c039d..1cd791ea 100644
--- a/src/components/fields/types.ts
+++ b/src/components/fields/types.ts
@@ -35,7 +35,7 @@ export interface IFieldConfig {
   settingsValidator?: (config: Record<string, any>) => Record<string, string>;
   filter?: {
     operators: IFilterOperator[];
-    customInput?: React.ComponentType<{ onChange: (value: any) => void }>;
+    customInput?: React.ComponentType<IFilterCustomInputProps>;
     defaultValue?: any;
     valueFormatter?: (value: any) => string;
   };
@@ -104,4 +104,11 @@ export interface IFilterOperator {
   value: TableFilter["operator"];
   label: string;
   secondaryLabel?: React.ReactNode;
+  group?: string;
+}
+
+export interface IFilterCustomInputProps {
+  onChange: (value: any) => void;
+  operator: TableFilter["operator"];
+  [key: string]: any;
 }

From 2f7f5693039aae28d6a71d4230718936bdc944b9 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Thu, 30 Jun 2022 15:44:22 +1000
Subject: [PATCH 007/309] Action field: prevent selecting self as required
 field (fixes ROWY-551)

---
 src/components/fields/Action/Settings.tsx | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/components/fields/Action/Settings.tsx b/src/components/fields/Action/Settings.tsx
index 7acb3879..1ecf60e1 100644
--- a/src/components/fields/Action/Settings.tsx
+++ b/src/components/fields/Action/Settings.tsx
@@ -58,7 +58,7 @@ const CodeEditor = lazy(
     import("@src/components/CodeEditor" /* webpackChunkName: "CodeEditor" */)
 );
 
-const Settings = ({ config, onChange }: ISettingsProps) => {
+const Settings = ({ config, onChange, fieldName }: ISettingsProps) => {
   const [projectId] = useAtom(projectIdAtom, globalScope);
   const [roles] = useAtom(projectRolesAtom, globalScope);
   const [settings] = useAtom(projectSettingsAtom, globalScope);
@@ -77,10 +77,12 @@ const Settings = ({ config, onChange }: ISettingsProps) => {
   //     ? ["requirements", "friction", "action", "undo", "customization"]
   //     : ["requirements", "friction", "action", "customization"];
 
-  const columnOptions = tableColumnsOrdered.map((c) => ({
-    label: c.name,
-    value: c.key,
-  }));
+  const columnOptions = tableColumnsOrdered
+    .map((c) => ({
+      label: c.name,
+      value: c.key,
+    }))
+    .filter((c) => c.value !== fieldName);
 
   const formattedParamsJson = stringify(
     Array.isArray(config.params) ? config.params : [],
@@ -145,6 +147,7 @@ const Settings = ({ config, onChange }: ISettingsProps) => {
               <Grid item xs={12} sm={6}>
                 <MultiSelect
                   label="Required roles"
+                  labelPlural="roles"
                   options={roles ?? []}
                   value={config.requiredRoles ?? []}
                   onChange={onChange("requiredRoles")}
@@ -158,6 +161,7 @@ const Settings = ({ config, onChange }: ISettingsProps) => {
               <Grid item xs={12} sm={6}>
                 <MultiSelect
                   label="Required fields"
+                  labelPlural="fields"
                   options={columnOptions}
                   value={config.requiredFields ?? []}
                   onChange={onChange("requiredFields")}

From d98d726676d7a25157eaf8e4f3162f960c9fc0e1 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Thu, 30 Jun 2022 19:19:25 +1000
Subject: [PATCH 008/309] Date & Time: only show date for date filters

---
 src/components/TableToolbar/Filters/FiltersPopover.tsx |  2 +-
 src/components/fields/DateTime/filters.ts              | 10 +++++++---
 src/components/fields/types.ts                         |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/components/TableToolbar/Filters/FiltersPopover.tsx b/src/components/TableToolbar/Filters/FiltersPopover.tsx
index 1346f158..52d6408e 100644
--- a/src/components/TableToolbar/Filters/FiltersPopover.tsx
+++ b/src/components/TableToolbar/Filters/FiltersPopover.tsx
@@ -75,7 +75,7 @@ export default function FiltersPopover({
           );
 
           const formattedValue = availableFilters?.valueFormatter
-            ? availableFilters.valueFormatter(filter.value)
+            ? availableFilters.valueFormatter(filter.value, filter.operator)
             : filter.value.toString();
 
           return (
diff --git a/src/components/fields/DateTime/filters.ts b/src/components/fields/DateTime/filters.ts
index 90f818e3..e3c2b73b 100644
--- a/src/components/fields/DateTime/filters.ts
+++ b/src/components/fields/DateTime/filters.ts
@@ -1,5 +1,5 @@
 import { format } from "date-fns";
-import { DATE_TIME_FORMAT } from "@src/constants/dates";
+import { DATE_TIME_FORMAT, DATE_FORMAT } from "@src/constants/dates";
 import { IFilterOperator } from "@src/components/fields/types";
 
 export const filterOperators: IFilterOperator[] = [
@@ -71,7 +71,11 @@ export const filterOperators: IFilterOperator[] = [
   },
 ];
 
-export const valueFormatter = (value: any) => {
-  if (value && value.toDate) return format(value.toDate(), DATE_TIME_FORMAT);
+export const valueFormatter = (value: any, operator: string) => {
+  if (value && value.toDate)
+    return format(
+      value.toDate(),
+      operator.startsWith("date") ? DATE_FORMAT : DATE_TIME_FORMAT
+    );
   return "";
 };
diff --git a/src/components/fields/types.ts b/src/components/fields/types.ts
index 1cd791ea..66890472 100644
--- a/src/components/fields/types.ts
+++ b/src/components/fields/types.ts
@@ -37,7 +37,7 @@ export interface IFieldConfig {
     operators: IFilterOperator[];
     customInput?: React.ComponentType<IFilterCustomInputProps>;
     defaultValue?: any;
-    valueFormatter?: (value: any) => string;
+    valueFormatter?: (value: any, operator: TableFilter["operator"]) => string;
   };
   sortKey?: string;
   csvExportFormatter?: (value: any, config?: any) => string;

From a943cbb8c8cfabd282f6efa9d347efe419f22507 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Fri, 1 Jul 2022 15:19:34 +1000
Subject: [PATCH 009/309] update AuthLayout

---
 src/assets/Logo.tsx            |  43 +++++++++++++++++++++++---
 src/assets/bg-table-dark.webp  | Bin 0 -> 10144 bytes
 src/assets/bg-table-light.webp | Bin 0 -> 8582 bytes
 src/layouts/AuthLayout.tsx     |  53 ++++++++++++++++++++++-----------
 src/layouts/MarketingPanel.tsx |   6 ++--
 5 files changed, 76 insertions(+), 26 deletions(-)
 create mode 100644 src/assets/bg-table-dark.webp
 create mode 100644 src/assets/bg-table-light.webp

diff --git a/src/assets/Logo.tsx b/src/assets/Logo.tsx
index 5c12bb1e..acd8151f 100644
--- a/src/assets/Logo.tsx
+++ b/src/assets/Logo.tsx
@@ -20,14 +20,49 @@ export default function Logo({ size = 1.5, ...props }: ILogoProps) {
     >
       <title id="rowy-logo-title">Rowy</title>
 
+      <defs>
+        <linearGradient x1="83.349%" y1="50%" x2="0%" y2="50%" id="b">
+          <stop stop-color="#F0A" offset="0%" />
+          <stop stop-color="#FA0" offset="100%" />
+        </linearGradient>
+        <linearGradient x1="50%" y1="16.276%" x2="50%" y2="100%" id="c">
+          <stop stop-color="#4200FF" offset="0%" />
+          <stop stop-color="#F0A" offset="100%" />
+        </linearGradient>
+        <linearGradient x1="83.052%" y1="50%" x2="0%" y2="50%" id="d">
+          <stop stop-color="#0AF" offset="0%" />
+          <stop stop-color="#0FA" offset="100%" />
+        </linearGradient>
+        <linearGradient x1="100%" y1="50%" x2="16.614%" y2="50%" id="e">
+          <stop stop-color="#0AF" offset="0%" />
+          <stop stop-color="#4200FF" offset="100%" />
+        </linearGradient>
+      </defs>
+
+      <path
+        d="M6 10v6H3a3 3 0 010-6h3zm-1 5v-4H3a2 2 0 00-1.995 1.85L1 13a2 2 0 001.85 1.995L3 15h2z"
+        fill="url(#b)"
+        transform="rotate(-90 3 13)"
+      />
+      <path
+        d="M6 6H0V3a3 3 0 116 0v3zM1 5h4V3a2 2 0 00-1.85-1.995L3 1a2 2 0 00-1.995 1.85L1 3v2z"
+        fill="#4200FF"
+      />
+      <path d="M6 5v6H0V5h6zM5 6H1v4h4V6z" fill="url(#c)" />
+      <path
+        d="M16 0v6h-3a3 3 0 010-6h3zm-1.001 5V1H13a2 2 0 00-1.995 1.85L11 3a2 2 0 001.85 1.995L13 5h1.999z"
+        fill="url(#d)"
+        transform="rotate(-180 13 3)"
+      />
+      <path
+        d="M11 0v6H5V3a3 3 0 013-3h3zm-1 1H8a2 2 0 00-1.995 1.85L6 3v2h4V1z"
+        fill="url(#e)"
+      />
+
       <path
         d="M58 3l4 9 4-9h2l-7 16h-2l2-4.5L56 3h2zm-26-.25a6.25 6.25 0 110 12.5 6.25 6.25 0 010-12.5zM26 3v2h-4v10h-2V3h6zm14 0l3 9 3-9h2l3 9 3-9h2l-4 12h-2l-3-9-3 9h-2L38 3h2zm-8 1.75a4.25 4.25 0 100 8.5 4.25 4.25 0 000-8.5z"
         fill={theme.palette.text.primary}
       />
-      <path
-        d="M13 0a3 3 0 010 6l-2-.001V6H6v7a3 3 0 01-6 0V3a3 3 0 015.501-1.657A2.989 2.989 0 018 0h5zM5 11H1v2a2 2 0 001.85 1.995L3 15a2 2 0 001.995-1.85L5 13v-2zm0-5H1v4h4V6zM3 1a2 2 0 00-1.995 1.85L1 3v2h4V3a2 2 0 00-1.85-1.995L3 1zm8.001 0v4H13a2 2 0 001.995-1.85L15 3a2 2 0 00-1.85-1.995L13 1h-1.999zM10 1H8a2 2 0 00-1.995 1.85L6 3v2h4V1z"
-        fill={theme.palette.primary.main}
-      />
     </svg>
   );
 }
diff --git a/src/assets/bg-table-dark.webp b/src/assets/bg-table-dark.webp
new file mode 100644
index 0000000000000000000000000000000000000000..2d1d7b0d79d97310cfcd649df3a45c90004d8aff
GIT binary patch
literal 10144
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
OX3895-aJ%bKmY*qWV-kO

literal 0
HcmV?d00001

diff --git a/src/assets/bg-table-light.webp b/src/assets/bg-table-light.webp
new file mode 100644
index 0000000000000000000000000000000000000000..18d3e91f6fcf305a56ec308e151e4a946b5b5563
GIT binary patch
literal 8582
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
M?+)t7q}l)g0Fx`Tng9R*

literal 0
HcmV?d00001

diff --git a/src/layouts/AuthLayout.tsx b/src/layouts/AuthLayout.tsx
index c5551d1b..08e5ad6a 100644
--- a/src/layouts/AuthLayout.tsx
+++ b/src/layouts/AuthLayout.tsx
@@ -1,6 +1,8 @@
-import { useAtom } from "jotai";
+import { use100vh } from "react-div-100vh";
 
 import {
+  alpha,
+  Box,
   Paper,
   Typography,
   LinearProgress,
@@ -8,12 +10,11 @@ import {
   Link,
   LinkProps,
 } from "@mui/material";
-import { alpha, Theme } from "@mui/material/styles";
-import BrandedBackground, { Wrapper } from "@src/assets/BrandedBackground";
 import Logo from "@src/assets/Logo";
+import bgTableLight from "@src/assets/bg-table-light.webp";
+import bgTableDark from "@src/assets/bg-table-dark.webp";
 
 import { EXTERNAL_LINKS } from "@src/constants/externalLinks";
-import { globalScope, projectIdAtom } from "@src/atoms/globalScope";
 
 export interface IAuthLayoutProps {
   hideLogo?: boolean;
@@ -34,7 +35,7 @@ export default function AuthLayout({
   children,
   loading,
 }: IAuthLayoutProps) {
-  const [projectId] = useAtom(projectIdAtom, globalScope);
+  const fullScreenHeight = use100vh() ?? 0;
 
   const linkProps: LinkProps = {
     variant: "caption",
@@ -45,9 +46,30 @@ export default function AuthLayout({
   };
 
   return (
-    <Wrapper sx={hideLogo ? { gap: (theme) => theme.spacing(2) } : {}}>
-      <BrandedBackground />
+    <Box
+      sx={{
+        backgroundImage: (theme) =>
+          `linear-gradient(to bottom,
+            ${alpha(theme.palette.background.default, 0.6)},
+            ${alpha(theme.palette.background.default, 0.6)}),
+            url(${theme.palette.mode === "dark" ? bgTableDark : bgTableLight})`,
+        backgroundSize: { xs: "1920px 1080px", md: "cover" },
+        backgroundRepeat: "no-repeat",
+        backgroundPosition: "top left",
 
+        display: "grid",
+        placeItems: "center",
+        alignContent: "center",
+        gap: 2,
+        gridAutoRows: "max-content",
+        minHeight: fullScreenHeight > 0 ? `${fullScreenHeight}px` : "100vh",
+
+        pt: (theme) => `max(env(safe-area-inset-top), ${theme.spacing(1)})`,
+        pb: (theme) => `max(env(safe-area-inset-bottom), ${theme.spacing(1)})`,
+        pl: (theme) => `max(env(safe-area-inset-left), ${theme.spacing(1)})`,
+        pr: (theme) => `max(env(safe-area-inset-right), ${theme.spacing(1)})`,
+      }}
+    >
       <div
         style={{
           textAlign: "center",
@@ -75,24 +97,19 @@ export default function AuthLayout({
 
             maxWidth: 360,
             width: "100%",
-            px: 4,
-            py: 3,
+            p: 4,
             minHeight: 300,
 
-            backgroundColor: (theme: Theme) =>
-              alpha(theme.palette.background.paper, 0.5),
-            backdropFilter: "blur(20px) saturate(150%)",
-
             display: "flex",
             flexDirection: "column",
             textAlign: "center",
 
-            "& > :not(style) + :not(style)": { mt: 6 },
+            "& > :not(style) + :not(style)": { mt: 4 },
           } as any
         }
       >
         {title && (
-          <Typography component="h1" variant="h4">
+          <Typography component="h1" variant="h4" sx={{ mt: -1 }}>
             {title}
           </Typography>
         )}
@@ -123,13 +140,13 @@ export default function AuthLayout({
           />
         )}
 
-        <Typography
+        {/* <Typography
           variant="caption"
           color="text.secondary"
           sx={{ pt: 1, display: hideProject ? "none" : "block" }}
         >
           Project: <span style={{ userSelect: "all" }}>{projectId}</span>
-        </Typography>
+        </Typography> */}
       </Paper>
 
       <Stack
@@ -167,6 +184,6 @@ export default function AuthLayout({
           Terms
         </Link>
       </Stack>
-    </Wrapper>
+    </Box>
   );
 }
diff --git a/src/layouts/MarketingPanel.tsx b/src/layouts/MarketingPanel.tsx
index e47ebd0b..ad443f85 100644
--- a/src/layouts/MarketingPanel.tsx
+++ b/src/layouts/MarketingPanel.tsx
@@ -1,5 +1,4 @@
 import { Stack, Paper, Typography, Button } from "@mui/material";
-import { alpha } from "@mui/material/styles";
 import { Discord as DiscordIcon } from "@src/assets/icons";
 import TwitterIcon from "@mui/icons-material/Twitter";
 
@@ -9,7 +8,7 @@ import { EXTERNAL_LINKS } from "@src/constants/externalLinks";
 export default function Marketing() {
   return (
     <Paper
-      elevation={4}
+      elevation={0}
       square
       sx={{
         display: { xs: "none", md: "block" },
@@ -18,8 +17,7 @@ export default function Marketing() {
         gridColumn: 1,
         gridRow: "1 / 4",
 
-        backgroundColor: (theme) => alpha(theme.palette.background.paper, 0.5),
-        backdropFilter: "blur(20px) saturate(150%)",
+        bgcolor: "background.default",
 
         pt: (theme) => `max(env(safe-area-inset-top), ${theme.spacing(8)})`,
         pb: (theme) => `max(env(safe-area-inset-bottom), ${theme.spacing(8)})`,

From 82ecbadedea03faaeeae70d630da7fc2c0991dfa Mon Sep 17 00:00:00 2001
From: shamsmosowi <shams.mosowi@gmail.com>
Date: Sat, 2 Jul 2022 21:07:33 +0200
Subject: [PATCH 010/309] move fullScreenButton to be shared, remove md
 settings

---
 src/components/CodeEditor/CodeEditor.tsx      |  3 +-
 src/components/CodeEditor/DiffEditor.tsx      |  3 +-
 .../{CodeEditor => }/FullScreenButton.tsx     |  0
 src/components/fields/Markdown/Settings.tsx   | 41 -------------------
 src/components/fields/Markdown/index.tsx      |  5 ---
 5 files changed, 4 insertions(+), 48 deletions(-)
 rename src/components/{CodeEditor => }/FullScreenButton.tsx (100%)
 delete mode 100644 src/components/fields/Markdown/Settings.tsx

diff --git a/src/components/CodeEditor/CodeEditor.tsx b/src/components/CodeEditor/CodeEditor.tsx
index f3deeb2b..6c969203 100644
--- a/src/components/CodeEditor/CodeEditor.tsx
+++ b/src/components/CodeEditor/CodeEditor.tsx
@@ -10,7 +10,7 @@ import { ResizeBottomRight } from "@src/assets/icons";
 import useMonacoCustomizations, {
   IUseMonacoCustomizationsProps,
 } from "./useMonacoCustomizations";
-import FullScreenButton from "./FullScreenButton";
+import FullScreenButton from "@src/components/FullScreenButton";
 import { spreadSx } from "@src/utils/ui";
 
 export interface ICodeEditorProps
@@ -73,6 +73,7 @@ export default function CodeEditor({
   return (
     <TrapFocus open={fullScreen}>
       <Box
+        component="div"
         sx={[boxSx, ...spreadSx(containerProps?.sx)]}
         style={fullScreen ? { height: "100%" } : {}}
       >
diff --git a/src/components/CodeEditor/DiffEditor.tsx b/src/components/CodeEditor/DiffEditor.tsx
index 834f7a68..64a9a55f 100644
--- a/src/components/CodeEditor/DiffEditor.tsx
+++ b/src/components/CodeEditor/DiffEditor.tsx
@@ -13,7 +13,7 @@ import { ResizeBottomRight } from "@src/assets/icons";
 import useMonacoCustomizations, {
   IUseMonacoCustomizationsProps,
 } from "./useMonacoCustomizations";
-import FullScreenButton from "./FullScreenButton";
+import FullScreenButton from "@src/components/FullScreenButton";
 import { spreadSx } from "@src/utils/ui";
 
 export interface IDiffEditorProps
@@ -64,6 +64,7 @@ export default function DiffEditor({
   return (
     <TrapFocus open={fullScreen}>
       <Box
+        component="div"
         sx={[boxSx, ...spreadSx(containerProps?.sx)]}
         style={fullScreen ? { height: "100%" } : {}}
       >
diff --git a/src/components/CodeEditor/FullScreenButton.tsx b/src/components/FullScreenButton.tsx
similarity index 100%
rename from src/components/CodeEditor/FullScreenButton.tsx
rename to src/components/FullScreenButton.tsx
diff --git a/src/components/fields/Markdown/Settings.tsx b/src/components/fields/Markdown/Settings.tsx
deleted file mode 100644
index 4a2bef71..00000000
--- a/src/components/fields/Markdown/Settings.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import { ISettingsProps } from "@src/components/fields/types";
-import MultiSelect from "@rowy/multiselect";
-
-const languages = [
-  "javascript",
-  "typescript",
-  "json",
-  "html",
-  "css",
-  "scss",
-  "shell",
-  "yaml",
-  "xml",
-  "ruby",
-  "python",
-  "php",
-  "markdown",
-  "rust",
-  "csharp",
-  "cpp",
-  "c",
-  "java",
-  "go",
-  "plaintext",
-];
-
-export default function Settings({ config, onChange }: ISettingsProps) {
-  return (
-    <MultiSelect
-      searchable
-      multiple={false}
-      options={languages}
-      value={config.language ?? "javascript"}
-      onChange={(value) => {
-        onChange("language")(value);
-      }}
-      label="Language"
-      labelPlural="languages"
-    />
-  );
-}
diff --git a/src/components/fields/Markdown/index.tsx b/src/components/fields/Markdown/index.tsx
index 4ce88144..6053f093 100644
--- a/src/components/fields/Markdown/index.tsx
+++ b/src/components/fields/Markdown/index.tsx
@@ -6,10 +6,6 @@ import { Markdown as MarkdownIcon } from "@src/assets/icons";
 import BasicCell from "./BasicCell";
 import withSideDrawerEditor from "@src/components/Table/editors/withSideDrawerEditor";
 
-const Settings = lazy(
-  () => import("./Settings" /* webpackChunkName: "Settings-markdown" */)
-);
-
 const SideDrawerField = lazy(
   () =>
     import(
@@ -29,6 +25,5 @@ export const config: IFieldConfig = {
   TableCell: withBasicCell(BasicCell),
   TableEditor: withSideDrawerEditor(BasicCell),
   SideDrawerField,
-  settings: Settings,
 };
 export default config;

From dd214b96e49cb3e14e3b167e94cd174d67e8bb5f Mon Sep 17 00:00:00 2001
From: shamsmosowi <shams.mosowi@gmail.com>
Date: Sun, 3 Jul 2022 15:24:25 +0200
Subject: [PATCH 011/309] bundle-analyzer

---
 craco.config.js |  4 +++-
 package.json    |  3 ++-
 yarn.lock       | 56 ++++++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/craco.config.js b/craco.config.js
index 8e921d31..1a175a2d 100644
--- a/craco.config.js
+++ b/craco.config.js
@@ -1,7 +1,8 @@
 const { whenDev } = require("@craco/craco");
 const CracoAlias = require("craco-alias");
 const CracoSwcPlugin = require("craco-swc");
-
+const BundleAnalyzerPlugin =
+  require("webpack-bundle-analyzer").BundleAnalyzerPlugin;
 module.exports = {
   plugins: [
     {
@@ -65,6 +66,7 @@ module.exports = {
     },
   },
   webpack: {
+    plugins: [new BundleAnalyzerPlugin({ analyzerMode: "server" })],
     configure: {
       resolve: {
         // Polyfill for monaco-editor-auto-typings
diff --git a/package.json b/package.json
index ff663d09..0297f513 100644
--- a/package.json
+++ b/package.json
@@ -176,7 +176,8 @@
     "raw-loader": "^4.0.2",
     "source-map-explorer": "^2.5.2",
     "ts-jest": "^28.0.2",
-    "typedoc": "^0.22.17"
+    "typedoc": "^0.22.17",
+    "webpack-bundle-analyzer": "^4.5.0"
   },
   "resolutions": {
     "@types/react": "^18"
diff --git a/yarn.lock b/yarn.lock
index da7f9913..b095480f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3092,6 +3092,11 @@
     schema-utils "^3.0.0"
     source-map "^0.7.3"
 
+"@polka/url@^1.0.0-next.20":
+  version "1.0.0-next.21"
+  resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1"
+  integrity sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==
+
 "@popperjs/core@^2.11.4":
   version "2.11.5"
   resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.5.tgz#db5a11bf66bdab39569719555b0f76e138d7bd64"
@@ -4388,7 +4393,7 @@ acorn-walk@^7.0.0, acorn-walk@^7.1.1:
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
   integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
 
-acorn-walk@^8.1.1:
+acorn-walk@^8.0.0, acorn-walk@^8.1.1:
   version "8.2.0"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
   integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
@@ -4398,6 +4403,11 @@ acorn@^7.0.0, acorn@^7.1.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
+acorn@^8.0.4:
+  version "8.7.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
+  integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==
+
 acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.0:
   version "8.7.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
@@ -9761,6 +9771,11 @@ mri@^1.1.0:
   resolved "https://registry.yarnpkg.com/mri/-/mri-1.2.0.tgz#6721480fec2a11a4889861115a48b6cbe7cc8f0b"
   integrity sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==
 
+mrmime@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-1.0.1.tgz#5f90c825fad4bdd41dc914eff5d1a8cfdaf24f27"
+  integrity sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==
+
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -10060,6 +10075,11 @@ open@^8.0.9, open@^8.4.0:
     is-docker "^2.1.1"
     is-wsl "^2.2.0"
 
+opener@^1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
+  integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==
+
 optionator@^0.8.1:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
@@ -12246,6 +12266,15 @@ signal-exit@^3.0.2, signal-exit@^3.0.3:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
   integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
 
+sirv@^1.0.7:
+  version "1.0.19"
+  resolved "https://registry.yarnpkg.com/sirv/-/sirv-1.0.19.tgz#1d73979b38c7fe91fcba49c85280daa9c2363b49"
+  integrity sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ==
+  dependencies:
+    "@polka/url" "^1.0.0-next.20"
+    mrmime "^1.0.0"
+    totalist "^1.0.0"
+
 sisteransi@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
@@ -12958,6 +12987,11 @@ toposort@^2.0.2:
   resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330"
   integrity sha1-riF2gXXRVZ1IvvNUILL0li8JwzA=
 
+totalist@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/totalist/-/totalist-1.1.0.tgz#a4d65a3e546517701e3e5c37a47a70ac97fe56df"
+  integrity sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==
+
 tough-cookie@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4"
@@ -13554,6 +13588,21 @@ webidl-conversions@^6.1.0:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
   integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
 
+webpack-bundle-analyzer@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.5.0.tgz#1b0eea2947e73528754a6f9af3e91b2b6e0f79d5"
+  integrity sha512-GUMZlM3SKwS8Z+CKeIFx7CVoHn3dXFcUAjT/dcZQQmfSZGvitPfMob2ipjai7ovFFqPvTqkEZ/leL4O0YOdAYQ==
+  dependencies:
+    acorn "^8.0.4"
+    acorn-walk "^8.0.0"
+    chalk "^4.1.0"
+    commander "^7.2.0"
+    gzip-size "^6.0.0"
+    lodash "^4.17.20"
+    opener "^1.5.2"
+    sirv "^1.0.7"
+    ws "^7.3.1"
+
 webpack-dev-middleware@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.1.tgz#aa079a8dedd7e58bfeab358a9af7dab304cee57f"
@@ -13979,6 +14028,11 @@ ws@>=7.4.6:
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.0.tgz#0b738cd484bfc9303421914b11bb4011e07615bb"
   integrity sha512-uYhVJ/m9oXwEI04iIVmgLmugh2qrZihkywG9y5FfZV2ATeLIzHf93qs+tUNqlttbQK957/VX3mtwAS+UfIwA4g==
 
+ws@^7.3.1:
+  version "7.5.8"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.8.tgz#ac2729881ab9e7cbaf8787fe3469a48c5c7f636a"
+  integrity sha512-ri1Id1WinAX5Jqn9HejiGb8crfRio0Qgu8+MtL36rlTA6RLsMdWt1Az/19A2Qij6uSHUMphEFaTKa4WG+UNHNw==
+
 ws@^7.4.6:
   version "7.5.7"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67"

From ea0da547f990209b89ad28d87a87659d9d5f79e7 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 4 Jul 2022 11:57:22 +1000
Subject: [PATCH 012/309] Leaf icon: use mdi-material-ui

---
 src/assets/icons/Leaf.tsx                | 10 ----------
 src/assets/icons/index.ts                |  6 ++++++
 src/components/Settings/RegionSelect.tsx |  2 +-
 3 files changed, 7 insertions(+), 11 deletions(-)
 delete mode 100644 src/assets/icons/Leaf.tsx

diff --git a/src/assets/icons/Leaf.tsx b/src/assets/icons/Leaf.tsx
deleted file mode 100644
index dc092b28..00000000
--- a/src/assets/icons/Leaf.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon";
-import { mdiLeaf } from "@mdi/js";
-
-export default function Leaf(props: SvgIconProps) {
-  return (
-    <SvgIcon {...props}>
-      <path d={mdiLeaf} />
-    </SvgIcon>
-  );
-}
diff --git a/src/assets/icons/index.ts b/src/assets/icons/index.ts
index 2721ea47..ad903f41 100644
--- a/src/assets/icons/index.ts
+++ b/src/assets/icons/index.ts
@@ -88,6 +88,12 @@ export { LanguageMarkdownOutline as Markdown };
 import { TableRow } from "mdi-material-ui";
 export { TableRow as Row };
 
+import { Table } from "mdi-material-ui";
+export { Table };
+
+import { Leaf } from "mdi-material-ui";
+export { Leaf };
+
 export * from "./AddRow";
 export * from "./AddRowTop";
 export * from "./ChevronDown";
diff --git a/src/components/Settings/RegionSelect.tsx b/src/components/Settings/RegionSelect.tsx
index 08dccaf4..d1f7892a 100644
--- a/src/components/Settings/RegionSelect.tsx
+++ b/src/components/Settings/RegionSelect.tsx
@@ -2,7 +2,7 @@ import { sortBy } from "lodash-es";
 
 import MultiSelect from "@rowy/multiselect";
 import { Grid } from "@mui/material";
-import LeafIcon from "@src/assets/icons/Leaf";
+import { Leaf as LeafIcon } from "@src/assets/icons";
 
 import { CLOUD_RUN_REGIONS } from "@src/constants/regions";
 

From 4f230871e1701e6df9b1038190ad7ac5a934ef33 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 4 Jul 2022 19:13:30 +1000
Subject: [PATCH 013/309] replace desktop pinned nav with collapsible nav

---
 src/atoms/globalScope/ui.ts                |   2 -
 src/components/FloatingSearch.tsx          |   4 +-
 src/components/SectionHeading.tsx          |   4 +-
 src/components/SideDrawer/StyledDrawer.ts  |  10 +-
 src/components/Table/EmptyTable.tsx        |   4 +-
 src/components/Table/Table.tsx             |   7 +-
 src/components/Table/TableContainer.tsx    |   4 +-
 src/constants/externalLinks.ts             |   1 +
 src/constants/routes.tsx                   |  21 +-
 src/layouts/Navigation/HelpMenu.tsx        |   3 +-
 src/layouts/Navigation/NavDrawer.tsx       | 431 +++++++++++++--------
 src/layouts/Navigation/NavItem.tsx         |  38 +-
 src/layouts/Navigation/NavTableSection.tsx |  38 +-
 src/layouts/Navigation/Navigation.tsx      | 200 ++--------
 src/layouts/Navigation/TopBar.tsx          | 177 +++++++++
 src/layouts/Navigation/UserMenu.tsx        |   1 -
 src/pages/FunctionsPage.tsx                |   4 +-
 src/pages/NotFoundPage.tsx                 |   5 +-
 src/pages/Table/ProvidedSubTablePage.tsx   |  10 +-
 src/pages/TablesPage.tsx                   |   9 +-
 20 files changed, 561 insertions(+), 412 deletions(-)
 create mode 100644 src/layouts/Navigation/TopBar.tsx

diff --git a/src/atoms/globalScope/ui.ts b/src/atoms/globalScope/ui.ts
index 245beee3..616fc8f0 100644
--- a/src/atoms/globalScope/ui.ts
+++ b/src/atoms/globalScope/ui.ts
@@ -13,8 +13,6 @@ export const altPressAtom = atom(false);
 
 /** Nav open state stored in local storage. */
 export const navOpenAtom = atomWithStorage("__ROWY__NAV_OPEN", false);
-/** Nav pinned state stored in local storage. */
-export const navPinnedAtom = atomWithStorage("__ROWY__NAV_PINNED", false);
 
 /** View for tables page */
 export const tablesViewAtom = atomWithStorage<"grid" | "list">(
diff --git a/src/components/FloatingSearch.tsx b/src/components/FloatingSearch.tsx
index 3068323f..a6dd3d40 100644
--- a/src/components/FloatingSearch.tsx
+++ b/src/components/FloatingSearch.tsx
@@ -8,7 +8,7 @@ import {
 import SearchIcon from "@mui/icons-material/Search";
 
 import SlideTransition from "@src/components/Modal/SlideTransition";
-import { APP_BAR_HEIGHT } from "@src/layouts/Navigation";
+import { TOP_BAR_HEIGHT } from "@src/layouts/Navigation/TopBar";
 
 export interface IFloatingSearchProps extends Partial<FilledTextFieldProps> {
   label: string;
@@ -26,7 +26,7 @@ export default function FloatingSearch({
   });
   const docked = useScrollTrigger({
     disableHysteresis: true,
-    threshold: APP_BAR_HEIGHT,
+    threshold: TOP_BAR_HEIGHT,
   });
 
   return (
diff --git a/src/components/SectionHeading.tsx b/src/components/SectionHeading.tsx
index 99eeeb48..6a29c25d 100644
--- a/src/components/SectionHeading.tsx
+++ b/src/components/SectionHeading.tsx
@@ -5,7 +5,7 @@ import { HashLink } from "react-router-hash-link";
 import { Stack, StackProps, Typography, IconButton } from "@mui/material";
 import LinkIcon from "@mui/icons-material/Link";
 
-import { APP_BAR_HEIGHT } from "@src/layouts/Navigation";
+import { TOP_BAR_HEIGHT } from "@src/layouts/Navigation/TopBar";
 
 export interface ISectionHeadingProps extends Omit<StackProps, "children"> {
   children: string;
@@ -35,7 +35,7 @@ export const SectionHeading = forwardRef(function SectionHeading_(
           opacity: 1,
         },
 
-        scrollMarginTop: (theme) => theme.spacing(APP_BAR_HEIGHT / 8 + 3.5),
+        scrollMarginTop: (theme) => theme.spacing(TOP_BAR_HEIGHT / 8 + 3.5),
         scrollBehavior: "smooth",
       }}
     >
diff --git a/src/components/SideDrawer/StyledDrawer.ts b/src/components/SideDrawer/StyledDrawer.ts
index e1ff7579..14802665 100644
--- a/src/components/SideDrawer/StyledDrawer.ts
+++ b/src/components/SideDrawer/StyledDrawer.ts
@@ -1,6 +1,6 @@
 import { styled, Drawer, drawerClasses } from "@mui/material";
 import { DRAWER_WIDTH, DRAWER_COLLAPSED_WIDTH } from "./index";
-import { APP_BAR_HEIGHT } from "@src/layouts/Navigation";
+import { TOP_BAR_HEIGHT } from "@src/layouts/Navigation/TopBar";
 import { TABLE_TOOLBAR_HEIGHT } from "@src/components/TableToolbar";
 
 export const StyledDrawer = styled(Drawer)(({ theme }) => ({
@@ -32,15 +32,15 @@ export const StyledDrawer = styled(Drawer)(({ theme }) => ({
 
     boxSizing: "content-box",
 
-    top: APP_BAR_HEIGHT + TABLE_TOOLBAR_HEIGHT,
-    height: `calc(100% - ${APP_BAR_HEIGHT + TABLE_TOOLBAR_HEIGHT}px)`,
+    top: TOP_BAR_HEIGHT + TABLE_TOOLBAR_HEIGHT,
+    height: `calc(100% - ${TOP_BAR_HEIGHT + TABLE_TOOLBAR_HEIGHT}px)`,
     ".MuiDialog-paperFullScreen &": {
       top:
-        APP_BAR_HEIGHT +
+        TOP_BAR_HEIGHT +
         TABLE_TOOLBAR_HEIGHT +
         Number(theme.spacing(2).replace("px", "")),
       height: `calc(100% - ${
-        APP_BAR_HEIGHT + TABLE_TOOLBAR_HEIGHT
+        TOP_BAR_HEIGHT + TABLE_TOOLBAR_HEIGHT
       }px - ${theme.spacing(2)})`,
     },
 
diff --git a/src/components/Table/EmptyTable.tsx b/src/components/Table/EmptyTable.tsx
index 96c5e2d0..fd9794fb 100644
--- a/src/components/Table/EmptyTable.tsx
+++ b/src/components/Table/EmptyTable.tsx
@@ -13,7 +13,7 @@ import {
   columnModalAtom,
   tableModalAtom,
 } from "@src/atoms/tableScope";
-import { APP_BAR_HEIGHT } from "@src/layouts/Navigation";
+import { TOP_BAR_HEIGHT } from "@src/layouts/Navigation/TopBar";
 
 export default function EmptyTable() {
   const openColumnModal = useSetAtom(columnModalAtom, tableScope);
@@ -130,7 +130,7 @@ export default function EmptyTable() {
       justifyContent="center"
       alignItems="center"
       sx={{
-        height: `calc(100vh - ${APP_BAR_HEIGHT}px)`,
+        height: `calc(100vh - ${TOP_BAR_HEIGHT}px)`,
         width: "100%",
         p: 2,
         maxWidth: 480,
diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index 467a9a14..4c77f850 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -29,7 +29,6 @@ import {
   globalScope,
   userRolesAtom,
   userSettingsAtom,
-  navPinnedAtom,
 } from "@src/atoms/globalScope";
 import {
   tableScope,
@@ -66,7 +65,6 @@ export default function Table({
 }) {
   const [userRoles] = useAtom(userRolesAtom, globalScope);
   const [userSettings] = useAtom(userSettingsAtom, globalScope);
-  const [navPinned] = useAtom(navPinnedAtom, globalScope);
 
   const [tableId] = useAtom(tableIdAtom, tableScope);
   const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
@@ -188,8 +186,9 @@ export default function Table({
 
       const target = event.target as HTMLDivElement;
 
-      if (navPinned && !columns[0].fixed)
-        setShowLeftScrollDivider(target.scrollLeft > 16);
+      // TODO:
+      // if (navPinned && !columns[0].fixed)
+      //   setShowLeftScrollDivider(target.scrollLeft > 16);
 
       const offset = 800;
       const isAtBottom =
diff --git a/src/components/Table/TableContainer.tsx b/src/components/Table/TableContainer.tsx
index 4a6d900d..eb372f3e 100644
--- a/src/components/Table/TableContainer.tsx
+++ b/src/components/Table/TableContainer.tsx
@@ -1,6 +1,6 @@
 import { colord } from "colord";
 import { styled, alpha, darken, lighten } from "@mui/material";
-import { APP_BAR_HEIGHT } from "@src/layouts/Navigation";
+import { TOP_BAR_HEIGHT } from "@src/layouts/Navigation/TopBar";
 import { TABLE_TOOLBAR_HEIGHT } from "@src/components/TableToolbar";
 import {
   DRAWER_COLLAPSED_WIDTH,
@@ -15,7 +15,7 @@ export const TableContainer = styled("div", {
   display: "flex",
   position: "relative",
   flexDirection: "column",
-  height: `calc(100vh - ${APP_BAR_HEIGHT}px - ${TABLE_TOOLBAR_HEIGHT}px)`,
+  height: `calc(100vh - ${TOP_BAR_HEIGHT}px - ${TABLE_TOOLBAR_HEIGHT}px)`,
 
   "& .left-scroll-divider": {
     position: "absolute",
diff --git a/src/constants/externalLinks.ts b/src/constants/externalLinks.ts
index e1f0ebba..9ea89451 100644
--- a/src/constants/externalLinks.ts
+++ b/src/constants/externalLinks.ts
@@ -27,6 +27,7 @@ const WIKI_PATHS = {
   setupRoles: "/setup/roles",
   setupUpdate: "/setup/update",
 
+  howTo: "/category/quickstart-guide",
   howToCreateTable: "/how-to/create-table",
   howToCreateColumn: "/how-to/create-column",
   howToAddRow: "/how-to/add-row",
diff --git a/src/constants/routes.tsx b/src/constants/routes.tsx
index f890f937..5c65d586 100644
--- a/src/constants/routes.tsx
+++ b/src/constants/routes.tsx
@@ -1,6 +1,6 @@
 import Logo from "@src/assets/Logo";
 import BreadcrumbsTableRoot from "@src/components/Table/BreadcrumbsTableRoot";
-import { GrowProps } from "@mui/material";
+import { FadeProps } from "@mui/material";
 
 export enum ROUTES {
   home = "/",
@@ -46,22 +46,15 @@ export enum ROUTES {
 export const ROUTE_TITLES = {
   [ROUTES.tables]: {
     title: "Tables",
-    titleComponent: (open, pinned) =>
-      !(open && pinned) && (
-        <Logo
-          style={{
-            display: "block",
-            margin: "0 auto",
-          }}
-        />
+    titleComponent: (open, isPermanent) =>
+      !(open && isPermanent) && (
+        <Logo style={{ display: "block", margin: "0 auto" }} />
       ),
   },
 
   [ROUTES.table]: {
     title: "Table",
-    titleComponent: (open, pinned) => (
-      <BreadcrumbsTableRoot sx={{ ml: open && pinned ? -48 / 8 : 2 }} />
-    ),
+    titleComponent: (_open, _isPermanent) => <BreadcrumbsTableRoot />,
     titleTransitionProps: { style: { transformOrigin: "0 50%" } },
     leftAligned: true,
   },
@@ -80,8 +73,8 @@ export const ROUTE_TITLES = {
   | string
   | {
       title: string;
-      titleComponent: (open: boolean, pinned: boolean) => React.ReactNode;
-      titleTransitionProps?: Partial<GrowProps>;
+      titleComponent: (open: boolean, isPermanent: boolean) => React.ReactNode;
+      titleTransitionProps?: Partial<FadeProps>;
       leftAligned?: boolean;
     }
 >;
diff --git a/src/layouts/Navigation/HelpMenu.tsx b/src/layouts/Navigation/HelpMenu.tsx
index c6a9bb49..c97bf4e8 100644
--- a/src/layouts/Navigation/HelpMenu.tsx
+++ b/src/layouts/Navigation/HelpMenu.tsx
@@ -11,7 +11,7 @@ import {
   Grow,
 } from "@mui/material";
 import HelpIcon from "@mui/icons-material/HelpOutline";
-import DocsIcon from "@mui/icons-material/DescriptionOutlined";
+import DocsIcon from "@mui/icons-material/LibraryBooksOutlined";
 import { Discord as DiscordIcon } from "@src/assets/icons";
 import GitHubIcon from "@mui/icons-material/GitHub";
 import TwitterIcon from "@mui/icons-material/Twitter";
@@ -44,7 +44,6 @@ export default function UserMenu(props: IconButtonProps) {
             setOpen(true);
             analytics.logEvent("open_help_menu");
           }}
-          sx={{ ml: 1.5 }}
         >
           <HelpIcon />
         </IconButton>
diff --git a/src/layouts/Navigation/NavDrawer.tsx b/src/layouts/Navigation/NavDrawer.tsx
index cabc1c66..0f1097b9 100644
--- a/src/layouts/Navigation/NavDrawer.tsx
+++ b/src/layouts/Navigation/NavDrawer.tsx
@@ -1,5 +1,7 @@
+import { useState } from "react";
 import { useAtom, useSetAtom } from "jotai";
 import { find, groupBy } from "lodash-es";
+import { colord } from "colord";
 
 import {
   Drawer,
@@ -9,19 +11,25 @@ import {
   List,
   ListItemIcon,
   ListItemText,
-  // ListSubheader,
+  Avatar,
   Divider,
+  ListItemSecondaryAction,
+  Box,
+  Fade,
 } from "@mui/material";
 import CloseIcon from "@mui/icons-material/MenuOpen";
-import PinIcon from "@mui/icons-material/PushPinOutlined";
-import UnpinIcon from "@mui/icons-material/PushPin";
+import ArrowBackIcon from "@mui/icons-material/WorkspacesOutlined";
 import HomeIcon from "@mui/icons-material/HomeOutlined";
 import SettingsIcon from "@mui/icons-material/SettingsOutlined";
 import ProjectSettingsIcon from "@mui/icons-material/BuildCircleOutlined";
 import UserManagementIcon from "@mui/icons-material/AccountCircleOutlined";
 import AddIcon from "@mui/icons-material/Add";
+import { Table as TableIcon } from "@src/assets/icons";
+import DocsIcon from "@mui/icons-material/LibraryBooksOutlined";
+import LearningIcon from "@mui/icons-material/LocalLibraryOutlined";
+import HelpIcon from "@mui/icons-material/HelpOutline";
+import InlineOpenInNewIcon from "@src/components/InlineOpenInNewIcon";
 
-import { APP_BAR_HEIGHT } from ".";
 import Logo from "@src/assets/Logo";
 import NavItem from "./NavItem";
 import NavTableSection from "./NavTableSection";
@@ -36,24 +44,22 @@ import {
 } from "@src/atoms/globalScope";
 import { TableSettings } from "@src/types/table";
 import { ROUTES } from "@src/constants/routes";
+import { EXTERNAL_LINKS, WIKI_LINKS } from "@src/constants/externalLinks";
+import { TOP_BAR_HEIGHT } from "./TopBar";
 
 export const NAV_DRAWER_WIDTH = 256;
+export const NAV_DRAWER_COLLAPSED_WIDTH = 56;
 
 export interface INavDrawerProps extends DrawerProps {
+  open: boolean;
+  isPermanent: boolean;
   onClose: NonNullable<DrawerProps["onClose"]>;
-  pinned: boolean;
-  setPinned: React.Dispatch<React.SetStateAction<boolean>>;
-  canPin: boolean;
-  scrollTrigger: boolean;
 }
 
 export default function NavDrawer({
   open,
-  pinned,
-  setPinned,
-  canPin,
-  scrollTrigger,
-  ...props
+  isPermanent,
+  onClose,
 }: INavDrawerProps) {
   const [tables] = useAtom(tablesAtom, globalScope);
   const [userSettings] = useAtom(userSettingsAtom, globalScope);
@@ -63,6 +69,8 @@ export default function NavDrawer({
     globalScope
   );
 
+  const [hover, setHover] = useState(false);
+
   const favorites = Array.isArray(userSettings.favoriteTables)
     ? userSettings.favoriteTables
     : [];
@@ -73,146 +81,145 @@ export default function NavDrawer({
     ...groupBy(tables, "section"),
   };
 
-  const closeDrawer = pinned
+  const collapsed = !open && isPermanent;
+  const tempExpanded = hover && collapsed;
+  const width =
+    collapsed && !tempExpanded ? NAV_DRAWER_COLLAPSED_WIDTH : NAV_DRAWER_WIDTH;
+  const closeDrawer = isPermanent
     ? undefined
-    : (e: {}) => props.onClose(e, "escapeKeyDown");
+    : (e: {}) => onClose(e, "escapeKeyDown");
+
+  const externalLinkIcon = !collapsed && (
+    <ListItemSecondaryAction sx={{ right: 10, color: "text.disabled" }}>
+      <InlineOpenInNewIcon />
+    </ListItemSecondaryAction>
+  );
 
   return (
-    <Drawer
-      open={open}
-      {...props}
-      variant={pinned ? "persistent" : "temporary"}
-      anchor="left"
-      sx={{
-        width: open ? NAV_DRAWER_WIDTH : 0,
-        transition: (theme) =>
-          theme.transitions.create("width", {
-            easing: pinned
-              ? theme.transitions.easing.easeOut
-              : theme.transitions.easing.sharp,
-            duration: pinned
-              ? theme.transitions.duration.enteringScreen
-              : theme.transitions.duration.leavingScreen,
-          }),
-
-        flexShrink: 0,
-
-        "& .MuiDrawer-paper": {
-          minWidth: NAV_DRAWER_WIDTH,
-          borderRight: "none",
-          bgcolor: pinned ? "background.default" : "background.paper",
-        },
-      }}
-    >
-      <Stack
-        direction="row"
-        alignItems="center"
-        sx={{
-          height: APP_BAR_HEIGHT,
-          flexShrink: 0,
-          px: 0.5,
-
-          position: "sticky",
-          top: 0,
-          zIndex: "appBar",
-          backgroundColor:
-            pinned && scrollTrigger ? "background.paper" : "inherit",
-          backgroundImage: pinned
-            ? "linear-gradient(rgba(255, 255, 255, 0.09), rgba(255, 255, 255, 0.09))" // Elevation 8
-            : "inherit",
-
-          "&::before": {
-            content: "''",
-            display: "block",
-            position: "absolute",
-            inset: 0,
-
-            bgcolor: "background.default",
-            opacity: pinned ? (scrollTrigger ? 0 : 1) : 0,
-            transition: (theme) =>
-              theme.transitions.create("opacity", {
-                easing:
-                  canPin && pinned
-                    ? theme.transitions.easing.easeOut
-                    : theme.transitions.easing.sharp,
-                duration:
-                  canPin && pinned
-                    ? theme.transitions.duration.enteringScreen
-                    : theme.transitions.duration.leavingScreen,
-              }),
+    <>
+      <Drawer
+        open={isPermanent || open}
+        onClose={onClose}
+        hideBackdrop={isPermanent}
+        ModalProps={{ disablePortal: true }}
+        variant={isPermanent ? "permanent" : "temporary"}
+        anchor="left"
+        sx={[
+          {
+            width,
+            flexShrink: 0,
+            "& .MuiDrawer-paper": {
+              width,
+              pt: 0,
+              pb: 1,
+            },
           },
-          boxShadow: pinned && scrollTrigger ? 1 : 0,
-          transition: (theme) =>
-            theme.transitions.create(["background-color", "box-shadow"], {
-              easing:
-                canPin && pinned
-                  ? theme.transitions.easing.easeOut
-                  : theme.transitions.easing.sharp,
-              duration:
-                canPin && pinned
-                  ? theme.transitions.duration.enteringScreen
-                  : theme.transitions.duration.leavingScreen,
-            }),
-        }}
+          isPermanent && {
+            position: "fixed",
+            zIndex: (theme) => theme.zIndex.appBar - 1,
+
+            "& .MuiDrawer-paper": {
+              mt: `${TOP_BAR_HEIGHT - 4}px`,
+              height: `calc(100% - ${TOP_BAR_HEIGHT - 4}px)`,
+              pt: 0.5,
+              borderRadius: 2,
+              borderTopLeftRadius: 0,
+              borderBottomLeftRadius: 0,
+
+              width,
+              transitionProperty:
+                "width, transform, background-color, box-shadow",
+              transitionTimingFunction: "var(--nav-transition-timing-function)",
+              transitionDuration: "var(--nav-transition-duration)",
+              overflowX: "hidden",
+
+              borderRight: "none",
+              bgcolor: "background.default",
+            },
+
+            "& .MuiListItemSecondaryAction-root": {
+              transitionProperty: "opacity",
+              transitionTimingFunction: "var(--nav-transition-timing-function)",
+              transitionDuration: "var(--nav-transition-duration)",
+            },
+          },
+          collapsed &&
+            !tempExpanded && {
+              "& .MuiMenuItem-root": {},
+              "& .MuiListItemSecondaryAction-root": {
+                opacity: 0,
+                transitionDelay: "0ms",
+              },
+            },
+          tempExpanded && {
+            zIndex: "drawer",
+            "& .MuiDrawer-paper": {
+              bgcolor: (theme) =>
+                colord(theme.palette.background.paper)
+                  .mix("#fff", 0.09)
+                  .alpha(1)
+                  .toHslString(),
+              boxShadow: (theme) =>
+                theme.shadows[4].replace(/, 0 (\d+px)/g, ", $1 0"),
+            },
+          },
+        ]}
+        onMouseEnter={() => setHover(true)}
+        onMouseLeave={() => setHover(false)}
       >
-        <IconButton
-          aria-label="Close navigation drawer"
-          onClick={props.onClose as any}
-          size="large"
-        >
-          <CloseIcon />
-        </IconButton>
-
-        <Logo style={{ marginLeft: 1, position: "relative", zIndex: 1 }} />
-
-        {canPin && (
-          <IconButton
-            aria-label="Pin navigation drawer"
-            onClick={() => setPinned((p) => !p)}
-            aria-pressed={pinned}
-            size="large"
-            style={{ marginLeft: "auto" }}
+        {!isPermanent && (
+          <Stack
+            direction="row"
+            alignItems="center"
+            sx={{ height: TOP_BAR_HEIGHT, flexShrink: 0, px: 0.5 }}
           >
-            {pinned ? <UnpinIcon /> : <PinIcon />}
-          </IconButton>
+            <IconButton
+              aria-label="Close navigation drawer"
+              onClick={onClose as any}
+              size="large"
+            >
+              <CloseIcon />
+            </IconButton>
+
+            <Logo style={{ marginLeft: 1, position: "relative", zIndex: 1 }} />
+          </Stack>
         )}
-      </Stack>
 
-      <nav>
-        <List>
-          <li>
-            <NavItem to={ROUTES.tables} onClick={closeDrawer}>
-              <ListItemIcon>
-                <HomeIcon />
-              </ListItemIcon>
-              <ListItemText primary="Home" />
-            </NavItem>
-          </li>
-
-          {userRoles.includes("ADMIN") && (
-            <Divider variant="middle" sx={{ my: 1 }} />
-          )}
-
-          <li>
-            <NavItem to={ROUTES.userSettings} onClick={closeDrawer}>
-              <ListItemIcon>
-                <SettingsIcon />
-              </ListItemIcon>
-              <ListItemText primary="Settings" />
-            </NavItem>
-          </li>
-          {userRoles.includes("ADMIN") && (
+        <nav style={{ flexGrow: 1 }}>
+          <List
+            disablePadding
+            style={{ height: "100%", display: "flex", flexDirection: "column" }}
+          >
             <li>
-              <NavItem to={ROUTES.projectSettings} onClick={closeDrawer}>
+              <NavItem onClick={closeDrawer}>
                 <ListItemIcon>
-                  <ProjectSettingsIcon />
+                  <ArrowBackIcon />
                 </ListItemIcon>
-                <ListItemText primary="Project Settings" />
-                <UpdateCheckBadge sx={{ mr: 1.5 }} />
+                <ListItemText primary="Workspace" />
               </NavItem>
             </li>
-          )}
-          {userRoles.includes("ADMIN") && (
+
+            <li>
+              <NavItem onClick={closeDrawer}>
+                <ListItemIcon>
+                  <Avatar
+                    sx={{
+                      borderRadius: 1,
+                      width: 24,
+                      height: 24,
+                      fontSize: "inherit",
+                      bgcolor: "primary.main",
+                      color: "primary.contrastText",
+                    }}
+                  >
+                    P
+                  </Avatar>
+                </ListItemIcon>
+                <ListItemText primary="Project" />
+              </NavItem>
+            </li>
+
+            {/* {userRoles.includes("ADMIN") && (
             <li>
               <NavItem to={ROUTES.userManagement} onClick={closeDrawer}>
                 <ListItemIcon>
@@ -221,42 +228,126 @@ export default function NavDrawer({
                 <ListItemText primary="User Management" />
               </NavItem>
             </li>
-          )}
+          )} */}
 
-          <Divider variant="middle" sx={{ my: 1 }} />
+            <Divider variant="middle" sx={{ my: 1 }} />
 
-          {/* <ListSubheader>Your tables</ListSubheader> */}
+            <li>
+              <NavItem to={ROUTES.tables} onClick={closeDrawer}>
+                <ListItemIcon>
+                  <HomeIcon />
+                </ListItemIcon>
+                <ListItemText primary="Home" />
+              </NavItem>
+            </li>
 
-          <li>
-            <NavItem
-              {...({ component: "button" } as any)}
-              style={{ textAlign: "left" }}
-              sx={{ mb: 1 }}
-              onClick={(e) => {
-                if (closeDrawer) closeDrawer(e);
-                openTableSettingsDialog({});
-              }}
-            >
+            <li>
+              <NavItem to={ROUTES.userSettings} onClick={closeDrawer}>
+                <ListItemIcon>
+                  <SettingsIcon />
+                </ListItemIcon>
+                <ListItemText primary="Settings" />
+              </NavItem>
+            </li>
+
+            {userRoles.includes("ADMIN") && (
+              <li>
+                <NavItem to={ROUTES.projectSettings} onClick={closeDrawer}>
+                  <ListItemIcon>
+                    <ProjectSettingsIcon />
+                  </ListItemIcon>
+                  <ListItemText primary="Project Settings" />
+                  <UpdateCheckBadge sx={{ mr: 1.5 }} />
+                </NavItem>
+              </li>
+            )}
+
+            <Divider variant="middle" sx={{ my: 1 }} />
+
+            {/* <ListSubheader>Your tables</ListSubheader> */}
+
+            <li>
+              <NavItem
+                {...({ component: "button" } as any)}
+                style={{ textAlign: "left" }}
+                onClick={(e) => {
+                  if (closeDrawer) closeDrawer(e);
+                  openTableSettingsDialog({});
+                }}
+              >
+                <ListItemIcon>
+                  <AddIcon />
+                </ListItemIcon>
+                <ListItemText primary="Create table…" />
+              </NavItem>
+            </li>
+
+            {/* <li>
+            <NavItem to={ROUTES.tables} onClick={closeDrawer}>
               <ListItemIcon>
-                <AddIcon />
+                <TableIcon />
               </ListItemIcon>
-              <ListItemText primary="Create table…" />
+              <ListItemText primary="Table" />
             </NavItem>
-          </li>
+          </li> */}
 
-          {sections &&
-            Object.entries(sections)
-              .filter(([, tables]) => tables.length > 0)
-              .map(([section, tables]) => (
-                <NavTableSection
-                  key={section}
-                  section={section}
-                  tables={tables}
-                  closeDrawer={closeDrawer}
-                />
-              ))}
-        </List>
-      </nav>
-    </Drawer>
+            {sections &&
+              Object.entries(sections)
+                .filter(([, tables]) => tables.length > 0)
+                .map(([section, tables]) => (
+                  <NavTableSection
+                    key={section}
+                    section={section}
+                    tables={tables}
+                    closeDrawer={closeDrawer}
+                    hidden={isPermanent && !open && !tempExpanded}
+                  />
+                ))}
+
+            <Divider variant="middle" sx={{ my: 1, mt: "auto" }} />
+
+            <li>
+              <NavItem href={EXTERNAL_LINKS.docs}>
+                <ListItemIcon>
+                  <DocsIcon />
+                </ListItemIcon>
+                <ListItemText primary="Docs" />
+                {externalLinkIcon}
+              </NavItem>
+            </li>
+            <li>
+              <NavItem href={WIKI_LINKS.howTo}>
+                <ListItemIcon>
+                  <LearningIcon />
+                </ListItemIcon>
+                <ListItemText primary="Learning" />
+                {externalLinkIcon}
+              </NavItem>
+            </li>
+            <li>
+              <NavItem href={EXTERNAL_LINKS.docs}>
+                <ListItemIcon>
+                  <HelpIcon />
+                </ListItemIcon>
+                <ListItemText primary="Help" />
+              </NavItem>
+            </li>
+          </List>
+        </nav>
+      </Drawer>
+
+      {isPermanent && (
+        <Box
+          sx={{
+            flexShrink: 0,
+            flexGrow: 0,
+            width: open ? NAV_DRAWER_WIDTH : NAV_DRAWER_COLLAPSED_WIDTH,
+            transitionProperty: "width",
+            transitionTimingFunction: "var(--nav-transition-timing-function)",
+            transitionDuration: "var(--nav-transition-duration)",
+          }}
+        />
+      )}
+    </>
   );
 }
diff --git a/src/layouts/Navigation/NavItem.tsx b/src/layouts/Navigation/NavItem.tsx
index c33bf6f3..efe92f66 100644
--- a/src/layouts/Navigation/NavItem.tsx
+++ b/src/layouts/Navigation/NavItem.tsx
@@ -1,29 +1,35 @@
 import { Link, useLocation } from "react-router-dom";
 import { MenuItem, MenuItemProps } from "@mui/material";
+import { spreadSx } from "@src/utils/ui";
 
-export default function NavItem(props: MenuItemProps<typeof Link>) {
+const linkProps = { target: "_blank", rel: "noopener noreferrer" };
+
+export default function NavItem(props: MenuItemProps<typeof Link | "a">) {
   const { pathname } = useLocation();
 
   return (
     <MenuItem
-      component={Link}
-      selected={pathname === props.to}
+      component={"to" in props ? Link : "a"}
+      selected={"to" in props ? pathname === props.to : false}
       {...props}
-      sx={{
-        "& .MuiListItemText-primary": {
-          typography: "button",
-          color: "text.secondary",
-        },
-        "& .MuiListItemIcon-root": { opacity: 0.87 },
+      {...("href" in props ? linkProps : {})}
+      sx={[
+        {
+          overflow: "hidden",
 
-        "&:hover, &.Mui-selected": {
-          "& .MuiListItemText-primary": { color: "text.primary" },
-          "& .MuiSvgIcon-root": { color: "text.primary" },
-        },
+          "& .MuiListItemText-primary": {
+            typography: "button",
+            color: "text.secondary",
+          },
+          "& .MuiListItemIcon-root": { opacity: 0.87 },
 
-        ...props.sx,
-        "&&::before": { left: "auto", right: 0 },
-      }}
+          "&:hover, &.Mui-selected": {
+            "& .MuiListItemText-primary": { color: "text.primary" },
+            "& .MuiSvgIcon-root": { color: "text.primary" },
+          },
+        },
+        ...spreadSx(props.sx),
+      ]}
     />
   );
 }
diff --git a/src/layouts/Navigation/NavTableSection.tsx b/src/layouts/Navigation/NavTableSection.tsx
index 4a328151..296a3a2c 100644
--- a/src/layouts/Navigation/NavTableSection.tsx
+++ b/src/layouts/Navigation/NavTableSection.tsx
@@ -1,7 +1,13 @@
 import { useState } from "react";
 import { useLocation } from "react-router-dom";
 
-import { List, ListItemIcon, ListItemText, Collapse } from "@mui/material";
+import {
+  List,
+  ListItemIcon,
+  ListItemText,
+  ListItemSecondaryAction,
+  Collapse,
+} from "@mui/material";
 import FolderIcon from "@mui/icons-material/FolderOutlined";
 import FavoriteIcon from "@mui/icons-material/FavoriteBorder";
 import { ChevronDown } from "@src/assets/icons";
@@ -17,12 +23,14 @@ export interface INavTableSectionProps {
   section: string;
   tables: TableSettings[];
   closeDrawer?: (e: {}) => void;
+  hidden?: boolean;
 }
 
 export default function NavTableSection({
   section,
   tables,
   closeDrawer,
+  hidden,
 }: INavTableSectionProps) {
   const { pathname } = useLocation();
   const hasMatch = tables.map(getTableRoute).includes(pathname);
@@ -31,7 +39,14 @@ export default function NavTableSection({
   const isFavorites = section === "Favorites";
 
   return (
-    <li>
+    <li
+      style={{
+        opacity: hidden ? 0.38 : 1,
+        transitionProperty: "opacity",
+        transitionTimingFunction: "var(--nav-transition-timing-function)",
+        transitionDuration: "var(--nav-transition-duration)",
+      }}
+    >
       <NavItem
         {...({ component: "button" } as any)}
         selected={!isFavorites && hasMatch && !open}
@@ -43,14 +58,17 @@ export default function NavTableSection({
 
         <ListItemText primary={section} style={{ textAlign: "left" }} />
 
-        <ChevronDown
-          sx={{
-            color: "action.active",
-            mr: -0.5,
-            transform: open ? "rotate(180deg)" : "rotate(0)",
-            transition: (theme) => theme.transitions.create("transform"),
-          }}
-        />
+        <ListItemSecondaryAction>
+          <ChevronDown
+            sx={{
+              color: "action.active",
+              m: 0.25,
+              display: "block",
+              transform: open ? "rotate(180deg)" : "rotate(0)",
+              transition: (theme) => theme.transitions.create("transform"),
+            }}
+          />
+        </ListItemSecondaryAction>
       </NavItem>
 
       <Collapse in={open}>
diff --git a/src/layouts/Navigation/Navigation.tsx b/src/layouts/Navigation/Navigation.tsx
index 2b1f86ce..11566a86 100644
--- a/src/layouts/Navigation/Navigation.tsx
+++ b/src/layouts/Navigation/Navigation.tsx
@@ -3,51 +3,28 @@ import { useAtom } from "jotai";
 import { ErrorBoundary } from "react-error-boundary";
 import { useLocation, Outlet } from "react-router-dom";
 
-import {
-  useScrollTrigger,
-  useMediaQuery,
-  Stack,
-  AppBar,
-  Toolbar,
-  IconButton,
-  Box,
-  Typography,
-  Grow,
-} from "@mui/material";
-import MenuIcon from "@mui/icons-material/Menu";
+import { useMediaQuery, Stack, GlobalStyles } from "@mui/material";
 
-import NavDrawer, { NAV_DRAWER_WIDTH } from "./NavDrawer";
-import HelpMenu from "./HelpMenu";
-import UserMenu from "./UserMenu";
+import TopBar, { TOP_BAR_HEIGHT } from "./TopBar";
+import NavDrawer from "./NavDrawer";
 import ErrorFallback, {
   IErrorFallbackProps,
 } from "@src/components/ErrorFallback";
 import Loading from "@src/components/Loading";
-import UpdateCheckBadge from "./UpdateCheckBadge";
 
 import {
   globalScope,
   projectIdAtom,
-  userRolesAtom,
   navOpenAtom,
-  navPinnedAtom,
 } from "@src/atoms/globalScope";
 import { ROUTE_TITLES } from "@src/constants/routes";
 import { useDocumentTitle } from "@src/hooks/useDocumentTitle";
 
-export const APP_BAR_HEIGHT = 56;
-const StyledErrorFallback = (props: IErrorFallbackProps) => (
-  <ErrorFallback {...props} style={{ marginTop: -APP_BAR_HEIGHT }} />
-);
-
 export default function Navigation({ children }: React.PropsWithChildren<{}>) {
   const [projectId] = useAtom(projectIdAtom, globalScope);
-  const [userRoles] = useAtom(userRolesAtom, globalScope);
 
   const [open, setOpen] = useAtom(navOpenAtom, globalScope);
-  const [pinned, setPinned] = useAtom(navPinnedAtom, globalScope);
-  const trigger = useScrollTrigger({ disableHysteresis: true, threshold: 0 });
-  const canPin = !useMediaQuery((theme: any) => theme.breakpoints.down("lg"));
+  const isPermanent = useMediaQuery((theme: any) => theme.breakpoints.up("md"));
 
   const { pathname } = useLocation();
   const basePath = ("/" + pathname.split("/")[1]) as keyof typeof ROUTE_TITLES;
@@ -60,165 +37,52 @@ export default function Navigation({ children }: React.PropsWithChildren<{}>) {
 
   return (
     <>
-      <AppBar
-        position="sticky"
-        color="inherit"
-        elevation={trigger ? 1 : 0}
-        sx={{
-          height: APP_BAR_HEIGHT,
-          backgroundImage:
-            "linear-gradient(rgba(255, 255, 255, 0.09), rgba(255, 255, 255, 0.09))", // Elevation 8
-
-          "&::before": {
-            content: "''",
-            display: "block",
-            position: "absolute",
-            top: 0,
-            right: 0,
-            bottom: 0,
-            left: 0,
-
-            bgcolor: "background.default",
-            opacity: trigger ? 0 : 1,
-            transition: (theme) =>
-              theme.transitions.create("opacity", {
-                easing:
-                  canPin && pinned
-                    ? theme.transitions.easing.easeOut
-                    : theme.transitions.easing.sharp,
-                duration:
-                  canPin && pinned
-                    ? theme.transitions.duration.enteringScreen
-                    : theme.transitions.duration.leavingScreen,
-              }),
-          },
-
-          ml: canPin && pinned && open ? `${NAV_DRAWER_WIDTH}px` : 0,
-          width:
-            canPin && pinned && open
-              ? `calc(100% - ${NAV_DRAWER_WIDTH}px)`
-              : "100%",
-          transition: (theme) =>
-            theme.transitions.create(["margin-left", "width", "box-shadow"], {
-              easing:
-                canPin && pinned
-                  ? theme.transitions.easing.easeOut
-                  : theme.transitions.easing.sharp,
-              duration:
-                canPin && pinned
-                  ? theme.transitions.duration.enteringScreen
-                  : theme.transitions.duration.leavingScreen,
-            }),
-        }}
-      >
-        <Toolbar
-          sx={{
-            height: APP_BAR_HEIGHT,
-            minWidth: 0,
-            maxWidth: "none",
-            "&&": {
-              minHeight: APP_BAR_HEIGHT,
-              p: 0,
-              pl: (theme) =>
-                `max(env(safe-area-inset-left), ${theme.spacing(2)})`,
-              pr: (theme) =>
-                `max(env(safe-area-inset-right), ${theme.spacing(2)})`,
-            },
-          }}
-        >
-          {!(open && canPin && pinned) && (
-            <Grow in>
-              <IconButton
-                aria-label="Open navigation drawer"
-                onClick={() => setOpen(true)}
-                size="large"
-                edge="start"
-              >
-                {userRoles.includes("ADMIN") ? (
-                  <UpdateCheckBadge>
-                    <MenuIcon />
-                  </UpdateCheckBadge>
-                ) : (
-                  <MenuIcon />
-                )}
-              </IconButton>
-            </Grow>
-          )}
-
-          <Grow
-            in
-            key={title}
-            {...(typeof routeTitle !== "string"
-              ? routeTitle.titleTransitionProps
-              : undefined)}
-          >
-            <Box
-              sx={{
-                flex: 1,
-                overflowX: "auto",
-                userSelect: "none",
-                pl: open && canPin && pinned ? 48 / 8 : 0,
-                pr: 1,
-                ml: (routeTitle as any)?.leftAligned
-                  ? 0
-                  : { xs: 0, sm: 1.5 + 6 + 1 },
-              }}
-            >
-              {typeof routeTitle !== "string" ? (
-                routeTitle.titleComponent(open, canPin && pinned)
-              ) : (
-                <Typography
-                  variant="h6"
-                  component="h1"
-                  textAlign="center"
-                  noWrap
-                  sx={{
-                    typography: { sm: "h5" },
-                    textAlign: { xs: "left", sm: "center" },
-                  }}
-                >
-                  {title}
-                </Typography>
-              )}
-            </Box>
-          </Grow>
-
-          <HelpMenu />
-          <UserMenu />
-        </Toolbar>
-      </AppBar>
+      <TopBar
+        open={open}
+        setOpen={setOpen}
+        isPermanent={isPermanent}
+        routeTitle={routeTitle}
+        title={title}
+      />
 
       <Stack direction="row">
         <NavDrawer
           open={open}
-          pinned={canPin && pinned}
-          setPinned={setPinned}
-          canPin={canPin}
+          isPermanent={isPermanent}
           onClose={() => setOpen(false)}
-          scrollTrigger={trigger}
         />
 
         <ErrorBoundary FallbackComponent={StyledErrorFallback}>
           <Suspense
             fallback={
-              <Loading fullScreen style={{ marginTop: -APP_BAR_HEIGHT }} />
+              <Loading fullScreen style={{ marginTop: -TOP_BAR_HEIGHT }} />
             }
           >
-            <div
-              style={{
-                flexGrow: 1,
-                maxWidth:
-                  canPin && pinned && open
-                    ? `calc(100% - ${NAV_DRAWER_WIDTH}px)`
-                    : "100%",
-              }}
-            >
+            <div style={{ flexGrow: 1, maxWidth: "100%" }}>
               <Outlet />
               {children}
             </div>
           </Suspense>
         </ErrorBoundary>
       </Stack>
+
+      <GlobalStyles
+        styles={(theme) => ({
+          ":root": {
+            "--nav-transition-timing-function": open
+              ? theme.transitions.easing.easeOut
+              : theme.transitions.easing.sharp,
+            "--nav-transition-duration":
+              (open
+                ? theme.transitions.duration.enteringScreen
+                : theme.transitions.duration.leavingScreen) + "ms",
+          },
+        })}
+      />
     </>
   );
 }
+
+const StyledErrorFallback = (props: IErrorFallbackProps) => (
+  <ErrorFallback {...props} style={{ marginTop: -TOP_BAR_HEIGHT }} />
+);
diff --git a/src/layouts/Navigation/TopBar.tsx b/src/layouts/Navigation/TopBar.tsx
new file mode 100644
index 00000000..f17152ae
--- /dev/null
+++ b/src/layouts/Navigation/TopBar.tsx
@@ -0,0 +1,177 @@
+import { useAtom } from "jotai";
+
+import {
+  useScrollTrigger,
+  AppBar,
+  Toolbar,
+  IconButton,
+  Box,
+  Typography,
+  Grow,
+  Fade,
+} from "@mui/material";
+import MenuIcon from "@mui/icons-material/Menu";
+import MenuCloseIcon from "@mui/icons-material/MenuOpen";
+
+import Logo from "@src/assets/Logo";
+import { NAV_DRAWER_WIDTH, NAV_DRAWER_COLLAPSED_WIDTH } from "./NavDrawer";
+import HelpMenu from "./HelpMenu";
+import UserMenu from "./UserMenu";
+import UpdateCheckBadge from "./UpdateCheckBadge";
+
+import { globalScope, userRolesAtom } from "@src/atoms/globalScope";
+import { ROUTE_TITLES } from "@src/constants/routes";
+
+export const TOP_BAR_HEIGHT = 56;
+
+export interface ITopBarProps {
+  open: boolean;
+  setOpen: (open: boolean) => void;
+  isPermanent: boolean;
+  routeTitle: typeof ROUTE_TITLES[keyof typeof ROUTE_TITLES];
+  title: string;
+}
+
+export default function TopBar({
+  open,
+  setOpen,
+  isPermanent,
+  routeTitle,
+  title,
+}: ITopBarProps) {
+  const [userRoles] = useAtom(userRolesAtom, globalScope);
+
+  const trigger = useScrollTrigger({ disableHysteresis: true, threshold: 0 });
+  const menuIcon = open ? <MenuCloseIcon /> : <MenuIcon />;
+
+  return (
+    <AppBar
+      position="sticky"
+      color="inherit"
+      elevation={trigger ? 1 : 0}
+      sx={{
+        height: TOP_BAR_HEIGHT,
+        backgroundImage:
+          "linear-gradient(rgba(255, 255, 255, 0.09), rgba(255, 255, 255, 0.09))", // Elevation 8
+
+        "&::before": {
+          content: "''",
+          display: "block",
+          position: "absolute",
+          top: 0,
+          right: 0,
+          bottom: 0,
+          left: 0,
+
+          bgcolor: "background.default",
+          opacity: trigger ? 0 : 1,
+
+          transitionProperty: "opacity",
+          transitionTimingFunction: "var(--nav-transition-timing-function)",
+          transitionDuration: "var(--nav-transition-duration)",
+        },
+      }}
+    >
+      <Toolbar
+        sx={{
+          height: TOP_BAR_HEIGHT,
+          minWidth: 0,
+          maxWidth: "none",
+          "&&": {
+            minHeight: TOP_BAR_HEIGHT,
+            p: 0,
+            pl: (theme) =>
+              `max(env(safe-area-inset-left), ${theme.spacing(0.5)})`,
+            pr: (theme) =>
+              `max(env(safe-area-inset-right), ${theme.spacing(0.5)})`,
+          },
+        }}
+      >
+        <Grow in>
+          <IconButton
+            aria-label={`${open ? "Close" : "Open"} navigation drawer`}
+            onClick={() => setOpen(!open)}
+            size="large"
+          >
+            {userRoles.includes("ADMIN") ? (
+              <UpdateCheckBadge>{menuIcon}</UpdateCheckBadge>
+            ) : (
+              menuIcon
+            )}
+          </IconButton>
+        </Grow>
+
+        {isPermanent && (
+          <Box
+            sx={{
+              width: open ? NAV_DRAWER_WIDTH : NAV_DRAWER_COLLAPSED_WIDTH,
+              height: 2,
+
+              transform: `scale(${open ? 1 : 0})`,
+              transformOrigin: "0% 50%",
+              opacity: open ? 1 : 0,
+
+              transitionProperty: "width, opacity, transform",
+              transitionTimingFunction: "var(--nav-transition-timing-function)",
+              transitionDuration: "var(--nav-transition-duration)",
+
+              display: "flex",
+              justifyContent: "flex-start",
+              alignItems: "center",
+              pointerEvents: "none",
+            }}
+          >
+            <Logo />
+          </Box>
+        )}
+
+        <Fade
+          in
+          key={title}
+          {...(typeof routeTitle !== "string"
+            ? routeTitle.titleTransitionProps
+            : undefined)}
+        >
+          <Box
+            sx={[
+              {
+                flex: 1,
+                overflowX: "auto",
+                userSelect: "none",
+                ml: 1,
+              },
+              !(routeTitle as any)?.leftAligned && {
+                ml: { xs: 1, sm: 6 },
+              },
+              isPermanent &&
+                (routeTitle as any)?.leftAligned && {
+                  ml: -NAV_DRAWER_COLLAPSED_WIDTH / 8 + 0.5 + 2,
+                },
+            ]}
+          >
+            {typeof routeTitle !== "string" ? (
+              routeTitle.titleComponent(open, isPermanent)
+            ) : (
+              <Typography
+                variant="h6"
+                component="h1"
+                noWrap
+                sx={{
+                  flexShrink: 0,
+                  flexGrow: 1,
+                  typography: { sm: "h5" },
+                  textAlign: { xs: "left", sm: "center" },
+                }}
+              >
+                {title}
+              </Typography>
+            )}
+          </Box>
+        </Fade>
+
+        <HelpMenu />
+        <UserMenu />
+      </Toolbar>
+    </AppBar>
+  );
+}
diff --git a/src/layouts/Navigation/UserMenu.tsx b/src/layouts/Navigation/UserMenu.tsx
index 698ea468..75cf8d18 100644
--- a/src/layouts/Navigation/UserMenu.tsx
+++ b/src/layouts/Navigation/UserMenu.tsx
@@ -66,7 +66,6 @@ export default function UserMenu(props: IconButtonProps) {
           aria-label="Open user menu"
           aria-controls="user-menu"
           aria-haspopup="true"
-          edge="end"
           size="large"
           {...props}
           ref={anchorEl}
diff --git a/src/pages/FunctionsPage.tsx b/src/pages/FunctionsPage.tsx
index 3ab86a45..18f944eb 100644
--- a/src/pages/FunctionsPage.tsx
+++ b/src/pages/FunctionsPage.tsx
@@ -39,7 +39,7 @@ import {
 import { TableSettings } from "@src/types/table";
 import { ROUTES } from "@src/constants/routes";
 import useBasicSearch from "@src/hooks/useBasicSearch";
-import { APP_BAR_HEIGHT } from "@src/layouts/Navigation";
+import { TOP_BAR_HEIGHT } from "@src/layouts/Navigation/TopBar";
 
 const SEARCH_KEYS = ["id", "name", "section", "description"];
 
@@ -112,7 +112,7 @@ export default function HomePage() {
         message="No tables"
         description="There are no tables in this project. Sign in with an ADMIN account to create tables."
         fullScreen
-        style={{ marginTop: -APP_BAR_HEIGHT }}
+        style={{ marginTop: -TOP_BAR_HEIGHT }}
       />
     );
   }
diff --git a/src/pages/NotFoundPage.tsx b/src/pages/NotFoundPage.tsx
index b8dd66f7..abd1f780 100644
--- a/src/pages/NotFoundPage.tsx
+++ b/src/pages/NotFoundPage.tsx
@@ -6,7 +6,8 @@ import { Go as GoIcon } from "@src/assets/icons";
 import HomeIcon from "@mui/icons-material/HomeOutlined";
 
 import AuthLayout from "@src/layouts/AuthLayout";
-import Navigation, { APP_BAR_HEIGHT } from "@src/layouts/Navigation";
+import Navigation from "@src/layouts/Navigation";
+import { TOP_BAR_HEIGHT } from "@src/layouts/Navigation/TopBar";
 import EmptyState from "@src/components/EmptyState";
 
 import meta from "@root/package.json";
@@ -33,7 +34,7 @@ export default function NotFound() {
               Home
             </Button>
           }
-          style={{ marginTop: -APP_BAR_HEIGHT }}
+          style={{ marginTop: -TOP_BAR_HEIGHT }}
         />
       </Navigation>
     );
diff --git a/src/pages/Table/ProvidedSubTablePage.tsx b/src/pages/Table/ProvidedSubTablePage.tsx
index 8b5af2b3..1f7b41fb 100644
--- a/src/pages/Table/ProvidedSubTablePage.tsx
+++ b/src/pages/Table/ProvidedSubTablePage.tsx
@@ -22,7 +22,7 @@ import {
   tableSchemaAtom,
 } from "@src/atoms/tableScope";
 import { ROUTES } from "@src/constants/routes";
-import { APP_BAR_HEIGHT } from "@src/layouts/Navigation";
+import { TOP_BAR_HEIGHT } from "@src/layouts/Navigation/TopBar";
 import { TABLE_TOOLBAR_HEIGHT } from "@src/components/TableToolbar";
 
 /**
@@ -92,15 +92,15 @@ export default function ProvidedSubTablePage() {
           backgroundImage: "none",
         },
         "& .modal-title-row": {
-          height: APP_BAR_HEIGHT,
+          height: TOP_BAR_HEIGHT,
           "& .MuiDialogTitle-root": {
             px: 2,
-            py: (APP_BAR_HEIGHT - 28) / 2 / 8,
+            py: (TOP_BAR_HEIGHT - 28) / 2 / 8,
           },
-          "& .dialog-close": { m: (APP_BAR_HEIGHT - 40) / 2 / 8, ml: -1 },
+          "& .dialog-close": { m: (TOP_BAR_HEIGHT - 40) / 2 / 8, ml: -1 },
         },
         "& .table-container": {
-          height: `calc(100vh - ${APP_BAR_HEIGHT}px - ${TABLE_TOOLBAR_HEIGHT}px - 16px)`,
+          height: `calc(100vh - ${TOP_BAR_HEIGHT}px - ${TABLE_TOOLBAR_HEIGHT}px - 16px)`,
         },
       }}
       ScrollableDialogContentProps={{
diff --git a/src/pages/TablesPage.tsx b/src/pages/TablesPage.tsx
index bc1b0392..cfa03d5a 100644
--- a/src/pages/TablesPage.tsx
+++ b/src/pages/TablesPage.tsx
@@ -39,7 +39,7 @@ import {
 import { TableSettings } from "@src/types/table";
 import { ROUTES } from "@src/constants/routes";
 import useBasicSearch from "@src/hooks/useBasicSearch";
-import { APP_BAR_HEIGHT } from "@src/layouts/Navigation";
+import { TOP_BAR_HEIGHT } from "@src/layouts/Navigation/TopBar";
 
 const SEARCH_KEYS = ["id", "name", "section", "description"];
 
@@ -112,7 +112,7 @@ export default function HomePage() {
         message="No tables"
         description="There are no tables in this project. Sign in with an ADMIN account to create tables."
         fullScreen
-        style={{ marginTop: -APP_BAR_HEIGHT }}
+        style={{ marginTop: -TOP_BAR_HEIGHT }}
       />
     );
   }
@@ -165,7 +165,10 @@ export default function HomePage() {
         label="Search tables"
         onChange={(e) => handleQuery(e.target.value)}
         paperSx={{
-          maxWidth: (theme) => ({ md: theme.breakpoints.values.sm - 48 }),
+          maxWidth: (theme) => ({
+            md: theme.breakpoints.values.sm - 48 * 4,
+            lg: theme.breakpoints.values.sm - 48,
+          }),
           mb: { xs: 2, md: -6 },
         }}
       />

From db7b3ebd84b196865ef6c21ba08c9c711580fc26 Mon Sep 17 00:00:00 2001
From: Han Tuerker <46192266+htuerker@users.noreply.github.com>
Date: Tue, 5 Jul 2022 05:50:34 +0300
Subject: [PATCH 014/309] Feat: Percentage field color customization (#692)

* feat(percentage-c11n): convert to table cell

* feat(percentage-c11n): add logic to default configs

* feat(percentage-c11n): add color picker to settings

* feat(percentage-c11n): change default colors

* feat(percentage-c11n): fix button text color

* feat(percentage-c11n): add labels to settings

* feat(percentage-c11n): add preview section

* feat(percentage-c11n): fix cache issues with debouncing

* feat(percentage-c11n): add width responsiveness to color picker

* feat(percentage-c11n): fix responsiveness issues

* feat(percentage-c11n): add checkbox, refactor a little

* feat(percentage-c11n): convert data type to array

* feat(percentage-c11n): refactor config states

* feat(percentage-c11n): fix defaults

* feat(percentage-c11n): add basic cell without bg

* feat(percentage-c11n): remove collapse

* feat(percentage-c11n): refactor checkStates

* feat(percentage-c11n): add grid layout

* feat(percentage-c11n): chore conventions

* feat(percentage-c11n): add default theme color to sidedrawer

* remove redundant fragment

Co-authored-by: Sidney Alcantara <sidney@sidney.me>

* fix text color in preview

Co-authored-by: Sidney Alcantara <sidney@sidney.me>

* fix: change state to derived state

Co-authored-by: Sidney Alcantara <sidney@sidney.me>

* fix: review suggestions

* fix: remove redundant change call

Co-authored-by: Sidney Alcantara <sidney@sidney.me>

* fix(percentage-c11n): remove redundant dependencies

Co-authored-by: Shams <shams.mosowi@gmail.com>
Co-authored-by: Sidney Alcantara <sidney@sidney.me>
---
 src/components/ColorPickerInput.tsx           |  76 ++++++++
 .../fields/Percentage/BasicCell.tsx           |  46 ++---
 src/components/fields/Percentage/Settings.tsx | 171 ++++++++++++++++++
 .../fields/Percentage/SideDrawerField.tsx     |  14 +-
 .../fields/Percentage/TableCell.tsx           |  41 +++++
 src/components/fields/Percentage/index.tsx    |  20 +-
 src/utils/color.ts                            |  22 ++-
 7 files changed, 341 insertions(+), 49 deletions(-)
 create mode 100644 src/components/ColorPickerInput.tsx
 create mode 100644 src/components/fields/Percentage/Settings.tsx
 create mode 100644 src/components/fields/Percentage/TableCell.tsx

diff --git a/src/components/ColorPickerInput.tsx b/src/components/ColorPickerInput.tsx
new file mode 100644
index 00000000..89ebdb21
--- /dev/null
+++ b/src/components/ColorPickerInput.tsx
@@ -0,0 +1,76 @@
+import { useState, useRef, MutableRefObject, useLayoutEffect } from "react";
+import { Box, useTheme } from "@mui/material";
+
+import { Color, ColorPicker } from "react-color-palette";
+
+const useResponsiveWidth = (): [
+  width: number,
+  setRef: MutableRefObject<HTMLElement | null>
+] => {
+  const ref = useRef(null);
+  const [width, setWidth] = useState(0);
+
+  useLayoutEffect(() => {
+    if (!ref || !ref.current) {
+      return;
+    }
+    const resizeObserver = new ResizeObserver((targets) => {
+      const { width: currentWidth } = targets[0].contentRect;
+      setWidth(currentWidth);
+    });
+
+    resizeObserver.observe(ref.current);
+
+    return () => {
+      resizeObserver.disconnect();
+    };
+  }, []);
+
+  return [width, ref];
+};
+
+export interface IColorPickerProps {
+  value: Color;
+  onChangeComplete: (color: Color) => void;
+  disabled?: boolean;
+}
+
+export default function ColorPickerInput({
+  value,
+  onChangeComplete,
+  disabled = false,
+}: IColorPickerProps) {
+  const [localValue, setLocalValue] = useState(value);
+  const [width, setRef] = useResponsiveWidth();
+  const theme = useTheme();
+
+  return (
+    <Box
+      ref={setRef}
+      sx={[
+        {
+          padding: theme.spacing(1.5),
+          paddingTop: theme.spacing(1),
+          transitionDuration: 0,
+          "& .rcp": {
+            border: "none",
+            "& .rcp-saturation": {
+              borderRadius: theme.spacing(0.5),
+            },
+            "& .rcp-body": {
+              boxSizing: "unset",
+            },
+          },
+        },
+      ]}
+    >
+      <ColorPicker
+        width={width}
+        height={150}
+        color={localValue}
+        onChange={(color) => setLocalValue(color)}
+        onChangeComplete={onChangeComplete}
+      />
+    </Box>
+  );
+}
diff --git a/src/components/fields/Percentage/BasicCell.tsx b/src/components/fields/Percentage/BasicCell.tsx
index 05fcfac6..c2dbef58 100644
--- a/src/components/fields/Percentage/BasicCell.tsx
+++ b/src/components/fields/Percentage/BasicCell.tsx
@@ -1,41 +1,21 @@
 import { IBasicCellProps } from "@src/components/fields/types";
 
 import { useTheme } from "@mui/material";
-import { resultColorsScale } from "@src/utils/color";
 
 export default function Percentage({ value }: IBasicCellProps) {
   const theme = useTheme();
 
-  if (typeof value === "number")
-    return (
-      <>
-        <div
-          style={{
-            backgroundColor: resultColorsScale(value).toHex(),
-
-            position: "absolute",
-            top: 0,
-            right: 0,
-            bottom: 0,
-            left: 0,
-            opacity: 0.5,
-
-            zIndex: 0,
-          }}
-        />
-        <div
-          style={{
-            textAlign: "right",
-            color: theme.palette.text.primary,
-
-            position: "relative",
-            zIndex: 1,
-          }}
-        >
-          {Math.round(value * 100)}%
-        </div>
-      </>
-    );
-
-  return null;
+  const percentage = typeof value === "number" ? value : 0;
+  return (
+      <div
+        style={{
+          textAlign: "right",
+          color: theme.palette.text.primary,
+          position: "relative",
+          zIndex: 1,
+        }}
+      >
+        {Math.round(percentage * 100)}%
+      </div>
+  );
 }
diff --git a/src/components/fields/Percentage/Settings.tsx b/src/components/fields/Percentage/Settings.tsx
new file mode 100644
index 00000000..e28dde2c
--- /dev/null
+++ b/src/components/fields/Percentage/Settings.tsx
@@ -0,0 +1,171 @@
+import { useState } from "react";
+
+import {
+  Box,
+  Checkbox,
+  Grid,
+  InputLabel,
+  MenuItem,
+  TextField,
+  Typography,
+  useTheme,
+} from "@mui/material";
+import ColorPickerInput from "@src/components/ColorPickerInput";
+import { ISettingsProps } from "@src/components/fields/types";
+
+import { Color, toColor } from "react-color-palette";
+import { fieldSx } from "@src/components/SideDrawer/utils";
+import { resultColorsScale, defaultColors } from "@src/utils/color";
+
+const colorLabels: { [key: string]: string } = {
+  0: "Start",
+  1: "Middle",
+  2: "End",
+};
+
+export default function Settings({ onChange, config }: ISettingsProps) {
+  const colors: string[] = config.colors ?? defaultColors;
+
+  const [checkStates, setCheckStates] = useState<boolean[]>(
+    colors.map(Boolean)
+  );
+
+  const onCheckboxChange = (index: number, checked: boolean) => {
+    onChange("colors")(
+      colors.map((value: any, idx: number) =>
+        index === idx ? (checked ? value || defaultColors[idx] : null) : value
+      )
+    );
+    setCheckStates(
+      checkStates.map((value, idx) => (index === idx ? checked : value))
+    );
+  };
+
+  const handleColorChange = (index: number, color: Color): void => {
+    onChange("colors")(
+      colors.map((value, idx) => (index === idx ? color.hex : value))
+    );
+  };
+
+  return (
+    <>
+      <Grid container>
+        {checkStates.map((checked: boolean, index: number) => {
+          const colorHex = colors[index];
+          return (
+            <Grid
+              xs={12}
+              md={4}
+              item
+              sx={{
+                display: "flex",
+                alignItems: "end",
+                justifyContent: "center",
+              }}
+            >
+              <Checkbox
+                checked={checked}
+                sx={[
+                  fieldSx,
+                  {
+                    width: "auto",
+                    boxShadow: "none",
+                    backgroundColor: "inherit",
+                    "&:hover": {
+                      backgroundColor: "inherit",
+                    },
+                  },
+                ]}
+                onChange={() => onCheckboxChange(index, !checked)}
+              />
+              <TextField
+                select
+                label={colorLabels[index]}
+                value={1}
+                fullWidth
+                disabled={!checkStates[index]}
+              >
+                <MenuItem value={1} sx={{ display: "none" }}>
+                  {checked && (
+                    <Box sx={{ display: "flex", alignItems: "center" }}>
+                      <Box
+                        sx={{
+                          backgroundColor: colorHex,
+                          width: 15,
+                          height: 15,
+                          mr: 1.5,
+                          boxShadow: (theme) =>
+                            `0 0 0 1px ${theme.palette.divider} inset`,
+                          borderRadius: 0.5,
+                          opacity: 0.5,
+                        }}
+                      />
+                      <Box>{colorHex}</Box>
+                    </Box>
+                  )}
+                </MenuItem>
+                {colorHex && (
+                  <div>
+                    <ColorPickerInput
+                      value={toColor("hex", colorHex)}
+                      onChangeComplete={(color) =>
+                        handleColorChange(index, color)
+                      }
+                      disabled={!checkStates[index]}
+                    />
+                  </div>
+                )}
+              </TextField>
+            </Grid>
+          );
+        })}
+      </Grid>
+      <Preview colors={config.colors} />
+    </>
+  );
+}
+
+const Preview = ({ colors }: { colors: any }) => {
+  const theme = useTheme();
+  return (
+    <InputLabel>
+      Preview:
+      <Box
+        sx={{
+          display: "flex",
+          textAlign: "center",
+        }}
+      >
+        {[0, 0.125, 0.25, 0.375, 0.5, 0.625, 0.75, 0.875, 1].map((value) => {
+          return (
+            <Box
+              sx={{
+                position: "relative",
+                width: "100%",
+                padding: "0.5rem 0",
+                color: theme.palette.text.primary,
+              }}
+            >
+              <Box
+                key={value}
+                sx={{
+                  position: "absolute",
+                  inset: 0,
+                  backgroundColor: resultColorsScale(
+                    value,
+                    colors,
+                    theme.palette.background.paper
+                  ).toHex(),
+                  opacity: 0.5,
+                }}
+              />
+              <Typography style={{ position: "relative", zIndex: 1 }}>
+                {Math.floor(value * 100)}%
+              </Typography>
+            </Box>
+          );
+        })}
+      </Box>
+    </InputLabel>
+  );
+};
diff --git a/src/components/fields/Percentage/SideDrawerField.tsx b/src/components/fields/Percentage/SideDrawerField.tsx
index ea4e0681..a6cc4366 100644
--- a/src/components/fields/Percentage/SideDrawerField.tsx
+++ b/src/components/fields/Percentage/SideDrawerField.tsx
@@ -1,7 +1,6 @@
 import { ISideDrawerFieldProps } from "@src/components/fields/types";
 
-import { TextField, InputAdornment, Box } from "@mui/material";
-import { emphasize } from "@mui/material/styles";
+import { TextField, InputAdornment, Box, useTheme } from "@mui/material";
 import { resultColorsScale } from "@src/utils/color";
 import { getFieldId } from "@src/components/SideDrawer/utils";
 
@@ -12,6 +11,8 @@ export default function Percentage({
   onSubmit,
   disabled,
 }: ISideDrawerFieldProps) {
+  const { colors } = (column as any).config;
+  const theme = useTheme();
   return (
     <TextField
       variant="filled"
@@ -34,11 +35,14 @@ export default function Percentage({
                 width: 20,
                 height: 20,
                 borderRadius: 0.5,
-                boxShadow: (theme) =>
-                  `0 0 0 1px ${theme.palette.divider} inest`,
+                boxShadow: `0 0 0 1px ${theme.palette.divider} inset`,
                 backgroundColor:
                   typeof value === "number"
-                    ? resultColorsScale(value).toHex() + "!important"
+                    ? resultColorsScale(
+                        value,
+                        colors,
+                        theme.palette.background.paper
+                      ).toHex() + "!important"
                     : undefined,
               }}
             />
diff --git a/src/components/fields/Percentage/TableCell.tsx b/src/components/fields/Percentage/TableCell.tsx
new file mode 100644
index 00000000..29174a39
--- /dev/null
+++ b/src/components/fields/Percentage/TableCell.tsx
@@ -0,0 +1,41 @@
+import { IHeavyCellProps } from "@src/components/fields/types";
+
+import { useTheme } from "@mui/material";
+import { resultColorsScale } from "@src/utils/color";
+
+export default function Percentage({ column, value }: IHeavyCellProps) {
+  const theme = useTheme();
+  const { colors } = (column as any).config;
+
+  const percentage = typeof value === "number" ? value : 0;
+  return (
+    <>
+      <div
+        style={{
+          backgroundColor: resultColorsScale(
+            percentage,
+            colors,
+            theme.palette.background.paper
+          ).toHex(),
+          position: "absolute",
+          top: 0,
+          right: 0,
+          bottom: 0,
+          left: 0,
+          opacity: 0.5,
+          zIndex: 0,
+        }}
+      />
+      <div
+        style={{
+          textAlign: "right",
+          color: theme.palette.text.primary,
+          position: "relative",
+          zIndex: 1,
+        }}
+      >
+        {Math.round(percentage * 100)}%
+      </div>
+    </>
+  );
+}
diff --git a/src/components/fields/Percentage/index.tsx b/src/components/fields/Percentage/index.tsx
index c44690e3..f353774f 100644
--- a/src/components/fields/Percentage/index.tsx
+++ b/src/components/fields/Percentage/index.tsx
@@ -1,12 +1,20 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withBasicCell from "@src/components/fields/_withTableCell/withBasicCell";
+import withHeavyCell from "@src/components/fields/_withTableCell/withHeavyCell";
 
 import { Percentage as PercentageIcon } from "@src/assets/icons";
-import BasicCell from "./BasicCell";
 import TextEditor from "@src/components/Table/editors/TextEditor";
 import { filterOperators } from "@src/components/fields/Number/Filter";
 import BasicContextMenuActions from "@src/components/fields/_BasicCell/BasicCellContextMenuActions";
+
+const BasicCell = lazy(
+  () => import("./BasicCell" /* webpackChunkName: "BasicCell-Percentage" */)
+);
+
+const TableCell = lazy(
+  () => import("./TableCell" /* webpackChunkName: "TableCell-Percentage" */)
+);
+
 const SideDrawerField = lazy(
   () =>
     import(
@@ -14,6 +22,10 @@ const SideDrawerField = lazy(
     )
 );
 
+const Settings = lazy(
+  () => import("./Settings" /* webpackChunkName: "Settings-Percentage" */)
+);
+
 export const config: IFieldConfig = {
   type: FieldType.percentage,
   name: "Percentage",
@@ -22,11 +34,13 @@ export const config: IFieldConfig = {
   initialValue: 0,
   initializable: true,
   icon: <PercentageIcon />,
+  requireConfiguration: true,
   description: "Percentage stored as a number between 0 and 1.",
   contextMenuActions: BasicContextMenuActions,
-  TableCell: withBasicCell(BasicCell),
+  TableCell: withHeavyCell(BasicCell, TableCell),
   TableEditor: TextEditor,
   SideDrawerField,
+  settings: Settings,
   filter: {
     operators: filterOperators,
   },
diff --git a/src/utils/color.ts b/src/utils/color.ts
index 58dbfa53..686e2716 100644
--- a/src/utils/color.ts
+++ b/src/utils/color.ts
@@ -1,12 +1,18 @@
 import { colord } from "colord";
 
-export const resultColors = {
-  No: "#ED4747",
-  Maybe: "#f3c900",
-  Yes: "#1fad5f",
-};
+export const defaultColors = ["#ED4747", "#F3C900", "#1FAD5F"];
 
-export const resultColorsScale = (value: number) =>
+export const resultColorsScale = (
+  value: number,
+  colors: any = defaultColors,
+  defaultColor: string = "#fff"
+) =>
   value <= 0.5
-    ? colord(resultColors.No).mix(resultColors.Maybe, value * 2)
-    : colord(resultColors.Maybe).mix(resultColors.Yes, (value - 0.5) * 2);
+    ? colord(colors[0] || defaultColor).mix(
+        colors[1] || defaultColor,
+        value * 2
+      )
+    : colord(colors[1] || defaultColor).mix(
+        colors[2] || defaultColor,
+        (value - 0.5) * 2
+      );

From 89fadc1bc3fb6b0487f3906db8c576ac15e6f60a Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 5 Jul 2022 13:30:04 +1000
Subject: [PATCH 015/309] fix scrollbars

---
 src/components/TableToolbar/TableToolbar.tsx | 2 ++
 src/layouts/Navigation/NavDrawer.tsx         | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/TableToolbar/TableToolbar.tsx b/src/components/TableToolbar/TableToolbar.tsx
index b7858176..5f555b13 100644
--- a/src/components/TableToolbar/TableToolbar.tsx
+++ b/src/components/TableToolbar/TableToolbar.tsx
@@ -71,7 +71,9 @@ export default function TableToolbar() {
         pl: (theme) => `max(env(safe-area-inset-left), ${theme.spacing(2)})`,
         pb: 1.5,
         height: TABLE_TOOLBAR_HEIGHT,
+        scrollbarWidth: "thin",
         overflowX: "auto",
+        "&": { overflowX: "overlay" },
         overflowY: "hidden",
         "& > *": { flexShrink: 0 },
 
diff --git a/src/layouts/Navigation/NavDrawer.tsx b/src/layouts/Navigation/NavDrawer.tsx
index 0f1097b9..6e5d2060 100644
--- a/src/layouts/Navigation/NavDrawer.tsx
+++ b/src/layouts/Navigation/NavDrawer.tsx
@@ -112,6 +112,7 @@ export default function NavDrawer({
               width,
               pt: 0,
               pb: 1,
+              scrollbarWidth: "thin",
             },
           },
           isPermanent && {
@@ -145,7 +146,10 @@ export default function NavDrawer({
           },
           collapsed &&
             !tempExpanded && {
-              "& .MuiMenuItem-root": {},
+              "& .MuiDrawer-paper": {
+                scrollbarWidth: "none",
+                "::-webkit-scrollbar": { display: "none" },
+              },
               "& .MuiListItemSecondaryAction-root": {
                 opacity: 0,
                 transitionDelay: "0ms",

From 7c574c9d84df23cc87e91a9e338781198185bb1d Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 5 Jul 2022 13:46:44 +1000
Subject: [PATCH 016/309] increase min width for collapsible nav drawer

---
 src/theme/breakpoints.ts | 5 +++++
 src/theme/themes.ts      | 9 ++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 src/theme/breakpoints.ts

diff --git a/src/theme/breakpoints.ts b/src/theme/breakpoints.ts
new file mode 100644
index 00000000..aa065e73
--- /dev/null
+++ b/src/theme/breakpoints.ts
@@ -0,0 +1,5 @@
+export const breakpoints = {
+  breakpoints: {
+    values: { xs: 0, sm: 600, md: 980, lg: 1200, xl: 1536 },
+  },
+};
diff --git a/src/theme/themes.ts b/src/theme/themes.ts
index b1a74b1f..54affab5 100644
--- a/src/theme/themes.ts
+++ b/src/theme/themes.ts
@@ -1,14 +1,16 @@
 import { createTheme, ThemeOptions } from "@mui/material/styles";
 import { merge } from "lodash-es";
 
-import { typography } from "@src/theme/typography";
-import { colorsLight, colorsDark } from "@src/theme/colors";
-import { components } from "@src/theme/components";
+import { breakpoints } from "./breakpoints";
+import { typography } from "./typography";
+import { colorsLight, colorsDark } from "./colors";
+import { components } from "./components";
 
 export const customizableLightTheme = (customization: ThemeOptions) => {
   const customizedLightThemeBase = createTheme(
     merge(
       {},
+      breakpoints,
       typography((customization?.typography as any) ?? {}),
       colorsLight((customization?.palette?.primary as any)?.main)
     )
@@ -28,6 +30,7 @@ export const customizableDarkTheme = (customization: ThemeOptions) => {
   const customizedDarkThemeBase = createTheme(
     merge(
       {},
+      breakpoints,
       typography((customization?.typography as any) ?? {}),
       colorsDark(
         (customization?.palette?.primary as any)?.main,

From 711327e28dac3f8096eb1b6e0bfc1851b836c129 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 6 Jul 2022 15:23:05 +1000
Subject: [PATCH 017/309] update navigation

---
 src/App.tsx                                   |   7 +-
 src/assets/Logo.tsx                           |  16 +-
 src/config/firebaseui.ts                      |   8 +
 src/constants/routes.tsx                      |   4 +-
 src/layouts/AuthLayout.tsx                    |  29 ++--
 src/layouts/Navigation/HelpMenu.tsx           | 148 +++++++-----------
 src/layouts/Navigation/NavDrawer.tsx          | 104 +++++-------
 src/layouts/Navigation/NavItem.tsx            |  17 +-
 src/layouts/Navigation/TopBar.tsx             |  50 +++---
 src/layouts/Navigation/UpdateCheckBadge.tsx   |  11 +-
 src/pages/Auth/SignUpPage.tsx                 |  94 +++++------
 src/pages/Settings/DebugSettingsPage.tsx      |   2 +-
 ...UserManagementPage.tsx => MembersPage.tsx} |  10 +-
 ...Firebase.tsx => MembersSourceFirebase.tsx} |  16 +-
 14 files changed, 231 insertions(+), 285 deletions(-)
 rename src/pages/Settings/{UserManagementPage.tsx => MembersPage.tsx} (92%)
 rename src/sources/{UserManagementSourceFirebase.tsx => MembersSourceFirebase.tsx} (54%)

diff --git a/src/App.tsx b/src/App.tsx
index 92d33ff6..8fec3fc9 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -52,7 +52,7 @@ const UserSettingsPage = lazy(() => import("@src/pages/Settings/UserSettingsPage
 // prettier-ignore
 const ProjectSettingsPage = lazy(() => import("@src/pages/Settings/ProjectSettingsPage" /* webpackChunkName: "ProjectSettingsPage" */));
 // prettier-ignore
-const UserManagementPage = lazy(() => import("@src/pages/Settings/UserManagementPage" /* webpackChunkName: "UserManagementPage" */));
+const MembersPage = lazy(() => import("@src/pages/Settings/MembersPage" /* webpackChunkName: "MembersPage" */));
 // prettier-ignore
 const DebugSettingsPage = lazy(() => import("@src/pages/Settings/DebugSettingsPage" /* webpackChunkName: "DebugSettingsPage" */));
 
@@ -141,10 +141,7 @@ export default function App() {
               path={ROUTES.projectSettings}
               element={<ProjectSettingsPage />}
             />
-            <Route
-              path={ROUTES.userManagement}
-              element={<UserManagementPage />}
-            />
+            <Route path={ROUTES.members} element={<MembersPage />} />
             <Route
               path={ROUTES.debugSettings}
               element={<DebugSettingsPage />}
diff --git a/src/assets/Logo.tsx b/src/assets/Logo.tsx
index acd8151f..c4037f30 100644
--- a/src/assets/Logo.tsx
+++ b/src/assets/Logo.tsx
@@ -22,20 +22,20 @@ export default function Logo({ size = 1.5, ...props }: ILogoProps) {
 
       <defs>
         <linearGradient x1="83.349%" y1="50%" x2="0%" y2="50%" id="b">
-          <stop stop-color="#F0A" offset="0%" />
-          <stop stop-color="#FA0" offset="100%" />
+          <stop stopColor="#F0A" offset="0%" />
+          <stop stopColor="#FA0" offset="100%" />
         </linearGradient>
         <linearGradient x1="50%" y1="16.276%" x2="50%" y2="100%" id="c">
-          <stop stop-color="#4200FF" offset="0%" />
-          <stop stop-color="#F0A" offset="100%" />
+          <stop stopColor="#4200FF" offset="0%" />
+          <stop stopColor="#F0A" offset="100%" />
         </linearGradient>
         <linearGradient x1="83.052%" y1="50%" x2="0%" y2="50%" id="d">
-          <stop stop-color="#0AF" offset="0%" />
-          <stop stop-color="#0FA" offset="100%" />
+          <stop stopColor="#0AF" offset="0%" />
+          <stop stopColor="#0FA" offset="100%" />
         </linearGradient>
         <linearGradient x1="100%" y1="50%" x2="16.614%" y2="50%" id="e">
-          <stop stop-color="#0AF" offset="0%" />
-          <stop stop-color="#4200FF" offset="100%" />
+          <stop stopColor="#0AF" offset="0%" />
+          <stop stopColor="#4200FF" offset="100%" />
         </linearGradient>
       </defs>
 
diff --git a/src/config/firebaseui.ts b/src/config/firebaseui.ts
index b69fe91d..e015e190 100644
--- a/src/config/firebaseui.ts
+++ b/src/config/firebaseui.ts
@@ -14,9 +14,15 @@ import githubLogo from "@src/assets/logos/github.svg";
 import appleLogo from "@src/assets/logos/apple.svg";
 import yahooLogo from "@src/assets/logos/yahoo.svg";
 
+import { EXTERNAL_LINKS } from "@src/constants/externalLinks";
+
 export const authOptions = {
   google: {
     provider: GoogleAuthProvider.PROVIDER_ID,
+    customParameters: {
+      // Forces account selection even when one account is available
+      prompt: "select_account",
+    },
   },
   twitter: {
     provider: TwitterAuthProvider.PROVIDER_ID,
@@ -59,6 +65,8 @@ export const defaultUiConfig: firebaseui.auth.Config = {
   signInFlow: "popup",
   signInSuccessUrl: "/",
   signInOptions: [authOptions.google],
+  // tosUrl: EXTERNAL_LINKS.terms,
+  // privacyPolicyUrl: EXTERNAL_LINKS.privacy,
 };
 
 export const getSignInOptions = (
diff --git a/src/constants/routes.tsx b/src/constants/routes.tsx
index 5c65d586..498204a8 100644
--- a/src/constants/routes.tsx
+++ b/src/constants/routes.tsx
@@ -35,7 +35,7 @@ export enum ROUTES {
   settings = "/settings",
   userSettings = "/settings/user",
   projectSettings = "/settings/project",
-  userManagement = "/settings/userManagement",
+  members = "/members",
   debugSettings = "/settings/debug",
 
   test = "/test",
@@ -62,7 +62,7 @@ export const ROUTE_TITLES = {
   [ROUTES.settings]: "Settings",
   [ROUTES.userSettings]: "Settings",
   [ROUTES.projectSettings]: "Project Settings",
-  [ROUTES.userManagement]: "User Management",
+  [ROUTES.members]: "Members",
   [ROUTES.debugSettings]: "Debug",
 
   [ROUTES.test]: "Test",
diff --git a/src/layouts/AuthLayout.tsx b/src/layouts/AuthLayout.tsx
index 08e5ad6a..22a11d6e 100644
--- a/src/layouts/AuthLayout.tsx
+++ b/src/layouts/AuthLayout.tsx
@@ -1,3 +1,4 @@
+import { useAtom } from "jotai";
 import { use100vh } from "react-div-100vh";
 
 import {
@@ -14,6 +15,7 @@ import Logo from "@src/assets/Logo";
 import bgTableLight from "@src/assets/bg-table-light.webp";
 import bgTableDark from "@src/assets/bg-table-dark.webp";
 
+import { globalScope, projectIdAtom } from "@src/atoms/globalScope";
 import { EXTERNAL_LINKS } from "@src/constants/externalLinks";
 
 export interface IAuthLayoutProps {
@@ -35,6 +37,7 @@ export default function AuthLayout({
   children,
   loading,
 }: IAuthLayoutProps) {
+  const [projectId] = useAtom(projectIdAtom, globalScope);
   const fullScreenHeight = use100vh() ?? 0;
 
   const linkProps: LinkProps = {
@@ -50,8 +53,8 @@ export default function AuthLayout({
       sx={{
         backgroundImage: (theme) =>
           `linear-gradient(to bottom,
-            ${alpha(theme.palette.background.default, 0.6)},
-            ${alpha(theme.palette.background.default, 0.6)}),
+            ${alpha(theme.palette.background.default, 0.75)},
+            ${alpha(theme.palette.background.default, 0.75)}),
             url(${theme.palette.mode === "dark" ? bgTableDark : bgTableLight})`,
         backgroundSize: { xs: "1920px 1080px", md: "cover" },
         backgroundRepeat: "no-repeat",
@@ -59,20 +62,19 @@ export default function AuthLayout({
 
         display: "grid",
         placeItems: "center",
-        alignContent: "center",
+        alignContent: "space-between",
         gap: 2,
         gridAutoRows: "max-content",
         minHeight: fullScreenHeight > 0 ? `${fullScreenHeight}px` : "100vh",
 
-        pt: (theme) => `max(env(safe-area-inset-top), ${theme.spacing(1)})`,
-        pb: (theme) => `max(env(safe-area-inset-bottom), ${theme.spacing(1)})`,
-        pl: (theme) => `max(env(safe-area-inset-left), ${theme.spacing(1)})`,
+        pt: (theme) => `max(env(safe-area-inset-top), ${theme.spacing(2)})`,
+        pb: (theme) => `max(env(safe-area-inset-bottom), ${theme.spacing(2)})`,
         pr: (theme) => `max(env(safe-area-inset-right), ${theme.spacing(1)})`,
+        pl: (theme) => `max(env(safe-area-inset-left), ${theme.spacing(1)})`,
       }}
     >
       <div
         style={{
-          textAlign: "center",
           marginBottom: -8,
           display: hideLogo && hideLinks ? "none" : "block",
           visibility: hideLogo ? "hidden" : "visible",
@@ -83,13 +85,13 @@ export default function AuthLayout({
           target="_blank"
           rel="noopener noreferrer"
         >
-          <Logo />
+          <Logo size={2} />
         </a>
       </div>
 
       <Paper
         component="main"
-        elevation={4}
+        elevation={8}
         sx={
           {
             position: "relative",
@@ -99,10 +101,11 @@ export default function AuthLayout({
             width: "100%",
             p: 4,
             minHeight: 300,
+            borderRadius: 3,
 
             display: "flex",
             flexDirection: "column",
-            textAlign: "center",
+            // textAlign: "center",
 
             "& > :not(style) + :not(style)": { mt: 4 },
           } as any
@@ -140,13 +143,13 @@ export default function AuthLayout({
           />
         )}
 
-        {/* <Typography
+        <Typography
           variant="caption"
           color="text.secondary"
-          sx={{ pt: 1, display: hideProject ? "none" : "block" }}
+          sx={{ display: hideProject ? "none" : "block", mb: -0.5 }}
         >
           Project: <span style={{ userSelect: "all" }}>{projectId}</span>
-        </Typography> */}
+        </Typography>
       </Paper>
 
       <Stack
diff --git a/src/layouts/Navigation/HelpMenu.tsx b/src/layouts/Navigation/HelpMenu.tsx
index c97bf4e8..0a3b4567 100644
--- a/src/layouts/Navigation/HelpMenu.tsx
+++ b/src/layouts/Navigation/HelpMenu.tsx
@@ -1,16 +1,11 @@
-import { useState, useRef } from "react";
-
 import {
-  IconButton,
-  IconButtonProps,
   Menu,
+  MenuProps,
   MenuItem,
   ListItemIcon,
   ListItemSecondaryAction,
   Divider,
-  Grow,
 } from "@mui/material";
-import HelpIcon from "@mui/icons-material/HelpOutline";
 import DocsIcon from "@mui/icons-material/LibraryBooksOutlined";
 import { Discord as DiscordIcon } from "@src/assets/icons";
 import GitHubIcon from "@mui/icons-material/GitHub";
@@ -20,9 +15,13 @@ import { EXTERNAL_LINKS } from "@src/constants/externalLinks";
 import InlineOpenInNewIcon from "@src/components/InlineOpenInNewIcon";
 import { analytics } from "analytics";
 
-export default function UserMenu(props: IconButtonProps) {
-  const anchorEl = useRef<HTMLButtonElement>(null);
-  const [open, setOpen] = useState(false);
+export default function HelpMenu({
+  anchorEl,
+  onClose,
+}: Pick<MenuProps, "anchorEl" | "onClose">) {
+  // useEffect(() => {
+  // analytics.logEvent("open_help_menu");
+  // }, []);
 
   const externalLinkIcon = (
     <ListItemSecondaryAction sx={{ right: 10, color: "text.disabled" }}>
@@ -31,89 +30,54 @@ export default function UserMenu(props: IconButtonProps) {
   );
 
   return (
-    <>
-      <Grow in>
-        <IconButton
-          aria-label="Open help menu"
-          aria-controls="help-menu"
-          aria-haspopup="true"
-          size="large"
-          {...props}
-          ref={anchorEl}
-          onClick={() => {
-            setOpen(true);
-            analytics.logEvent("open_help_menu");
-          }}
-        >
-          <HelpIcon />
-        </IconButton>
-      </Grow>
-
-      <Menu
-        anchorEl={anchorEl.current}
-        id="help-menu"
-        anchorOrigin={{ vertical: "bottom", horizontal: "right" }}
-        transformOrigin={{ vertical: "top", horizontal: "right" }}
-        open={open}
-        onClose={() => setOpen(false)}
-        sx={{ "& .MuiPaper-root": { minWidth: 160 } }}
+    <Menu
+      anchorEl={anchorEl}
+      open={Boolean(anchorEl)}
+      onClose={onClose}
+      id="help-menu"
+      anchorOrigin={{ vertical: "bottom", horizontal: "right" }}
+      transformOrigin={{ vertical: "bottom", horizontal: "left" }}
+      sx={{ "& .MuiPaper-root": { mt: 0.5, minWidth: 160 } }}
+    >
+      <MenuItem
+        component="a"
+        href={EXTERNAL_LINKS.discord}
+        target="_blank"
+        rel="noopener noreferrer"
+        onClick={onClose as any}
       >
-        <MenuItem
-          component="a"
-          href={EXTERNAL_LINKS.docs}
-          target="_blank"
-          rel="noopener noreferrer"
-          onClick={() => setOpen(false)}
-        >
-          <ListItemIcon>
-            <DocsIcon />
-          </ListItemIcon>
-          Docs
-          {externalLinkIcon}
-        </MenuItem>
-
-        <Divider variant="middle" sx={{ mt: 0.5, mb: 0.5 }} />
-
-        <MenuItem
-          component="a"
-          href={EXTERNAL_LINKS.discord}
-          target="_blank"
-          rel="noopener noreferrer"
-          onClick={() => setOpen(false)}
-        >
-          <ListItemIcon>
-            <DiscordIcon />
-          </ListItemIcon>
-          Discord
-          {externalLinkIcon}
-        </MenuItem>
-        <MenuItem
-          component="a"
-          href={EXTERNAL_LINKS.gitHub}
-          target="_blank"
-          rel="noopener noreferrer"
-          onClick={() => setOpen(false)}
-        >
-          <ListItemIcon>
-            <GitHubIcon />
-          </ListItemIcon>
-          GitHub
-          {externalLinkIcon}
-        </MenuItem>
-        <MenuItem
-          component="a"
-          href={EXTERNAL_LINKS.twitter}
-          target="_blank"
-          rel="noopener noreferrer"
-          onClick={() => setOpen(false)}
-        >
-          <ListItemIcon>
-            <TwitterIcon />
-          </ListItemIcon>
-          Twitter
-          {externalLinkIcon}
-        </MenuItem>
-      </Menu>
-    </>
+        <ListItemIcon>
+          <DiscordIcon />
+        </ListItemIcon>
+        Discord
+        {externalLinkIcon}
+      </MenuItem>
+      <MenuItem
+        component="a"
+        href={EXTERNAL_LINKS.gitHub}
+        target="_blank"
+        rel="noopener noreferrer"
+        onClick={onClose as any}
+      >
+        <ListItemIcon>
+          <GitHubIcon />
+        </ListItemIcon>
+        GitHub
+        {externalLinkIcon}
+      </MenuItem>
+      <MenuItem
+        component="a"
+        href={EXTERNAL_LINKS.twitter}
+        target="_blank"
+        rel="noopener noreferrer"
+        onClick={onClose as any}
+      >
+        <ListItemIcon>
+          <TwitterIcon />
+        </ListItemIcon>
+        Twitter
+        {externalLinkIcon}
+      </MenuItem>
+    </Menu>
   );
 }
diff --git a/src/layouts/Navigation/NavDrawer.tsx b/src/layouts/Navigation/NavDrawer.tsx
index 6e5d2060..6ae58bac 100644
--- a/src/layouts/Navigation/NavDrawer.tsx
+++ b/src/layouts/Navigation/NavDrawer.tsx
@@ -11,29 +11,27 @@ import {
   List,
   ListItemIcon,
   ListItemText,
-  Avatar,
   Divider,
   ListItemSecondaryAction,
   Box,
-  Fade,
 } from "@mui/material";
 import CloseIcon from "@mui/icons-material/MenuOpen";
-import ArrowBackIcon from "@mui/icons-material/WorkspacesOutlined";
 import HomeIcon from "@mui/icons-material/HomeOutlined";
 import SettingsIcon from "@mui/icons-material/SettingsOutlined";
-import ProjectSettingsIcon from "@mui/icons-material/BuildCircleOutlined";
 import UserManagementIcon from "@mui/icons-material/AccountCircleOutlined";
 import AddIcon from "@mui/icons-material/Add";
-import { Table as TableIcon } from "@src/assets/icons";
 import DocsIcon from "@mui/icons-material/LibraryBooksOutlined";
 import LearningIcon from "@mui/icons-material/LocalLibraryOutlined";
 import HelpIcon from "@mui/icons-material/HelpOutline";
+import CommunityIcon from "@mui/icons-material/SentimentSatisfiedAltOutlined";
 import InlineOpenInNewIcon from "@src/components/InlineOpenInNewIcon";
+import { ChevronRight as ChevronRightIcon } from "@src/assets/icons";
 
 import Logo from "@src/assets/Logo";
 import NavItem from "./NavItem";
 import NavTableSection from "./NavTableSection";
 import UpdateCheckBadge from "./UpdateCheckBadge";
+import HelpMenu from "./HelpMenu";
 
 import {
   globalScope,
@@ -70,6 +68,8 @@ export default function NavDrawer({
   );
 
   const [hover, setHover] = useState(false);
+  const [helpMenuAnchorEl, setHelpMenuAnchorEl] =
+    useState<HTMLButtonElement | null>(null);
 
   const favorites = Array.isArray(userSettings.favoriteTables)
     ? userSettings.favoriteTables
@@ -89,8 +89,8 @@ export default function NavDrawer({
     ? undefined
     : (e: {}) => onClose(e, "escapeKeyDown");
 
-  const externalLinkIcon = !collapsed && (
-    <ListItemSecondaryAction sx={{ right: 10, color: "text.disabled" }}>
+  const externalLinkIcon = (
+    <ListItemSecondaryAction sx={{ right: 10 }}>
       <InlineOpenInNewIcon />
     </ListItemSecondaryAction>
   );
@@ -194,48 +194,6 @@ export default function NavDrawer({
             disablePadding
             style={{ height: "100%", display: "flex", flexDirection: "column" }}
           >
-            <li>
-              <NavItem onClick={closeDrawer}>
-                <ListItemIcon>
-                  <ArrowBackIcon />
-                </ListItemIcon>
-                <ListItemText primary="Workspace" />
-              </NavItem>
-            </li>
-
-            <li>
-              <NavItem onClick={closeDrawer}>
-                <ListItemIcon>
-                  <Avatar
-                    sx={{
-                      borderRadius: 1,
-                      width: 24,
-                      height: 24,
-                      fontSize: "inherit",
-                      bgcolor: "primary.main",
-                      color: "primary.contrastText",
-                    }}
-                  >
-                    P
-                  </Avatar>
-                </ListItemIcon>
-                <ListItemText primary="Project" />
-              </NavItem>
-            </li>
-
-            {/* {userRoles.includes("ADMIN") && (
-            <li>
-              <NavItem to={ROUTES.userManagement} onClick={closeDrawer}>
-                <ListItemIcon>
-                  <UserManagementIcon />
-                </ListItemIcon>
-                <ListItemText primary="User Management" />
-              </NavItem>
-            </li>
-          )} */}
-
-            <Divider variant="middle" sx={{ my: 1 }} />
-
             <li>
               <NavItem to={ROUTES.tables} onClick={closeDrawer}>
                 <ListItemIcon>
@@ -251,30 +209,30 @@ export default function NavDrawer({
                   <SettingsIcon />
                 </ListItemIcon>
                 <ListItemText primary="Settings" />
+                {userRoles.includes("ADMIN") && (
+                  <UpdateCheckBadge sx={{ mr: 1.5 }} />
+                )}
               </NavItem>
             </li>
 
             {userRoles.includes("ADMIN") && (
               <li>
-                <NavItem to={ROUTES.projectSettings} onClick={closeDrawer}>
+                <NavItem to={ROUTES.members} onClick={closeDrawer}>
                   <ListItemIcon>
-                    <ProjectSettingsIcon />
+                    <UserManagementIcon />
                   </ListItemIcon>
-                  <ListItemText primary="Project Settings" />
-                  <UpdateCheckBadge sx={{ mr: 1.5 }} />
+                  <ListItemText primary="Members" />
                 </NavItem>
               </li>
             )}
 
             <Divider variant="middle" sx={{ my: 1 }} />
 
-            {/* <ListSubheader>Your tables</ListSubheader> */}
-
             <li>
               <NavItem
                 {...({ component: "button" } as any)}
                 style={{ textAlign: "left" }}
-                onClick={(e) => {
+                onClick={(e: any) => {
                   if (closeDrawer) closeDrawer(e);
                   openTableSettingsDialog({});
                 }}
@@ -286,15 +244,6 @@ export default function NavDrawer({
               </NavItem>
             </li>
 
-            {/* <li>
-            <NavItem to={ROUTES.tables} onClick={closeDrawer}>
-              <ListItemIcon>
-                <TableIcon />
-              </ListItemIcon>
-              <ListItemText primary="Table" />
-            </NavItem>
-          </li> */}
-
             {sections &&
               Object.entries(sections)
                 .filter(([, tables]) => tables.length > 0)
@@ -329,13 +278,36 @@ export default function NavDrawer({
               </NavItem>
             </li>
             <li>
-              <NavItem href={EXTERNAL_LINKS.docs}>
+              <NavItem
+                onClick={(e: any) => setHelpMenuAnchorEl(e.currentTarget)}
+              >
+                <ListItemIcon>
+                  <CommunityIcon />
+                </ListItemIcon>
+                <ListItemText primary="Join our community" />
+                <ListItemSecondaryAction>
+                  <ChevronRightIcon />
+                </ListItemSecondaryAction>
+              </NavItem>
+            </li>
+            <li>
+              <NavItem
+                onClick={(e: any) => setHelpMenuAnchorEl(e.currentTarget)}
+              >
                 <ListItemIcon>
                   <HelpIcon />
                 </ListItemIcon>
                 <ListItemText primary="Help" />
+                <ListItemSecondaryAction>
+                  <ChevronRightIcon />
+                </ListItemSecondaryAction>
               </NavItem>
             </li>
+
+            <HelpMenu
+              anchorEl={helpMenuAnchorEl}
+              onClose={() => setHelpMenuAnchorEl(null)}
+            />
           </List>
         </nav>
       </Drawer>
diff --git a/src/layouts/Navigation/NavItem.tsx b/src/layouts/Navigation/NavItem.tsx
index efe92f66..cc6cf903 100644
--- a/src/layouts/Navigation/NavItem.tsx
+++ b/src/layouts/Navigation/NavItem.tsx
@@ -4,24 +4,29 @@ import { spreadSx } from "@src/utils/ui";
 
 const linkProps = { target: "_blank", rel: "noopener noreferrer" };
 
-export default function NavItem(props: MenuItemProps<typeof Link | "a">) {
+export default function NavItem(
+  props: MenuItemProps<typeof Link | "a" | "button">
+) {
   const { pathname } = useLocation();
 
   return (
     <MenuItem
-      component={"to" in props ? Link : "a"}
+      component={"to" in props ? Link : "href" in props ? "a" : "button"}
       selected={"to" in props ? pathname === props.to : false}
       {...props}
       {...("href" in props ? linkProps : {})}
       sx={[
         {
           overflow: "hidden",
+          textAlign: "left",
+          color: "text.secondary",
 
-          "& .MuiListItemText-primary": {
-            typography: "button",
-            color: "text.secondary",
+          "& .MuiListItemText-primary": { typography: "button" },
+          "& .MuiSvgIcon-root": {
+            color: "inherit",
+            opacity: 0.87,
+            display: "block",
           },
-          "& .MuiListItemIcon-root": { opacity: 0.87 },
 
           "&:hover, &.Mui-selected": {
             "& .MuiListItemText-primary": { color: "text.primary" },
diff --git a/src/layouts/Navigation/TopBar.tsx b/src/layouts/Navigation/TopBar.tsx
index f17152ae..ba6d59b5 100644
--- a/src/layouts/Navigation/TopBar.tsx
+++ b/src/layouts/Navigation/TopBar.tsx
@@ -1,10 +1,13 @@
 import { useAtom } from "jotai";
+import { colord } from "colord";
+import { NavLink } from "react-router-dom";
 
 import {
   useScrollTrigger,
   AppBar,
   Toolbar,
   IconButton,
+  Button,
   Box,
   Typography,
   Grow,
@@ -12,15 +15,15 @@ import {
 } from "@mui/material";
 import MenuIcon from "@mui/icons-material/Menu";
 import MenuCloseIcon from "@mui/icons-material/MenuOpen";
+import PersonAddIcon from "@mui/icons-material/PersonAddOutlined";
 
 import Logo from "@src/assets/Logo";
 import { NAV_DRAWER_WIDTH, NAV_DRAWER_COLLAPSED_WIDTH } from "./NavDrawer";
-import HelpMenu from "./HelpMenu";
 import UserMenu from "./UserMenu";
 import UpdateCheckBadge from "./UpdateCheckBadge";
 
 import { globalScope, userRolesAtom } from "@src/atoms/globalScope";
-import { ROUTE_TITLES } from "@src/constants/routes";
+import { ROUTES, ROUTE_TITLES } from "@src/constants/routes";
 
 export const TOP_BAR_HEIGHT = 56;
 
@@ -51,25 +54,14 @@ export default function TopBar({
       elevation={trigger ? 1 : 0}
       sx={{
         height: TOP_BAR_HEIGHT,
-        backgroundImage:
-          "linear-gradient(rgba(255, 255, 255, 0.09), rgba(255, 255, 255, 0.09))", // Elevation 8
-
-        "&::before": {
-          content: "''",
-          display: "block",
-          position: "absolute",
-          top: 0,
-          right: 0,
-          bottom: 0,
-          left: 0,
-
-          bgcolor: "background.default",
-          opacity: trigger ? 0 : 1,
-
-          transitionProperty: "opacity",
-          transitionTimingFunction: "var(--nav-transition-timing-function)",
-          transitionDuration: "var(--nav-transition-duration)",
-        },
+        backgroundColor: trigger
+          ? (theme) =>
+              colord(theme.palette.background.paper)
+                .mix("#fff", 0.09) // Elevation 8
+                .alpha(1)
+                .toHslString()
+          : "transparent",
+        transitionProperty: "box-shadow, background-color",
       }}
     >
       <Toolbar
@@ -137,11 +129,12 @@ export default function TopBar({
               {
                 flex: 1,
                 overflowX: "auto",
+                scrollbarWidth: "thin",
                 userSelect: "none",
                 ml: 1,
               },
               !(routeTitle as any)?.leftAligned && {
-                ml: { xs: 1, sm: 6 },
+                ml: { xs: 1, sm: 208 / 8 + 1 },
               },
               isPermanent &&
                 (routeTitle as any)?.leftAligned && {
@@ -169,7 +162,18 @@ export default function TopBar({
           </Box>
         </Fade>
 
-        <HelpMenu />
+        <Button
+          component={NavLink}
+          to={ROUTES.members}
+          startIcon={<PersonAddIcon />}
+          sx={{
+            mr: 1,
+            "&.active": { visibility: "hidden" },
+          }}
+        >
+          Invite team members
+        </Button>
+
         <UserMenu />
       </Toolbar>
     </AppBar>
diff --git a/src/layouts/Navigation/UpdateCheckBadge.tsx b/src/layouts/Navigation/UpdateCheckBadge.tsx
index e41ade67..7c142d55 100644
--- a/src/layouts/Navigation/UpdateCheckBadge.tsx
+++ b/src/layouts/Navigation/UpdateCheckBadge.tsx
@@ -1,10 +1,19 @@
+import { useAtom } from "jotai";
+
 import { Badge, BadgeProps } from "@mui/material";
+
+import { globalScope, userRolesAtom } from "@src/atoms/globalScope";
 import useUpdateCheck from "@src/hooks/useUpdateCheck";
 
 export default function UpdateCheckBadge(props: Partial<BadgeProps>) {
+  const [userRoles] = useAtom(userRolesAtom, globalScope);
   const [latestUpdate] = useUpdateCheck();
 
-  if (!latestUpdate.rowy && !latestUpdate.rowyRun) return <>{props.children}</>;
+  if (
+    !userRoles.includes("ADMIN") ||
+    (!latestUpdate.rowy && !latestUpdate.rowyRun)
+  )
+    return <>{props.children}</>;
 
   return (
     <Badge
diff --git a/src/pages/Auth/SignUpPage.tsx b/src/pages/Auth/SignUpPage.tsx
index de314406..b31f89e1 100644
--- a/src/pages/Auth/SignUpPage.tsx
+++ b/src/pages/Auth/SignUpPage.tsx
@@ -1,8 +1,7 @@
 import { useSearchParams } from "react-router-dom";
 
-import { useMediaQuery, Stack, Typography, Link } from "@mui/material";
+import { Typography, Link } from "@mui/material";
 
-import MarketingPanel from "@src/layouts/MarketingPanel";
 import AuthLayout from "@src/layouts/AuthLayout";
 import FirebaseUi from "@src/components/FirebaseUi";
 import { EXTERNAL_LINKS } from "@src/constants/externalLinks";
@@ -16,61 +15,48 @@ export default function SignUpPage() {
     uiConfig.signInSuccessUrl = redirect;
   }
 
-  const isMobile = useMediaQuery((theme: any) => theme.breakpoints.down("md"));
-
   return (
-    <Stack direction="row">
-      <MarketingPanel />
-
-      <div style={{ flexGrow: 1 }}>
-        <AuthLayout
-          hideLogo={!isMobile}
-          hideLinks={!isMobile}
-          title="Sign up"
-          description={
+    <AuthLayout
+      title="Sign up"
+      description={
+        <>
+          Welcome! To join this project, sign up with the email address
+          {searchParams.get("email") ? (
             <>
-              Welcome! To join this project, sign in with the email address
-              {searchParams.get("email") ? (
-                <>
-                  :{" "}
-                  <b style={{ userSelect: "all" }}>
-                    {searchParams.get("email")}
-                  </b>
-                </>
-              ) : (
-                " used to invite you."
-              )}
+              : <b style={{ userSelect: "all" }}>{searchParams.get("email")}</b>
             </>
-          }
+          ) : (
+            " used to invite you."
+          )}
+        </>
+      }
+    >
+      <FirebaseUi uiConfig={uiConfig} />
+      <Typography
+        variant="caption"
+        color="text.secondary"
+        style={{ marginTop: 16 }}
+      >
+        By signing up, you agree to our{" "}
+        <Link
+          href={EXTERNAL_LINKS.terms}
+          target="_blank"
+          rel="noopener noreferrer"
+          color="text.secondary"
         >
-          <FirebaseUi uiConfig={uiConfig} />
-          <Typography
-            variant="caption"
-            color="text.secondary"
-            style={{ marginTop: 16 }}
-          >
-            By signing up, you agree to our{" "}
-            <Link
-              href={EXTERNAL_LINKS.terms}
-              target="_blank"
-              rel="noopener noreferrer"
-              color="text.secondary"
-            >
-              Terms and Conditions
-            </Link>{" "}
-            and{" "}
-            <Link
-              href={EXTERNAL_LINKS.privacy}
-              target="_blank"
-              rel="noopener noreferrer"
-              color="text.secondary"
-            >
-              Privacy Policy
-            </Link>
-            .
-          </Typography>
-        </AuthLayout>
-      </div>
-    </Stack>
+          Terms and Conditions
+        </Link>{" "}
+        and{" "}
+        <Link
+          href={EXTERNAL_LINKS.privacy}
+          target="_blank"
+          rel="noopener noreferrer"
+          color="text.secondary"
+        >
+          Privacy Policy
+        </Link>
+        .
+      </Typography>
+    </AuthLayout>
   );
 }
diff --git a/src/pages/Settings/DebugSettingsPage.tsx b/src/pages/Settings/DebugSettingsPage.tsx
index ebd10f1d..d6ad22fa 100644
--- a/src/pages/Settings/DebugSettingsPage.tsx
+++ b/src/pages/Settings/DebugSettingsPage.tsx
@@ -17,7 +17,7 @@ import {
   allUsersAtom,
   updateUserAtom,
 } from "@src/atoms/globalScope";
-import UserManagementSourceFirebase from "@src/sources/UserManagementSourceFirebase";
+import UserManagementSourceFirebase from "@src/sources/MembersSourceFirebase";
 import { firebaseDbAtom } from "@src/sources/ProjectSourceFirebase";
 import { USERS } from "@src/config/dbPaths";
 import { getTableSchemaPath } from "@src/utils/table";
diff --git a/src/pages/Settings/UserManagementPage.tsx b/src/pages/Settings/MembersPage.tsx
similarity index 92%
rename from src/pages/Settings/UserManagementPage.tsx
rename to src/pages/Settings/MembersPage.tsx
index 045ae49b..2431e608 100644
--- a/src/pages/Settings/UserManagementPage.tsx
+++ b/src/pages/Settings/MembersPage.tsx
@@ -19,18 +19,18 @@ import UserSkeleton from "@src/components/Settings/UserManagement/UserSkeleton";
 import InviteUser from "@src/components/Settings/UserManagement/InviteUser";
 
 import { globalScope, allUsersAtom } from "@src/atoms/globalScope";
-import UserManagementSourceFirebase from "@src/sources/UserManagementSourceFirebase";
+import MembersSourceFirebase from "@src/sources/MembersSourceFirebase";
 import useBasicSearch from "@src/hooks/useBasicSearch";
 
 const SEARCH_KEYS = ["id", "user.displayName", "user.email"];
 
-function UserManagementPage() {
+function MembersPage() {
   const [users] = useAtom(allUsersAtom, globalScope);
   const [results, query, handleQuery] = useBasicSearch(users, SEARCH_KEYS);
 
   return (
     <Container maxWidth="sm" sx={{ px: 1, pt: 1, pb: 7 + 3 + 3 }}>
-      <UserManagementSourceFirebase />
+      <MembersSourceFirebase />
 
       <FloatingSearch
         label="Search users"
@@ -71,7 +71,7 @@ function UserManagementPage() {
   );
 }
 
-export default function SuspendedUserManagementPage() {
+export default function SuspendedMembersPage() {
   return (
     <Suspense
       fallback={
@@ -107,7 +107,7 @@ export default function SuspendedUserManagementPage() {
         </Fade>
       }
     >
-      <UserManagementPage />
+      <MembersPage />
     </Suspense>
   );
 }
diff --git a/src/sources/UserManagementSourceFirebase.tsx b/src/sources/MembersSourceFirebase.tsx
similarity index 54%
rename from src/sources/UserManagementSourceFirebase.tsx
rename to src/sources/MembersSourceFirebase.tsx
index 9b64ea1f..aa4acde5 100644
--- a/src/sources/UserManagementSourceFirebase.tsx
+++ b/src/sources/MembersSourceFirebase.tsx
@@ -11,14 +11,12 @@ import { USERS } from "@src/config/dbPaths";
 /**
  * When rendered, provides atom values for top-level tables
  */
-const UserManagementSourceFirebase = memo(
-  function UserManagementSourceFirebase() {
-    useFirestoreCollectionWithAtom(allUsersAtom, globalScope, USERS, {
-      updateDocAtom: updateUserAtom,
-    });
+const MembersSourceFirebase = memo(function MembersSourceFirebase() {
+  useFirestoreCollectionWithAtom(allUsersAtom, globalScope, USERS, {
+    updateDocAtom: updateUserAtom,
+  });
 
-    return null;
-  }
-);
+  return null;
+});
 
-export default UserManagementSourceFirebase;
+export default MembersSourceFirebase;

From 5123b1c1ca93ee8fcc556302687d240ec770eb0e Mon Sep 17 00:00:00 2001
From: shamsmosowi <shams.mosowi@gmail.com>
Date: Wed, 6 Jul 2022 13:38:14 +0200
Subject: [PATCH 018/309] extend callable timeout to over 9minutes

---
 src/components/fields/Action/ActionFab.tsx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/components/fields/Action/ActionFab.tsx b/src/components/fields/Action/ActionFab.tsx
index 26a32187..db8eee99 100644
--- a/src/components/fields/Action/ActionFab.tsx
+++ b/src/components/fields/Action/ActionFab.tsx
@@ -93,10 +93,9 @@ export default function ActionFab({
     return resp;
   };
   const handleCallableAction = async (data: any) => {
-    const resp: any = await httpsCallable(
-      firebaseFunctions,
-      callableName
-    )(data);
+    const resp: any = await httpsCallable(firebaseFunctions, callableName, {
+      timeout: 550,
+    })(data);
     return resp.data;
   };
 

From 9a168544b47a1cb3293c516fbba3dbfa401f40f1 Mon Sep 17 00:00:00 2001
From: shamsmosowi <shams.mosowi@gmail.com>
Date: Wed, 6 Jul 2022 13:44:34 +0200
Subject: [PATCH 019/309] fix timeout value

---
 src/components/fields/Action/ActionFab.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/fields/Action/ActionFab.tsx b/src/components/fields/Action/ActionFab.tsx
index db8eee99..67f00847 100644
--- a/src/components/fields/Action/ActionFab.tsx
+++ b/src/components/fields/Action/ActionFab.tsx
@@ -94,7 +94,7 @@ export default function ActionFab({
   };
   const handleCallableAction = async (data: any) => {
     const resp: any = await httpsCallable(firebaseFunctions, callableName, {
-      timeout: 550,
+      timeout: 550000,
     })(data);
     return resp.data;
   };

From 0ece76c3efb3daf258c93c1ed80e8b9efd7c870c Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Thu, 7 Jul 2022 19:16:59 +1000
Subject: [PATCH 020/309] add GetStartedChecklist

---
 src/assets/icons/index.ts                     |   6 +
 src/atoms/globalScope/ui.ts                   |   3 +
 src/components/SocialLogo.tsx                 |  52 ++++
 src/components/SteppedAccordion.tsx           |  20 +-
 src/constants/externalLinks.ts                |   1 +
 src/layouts/Navigation/CommunityMenu.tsx      | 116 ++++++++
 .../GetStartedChecklist.tsx                   | 174 +++++++++++
 .../GetStartedChecklist/Progress.tsx          |  23 ++
 .../Navigation/GetStartedChecklist/index.ts   |   2 +
 src/layouts/Navigation/HelpMenu.tsx           |  85 +++---
 src/layouts/Navigation/NavDrawer.tsx          | 277 ++++++++++++------
 src/layouts/Navigation/NavTableSection.tsx    |  16 +-
 src/layouts/Navigation/Navigation.tsx         |   2 +
 src/layouts/Navigation/SettingsNav.tsx        | 115 ++++++++
 src/layouts/Navigation/TopBar.tsx             |   9 +-
 15 files changed, 748 insertions(+), 153 deletions(-)
 create mode 100644 src/components/SocialLogo.tsx
 create mode 100644 src/layouts/Navigation/CommunityMenu.tsx
 create mode 100644 src/layouts/Navigation/GetStartedChecklist/GetStartedChecklist.tsx
 create mode 100644 src/layouts/Navigation/GetStartedChecklist/Progress.tsx
 create mode 100644 src/layouts/Navigation/GetStartedChecklist/index.ts
 create mode 100644 src/layouts/Navigation/SettingsNav.tsx

diff --git a/src/assets/icons/index.ts b/src/assets/icons/index.ts
index ad903f41..d969d6d8 100644
--- a/src/assets/icons/index.ts
+++ b/src/assets/icons/index.ts
@@ -94,6 +94,12 @@ export { Table };
 import { Leaf } from "mdi-material-ui";
 export { Leaf };
 
+import { FormatListChecks } from "mdi-material-ui";
+export { FormatListChecks as Checklist };
+
+import { FileTableBoxOutline } from "mdi-material-ui";
+export { FileTableBoxOutline as Project };
+
 export * from "./AddRow";
 export * from "./AddRowTop";
 export * from "./ChevronDown";
diff --git a/src/atoms/globalScope/ui.ts b/src/atoms/globalScope/ui.ts
index 616fc8f0..bf48d3a5 100644
--- a/src/atoms/globalScope/ui.ts
+++ b/src/atoms/globalScope/ui.ts
@@ -143,6 +143,9 @@ export const tableSettingsDialogSchemaAtom = atom(async (get) => {
   return getTableSchema(tableId);
 });
 
+/** Open the Get Started checklist from anywhere */
+export const getStartedChecklistAtom = atom(false);
+
 /** Persist the state of the add row ID type */
 export const tableAddRowIdTypeAtom = atomWithStorage<
   "decrement" | "random" | "custom"
diff --git a/src/components/SocialLogo.tsx b/src/components/SocialLogo.tsx
new file mode 100644
index 00000000..decbdae5
--- /dev/null
+++ b/src/components/SocialLogo.tsx
@@ -0,0 +1,52 @@
+import { Box, BoxProps, SvgIcon } from "@mui/material";
+import { Discord as DiscordIcon } from "@src/assets/icons";
+import GitHubIcon from "@mui/icons-material/GitHub";
+import TwitterIcon from "@mui/icons-material/Twitter";
+
+import { spreadSx } from "@src/utils/ui";
+
+const SOCIAL_PLATFORMS = Object.freeze({
+  discord: { bg: "#5865F2", fg: "#fff", icon: <DiscordIcon /> },
+  gitHub: { bg: "#24292E", fg: "#fff", icon: <GitHubIcon /> },
+  twitter: { bg: "#1d9bf0", fg: "#fff", icon: <TwitterIcon /> },
+  productHunt: {
+    bg: "#fff",
+    fg: "#DA552F",
+    icon: (
+      <SvgIcon viewBox="0 0 240 240">
+        <path d="M240 120c0 66.274-53.726 120-120 120S0 186.274 0 120 53.726 0 120 0s120 53.726 120 120m-104 0h-34V84h34c9.941 0 18 8.059 18 18 0 9.94-8.059 18-18 18m0-60H78v120h24v-36h34c23.196 0 42-18.804 42-42s-18.804-42-42-42" />
+      </SvgIcon>
+    ),
+  },
+});
+
+export interface ISocialLogoProps extends Partial<BoxProps> {
+  platform: keyof typeof SOCIAL_PLATFORMS;
+}
+
+export default function SocialLogo({ platform, ...props }: ISocialLogoProps) {
+  return (
+    <Box
+      {...props}
+      sx={[
+        {
+          borderRadius: 1.5,
+          p: 0.5,
+          bgcolor: SOCIAL_PLATFORMS[platform].bg,
+          color: SOCIAL_PLATFORMS[platform].fg,
+          boxShadow: (theme) => `0 0 0 1px ${
+            theme.palette.action.inputOutline
+          } inset,
+          0 ${theme.palette.mode === "dark" ? "" : "-"}1px 0 0 ${
+            theme.palette.action.inputOutline
+          } inset`,
+
+          "& svg": { display: "block" },
+        },
+        ...spreadSx(props.sx),
+      ]}
+    >
+      {SOCIAL_PLATFORMS[platform].icon}
+    </Box>
+  );
+}
diff --git a/src/components/SteppedAccordion.tsx b/src/components/SteppedAccordion.tsx
index 8e691790..97a62f8d 100644
--- a/src/components/SteppedAccordion.tsx
+++ b/src/components/SteppedAccordion.tsx
@@ -94,18 +94,20 @@ export default function SteppedAccordion({
             >
               <StepLabel error={error} {...labelProps}>
                 {title}
-                <ExpandIcon sx={{ mr: -0.5 }} />
+                {content && <ExpandIcon sx={{ mr: -0.5 }} />}
               </StepLabel>
             </StepButton>
 
-            <StepContent
-              TransitionProps={
-                disableUnmount ? { unmountOnExit: false } : undefined
-              }
-              {...contentProps}
-            >
-              {content}
-            </StepContent>
+            {content && (
+              <StepContent
+                TransitionProps={
+                  disableUnmount ? { unmountOnExit: false } : undefined
+                }
+                {...contentProps}
+              >
+                {content}
+              </StepContent>
+            )}
           </Step>
         )
       )}
diff --git a/src/constants/externalLinks.ts b/src/constants/externalLinks.ts
index 9ea89451..b0c73736 100644
--- a/src/constants/externalLinks.ts
+++ b/src/constants/externalLinks.ts
@@ -10,6 +10,7 @@ export const EXTERNAL_LINKS = {
   gitHub: meta.repository.url.replace(".git", ""),
   discord: "https://discord.gg/B8yAD5PDX4",
   twitter: "https://twitter.com/rowyio",
+  productHunt: "https://www.producthunt.com/products/rowy-2",
 
   rowyRun: meta.repository.url.replace(".git", "Run"),
   rowyRunGitHub: meta.repository.url.replace(".git", "Run"),
diff --git a/src/layouts/Navigation/CommunityMenu.tsx b/src/layouts/Navigation/CommunityMenu.tsx
new file mode 100644
index 00000000..b1b37b10
--- /dev/null
+++ b/src/layouts/Navigation/CommunityMenu.tsx
@@ -0,0 +1,116 @@
+import { useEffect } from "react";
+
+import {
+  Menu,
+  MenuProps,
+  ListSubheader,
+  MenuItem,
+  ListItemIcon,
+  ListItemSecondaryAction,
+} from "@mui/material";
+import InlineOpenInNewIcon from "@src/components/InlineOpenInNewIcon";
+import SocialLogo from "@src/components/SocialLogo";
+
+import { EXTERNAL_LINKS } from "@src/constants/externalLinks";
+import { logEvent, analytics } from "analytics";
+
+export default function HelpMenu({
+  anchorEl,
+  onClose,
+}: Pick<MenuProps, "anchorEl" | "onClose">) {
+  const open = Boolean(anchorEl);
+  useEffect(() => {
+    if (open) logEvent(analytics, "open_community_menu");
+  }, [open]);
+
+  const externalLinkIcon = (
+    <ListItemSecondaryAction sx={{ right: 10, color: "text.disabled" }}>
+      <InlineOpenInNewIcon />
+    </ListItemSecondaryAction>
+  );
+
+  return (
+    <Menu
+      anchorEl={anchorEl}
+      open={open}
+      onClose={onClose}
+      id="community-menu"
+      anchorOrigin={{ vertical: "bottom", horizontal: "right" }}
+      transformOrigin={{ vertical: "bottom", horizontal: "left" }}
+      sx={{ "& .MuiPaper-root": { mt: 0.5, py: 1 } }}
+      PaperProps={{ elevation: 10 }}
+    >
+      <ListSubheader
+        sx={{
+          pb: 0.5,
+          typography: "subtitle1",
+        }}
+      >
+        Join our community
+      </ListSubheader>
+      <ListSubheader
+        sx={{
+          pb: 1.5,
+          maxWidth: 260,
+          typography: "body2",
+          color: "text.secondary",
+        }}
+      >
+        Reach out for help, engage with our community, or shout us out!
+      </ListSubheader>
+
+      <MenuItem
+        component="a"
+        href={EXTERNAL_LINKS.discord}
+        target="_blank"
+        rel="noopener noreferrer"
+        onClick={onClose as any}
+      >
+        <ListItemIcon sx={{ mr: 1 }}>
+          <SocialLogo platform="discord" />
+        </ListItemIcon>
+        Discord
+        {externalLinkIcon}
+      </MenuItem>
+      <MenuItem
+        component="a"
+        href={EXTERNAL_LINKS.gitHub}
+        target="_blank"
+        rel="noopener noreferrer"
+        onClick={onClose as any}
+      >
+        <ListItemIcon sx={{ mr: 1 }}>
+          <SocialLogo platform="gitHub" />
+        </ListItemIcon>
+        GitHub
+        {externalLinkIcon}
+      </MenuItem>
+      <MenuItem
+        component="a"
+        href={EXTERNAL_LINKS.twitter}
+        target="_blank"
+        rel="noopener noreferrer"
+        onClick={onClose as any}
+      >
+        <ListItemIcon sx={{ mr: 1 }}>
+          <SocialLogo platform="twitter" />
+        </ListItemIcon>
+        Twitter
+        {externalLinkIcon}
+      </MenuItem>
+      <MenuItem
+        component="a"
+        href={EXTERNAL_LINKS.productHunt}
+        target="_blank"
+        rel="noopener noreferrer"
+        onClick={onClose as any}
+      >
+        <ListItemIcon sx={{ mr: 1 }}>
+          <SocialLogo platform="productHunt" />
+        </ListItemIcon>
+        Product Hunt
+        {externalLinkIcon}
+      </MenuItem>
+    </Menu>
+  );
+}
diff --git a/src/layouts/Navigation/GetStartedChecklist/GetStartedChecklist.tsx b/src/layouts/Navigation/GetStartedChecklist/GetStartedChecklist.tsx
new file mode 100644
index 00000000..48a9cd4d
--- /dev/null
+++ b/src/layouts/Navigation/GetStartedChecklist/GetStartedChecklist.tsx
@@ -0,0 +1,174 @@
+import { useAtom, useSetAtom } from "jotai";
+
+import { Typography, Button } from "@mui/material";
+import UncheckedIcon from "@mui/icons-material/RadioButtonUnchecked";
+import CheckedIcon from "@mui/icons-material/CheckCircleOutline";
+import AddIcon from "@mui/icons-material/Add";
+import MembersIcon from "@mui/icons-material/AccountCircleOutlined";
+import { Project as ProjectIcon } from "@src/assets/icons";
+
+import Modal, { IModalProps } from "@src/components/Modal";
+import SteppedAccordion from "@src/components/SteppedAccordion";
+import Progress from "./Progress";
+
+import {
+  globalScope,
+  getStartedChecklistAtom,
+  tableSettingsDialogAtom,
+} from "@src/atoms/globalScope";
+import {
+  NAV_DRAWER_WIDTH,
+  NAV_DRAWER_COLLAPSED_WIDTH,
+} from "@src/layouts/Navigation/NavDrawer";
+
+export interface IGetStartedChecklistProps extends Partial<IModalProps> {
+  navOpen: boolean;
+  navPermanent: boolean;
+}
+
+export default function GetStartedChecklist({
+  navOpen,
+  navPermanent,
+  ...props
+}: IGetStartedChecklistProps) {
+  const [open, setOpen] = useAtom(getStartedChecklistAtom, globalScope);
+  const openTableSettingsDialog = useSetAtom(
+    tableSettingsDialogAtom,
+    globalScope
+  );
+
+  if (!open) return null;
+
+  return (
+    <Modal
+      {...props}
+      onClose={() => setOpen(false)}
+      title="Get started"
+      hideBackdrop
+      maxWidth="xs"
+      PaperProps={{ elevation: 8 }}
+      fullScreen={false}
+      sx={[
+        {
+          "& .MuiDialog-container": {
+            justifyContent: "flex-start",
+            alignItems: "flex-end",
+          },
+
+          "& .MuiDialog-paper": {
+            marginLeft: {
+              xs: `max(env(safe-area-inset-left), 8px)`,
+              sm: `max(env(safe-area-inset-left), ${
+                (navPermanent
+                  ? navOpen
+                    ? NAV_DRAWER_WIDTH
+                    : NAV_DRAWER_COLLAPSED_WIDTH
+                  : 0) + 8
+              }px)`,
+            },
+            marginBottom: `max(env(safe-area-inset-bottom), 8px)`,
+            marginRight: `max(env(safe-area-inset-right), 8px)`,
+            width: 360,
+          },
+        },
+      ]}
+    >
+      <Progress sx={{ mb: 2 }} />
+
+      <SteppedAccordion
+        steps={[
+          {
+            id: "workspace",
+            title: "Create a workspace",
+            labelButtonProps: { icon: <CheckedIcon color="success" /> },
+            content: null,
+          },
+          {
+            id: "tutorial",
+            title: "Complete the table tutorial",
+            labelButtonProps: { icon: <UncheckedIcon color="action" /> },
+            content: (
+              <>
+                <Typography>This is why you should</Typography>
+                <Button variant="contained" color="primary">
+                  Begin tutorial
+                </Button>
+              </>
+            ),
+          },
+          {
+            id: "project",
+            title: "Create a project",
+            labelButtonProps: { icon: <UncheckedIcon color="action" /> },
+            content: (
+              <>
+                <Typography>
+                  You’re ready to create a project and connect to a data source
+                </Typography>
+                <Button
+                  variant="contained"
+                  color="primary"
+                  startIcon={<ProjectIcon />}
+                >
+                  Create project
+                </Button>
+              </>
+            ),
+          },
+          {
+            id: "table",
+            title: "Create a table",
+            labelButtonProps: { icon: <UncheckedIcon color="action" /> },
+            content: (
+              <>
+                <Typography>This is why you should</Typography>
+                <Button
+                  variant="contained"
+                  color="primary"
+                  startIcon={<AddIcon />}
+                  onClick={() => openTableSettingsDialog({ open: true })}
+                >
+                  Create table
+                </Button>
+              </>
+            ),
+          },
+          {
+            id: "members",
+            title: "Invite team members",
+            labelButtonProps: { icon: <UncheckedIcon color="action" /> },
+            content: (
+              <>
+                <Typography>
+                  Go to the members page to invite someone
+                </Typography>
+                <Button
+                  variant="contained"
+                  color="primary"
+                  startIcon={<MembersIcon />}
+                >
+                  Members
+                </Button>
+              </>
+            ),
+          },
+        ]}
+        sx={{
+          "& .MuiStepConnector-root": {
+            my: -10 / 8,
+          },
+          "& .Mui-active + .MuiStep-root:not(:last-of-type) .MuiStepContent-root":
+            {
+              mt: -10 / 8,
+              pt: 10 / 8,
+              mb: 10 / 8,
+              pb: 2,
+            },
+          "& .MuiStepContent-root .MuiCollapse-wrapperInner > * + *": {
+            mt: 1,
+          },
+        }}
+      />
+    </Modal>
+  );
+}
diff --git a/src/layouts/Navigation/GetStartedChecklist/Progress.tsx b/src/layouts/Navigation/GetStartedChecklist/Progress.tsx
new file mode 100644
index 00000000..6c824d65
--- /dev/null
+++ b/src/layouts/Navigation/GetStartedChecklist/Progress.tsx
@@ -0,0 +1,23 @@
+import { Box, BoxProps, Typography } from "@mui/material";
+import { spreadSx } from "@src/utils/ui";
+
+export default function Progress({ sx }: Partial<BoxProps>) {
+  return (
+    <Box
+      sx={[
+        { display: "flex", alignItems: "center", gap: 0.5 },
+        ...spreadSx(sx),
+      ]}
+    >
+      <Typography style={{ flex: 3 }}>1/5</Typography>
+
+      <Box
+        sx={{ flex: 1, borderRadius: 1, height: 8, bgcolor: "success.light" }}
+      />
+      <Box sx={{ flex: 1, borderRadius: 1, height: 8, bgcolor: "divider" }} />
+      <Box sx={{ flex: 1, borderRadius: 1, height: 8, bgcolor: "divider" }} />
+      <Box sx={{ flex: 1, borderRadius: 1, height: 8, bgcolor: "divider" }} />
+      <Box sx={{ flex: 1, borderRadius: 1, height: 8, bgcolor: "divider" }} />
+    </Box>
+  );
+}
diff --git a/src/layouts/Navigation/GetStartedChecklist/index.ts b/src/layouts/Navigation/GetStartedChecklist/index.ts
new file mode 100644
index 00000000..d9dc14e5
--- /dev/null
+++ b/src/layouts/Navigation/GetStartedChecklist/index.ts
@@ -0,0 +1,2 @@
+export * from "./GetStartedChecklist";
+export { default } from "./GetStartedChecklist";
diff --git a/src/layouts/Navigation/HelpMenu.tsx b/src/layouts/Navigation/HelpMenu.tsx
index 0a3b4567..e96fbc4b 100644
--- a/src/layouts/Navigation/HelpMenu.tsx
+++ b/src/layouts/Navigation/HelpMenu.tsx
@@ -1,30 +1,39 @@
+import { useEffect } from "react";
+
 import {
   Menu,
   MenuProps,
+  ListSubheader,
   MenuItem,
   ListItemIcon,
   ListItemSecondaryAction,
   Divider,
 } from "@mui/material";
-import DocsIcon from "@mui/icons-material/LibraryBooksOutlined";
-import { Discord as DiscordIcon } from "@src/assets/icons";
-import GitHubIcon from "@mui/icons-material/GitHub";
-import TwitterIcon from "@mui/icons-material/Twitter";
+import InlineOpenInNewIcon from "@src/components/InlineOpenInNewIcon";
+import SocialLogo from "@src/components/SocialLogo";
 
 import { EXTERNAL_LINKS } from "@src/constants/externalLinks";
-import InlineOpenInNewIcon from "@src/components/InlineOpenInNewIcon";
-import { analytics } from "analytics";
+import { logEvent, analytics } from "analytics";
 
 export default function HelpMenu({
   anchorEl,
   onClose,
 }: Pick<MenuProps, "anchorEl" | "onClose">) {
-  // useEffect(() => {
-  // analytics.logEvent("open_help_menu");
-  // }, []);
+  const open = Boolean(anchorEl);
+  useEffect(() => {
+    if (open) logEvent(analytics, "open_help_menu");
+  }, [open]);
 
   const externalLinkIcon = (
-    <ListItemSecondaryAction sx={{ right: 10, color: "text.disabled" }}>
+    <ListItemSecondaryAction
+      sx={{
+        position: "static",
+        transform: "none",
+        ml: "auto",
+        pl: 2,
+        color: "text.disabled",
+      }}
+    >
       <InlineOpenInNewIcon />
     </ListItemSecondaryAction>
   );
@@ -32,50 +41,60 @@ export default function HelpMenu({
   return (
     <Menu
       anchorEl={anchorEl}
-      open={Boolean(anchorEl)}
+      open={open}
       onClose={onClose}
       id="help-menu"
       anchorOrigin={{ vertical: "bottom", horizontal: "right" }}
       transformOrigin={{ vertical: "bottom", horizontal: "left" }}
-      sx={{ "& .MuiPaper-root": { mt: 0.5, minWidth: 160 } }}
+      sx={{ "& .MuiPaper-root": { mt: 0.5, py: 1 } }}
+      PaperProps={{ elevation: 10 }}
     >
+      <ListSubheader
+        sx={{
+          mb: 0.5,
+          typography: "subtitle1",
+        }}
+      >
+        Get support
+      </ListSubheader>
+      <ListSubheader
+        sx={{
+          mb: 1.5,
+          maxWidth: 260,
+          typography: "body2",
+          color: "text.secondary",
+        }}
+      >
+        Reach out for help and find FAQs on GitHub Discussions
+      </ListSubheader>
+
       <MenuItem
         component="a"
-        href={EXTERNAL_LINKS.discord}
+        href={EXTERNAL_LINKS.gitHub + "/discussions"}
         target="_blank"
         rel="noopener noreferrer"
         onClick={onClose as any}
       >
-        <ListItemIcon>
-          <DiscordIcon />
+        <ListItemIcon sx={{ mr: 1 }}>
+          <SocialLogo platform="gitHub" />
         </ListItemIcon>
-        Discord
+        GitHub Discussions
         {externalLinkIcon}
       </MenuItem>
+
+      <Divider variant="middle" />
+
       <MenuItem
         component="a"
-        href={EXTERNAL_LINKS.gitHub}
+        href={EXTERNAL_LINKS.gitHub + "/issues/new/choose"}
         target="_blank"
         rel="noopener noreferrer"
         onClick={onClose as any}
       >
-        <ListItemIcon>
-          <GitHubIcon />
+        <ListItemIcon sx={{ mr: 1 }}>
+          <SocialLogo platform="gitHub" />
         </ListItemIcon>
-        GitHub
-        {externalLinkIcon}
-      </MenuItem>
-      <MenuItem
-        component="a"
-        href={EXTERNAL_LINKS.twitter}
-        target="_blank"
-        rel="noopener noreferrer"
-        onClick={onClose as any}
-      >
-        <ListItemIcon>
-          <TwitterIcon />
-        </ListItemIcon>
-        Twitter
+        Feature request
         {externalLinkIcon}
       </MenuItem>
     </Menu>
diff --git a/src/layouts/Navigation/NavDrawer.tsx b/src/layouts/Navigation/NavDrawer.tsx
index 6ae58bac..d3cb5568 100644
--- a/src/layouts/Navigation/NavDrawer.tsx
+++ b/src/layouts/Navigation/NavDrawer.tsx
@@ -4,6 +4,7 @@ import { find, groupBy } from "lodash-es";
 import { colord } from "colord";
 
 import {
+  alpha,
   Drawer,
   DrawerProps,
   Stack,
@@ -17,28 +18,31 @@ import {
 } from "@mui/material";
 import CloseIcon from "@mui/icons-material/MenuOpen";
 import HomeIcon from "@mui/icons-material/HomeOutlined";
-import SettingsIcon from "@mui/icons-material/SettingsOutlined";
-import UserManagementIcon from "@mui/icons-material/AccountCircleOutlined";
 import AddIcon from "@mui/icons-material/Add";
 import DocsIcon from "@mui/icons-material/LibraryBooksOutlined";
 import LearningIcon from "@mui/icons-material/LocalLibraryOutlined";
 import HelpIcon from "@mui/icons-material/HelpOutline";
 import CommunityIcon from "@mui/icons-material/SentimentSatisfiedAltOutlined";
 import InlineOpenInNewIcon from "@src/components/InlineOpenInNewIcon";
-import { ChevronRight as ChevronRightIcon } from "@src/assets/icons";
+import {
+  ChevronRight as ChevronRightIcon,
+  Checklist as ChecklistIcon,
+} from "@src/assets/icons";
 
 import Logo from "@src/assets/Logo";
 import NavItem from "./NavItem";
+import SettingsNav from "./SettingsNav";
 import NavTableSection from "./NavTableSection";
-import UpdateCheckBadge from "./UpdateCheckBadge";
+import Progress from "./GetStartedChecklist/Progress";
+import CommunityMenu from "./CommunityMenu";
 import HelpMenu from "./HelpMenu";
 
 import {
   globalScope,
-  userRolesAtom,
   userSettingsAtom,
   tablesAtom,
   tableSettingsDialogAtom,
+  getStartedChecklistAtom,
 } from "@src/atoms/globalScope";
 import { TableSettings } from "@src/types/table";
 import { ROUTES } from "@src/constants/routes";
@@ -61,16 +65,23 @@ export default function NavDrawer({
 }: INavDrawerProps) {
   const [tables] = useAtom(tablesAtom, globalScope);
   const [userSettings] = useAtom(userSettingsAtom, globalScope);
-  const [userRoles] = useAtom(userRolesAtom, globalScope);
   const openTableSettingsDialog = useSetAtom(
     tableSettingsDialogAtom,
     globalScope
   );
+  const openGetStartedChecklist = useSetAtom(
+    getStartedChecklistAtom,
+    globalScope
+  );
 
   const [hover, setHover] = useState(false);
+  const [communityMenuAnchorEl, setCommunityMenuAnchorEl] =
+    useState<HTMLButtonElement | null>(null);
   const [helpMenuAnchorEl, setHelpMenuAnchorEl] =
     useState<HTMLButtonElement | null>(null);
 
+  const menuOpen = communityMenuAnchorEl || helpMenuAnchorEl;
+
   const favorites = Array.isArray(userSettings.favoriteTables)
     ? userSettings.favoriteTables
     : [];
@@ -82,7 +93,7 @@ export default function NavDrawer({
   };
 
   const collapsed = !open && isPermanent;
-  const tempExpanded = hover && collapsed;
+  const tempExpanded = (hover || menuOpen) && collapsed;
   const width =
     collapsed && !tempExpanded ? NAV_DRAWER_COLLAPSED_WIDTH : NAV_DRAWER_WIDTH;
   const closeDrawer = isPermanent
@@ -111,8 +122,15 @@ export default function NavDrawer({
             "& .MuiDrawer-paper": {
               width,
               pt: 0,
-              pb: 1,
               scrollbarWidth: "thin",
+
+              "--nav-bg": (theme) =>
+                colord(theme.palette.background.paper)
+                  .mix("#fff", 0.09) // elevation 8
+                  .alpha(1)
+                  .toHslString(),
+              bgcolor: "var(--nav-bg)",
+              backgroundImage: "none",
             },
           },
           isPermanent && {
@@ -135,7 +153,7 @@ export default function NavDrawer({
               overflowX: "hidden",
 
               borderRight: "none",
-              bgcolor: "background.default",
+              "--nav-bg": (theme) => theme.palette.background.default,
             },
 
             "& .MuiListItemSecondaryAction-root": {
@@ -158,9 +176,9 @@ export default function NavDrawer({
           tempExpanded && {
             zIndex: "drawer",
             "& .MuiDrawer-paper": {
-              bgcolor: (theme) =>
+              "--nav-bg": (theme) =>
                 colord(theme.palette.background.paper)
-                  .mix("#fff", 0.09)
+                  .mix("#fff", 0.09) // elevation 8
                   .alpha(1)
                   .toHslString(),
               boxShadow: (theme) =>
@@ -168,14 +186,25 @@ export default function NavDrawer({
             },
           },
         ]}
-        onMouseEnter={() => setHover(true)}
-        onMouseLeave={() => setHover(false)}
+        PaperProps={{
+          elevation: isPermanent ? 0 : 8,
+          onMouseEnter: () => setHover(true),
+          onMouseLeave: () => setHover(false),
+        }}
       >
         {!isPermanent && (
           <Stack
             direction="row"
             alignItems="center"
-            sx={{ height: TOP_BAR_HEIGHT, flexShrink: 0, px: 0.5 }}
+            sx={{
+              height: TOP_BAR_HEIGHT,
+              flexShrink: 0,
+              px: 0.5,
+              position: "sticky",
+              top: 0,
+              zIndex: 1,
+              backgroundColor: "var(--nav-bg)",
+            }}
           >
             <IconButton
               aria-label="Close navigation drawer"
@@ -191,8 +220,15 @@ export default function NavDrawer({
 
         <nav style={{ flexGrow: 1 }}>
           <List
+            component="ol"
             disablePadding
-            style={{ height: "100%", display: "flex", flexDirection: "column" }}
+            style={{
+              height: "100%",
+              display: "flex",
+              flexDirection: "column",
+              position: "static",
+              backgroundColor: "var(--nav-bg)",
+            }}
           >
             <li>
               <NavItem to={ROUTES.tables} onClick={closeDrawer}>
@@ -203,47 +239,13 @@ export default function NavDrawer({
               </NavItem>
             </li>
 
-            <li>
-              <NavItem to={ROUTES.userSettings} onClick={closeDrawer}>
-                <ListItemIcon>
-                  <SettingsIcon />
-                </ListItemIcon>
-                <ListItemText primary="Settings" />
-                {userRoles.includes("ADMIN") && (
-                  <UpdateCheckBadge sx={{ mr: 1.5 }} />
-                )}
-              </NavItem>
-            </li>
-
-            {userRoles.includes("ADMIN") && (
-              <li>
-                <NavItem to={ROUTES.members} onClick={closeDrawer}>
-                  <ListItemIcon>
-                    <UserManagementIcon />
-                  </ListItemIcon>
-                  <ListItemText primary="Members" />
-                </NavItem>
-              </li>
-            )}
+            <SettingsNav
+              closeDrawer={closeDrawer as any}
+              collapsed={isPermanent && !open && !tempExpanded}
+            />
 
             <Divider variant="middle" sx={{ my: 1 }} />
 
-            <li>
-              <NavItem
-                {...({ component: "button" } as any)}
-                style={{ textAlign: "left" }}
-                onClick={(e: any) => {
-                  if (closeDrawer) closeDrawer(e);
-                  openTableSettingsDialog({});
-                }}
-              >
-                <ListItemIcon>
-                  <AddIcon />
-                </ListItemIcon>
-                <ListItemText primary="Create table…" />
-              </NavItem>
-            </li>
-
             {sections &&
               Object.entries(sections)
                 .filter(([, tables]) => tables.length > 0)
@@ -253,61 +255,142 @@ export default function NavDrawer({
                     section={section}
                     tables={tables}
                     closeDrawer={closeDrawer}
-                    hidden={isPermanent && !open && !tempExpanded}
+                    collapsed={isPermanent && !open && !tempExpanded}
                   />
                 ))}
 
-            <Divider variant="middle" sx={{ my: 1, mt: "auto" }} />
-
-            <li>
-              <NavItem href={EXTERNAL_LINKS.docs}>
-                <ListItemIcon>
-                  <DocsIcon />
-                </ListItemIcon>
-                <ListItemText primary="Docs" />
-                {externalLinkIcon}
-              </NavItem>
-            </li>
-            <li>
-              <NavItem href={WIKI_LINKS.howTo}>
-                <ListItemIcon>
-                  <LearningIcon />
-                </ListItemIcon>
-                <ListItemText primary="Learning" />
-                {externalLinkIcon}
-              </NavItem>
-            </li>
             <li>
               <NavItem
-                onClick={(e: any) => setHelpMenuAnchorEl(e.currentTarget)}
+                {...({ component: "button" } as any)}
+                onClick={(e: any) => {
+                  if (closeDrawer) closeDrawer(e);
+                  openTableSettingsDialog({});
+                }}
+                sx={{ mb: 1 }}
               >
                 <ListItemIcon>
-                  <CommunityIcon />
+                  <AddIcon />
                 </ListItemIcon>
-                <ListItemText primary="Join our community" />
-                <ListItemSecondaryAction>
-                  <ChevronRightIcon />
-                </ListItemSecondaryAction>
-              </NavItem>
-            </li>
-            <li>
-              <NavItem
-                onClick={(e: any) => setHelpMenuAnchorEl(e.currentTarget)}
-              >
-                <ListItemIcon>
-                  <HelpIcon />
-                </ListItemIcon>
-                <ListItemText primary="Help" />
-                <ListItemSecondaryAction>
-                  <ChevronRightIcon />
-                </ListItemSecondaryAction>
+                <ListItemText primary="Create table…" />
               </NavItem>
             </li>
 
-            <HelpMenu
-              anchorEl={helpMenuAnchorEl}
-              onClose={() => setHelpMenuAnchorEl(null)}
-            />
+            <List
+              component="li"
+              disablePadding
+              sx={{
+                position: "sticky",
+                bottom: 0,
+                bgcolor: "var(--nav-bg)",
+                mt: "auto",
+                pb: 1,
+              }}
+            >
+              <ol style={{ listStyle: "none", margin: 0, padding: 0 }}>
+                <Divider variant="middle" sx={{ mb: 1 }} />
+
+                <li>
+                  <NavItem
+                    onClick={() => {
+                      openGetStartedChecklist(true);
+                      setHover(false);
+                    }}
+                    sx={{
+                      mb: 1,
+                      py: 0.5,
+                      bgcolor: (theme) =>
+                        alpha(
+                          theme.palette.primary.main,
+                          theme.palette.action.selectedOpacity
+                        ),
+                      "&:hover": {
+                        bgcolor: (theme) =>
+                          alpha(
+                            theme.palette.primary.main,
+                            theme.palette.action.selectedOpacity +
+                              theme.palette.action.hoverOpacity
+                          ),
+                      },
+                      "& *, &&:hover *": {
+                        color: (theme) =>
+                          theme.palette.primary[
+                            theme.palette.mode === "dark" ? "light" : "dark"
+                          ],
+                      },
+                    }}
+                  >
+                    <ListItemIcon>
+                      <ChecklistIcon />
+                    </ListItemIcon>
+                    <ListItemText
+                      primary="Get started"
+                      secondary={<Progress sx={{ mr: 3 }} />}
+                    />
+                    <ListItemSecondaryAction>
+                      <ChevronRightIcon />
+                    </ListItemSecondaryAction>
+                  </NavItem>
+                </li>
+
+                <li>
+                  <NavItem href={EXTERNAL_LINKS.docs}>
+                    <ListItemIcon>
+                      <DocsIcon />
+                    </ListItemIcon>
+                    <ListItemText primary="Docs" />
+                    {externalLinkIcon}
+                  </NavItem>
+                </li>
+
+                <li>
+                  <NavItem href={WIKI_LINKS.howTo}>
+                    <ListItemIcon>
+                      <LearningIcon />
+                    </ListItemIcon>
+                    <ListItemText primary="Learning" />
+                    {externalLinkIcon}
+                  </NavItem>
+                </li>
+
+                <li>
+                  <NavItem
+                    onClick={(e: any) =>
+                      setCommunityMenuAnchorEl(e.currentTarget)
+                    }
+                  >
+                    <ListItemIcon>
+                      <CommunityIcon />
+                    </ListItemIcon>
+                    <ListItemText primary="Join our community" />
+                    <ListItemSecondaryAction>
+                      <ChevronRightIcon />
+                    </ListItemSecondaryAction>
+                  </NavItem>
+                  <CommunityMenu
+                    anchorEl={communityMenuAnchorEl}
+                    onClose={() => setCommunityMenuAnchorEl(null)}
+                  />
+                </li>
+
+                <li>
+                  <NavItem
+                    onClick={(e: any) => setHelpMenuAnchorEl(e.currentTarget)}
+                  >
+                    <ListItemIcon>
+                      <HelpIcon />
+                    </ListItemIcon>
+                    <ListItemText primary="Help" />
+                    <ListItemSecondaryAction>
+                      <ChevronRightIcon />
+                    </ListItemSecondaryAction>
+                  </NavItem>
+                  <HelpMenu
+                    anchorEl={helpMenuAnchorEl}
+                    onClose={() => setHelpMenuAnchorEl(null)}
+                  />
+                </li>
+              </ol>
+            </List>
           </List>
         </nav>
       </Drawer>
diff --git a/src/layouts/Navigation/NavTableSection.tsx b/src/layouts/Navigation/NavTableSection.tsx
index 296a3a2c..6867fae6 100644
--- a/src/layouts/Navigation/NavTableSection.tsx
+++ b/src/layouts/Navigation/NavTableSection.tsx
@@ -23,14 +23,14 @@ export interface INavTableSectionProps {
   section: string;
   tables: TableSettings[];
   closeDrawer?: (e: {}) => void;
-  hidden?: boolean;
+  collapsed?: boolean;
 }
 
 export default function NavTableSection({
   section,
   tables,
   closeDrawer,
-  hidden,
+  collapsed,
 }: INavTableSectionProps) {
   const { pathname } = useLocation();
   const hasMatch = tables.map(getTableRoute).includes(pathname);
@@ -39,16 +39,8 @@ export default function NavTableSection({
   const isFavorites = section === "Favorites";
 
   return (
-    <li
-      style={{
-        opacity: hidden ? 0.38 : 1,
-        transitionProperty: "opacity",
-        transitionTimingFunction: "var(--nav-transition-timing-function)",
-        transitionDuration: "var(--nav-transition-duration)",
-      }}
-    >
+    <li>
       <NavItem
-        {...({ component: "button" } as any)}
         selected={!isFavorites && hasMatch && !open}
         onClick={() => setOpen((o) => !o)}
       >
@@ -71,7 +63,7 @@ export default function NavTableSection({
         </ListItemSecondaryAction>
       </NavItem>
 
-      <Collapse in={open}>
+      <Collapse in={open && !collapsed}>
         <List style={{ paddingTop: 0 }}>
           {tables.map((table) => {
             const route = getTableRoute(table);
diff --git a/src/layouts/Navigation/Navigation.tsx b/src/layouts/Navigation/Navigation.tsx
index 11566a86..dc15bbac 100644
--- a/src/layouts/Navigation/Navigation.tsx
+++ b/src/layouts/Navigation/Navigation.tsx
@@ -11,6 +11,7 @@ import ErrorFallback, {
   IErrorFallbackProps,
 } from "@src/components/ErrorFallback";
 import Loading from "@src/components/Loading";
+import GetStartedChecklist from "./GetStartedChecklist";
 
 import {
   globalScope,
@@ -51,6 +52,7 @@ export default function Navigation({ children }: React.PropsWithChildren<{}>) {
           isPermanent={isPermanent}
           onClose={() => setOpen(false)}
         />
+        <GetStartedChecklist navOpen={open} navPermanent={isPermanent} />
 
         <ErrorBoundary FallbackComponent={StyledErrorFallback}>
           <Suspense
diff --git a/src/layouts/Navigation/SettingsNav.tsx b/src/layouts/Navigation/SettingsNav.tsx
new file mode 100644
index 00000000..750bccd1
--- /dev/null
+++ b/src/layouts/Navigation/SettingsNav.tsx
@@ -0,0 +1,115 @@
+import { useState } from "react";
+import { useAtom } from "jotai";
+import { useLocation } from "react-router-dom";
+
+import {
+  ListItemIcon,
+  ListItemText,
+  ListItemSecondaryAction,
+  Collapse,
+  List,
+} from "@mui/material";
+import MembersIcon from "@mui/icons-material/AccountCircleOutlined";
+import SettingsIcon from "@mui/icons-material/SettingsOutlined";
+import { ChevronDown } from "@src/assets/icons";
+
+import NavItem from "./NavItem";
+import UpdateCheckBadge from "./UpdateCheckBadge";
+
+import { globalScope, userRolesAtom } from "@src/atoms/globalScope";
+import { ROUTES } from "@src/constants/routes";
+
+export interface ISettingsNavProps {
+  closeDrawer: () => void;
+  collapsed: boolean;
+}
+
+export default function SettingsNav({
+  closeDrawer,
+  collapsed,
+}: ISettingsNavProps) {
+  const [userRoles] = useAtom(userRolesAtom, globalScope);
+  const { pathname } = useLocation();
+  const [open, setOpen] = useState(pathname.includes(ROUTES.settings));
+
+  if (!userRoles.includes("ADMIN"))
+    return (
+      <li>
+        <NavItem to={ROUTES.userSettings} onClick={closeDrawer}>
+          <ListItemIcon>
+            <SettingsIcon />
+          </ListItemIcon>
+          <ListItemText primary="Settings" />
+        </NavItem>
+      </li>
+    );
+
+  return (
+    <>
+      <li>
+        <NavItem to={ROUTES.members} onClick={closeDrawer}>
+          <ListItemIcon>
+            <MembersIcon />
+          </ListItemIcon>
+          <ListItemText primary="Members" />
+        </NavItem>
+      </li>
+
+      <li>
+        <NavItem onClick={() => setOpen((o) => !o)}>
+          <ListItemIcon>
+            <SettingsIcon />
+          </ListItemIcon>
+          <ListItemText primary="Settings" />
+
+          <ListItemSecondaryAction>
+            <ChevronDown
+              sx={{
+                color: "action.active",
+                m: 0.25,
+                display: "block",
+                transform: open ? "rotate(180deg)" : "rotate(0)",
+                transition: (theme) => theme.transitions.create("transform"),
+              }}
+            />
+          </ListItemSecondaryAction>
+          {userRoles.includes("ADMIN") && <UpdateCheckBadge sx={{ mr: 1.5 }} />}
+        </NavItem>
+
+        <Collapse in={open && !collapsed}>
+          <List style={{ paddingTop: 0 }}>
+            <li>
+              <NavItem to={ROUTES.userSettings} onClick={closeDrawer}>
+                <ListItemIcon />
+                <ListItemText
+                  primary="User"
+                  sx={{
+                    "&& .MuiListItemText-primary": {
+                      fontWeight: "normal",
+                      fontSize: ".8125rem",
+                    },
+                  }}
+                />
+              </NavItem>
+            </li>
+
+            <li>
+              <NavItem to={ROUTES.projectSettings} onClick={closeDrawer}>
+                <ListItemIcon />
+                <ListItemText
+                  primary="Project"
+                  sx={{
+                    "&& .MuiListItemText-primary": {
+                      fontWeight: "normal",
+                      fontSize: ".8125rem",
+                    },
+                  }}
+                />
+              </NavItem>
+            </li>
+          </List>
+        </Collapse>
+      </li>
+    </>
+  );
+}
diff --git a/src/layouts/Navigation/TopBar.tsx b/src/layouts/Navigation/TopBar.tsx
index ba6d59b5..7ac9c80e 100644
--- a/src/layouts/Navigation/TopBar.tsx
+++ b/src/layouts/Navigation/TopBar.tsx
@@ -134,7 +134,7 @@ export default function TopBar({
                 ml: 1,
               },
               !(routeTitle as any)?.leftAligned && {
-                ml: { xs: 1, sm: 208 / 8 + 1 },
+                ml: { xs: 1, sm: 40 / 8 + 1, md: 208 / 8 + 1 },
               },
               isPermanent &&
                 (routeTitle as any)?.leftAligned && {
@@ -167,11 +167,16 @@ export default function TopBar({
           to={ROUTES.members}
           startIcon={<PersonAddIcon />}
           sx={{
+            minWidth: 40,
+            "&&": { px: { xs: 1, md: 2 } },
             mr: 1,
             "&.active": { visibility: "hidden" },
+
+            "& .text": { display: { xs: "none", md: "inline" } },
+            "& .MuiButton-startIcon": { mr: { xs: 0, md: 1 } },
           }}
         >
-          Invite team members
+          <span className="text">Invite team members</span>
         </Button>
 
         <UserMenu />

From b23eb499a60d48ffe877ce4379c21bf7af8648df Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Fri, 8 Jul 2022 14:40:27 +1000
Subject: [PATCH 021/309] update community, help menu spacing

---
 src/layouts/Navigation/CommunityMenu.tsx | 2 +-
 src/layouts/Navigation/HelpMenu.tsx      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/layouts/Navigation/CommunityMenu.tsx b/src/layouts/Navigation/CommunityMenu.tsx
index b1b37b10..ec68e76a 100644
--- a/src/layouts/Navigation/CommunityMenu.tsx
+++ b/src/layouts/Navigation/CommunityMenu.tsx
@@ -37,7 +37,7 @@ export default function HelpMenu({
       id="community-menu"
       anchorOrigin={{ vertical: "bottom", horizontal: "right" }}
       transformOrigin={{ vertical: "bottom", horizontal: "left" }}
-      sx={{ "& .MuiPaper-root": { mt: 0.5, py: 1 } }}
+      sx={{ "& .MuiPaper-root": { mt: 1.5, py: 1 } }}
       PaperProps={{ elevation: 10 }}
     >
       <ListSubheader
diff --git a/src/layouts/Navigation/HelpMenu.tsx b/src/layouts/Navigation/HelpMenu.tsx
index e96fbc4b..f0050f40 100644
--- a/src/layouts/Navigation/HelpMenu.tsx
+++ b/src/layouts/Navigation/HelpMenu.tsx
@@ -46,7 +46,7 @@ export default function HelpMenu({
       id="help-menu"
       anchorOrigin={{ vertical: "bottom", horizontal: "right" }}
       transformOrigin={{ vertical: "bottom", horizontal: "left" }}
-      sx={{ "& .MuiPaper-root": { mt: 0.5, py: 1 } }}
+      sx={{ "& .MuiPaper-root": { mt: 1.5, py: 1 } }}
       PaperProps={{ elevation: 10 }}
     >
       <ListSubheader

From df6df4c6fc32285d24b514e02e3688ded91583b5 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 11 Jul 2022 14:42:07 +1000
Subject: [PATCH 022/309] update auth styles

---
 src/components/FirebaseUi.tsx | 18 +++++++++++---
 src/config/firebaseui.ts      |  4 ++--
 src/layouts/AuthLayout.tsx    |  7 +++---
 src/pages/Auth/AuthPage.tsx   | 24 +++++++++++++++++--
 src/pages/Auth/SignUpPage.tsx | 44 +++++++++++++----------------------
 5 files changed, 58 insertions(+), 39 deletions(-)

diff --git a/src/components/FirebaseUi.tsx b/src/components/FirebaseUi.tsx
index ceda7035..08c26f92 100644
--- a/src/components/FirebaseUi.tsx
+++ b/src/components/FirebaseUi.tsx
@@ -29,9 +29,20 @@ const useStyles = makeStyles()((theme) => ({
       color: theme.palette.text.secondary,
       fontFamily: theme.typography.fontFamily,
     },
-    "& .firebaseui-tos": {
+    "& .firebaseui-provider-sign-in-footer > .firebaseui-tos": {
       ...(theme.typography.caption as any),
       color: theme.palette.text.disabled,
+      textAlign: "left",
+      marginTop: theme.spacing(1),
+      marginBottom: 0,
+      "& .firebaseui-link": {
+        textDecorationColor: theme.palette.divider,
+        "&:hover": { textDecorationColor: "currentcolor" },
+      },
+    },
+    "& .firebaseui-link": {
+      color: "inherit",
+      textDecoration: "underline",
     },
     "& .firebaseui-country-selector": {
       color: theme.palette.text.primary,
@@ -259,9 +270,10 @@ export default function FirebaseUi(props: IFirebaseUiProps) {
       <Typography
         variant="button"
         display="block"
-        textAlign="center"
         color="textSecondary"
-        sx={{ mt: -1, mb: -3 }}
+        sx={{
+          "&&": { mt: -1, mb: -3, textAlign: "center", alignSelf: "center" },
+        }}
       >
         Continue with
       </Typography>
diff --git a/src/config/firebaseui.ts b/src/config/firebaseui.ts
index e015e190..e2a28f22 100644
--- a/src/config/firebaseui.ts
+++ b/src/config/firebaseui.ts
@@ -65,8 +65,8 @@ export const defaultUiConfig: firebaseui.auth.Config = {
   signInFlow: "popup",
   signInSuccessUrl: "/",
   signInOptions: [authOptions.google],
-  // tosUrl: EXTERNAL_LINKS.terms,
-  // privacyPolicyUrl: EXTERNAL_LINKS.privacy,
+  tosUrl: EXTERNAL_LINKS.terms,
+  privacyPolicyUrl: EXTERNAL_LINKS.privacy,
 };
 
 export const getSignInOptions = (
diff --git a/src/layouts/AuthLayout.tsx b/src/layouts/AuthLayout.tsx
index 22a11d6e..9406e83d 100644
--- a/src/layouts/AuthLayout.tsx
+++ b/src/layouts/AuthLayout.tsx
@@ -105,7 +105,6 @@ export default function AuthLayout({
 
             display: "flex",
             flexDirection: "column",
-            // textAlign: "center",
 
             "& > :not(style) + :not(style)": { mt: 4 },
           } as any
@@ -125,8 +124,8 @@ export default function AuthLayout({
         <Stack
           spacing={4}
           justifyContent="center"
-          alignItems="center"
-          style={{ textAlign: "center", flexGrow: 1 }}
+          alignItems="flex-start"
+          style={{ flexGrow: 1 }}
         >
           {children}
         </Stack>
@@ -145,7 +144,7 @@ export default function AuthLayout({
 
         <Typography
           variant="caption"
-          color="text.secondary"
+          color="text.disabled"
           sx={{ display: hideProject ? "none" : "block", mb: -0.5 }}
         >
           Project: <span style={{ userSelect: "all" }}>{projectId}</span>
diff --git a/src/pages/Auth/AuthPage.tsx b/src/pages/Auth/AuthPage.tsx
index 8e2b2ca7..2ae2ec64 100644
--- a/src/pages/Auth/AuthPage.tsx
+++ b/src/pages/Auth/AuthPage.tsx
@@ -1,8 +1,12 @@
-import { useSearchParams } from "react-router-dom";
+import { useSearchParams, Link } from "react-router-dom";
+
+import { Typography, Link as MuiLink } from "@mui/material";
 
 import AuthLayout from "@src/layouts/AuthLayout";
 import FirebaseUi from "@src/components/FirebaseUi";
 
+import { ROUTES } from "@src/constants/routes";
+
 export default function AuthPage() {
   const [searchParams] = useSearchParams();
 
@@ -13,7 +17,23 @@ export default function AuthPage() {
   }
 
   return (
-    <AuthLayout title="Sign in">
+    <AuthLayout
+      title="Sign in"
+      description={
+        <Typography
+          color="text.secondary"
+          align="right"
+          display="block"
+          component="span"
+          sx={{ mt: -4.25, alignSelf: "flex-end" }}
+        >
+          or{" "}
+          <MuiLink component={Link} to={ROUTES.signUp} color="text.secondary">
+            sign up
+          </MuiLink>
+        </Typography>
+      }
+    >
       <FirebaseUi uiConfig={uiConfig} />
     </AuthLayout>
   );
diff --git a/src/pages/Auth/SignUpPage.tsx b/src/pages/Auth/SignUpPage.tsx
index b31f89e1..007e07a0 100644
--- a/src/pages/Auth/SignUpPage.tsx
+++ b/src/pages/Auth/SignUpPage.tsx
@@ -1,10 +1,11 @@
-import { useSearchParams } from "react-router-dom";
+import { useSearchParams, Link } from "react-router-dom";
 
-import { Typography, Link } from "@mui/material";
+import { Typography, Link as MuiLink } from "@mui/material";
 
 import AuthLayout from "@src/layouts/AuthLayout";
 import FirebaseUi from "@src/components/FirebaseUi";
-import { EXTERNAL_LINKS } from "@src/constants/externalLinks";
+
+import { ROUTES } from "@src/constants/routes";
 
 export default function SignUpPage() {
   const [searchParams] = useSearchParams();
@@ -20,6 +21,18 @@ export default function SignUpPage() {
       title="Sign up"
       description={
         <>
+          <Typography
+            color="text.secondary"
+            align="right"
+            display="block"
+            component="span"
+            sx={{ mt: -4.25, mb: 2, alignSelf: "flex-end" }}
+          >
+            or{" "}
+            <MuiLink component={Link} to={ROUTES.auth} color="text.secondary">
+              sign in
+            </MuiLink>
+          </Typography>
           Welcome! To join this project, sign up with the email address
           {searchParams.get("email") ? (
             <>
@@ -32,31 +45,6 @@ export default function SignUpPage() {
       }
     >
       <FirebaseUi uiConfig={uiConfig} />
-      <Typography
-        variant="caption"
-        color="text.secondary"
-        style={{ marginTop: 16 }}
-      >
-        By signing up, you agree to our{" "}
-        <Link
-          href={EXTERNAL_LINKS.terms}
-          target="_blank"
-          rel="noopener noreferrer"
-          color="text.secondary"
-        >
-          Terms and Conditions
-        </Link>{" "}
-        and{" "}
-        <Link
-          href={EXTERNAL_LINKS.privacy}
-          target="_blank"
-          rel="noopener noreferrer"
-          color="text.secondary"
-        >
-          Privacy Policy
-        </Link>
-        .
-      </Typography>
     </AuthLayout>
   );
 }

From c92a0d19bf71c6da5ea49a3cb56095d24762268b Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 13 Jul 2022 20:02:03 +1000
Subject: [PATCH 023/309] update button design

---
 package.json             | 2 +-
 src/theme/colors.ts      | 4 ++--
 src/theme/components.tsx | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index ff663d09..d646de6f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rowy",
-  "version": "2.6.1",
+  "version": "2.7.0-alpha",
   "homepage": "https://rowy.io",
   "repository": {
     "type": "git",
diff --git a/src/theme/colors.ts b/src/theme/colors.ts
index 5514b3d7..2cf5e12d 100644
--- a/src/theme/colors.ts
+++ b/src/theme/colors.ts
@@ -49,7 +49,7 @@ export const colorsLight = (
         disabled: textBase.alpha(0.26).toHslString(),
         disabledBackground: textBase.alpha(0.12).toHslString(),
         input: "#fff",
-        inputOutline: shadowBase.alpha(0.12).toRgbString(),
+        inputOutline: shadowBase.alpha(0.1).toRgbString(),
       },
       divider: shadowBase.alpha(0.12).toRgbString(), // Using hsl string breaks table borders
     },
@@ -154,7 +154,7 @@ export const colorsDark = (
         hover: "rgba(255, 255, 255, 0.08)",
         hoverOpacity: 0.08,
         input: "rgba(255, 255, 255, 0.06)",
-        inputOutline: "rgba(255, 255, 255, 0.08)",
+        inputOutline: "rgba(255, 255, 255, 0.06)",
       },
       // success: { light: "#34c759" },
     },
diff --git a/src/theme/components.tsx b/src/theme/components.tsx
index 48d4b446..342a92ea 100644
--- a/src/theme/components.tsx
+++ b/src/theme/components.tsx
@@ -725,12 +725,12 @@ export const components = (theme: Theme): ThemeOptions => {
           },
 
           contained: {
-            boxShadow: `0 -1px 0 0 rgba(0, 0, 0, 0.12) inset, ${theme.shadows[2]}`,
+            boxShadow: `0 -1px 0 0 rgba(0, 0, 0, 0.4) inset, 0 0 0 1px rgba(255, 255, 255, 0.08) inset, ${theme.shadows[2]}`,
             "&:hover": {
-              boxShadow: `0 -1px 0 0 rgba(0, 0, 0, 0.12) inset, ${theme.shadows[4]}`,
+              boxShadow: `0 -1px 0 0 rgba(0, 0, 0, 0.4) inset, 0 0 0 1px rgba(255, 255, 255, 0.08) inset, ${theme.shadows[4]}`,
             },
             "&:active": {
-              boxShadow: `0 -1px 0 0 rgba(0, 0, 0, 0.12) inset, ${theme.shadows[8]}`,
+              boxShadow: `0 -1px 0 0 rgba(0, 0, 0, 0.4) inset, 0 0 0 1px rgba(255, 255, 255, 0.08) inset, ${theme.shadows[8]}`,
             },
           },
           containedPrimary: {

From ff29f6b16e546ac39b9863c44e75194e0dd6ca0d Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 13 Jul 2022 20:02:35 +1000
Subject: [PATCH 024/309] ConfirmDialog: add buttonLayout prop

---
 src/atoms/globalScope/ui.ts      |  2 ++
 src/components/ConfirmDialog.tsx | 11 ++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/atoms/globalScope/ui.ts b/src/atoms/globalScope/ui.ts
index bf48d3a5..ba6275fb 100644
--- a/src/atoms/globalScope/ui.ts
+++ b/src/atoms/globalScope/ui.ts
@@ -45,6 +45,8 @@ export type ConfirmDialogProps = {
 
   /** Optionally set dialog max width */
   maxWidth?: DialogProps["maxWidth"];
+  /** Optionally set button layout */
+  buttonLayout?: "horizontal" | "vertical";
 };
 /**
  * Open a confirm dialog
diff --git a/src/components/ConfirmDialog.tsx b/src/components/ConfirmDialog.tsx
index 2025bc94..9fb9b846 100644
--- a/src/components/ConfirmDialog.tsx
+++ b/src/components/ConfirmDialog.tsx
@@ -36,6 +36,7 @@ export default function ConfirmDialog() {
       hideCancel,
 
       maxWidth = "xs",
+      buttonLayout = "horizontal",
     },
     setState,
   ] = useAtom(confirmDialogAtom, globalScope);
@@ -76,7 +77,15 @@ export default function ConfirmDialog() {
         )}
       </DialogContent>
 
-      <DialogActions>
+      <DialogActions
+        sx={[
+          buttonLayout === "vertical" && {
+            flexDirection: "column",
+            alignItems: "stretch",
+            "& > :not(:first-of-type)": { ml: 0, mt: 1 },
+          },
+        ]}
+      >
         {!hideCancel && (
           <Button
             onClick={() => {

From 133a9d5dfaeb84abc39df7321529c01a3e18777e Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Thu, 14 Jul 2022 13:00:59 +1000
Subject: [PATCH 025/309] =?UTF-8?q?Import=20CSV:=20create=20new=20columns?=
 =?UTF-8?q?=20by=20default=20if=20it=20can=E2=80=99t=20find=20an=20existin?=
 =?UTF-8?q?g=20column=20with=20a=20similar=20name=20(#608)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ImportCsvWizard/Step1Columns.tsx          | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx b/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx
index 8643c2c2..84da1170 100644
--- a/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx
+++ b/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx
@@ -47,6 +47,7 @@ export default function Step1Columns({
     config.pairs.map((pair) => pair.csvKey)
   );
 
+  // When a field is selected to be imported
   const handleSelect =
     (field: string) => (e: React.ChangeEvent<HTMLInputElement>) => {
       const checked = e.target.checked;
@@ -65,6 +66,25 @@ export default function Step1Columns({
             pairs: [...config.pairs, { csvKey: field, columnKey: match }],
           }));
         }
+        // If no match, create a new column
+        else {
+          const columnKey = camelCase(field);
+          setConfig((config) => ({
+            ...config,
+            pairs: [...config.pairs, { csvKey: field, columnKey }],
+            newColumns: [
+              ...config.newColumns,
+              {
+                name: field,
+                fieldName: columnKey,
+                key: columnKey,
+                type: suggestType(csvData.rows, field) || FieldType.shortText,
+                index: -1,
+                config: {},
+              },
+            ],
+          }));
+        }
       } else {
         const newValue = [...selectedFields];
         newValue.splice(newValue.indexOf(field), 1);
@@ -95,6 +115,7 @@ export default function Step1Columns({
       }
     };
 
+  // When a field is mapped to a new column
   const handleChange = (csvKey: string) => (value: string) => {
     const columnKey = !!tableSchema.columns?.[value] ? value : camelCase(value);
 

From 16c45e935d26814c6bae3edd606b8724d135bada Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Thu, 14 Jul 2022 13:36:17 +1000
Subject: [PATCH 026/309] add table tutorial at /tutorial/table

---
 src/App.tsx                                   |   7 +
 src/assets/icons/index.ts                     |   3 +
 src/components/EmptyState.tsx                 |  14 +-
 .../GetStartedChecklist.tsx                   |  10 +-
 .../GetStartedChecklist/index.ts              |   0
 src/components/StepsProgress.tsx              |  44 +++++
 src/components/Table/ColumnSelect.tsx         |  17 +-
 src/components/Table/EmptyTable.tsx           |   1 +
 .../ImportCsvWizard/Step1Columns.tsx          |  40 ++--
 .../TableTutorial/Steps/Step1Import.tsx       |  57 ++++++
 .../TableTutorial/Steps/Step2Add.tsx          |  94 +++++++++
 .../TableTutorial/Steps/Step3Invite.tsx       |  17 ++
 .../TableTutorial/Steps/Step4Code.tsx         |  16 ++
 src/components/TableTutorial/Steps/index.ts   |  27 +++
 .../TableTutorial/TableSourceTutorial.tsx     | 115 +++++++++++
 .../TableTutorial/TableTutorial.tsx           | 180 ++++++++++++++++++
 .../TableTutorial/TutorialCheckbox.tsx        |  69 +++++++
 src/components/TableTutorial/data.ts          |   9 +
 src/components/TableTutorial/index.ts         |   2 +
 src/constants/routes.tsx                      |  17 +-
 .../GetStartedChecklist/Progress.tsx          |  23 ---
 src/layouts/Navigation/NavDrawer.tsx          |   6 +-
 src/layouts/Navigation/Navigation.tsx         |   2 +-
 src/pages/Table/TablePage.tsx                 |  11 +-
 src/pages/Table/TableTutorialPage.tsx         | 138 ++++++++++++++
 src/theme/CheckboxIcon.tsx                    |   1 +
 src/theme/CheckboxIndeterminateIcon.tsx       |   1 +
 src/theme/RadioIcon.tsx                       |   1 +
 src/types/files.d.ts                          |   4 +
 29 files changed, 877 insertions(+), 49 deletions(-)
 rename src/{layouts/Navigation => components}/GetStartedChecklist/GetStartedChecklist.tsx (94%)
 rename src/{layouts/Navigation => components}/GetStartedChecklist/index.ts (100%)
 create mode 100644 src/components/StepsProgress.tsx
 create mode 100644 src/components/TableTutorial/Steps/Step1Import.tsx
 create mode 100644 src/components/TableTutorial/Steps/Step2Add.tsx
 create mode 100644 src/components/TableTutorial/Steps/Step3Invite.tsx
 create mode 100644 src/components/TableTutorial/Steps/Step4Code.tsx
 create mode 100644 src/components/TableTutorial/Steps/index.ts
 create mode 100644 src/components/TableTutorial/TableSourceTutorial.tsx
 create mode 100644 src/components/TableTutorial/TableTutorial.tsx
 create mode 100644 src/components/TableTutorial/TutorialCheckbox.tsx
 create mode 100644 src/components/TableTutorial/data.ts
 create mode 100644 src/components/TableTutorial/index.ts
 delete mode 100644 src/layouts/Navigation/GetStartedChecklist/Progress.tsx
 create mode 100644 src/pages/Table/TableTutorialPage.tsx

diff --git a/src/App.tsx b/src/App.tsx
index 8fec3fc9..a4aeaf12 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -44,6 +44,8 @@ const TablesPage = lazy(() => import("@src/pages/TablesPage" /* webpackChunkName
 const ProvidedTablePage = lazy(() => import("@src/pages/Table/ProvidedTablePage" /* webpackChunkName: "ProvidedTablePage" */));
 // prettier-ignore
 const ProvidedSubTablePage = lazy(() => import("@src/pages/Table/ProvidedSubTablePage" /* webpackChunkName: "ProvidedSubTablePage" */));
+// prettier-ignore
+const TableTutorialPage = lazy(() => import("@src/pages/Table/TableTutorialPage" /* webpackChunkName: "TableTutorialPage" */));
 
 // prettier-ignore
 const FunctionPage = lazy(() => import("@src/pages/FunctionPage" /* webpackChunkName: "FunctionPage" */));
@@ -125,6 +127,11 @@ export default function App() {
               <Route path=":id" element={<TableGroupRedirectPage />} />
             </Route>
 
+            <Route
+              path={ROUTES.tableTutorial}
+              element={<TableTutorialPage />}
+            />
+
             <Route path={ROUTES.function}>
               <Route
                 index
diff --git a/src/assets/icons/index.ts b/src/assets/icons/index.ts
index d969d6d8..3503e99b 100644
--- a/src/assets/icons/index.ts
+++ b/src/assets/icons/index.ts
@@ -100,6 +100,9 @@ export { FormatListChecks as Checklist };
 import { FileTableBoxOutline } from "mdi-material-ui";
 export { FileTableBoxOutline as Project };
 
+import { TableColumn } from "mdi-material-ui";
+export { TableColumn };
+
 export * from "./AddRow";
 export * from "./AddRowTop";
 export * from "./ChevronDown";
diff --git a/src/components/EmptyState.tsx b/src/components/EmptyState.tsx
index 11e28d99..10fe6e14 100644
--- a/src/components/EmptyState.tsx
+++ b/src/components/EmptyState.tsx
@@ -1,4 +1,5 @@
 import { use100vh } from "react-div-100vh";
+import clsx from "clsx";
 
 import {
   Grid,
@@ -40,7 +41,13 @@ export default function EmptyState({
 
   if (basic)
     return (
-      <Grid container alignItems="center" spacing={1} {...props}>
+      <Grid
+        container
+        alignItems="center"
+        spacing={1}
+        {...props}
+        className={clsx("empty-state", "empty-state--basic", props.className)}
+      >
         <Grid item>
           <Icon style={{ display: "block" }} />
         </Grid>
@@ -66,6 +73,11 @@ export default function EmptyState({
         textAlign: "center",
         ...props.style,
       }}
+      className={clsx(
+        "empty-state",
+        "empty-state--full-screen",
+        props.className
+      )}
     >
       <Grid
         item
diff --git a/src/layouts/Navigation/GetStartedChecklist/GetStartedChecklist.tsx b/src/components/GetStartedChecklist/GetStartedChecklist.tsx
similarity index 94%
rename from src/layouts/Navigation/GetStartedChecklist/GetStartedChecklist.tsx
rename to src/components/GetStartedChecklist/GetStartedChecklist.tsx
index 48a9cd4d..9ae90fa2 100644
--- a/src/layouts/Navigation/GetStartedChecklist/GetStartedChecklist.tsx
+++ b/src/components/GetStartedChecklist/GetStartedChecklist.tsx
@@ -9,7 +9,7 @@ import { Project as ProjectIcon } from "@src/assets/icons";
 
 import Modal, { IModalProps } from "@src/components/Modal";
 import SteppedAccordion from "@src/components/SteppedAccordion";
-import Progress from "./Progress";
+import StepsProgress from "@src/components/StepsProgress";
 
 import {
   globalScope,
@@ -73,14 +73,18 @@ export default function GetStartedChecklist({
         },
       ]}
     >
-      <Progress sx={{ mb: 2 }} />
+      <StepsProgress value={1} steps={5} sx={{ mb: 2 }} />
 
       <SteppedAccordion
         steps={[
           {
             id: "workspace",
             title: "Create a workspace",
-            labelButtonProps: { icon: <CheckedIcon color="success" /> },
+            labelButtonProps: {
+              icon: (
+                <CheckedIcon color="success" sx={{ color: "success.light" }} />
+              ),
+            },
             content: null,
           },
           {
diff --git a/src/layouts/Navigation/GetStartedChecklist/index.ts b/src/components/GetStartedChecklist/index.ts
similarity index 100%
rename from src/layouts/Navigation/GetStartedChecklist/index.ts
rename to src/components/GetStartedChecklist/index.ts
diff --git a/src/components/StepsProgress.tsx b/src/components/StepsProgress.tsx
new file mode 100644
index 00000000..0c6b0583
--- /dev/null
+++ b/src/components/StepsProgress.tsx
@@ -0,0 +1,44 @@
+import { Box, BoxProps, Typography } from "@mui/material";
+import { spreadSx } from "@src/utils/ui";
+
+export interface IStepsProgressProps extends Partial<BoxProps> {
+  steps: number;
+  value: number;
+}
+
+export default function StepsProgress({
+  steps,
+  value,
+  sx,
+  ...props
+}: IStepsProgressProps) {
+  return (
+    <Box
+      {...props}
+      sx={[
+        { display: "flex", alignItems: "center", gap: 0.5 },
+        ...spreadSx(sx),
+      ]}
+    >
+      <Typography
+        className="steps-progress__label"
+        sx={{ flex: 3, fontVariantNumeric: "tabular-nums" }}
+      >
+        {Math.min(Math.max(value, 0), steps)}/{steps}
+      </Typography>
+
+      {new Array(steps).fill(undefined).map((_, i) => (
+        <Box
+          key={i + 1}
+          sx={{
+            flex: 1,
+            borderRadius: 1,
+            height: 8,
+            bgcolor: i + 1 <= value ? "success.light" : "divider",
+            transition: (theme) => theme.transitions.create("background-color"),
+          }}
+        />
+      ))}
+    </Box>
+  );
+}
diff --git a/src/components/Table/ColumnSelect.tsx b/src/components/Table/ColumnSelect.tsx
index ab235f11..99a651c2 100644
--- a/src/components/Table/ColumnSelect.tsx
+++ b/src/components/Table/ColumnSelect.tsx
@@ -1,7 +1,8 @@
 import { useAtom } from "jotai";
 
 import MultiSelect, { MultiSelectProps } from "@rowy/multiselect";
-import { Stack, StackProps, Typography } from "@mui/material";
+import { Stack, StackProps, Typography, Chip } from "@mui/material";
+import { TableColumn as TableColumnIcon } from "@src/assets/icons";
 
 import { globalScope, altPressAtom } from "@src/atoms/globalScope";
 import { tableScope, tableColumnsOrderedAtom } from "@src/atoms/tableScope";
@@ -53,7 +54,6 @@ export default function ColumnSelect({
       TextFieldProps={{
         ...props.TextFieldProps,
         SelectProps: {
-          ...props.TextFieldProps?.SelectProps,
           renderValue: () => {
             if (Array.isArray(props.value) && props.value.length > 1)
               return `${props.value.length} columns`;
@@ -72,6 +72,7 @@ export default function ColumnSelect({
               value
             );
           },
+          ...props.TextFieldProps?.SelectProps,
         },
       }}
     />
@@ -92,6 +93,8 @@ export function ColumnItem({
 }: IColumnItemProps) {
   const [altPress] = useAtom(altPressAtom, globalScope);
 
+  const isNew = option.index === undefined && !option.type;
+
   return (
     <Stack
       direction="row"
@@ -100,10 +103,18 @@ export function ColumnItem({
       {...props}
       sx={[{ color: "text.secondary", width: "100%" }, ...spreadSx(props.sx)]}
     >
-      {getFieldProp("icon", option.type)}
+      {getFieldProp("icon", option.type) ?? (
+        <TableColumnIcon color="disabled" />
+      )}
+
       <Typography color="text.primary" style={{ flexGrow: 1 }}>
         {altPress ? <code>{option.value}</code> : option.label}
       </Typography>
+
+      {isNew && (
+        <Chip label="New" color="primary" size="small" variant="outlined" />
+      )}
+
       {altPress ? (
         <Typography
           color="text.disabled"
diff --git a/src/components/Table/EmptyTable.tsx b/src/components/Table/EmptyTable.tsx
index fd9794fb..5f9e3c70 100644
--- a/src/components/Table/EmptyTable.tsx
+++ b/src/components/Table/EmptyTable.tsx
@@ -137,6 +137,7 @@ export default function EmptyTable() {
         margin: "0 auto",
         textAlign: "center",
       }}
+      id="empty-table"
     >
       {contents}
     </Stack>
diff --git a/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx b/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx
index 84da1170..dd2c04a7 100644
--- a/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx
+++ b/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx
@@ -10,13 +10,16 @@ import {
   FormControlLabel,
   Checkbox,
   Chip,
+  Stack,
+  Box,
 } from "@mui/material";
 import ArrowIcon from "@mui/icons-material/ArrowForward";
+import { TableColumn as TableColumnIcon } from "@src/assets/icons";
 
 import { IStepProps } from ".";
 import FadeList from "@src/components/TableModals/ScrollableList";
 import Column, { COLUMN_HEADER_HEIGHT } from "@src/components/Table/Column";
-import MultiSelect from "@rowy/multiselect";
+import ColumnSelect from "@src/components/Table/ColumnSelect";
 
 import {
   tableScope,
@@ -24,6 +27,7 @@ import {
   tableColumnsOrderedAtom,
 } from "@src/atoms/tableScope";
 import { FieldType } from "@src/constants/fields";
+import { getFieldProp } from "@src/components/fields";
 import { suggestType } from "@src/components/TableModals/ImportExistingWizard/utils";
 
 export default function Step1Columns({
@@ -215,9 +219,8 @@ export default function Step1Columns({
 
               <Grid item xs>
                 {selected && (
-                  <MultiSelect
+                  <ColumnSelect
                     multiple={false}
-                    options={tableColumns}
                     value={columnKey}
                     onChange={handleChange(field) as any}
                     TextFieldProps={{
@@ -227,21 +230,34 @@ export default function Step1Columns({
                           if (!columnKey) return "Select or add column";
                           else
                             return (
-                              <>
+                              <Stack
+                                direction="row"
+                                gap={1}
+                                alignItems="center"
+                              >
+                                <Box sx={{ width: 24, height: 24 }}>
+                                  {!isNewColumn ? (
+                                    getFieldProp("icon", matchingColumn?.type)
+                                  ) : (
+                                    <TableColumnIcon color="disabled" />
+                                  )}
+                                </Box>
                                 {matchingColumn?.name}
                                 {isNewColumn && (
                                   <Chip
                                     label="New"
+                                    color="primary"
                                     size="small"
-                                    sx={{
-                                      marginLeft: (theme) =>
-                                        theme.spacing(1) + " !important",
-                                      backgroundColor: "action.focus",
+                                    variant="outlined"
+                                    style={{
+                                      marginLeft: "auto",
                                       pointerEvents: "none",
+                                      height: 24,
+                                      fontWeight: "normal",
                                     }}
                                   />
                                 )}
-                              </>
+                              </Stack>
                             );
                         },
                         sx: [
@@ -272,14 +288,14 @@ export default function Step1Columns({
                           !columnKey && { color: "text.disabled" },
                         ],
                       },
+                      sx: { "& .MuiInputLabel-root": { display: "none" } },
                     }}
                     clearable={false}
                     displayEmpty
-                    labelPlural="columns"
                     freeText
-                    AddButtonProps={{ children: "Add new column…" }}
+                    AddButtonProps={{ children: "Create column…" }}
                     AddDialogProps={{
-                      title: "Add new column",
+                      title: "Create column",
                       textFieldLabel: "Column name",
                     }}
                   />
diff --git a/src/components/TableTutorial/Steps/Step1Import.tsx b/src/components/TableTutorial/Steps/Step1Import.tsx
new file mode 100644
index 00000000..005fcaab
--- /dev/null
+++ b/src/components/TableTutorial/Steps/Step1Import.tsx
@@ -0,0 +1,57 @@
+import { useState, useEffect } from "react";
+import { useAtom } from "jotai";
+import { ITableTutorialStepComponentProps } from ".";
+
+import { Typography } from "@mui/material";
+import TutorialCheckbox from "@src/components/TableTutorial/TutorialCheckbox";
+
+import { tableScope, tableRowsAtom } from "@src/atoms/tableScope";
+
+export const Step1Import = {
+  id: "import",
+  title: "Let’s create a simple product pricing table",
+  description:
+    "Rowy connects to your database and displays it in a spreadsheet UI, making it easy to manage your data.",
+  StepComponent,
+  completeText: (
+    <Typography variant="body1">
+      <strong>Great work!</strong> Save time by importing data to tables. You
+      can also export your data to CSV, TSV, and JSON.
+    </Typography>
+  ),
+};
+
+export default Step1Import;
+
+function StepComponent({ setComplete }: ITableTutorialStepComponentProps) {
+  const [checked, setChecked] = useState([false]);
+  if (checked.every(Boolean)) setComplete(true);
+  else setComplete(false);
+  const handleChange =
+    (index: number) => (event: React.ChangeEvent<HTMLInputElement>) =>
+      setChecked((c) => {
+        const cloned = [...c];
+        cloned.splice(index, 1, event.target.checked);
+        return cloned;
+      });
+
+  const [tableRows] = useAtom(tableRowsAtom, tableScope);
+  useEffect(() => {
+    if (tableRows.length >= 5)
+      handleChange(0)({ target: { checked: true } } as any);
+  }, [tableRows]);
+
+  return (
+    <>
+      <ol>
+        <li>
+          <TutorialCheckbox
+            label="Begin by clicking “Import CSV” to import our sample dataset"
+            checked={checked[0]}
+            onChange={handleChange(0)}
+          />
+        </li>
+      </ol>
+    </>
+  );
+}
diff --git a/src/components/TableTutorial/Steps/Step2Add.tsx b/src/components/TableTutorial/Steps/Step2Add.tsx
new file mode 100644
index 00000000..2c7f2e8f
--- /dev/null
+++ b/src/components/TableTutorial/Steps/Step2Add.tsx
@@ -0,0 +1,94 @@
+import { useState, useEffect } from "react";
+import { useAtom } from "jotai";
+import { isEmpty } from "lodash-es";
+import { ITableTutorialStepComponentProps } from ".";
+
+import { Typography } from "@mui/material";
+import TutorialCheckbox from "@src/components/TableTutorial/TutorialCheckbox";
+
+import {
+  tableScope,
+  tableColumnsOrderedAtom,
+  tableRowsAtom,
+} from "@src/atoms/tableScope";
+import { FieldType } from "@src/constants/fields";
+
+export const Step2Add = {
+  id: "add",
+  title: "Let’s add some columns and rows to your table",
+  description:
+    "When you make changes made to your data in Rowy, they’re reflected in your Firestore database in realtime.",
+  StepComponent,
+  completeText: (
+    <Typography variant="body1">
+      <strong>Nicely done!</strong> Rating is just one of Rowy’s 30+ field
+      types. You can explore the others when making your own tables.
+    </Typography>
+  ),
+};
+
+export default Step2Add;
+
+function StepComponent({ setComplete }: ITableTutorialStepComponentProps) {
+  const [checked, setChecked] = useState([false, false, false]);
+  if (checked.every(Boolean)) setComplete(true);
+  else setComplete(false);
+  const handleChange =
+    (index: number) => (event: React.ChangeEvent<HTMLInputElement>) =>
+      setChecked((c) => {
+        const cloned = [...c];
+        cloned.splice(index, 1, event.target.checked);
+        return cloned;
+      });
+
+  const [tableColumnsOrdered] = useAtom(tableColumnsOrderedAtom, tableScope);
+  useEffect(() => {
+    if (
+      tableColumnsOrdered.some(
+        (c) =>
+          c.type === FieldType.rating && c.name.toLowerCase().includes("rating")
+      )
+    )
+      handleChange(0)({ target: { checked: true } } as any);
+  }, [tableColumnsOrdered]);
+
+  const [tableRows] = useAtom(tableRowsAtom, tableScope);
+  useEffect(() => {
+    if (tableRows.length >= 6) {
+      handleChange(1)({ target: { checked: true } } as any);
+
+      const { _rowy_ref, ...firstRow } = tableRows[0];
+      if (!isEmpty(firstRow)) {
+        handleChange(2)({ target: { checked: true } } as any);
+      }
+    }
+  }, [tableRows]);
+
+  return (
+    <>
+      <ol>
+        <li>
+          <TutorialCheckbox
+            label="Add a column named “Rating”, with the field type “Rating”"
+            checked={checked[0]}
+            onChange={handleChange(0)}
+          />
+        </li>
+        <li>
+          <TutorialCheckbox
+            label="Add a row"
+            checked={checked[1]}
+            onChange={handleChange(1)}
+          />
+        </li>
+        <li>
+          <TutorialCheckbox
+            label="Enter some data in the new row"
+            checked={checked[2]}
+            onChange={handleChange(2)}
+          />
+        </li>
+      </ol>
+    </>
+  );
+}
diff --git a/src/components/TableTutorial/Steps/Step3Invite.tsx b/src/components/TableTutorial/Steps/Step3Invite.tsx
new file mode 100644
index 00000000..139935cb
--- /dev/null
+++ b/src/components/TableTutorial/Steps/Step3Invite.tsx
@@ -0,0 +1,17 @@
+import { ITableTutorialStepComponentProps } from ".";
+
+export const Step3Invite = {
+  id: "invite",
+  title: "Let’s create a simple product pricing table",
+  description:
+    "Rowy allows you to invite your team members with granular, role-based access controls.",
+  StepComponent,
+};
+
+export default Step3Invite;
+
+function StepComponent({ setComplete }: ITableTutorialStepComponentProps) {
+  setComplete(true);
+
+  return <>TODO:</>;
+}
diff --git a/src/components/TableTutorial/Steps/Step4Code.tsx b/src/components/TableTutorial/Steps/Step4Code.tsx
new file mode 100644
index 00000000..f462fd64
--- /dev/null
+++ b/src/components/TableTutorial/Steps/Step4Code.tsx
@@ -0,0 +1,16 @@
+import { ITableTutorialStepComponentProps } from ".";
+
+export const Step4Code = {
+  id: "code",
+  title: "Let’s learn how to unlock the true powers of Rowy",
+  description: "TODO:",
+  StepComponent,
+};
+
+export default Step4Code;
+
+function StepComponent({ setComplete }: ITableTutorialStepComponentProps) {
+  setComplete(true);
+
+  return <>TODO:</>;
+}
diff --git a/src/components/TableTutorial/Steps/index.ts b/src/components/TableTutorial/Steps/index.ts
new file mode 100644
index 00000000..556d3dce
--- /dev/null
+++ b/src/components/TableTutorial/Steps/index.ts
@@ -0,0 +1,27 @@
+import Step1Import from "./Step1Import";
+import Step2Add from "./Step2Add";
+import Step3Invite from "./Step3Invite";
+import Step4Code from "./Step4Code";
+
+export const TUTORIAL_STEPS = [
+  Step1Import,
+  Step2Add,
+  Step3Invite,
+  Step4Code,
+] as Array<ITableTutorialStepProps>;
+
+export interface ITableTutorialStepProps {
+  onNext: () => void;
+  isFinal: boolean;
+
+  id: string;
+  title: React.ReactNode;
+  description: React.ReactNode;
+  StepComponent: React.ComponentType<ITableTutorialStepComponentProps>;
+  completeText?: React.ReactNode;
+}
+
+export interface ITableTutorialStepComponentProps {
+  complete: boolean;
+  setComplete: (complete: boolean) => void;
+}
diff --git a/src/components/TableTutorial/TableSourceTutorial.tsx b/src/components/TableTutorial/TableSourceTutorial.tsx
new file mode 100644
index 00000000..9173a89d
--- /dev/null
+++ b/src/components/TableTutorial/TableSourceTutorial.tsx
@@ -0,0 +1,115 @@
+import { useCallback } from "react";
+import { useSetAtom } from "jotai";
+import { useAtomCallback } from "jotai/utils";
+import { cloneDeep, unset, findIndex, sortBy } from "lodash-es";
+
+import {
+  tableScope,
+  tableSchemaAtom,
+  updateTableSchemaAtom,
+  tableRowsDbAtom,
+  _updateRowDbAtom,
+  _deleteRowDbAtom,
+  _bulkWriteDbAtom,
+  addRowAtom,
+} from "@src/atoms/tableScope";
+import { TableSchema, TableRow, BulkWriteFunction } from "@src/types/table";
+import { updateRowData } from "@src/utils/table";
+import { TABLE_SCHEMAS } from "@src/config/dbPaths";
+
+export const TUTORIAL_COLLECTION = "tutorial";
+export const TUTORIAL_TABLE_SETTINGS = {
+  id: TUTORIAL_COLLECTION,
+  name: "Tutorial",
+  collection: TUTORIAL_COLLECTION,
+  roles: ["ADMIN"],
+  section: "",
+  tableType: "primaryCollection",
+  audit: false,
+};
+export const TUTORIAL_TABLE_SCHEMA = {
+  _rowy_ref: {
+    path: TABLE_SCHEMAS + "/" + TUTORIAL_COLLECTION,
+    id: TUTORIAL_COLLECTION,
+  },
+};
+
+export function TableSourceTutorial() {
+  const setTableSchema = useSetAtom(tableSchemaAtom, tableScope);
+
+  const setUpdateTableSchema = useSetAtom(updateTableSchemaAtom, tableScope);
+  setUpdateTableSchema(
+    () => async (update: Partial<TableSchema>, deleteFields?: string[]) => {
+      setTableSchema((current) => {
+        const withFieldsDeleted = cloneDeep(current);
+        if (Array.isArray(deleteFields)) {
+          for (const field of deleteFields) {
+            unset(withFieldsDeleted, field);
+          }
+        }
+        return updateRowData(withFieldsDeleted || {}, update);
+      });
+    }
+  );
+
+  const setRowsDb = useSetAtom(tableRowsDbAtom, tableScope);
+  const readRowsDb = useAtomCallback(
+    useCallback((get) => get(tableRowsDbAtom), []),
+    tableScope
+  );
+
+  const setUpdateRowDb = useSetAtom(_updateRowDbAtom, tableScope);
+  setUpdateRowDb(() => (path: string, update: Partial<TableRow>) => {
+    setRowsDb((_rows) => {
+      const rows = [..._rows];
+      const index = findIndex(rows, ["_rowy_ref.path", path]);
+
+      // Append if not found and sort by ID
+      if (index === -1) {
+        return sortBy(
+          [
+            ...rows,
+            { ...update, _rowy_ref: { id: path.split("/").pop()!, path } },
+          ],
+          ["_rowy_ref.id"]
+        );
+      }
+
+      rows[index] = updateRowData(rows[index], update);
+      return rows;
+    });
+    return Promise.resolve();
+  });
+
+  const setDeleteRowDb = useSetAtom(_deleteRowDbAtom, tableScope);
+  setDeleteRowDb(() => async (path: string) => {
+    const _rows = await readRowsDb();
+    const rows = [..._rows];
+    const index = findIndex(rows, ["_rowy_ref.path", path]);
+    if (index > -1) {
+      rows.splice(index, 1);
+      setRowsDb(rows);
+    }
+    return Promise.resolve();
+  });
+
+  const setBulkWriteDb = useSetAtom(_bulkWriteDbAtom, tableScope);
+  const addRow = useSetAtom(addRowAtom, tableScope);
+  // WARNING: Only supports bulk add row for import CSV
+  setBulkWriteDb(
+    () =>
+      (
+        operations: Parameters<BulkWriteFunction>[0],
+        _onBatchCommit: Parameters<BulkWriteFunction>[1]
+      ) =>
+        addRow({
+          row: operations.map((operation) => ({
+            ...(operation as any).data,
+            _rowy_ref: { id: operation.path, path: operation.path },
+          })),
+          setId: "decrement",
+        })
+  );
+
+  return null;
+}
diff --git a/src/components/TableTutorial/TableTutorial.tsx b/src/components/TableTutorial/TableTutorial.tsx
new file mode 100644
index 00000000..7d61d521
--- /dev/null
+++ b/src/components/TableTutorial/TableTutorial.tsx
@@ -0,0 +1,180 @@
+import { useState, Fragment } from "react";
+import { useSetAtom } from "jotai";
+import { useNavigate } from "react-router-dom";
+
+import {
+  Slide,
+  Drawer,
+  Typography,
+  IconButton,
+  Box,
+  Stack,
+  Button,
+} from "@mui/material";
+import CloseIcon from "@mui/icons-material/Close";
+import ArrowForwardIcon from "@mui/icons-material/ArrowForward";
+
+import StepsProgress from "@src/components/StepsProgress";
+import { TUTORIAL_STEPS } from "./Steps";
+
+import { globalScope, confirmDialogAtom } from "@src/atoms/globalScope";
+import { ROUTES } from "@src/constants/routes";
+import { NAV_DRAWER_COLLAPSED_WIDTH } from "@src/layouts/Navigation/NavDrawer";
+
+export default function TableTutorial() {
+  const confirm = useSetAtom(confirmDialogAtom, globalScope);
+  const navigate = useNavigate();
+
+  const [completed, setCompleted] = useState(
+    new Array(TUTORIAL_STEPS.length).fill(false)
+  );
+  const [currentStep, setCurrentStep] = useState(0);
+
+  const handleComplete = (value: boolean) =>
+    setCompleted((c) => {
+      if (c[currentStep] === value) return c;
+      const newCompleted = [...c];
+      newCompleted[currentStep] = value;
+      return newCompleted;
+    });
+
+  const handleNext = () =>
+    setCurrentStep((c) => Math.min(c + 1, TUTORIAL_STEPS.length - 1));
+
+  const stepProps = TUTORIAL_STEPS[currentStep];
+  const StepComponent = stepProps.StepComponent;
+  const isFinal = currentStep === TUTORIAL_STEPS.length - 1;
+
+  return (
+    <Slide in direction="up">
+      <Drawer
+        variant="permanent"
+        anchor="bottom"
+        sx={{
+          position: "fixed",
+          top: "auto",
+          bottom: `env(safe-area-inset-bottom)`,
+          left: {
+            xs: `env(safe-area-inset-left)`,
+            md: NAV_DRAWER_COLLAPSED_WIDTH + 2,
+          },
+          right: `env(safe-area-inset-right)`,
+          height: "min(50vh, 440px)",
+
+          "& .MuiPaper-root": {
+            position: "static",
+            height: "100%",
+
+            borderRadius: 2,
+            borderBottomLeftRadius: 0,
+            borderBottomRightRadius: 0,
+            border: "none",
+
+            px: { xs: 2, sm: 3, md: 6 },
+            py: { xs: 3, md: 5 },
+            pb: (theme) =>
+              `max(env(safe-area-inset-bottom), ${theme.spacing(5)})`,
+            overflow: "auto",
+
+            display: "flex",
+            flexDirection: "column",
+            gap: 2,
+          },
+
+          "& ol": { m: 0, p: 0, listStyle: "none" },
+          "& p": { maxWidth: "100ch" },
+        }}
+        PaperProps={{ elevation: 2 }}
+      >
+        <Typography variant="overline" sx={{ mb: -2 }}>
+          Get started tutorial
+        </Typography>
+
+        <IconButton
+          aria-label="Close tutorial"
+          size="medium"
+          sx={{
+            marginLeft: "auto",
+            width: 40,
+            position: "absolute",
+            top: 12,
+            right: 12,
+          }}
+          onClick={() =>
+            confirm({
+              title: "Close tutorial?",
+              body: "Your progress will be lost",
+              handleConfirm: () => navigate(ROUTES.tables),
+              confirm: "Close tutorial",
+              cancel: "Continue tutorial",
+              confirmColor: "error",
+              buttonLayout: "vertical",
+            })
+          }
+        >
+          <CloseIcon />
+        </IconButton>
+
+        <Fragment key={TUTORIAL_STEPS[currentStep].id}>
+          <header>
+            <Typography variant="h5" component="h1" gutterBottom>
+              {stepProps.title}
+            </Typography>
+            <Typography variant="body1">{stepProps.description}</Typography>
+          </header>
+
+          <div style={{ flexGrow: 1 }}>
+            <StepComponent
+              complete={completed[currentStep]}
+              setComplete={handleComplete}
+            />
+          </div>
+
+          {stepProps.completeText && (
+            <Box
+              sx={{
+                visibility: completed[currentStep] ? "visible" : "hidden",
+                opacity: completed[currentStep] ? 1 : 0,
+                transition: (theme) => theme.transitions.create("opacity"),
+              }}
+            >
+              {stepProps.completeText}
+            </Box>
+          )}
+        </Fragment>
+
+        <Stack
+          direction="row"
+          justifyContent="flex-end"
+          alignItems="center"
+          gap={1}
+        >
+          <StepsProgress
+            steps={TUTORIAL_STEPS.length}
+            value={completed.filter(Boolean).length}
+            style={{
+              flexGrow: 0,
+              flexShrink: 1,
+              flexBasis: 200,
+              marginRight: "auto",
+            }}
+          />
+
+          <Button variant="text" style={{ flexShrink: 0 }}>
+            I’m stuck
+          </Button>
+          <Button
+            variant="contained"
+            color="primary"
+            style={{ flexShrink: 0 }}
+            disabled={!completed[currentStep]}
+            onClick={handleNext}
+            endIcon={isFinal ? <ArrowForwardIcon /> : undefined}
+          >
+            {isFinal ? "Finish" : "Next"}
+          </Button>
+        </Stack>
+      </Drawer>
+    </Slide>
+  );
+}
diff --git a/src/components/TableTutorial/TutorialCheckbox.tsx b/src/components/TableTutorial/TutorialCheckbox.tsx
new file mode 100644
index 00000000..caf25c9d
--- /dev/null
+++ b/src/components/TableTutorial/TutorialCheckbox.tsx
@@ -0,0 +1,69 @@
+import {
+  FormControlLabel,
+  FormControlLabelProps,
+  Checkbox,
+  CheckboxProps,
+} from "@mui/material";
+
+export interface ITutorialCheckboxProps {
+  label: FormControlLabelProps["label"];
+  checked: CheckboxProps["checked"];
+  onChange: CheckboxProps["onChange"];
+}
+
+export default function TutorialCheckbox({
+  checked,
+  onChange,
+  label,
+}: ITutorialCheckboxProps) {
+  return (
+    <FormControlLabel
+      label={label}
+      sx={{
+        ml: -6 / 8,
+        mr: 0,
+
+        "& .MuiFormControlLabel-label": {
+          mt: ((36 - 20) / 2 + 1) / 8,
+          // typography: "body1",
+        },
+      }}
+      control={
+        <Checkbox
+          checked={checked}
+          onChange={onChange}
+          color="success"
+          sx={{
+            color: "success.light",
+            p: 3 / 8,
+            mr: 0.5,
+
+            "& .checkbox-icon": {
+              color: "success.light",
+              borderRadius: "50%",
+              borderWidth: 2,
+              width: 24,
+              height: 24,
+              placeItems: "center",
+
+              "& svg": {
+                position: "relative",
+                top: 1,
+                left: 1,
+              },
+
+              "& .tick": {
+                stroke: "currentColor",
+              },
+            },
+
+            '& .checkbox-icon, &.Mui-checked .checkbox-icon, &[aria-selected="true"] .checkbox-icon':
+              {
+                backgroundColor: "transparent",
+              },
+          }}
+        />
+      }
+    />
+  );
+}
diff --git a/src/components/TableTutorial/data.ts b/src/components/TableTutorial/data.ts
new file mode 100644
index 00000000..3de054d1
--- /dev/null
+++ b/src/components/TableTutorial/data.ts
@@ -0,0 +1,9 @@
+export const columns = ["Name", "Price"];
+
+export const rows = [
+  { Name: "Wine - Vouvray Cuvee Domaine", Price: 22.73 },
+  { Name: "Hold Up Tool Storage Rack", Price: 55.52 },
+  { Name: "Squid - Tubes / Tenticles 10/20", Price: 91.34 },
+  { Name: "Squeeze Bottle", Price: 3.11 },
+  { Name: "Flour - Semolina", Price: 97.01 },
+];
diff --git a/src/components/TableTutorial/index.ts b/src/components/TableTutorial/index.ts
new file mode 100644
index 00000000..a515986c
--- /dev/null
+++ b/src/components/TableTutorial/index.ts
@@ -0,0 +1,2 @@
+export * from "./TableTutorial";
+export { default } from "./TableTutorial";
diff --git a/src/constants/routes.tsx b/src/constants/routes.tsx
index 498204a8..8e4ef19b 100644
--- a/src/constants/routes.tsx
+++ b/src/constants/routes.tsx
@@ -1,6 +1,6 @@
 import Logo from "@src/assets/Logo";
 import BreadcrumbsTableRoot from "@src/components/Table/BreadcrumbsTableRoot";
-import { FadeProps } from "@mui/material";
+import { FadeProps, Typography } from "@mui/material";
 
 export enum ROUTES {
   home = "/",
@@ -38,6 +38,9 @@ export enum ROUTES {
   members = "/members",
   debugSettings = "/settings/debug",
 
+  tutorial = "/tutorial",
+  tableTutorial = "/tutorial/table",
+
   test = "/test",
   themeTest = "/test/theme",
   rowyRunTest = "/test/rowyRunTest",
@@ -65,6 +68,18 @@ export const ROUTE_TITLES = {
   [ROUTES.members]: "Members",
   [ROUTES.debugSettings]: "Debug",
 
+  [ROUTES.tutorial]: "Tutorial",
+  [ROUTES.tableTutorial]: {
+    title: "Tutorial",
+    titleComponent: (_o, _i) => (
+      <Typography component="h1" variant="h6">
+        Tutorial
+      </Typography>
+    ),
+    titleTransitionProps: { style: { transformOrigin: "0 50%" } },
+    leftAligned: true,
+  },
+
   [ROUTES.test]: "Test",
   [ROUTES.themeTest]: "Theme Test",
   [ROUTES.rowyRunTest]: "Rowy Run Test",
diff --git a/src/layouts/Navigation/GetStartedChecklist/Progress.tsx b/src/layouts/Navigation/GetStartedChecklist/Progress.tsx
deleted file mode 100644
index 6c824d65..00000000
--- a/src/layouts/Navigation/GetStartedChecklist/Progress.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Box, BoxProps, Typography } from "@mui/material";
-import { spreadSx } from "@src/utils/ui";
-
-export default function Progress({ sx }: Partial<BoxProps>) {
-  return (
-    <Box
-      sx={[
-        { display: "flex", alignItems: "center", gap: 0.5 },
-        ...spreadSx(sx),
-      ]}
-    >
-      <Typography style={{ flex: 3 }}>1/5</Typography>
-
-      <Box
-        sx={{ flex: 1, borderRadius: 1, height: 8, bgcolor: "success.light" }}
-      />
-      <Box sx={{ flex: 1, borderRadius: 1, height: 8, bgcolor: "divider" }} />
-      <Box sx={{ flex: 1, borderRadius: 1, height: 8, bgcolor: "divider" }} />
-      <Box sx={{ flex: 1, borderRadius: 1, height: 8, bgcolor: "divider" }} />
-      <Box sx={{ flex: 1, borderRadius: 1, height: 8, bgcolor: "divider" }} />
-    </Box>
-  );
-}
diff --git a/src/layouts/Navigation/NavDrawer.tsx b/src/layouts/Navigation/NavDrawer.tsx
index d3cb5568..bb9b5e53 100644
--- a/src/layouts/Navigation/NavDrawer.tsx
+++ b/src/layouts/Navigation/NavDrawer.tsx
@@ -33,7 +33,7 @@ import Logo from "@src/assets/Logo";
 import NavItem from "./NavItem";
 import SettingsNav from "./SettingsNav";
 import NavTableSection from "./NavTableSection";
-import Progress from "./GetStartedChecklist/Progress";
+import StepsProgress from "@src/components/StepsProgress";
 import CommunityMenu from "./CommunityMenu";
 import HelpMenu from "./HelpMenu";
 
@@ -324,7 +324,9 @@ export default function NavDrawer({
                     </ListItemIcon>
                     <ListItemText
                       primary="Get started"
-                      secondary={<Progress sx={{ mr: 3 }} />}
+                      secondary={
+                        <StepsProgress value={1} steps={5} sx={{ mr: 3 }} />
+                      }
                     />
                     <ListItemSecondaryAction>
                       <ChevronRightIcon />
diff --git a/src/layouts/Navigation/Navigation.tsx b/src/layouts/Navigation/Navigation.tsx
index dc15bbac..f996dc53 100644
--- a/src/layouts/Navigation/Navigation.tsx
+++ b/src/layouts/Navigation/Navigation.tsx
@@ -11,7 +11,7 @@ import ErrorFallback, {
   IErrorFallbackProps,
 } from "@src/components/ErrorFallback";
 import Loading from "@src/components/Loading";
-import GetStartedChecklist from "./GetStartedChecklist";
+import GetStartedChecklist from "@src/components/GetStartedChecklist";
 
 import {
   globalScope,
diff --git a/src/pages/Table/TablePage.tsx b/src/pages/Table/TablePage.tsx
index a4336803..4d682fc3 100644
--- a/src/pages/Table/TablePage.tsx
+++ b/src/pages/Table/TablePage.tsx
@@ -34,13 +34,18 @@ const BuildLogsSnack = lazy(() => import("@src/components/TableModals/CloudLogsM
 export interface ITablePageProps {
   /** Disable modals on this table when a sub-table is open and it’s listening to URL state */
   disableModals?: boolean;
+  /** Disable side drawer */
+  disableSideDrawer?: boolean;
 }
 
 /**
  * TablePage renders all the UI for the table.
  * Must be wrapped by either `ProvidedTablePage` or `ProvidedSubTablePage`.
  */
-export default function TablePage({ disableModals }: ITablePageProps) {
+export default function TablePage({
+  disableModals,
+  disableSideDrawer,
+}: ITablePageProps) {
   const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
   const snackLogContext = useSnackLogContext();
 
@@ -63,7 +68,7 @@ export default function TablePage({ disableModals }: ITablePageProps) {
     return (
       <Suspense fallback={null}>
         <Fade in style={{ transitionDelay: "500ms" }}>
-          <div>
+          <div className="empty-table-container">
             <EmptyTable />
 
             <Suspense fallback={null}>
@@ -94,7 +99,7 @@ export default function TablePage({ disableModals }: ITablePageProps) {
 
       <ErrorBoundary FallbackComponent={InlineErrorFallback}>
         <Suspense fallback={null}>
-          <SideDrawer dataGridRef={dataGridRef} />
+          {!disableSideDrawer && <SideDrawer dataGridRef={dataGridRef} />}
         </Suspense>
       </ErrorBoundary>
 
diff --git a/src/pages/Table/TableTutorialPage.tsx b/src/pages/Table/TableTutorialPage.tsx
new file mode 100644
index 00000000..8a0a7425
--- /dev/null
+++ b/src/pages/Table/TableTutorialPage.tsx
@@ -0,0 +1,138 @@
+import { Suspense } from "react";
+import { useAtom, useSetAtom, Provider } from "jotai";
+import { DebugAtoms } from "@src/atoms/utils";
+import { ErrorBoundary } from "react-error-boundary";
+
+import { Box, Typography, Button } from "@mui/material";
+import { Import as ImportIcon } from "@src/assets/icons";
+
+import ErrorFallback from "@src/components/ErrorFallback";
+import TablePage from "./TablePage";
+import TableToolbarSkeleton from "@src/components/TableToolbar/TableToolbarSkeleton";
+import TableSkeleton from "@src/components/Table/TableSkeleton";
+import TableTutorial from "@src/components/TableTutorial";
+import EmptyState from "@src/components/EmptyState";
+import TableModals from "@src/components/TableModals";
+
+import { globalScope, currentUserAtom } from "@src/atoms/globalScope";
+import {
+  tableScope,
+  tableIdAtom,
+  tableSettingsAtom,
+  tableSchemaAtom,
+  tableColumnsOrderedAtom,
+  tableRowsAtom,
+  tableModalAtom,
+  importCsvAtom,
+} from "@src/atoms/tableScope";
+
+import {
+  TUTORIAL_COLLECTION,
+  TUTORIAL_TABLE_SETTINGS,
+  TUTORIAL_TABLE_SCHEMA,
+  TableSourceTutorial,
+} from "@src/components/TableTutorial/TableSourceTutorial";
+import { TOP_BAR_HEIGHT } from "@src/layouts/Navigation/TopBar";
+import * as csvData from "@src/components/TableTutorial/data";
+
+/**
+ * Wraps `TablePage` with the data for a top-level table.
+ */
+export default function TableTutorialPage() {
+  const [currentUser] = useAtom(currentUserAtom, globalScope);
+
+  return (
+    <ErrorBoundary FallbackComponent={ErrorFallback}>
+      <Suspense
+        fallback={
+          <>
+            <TableToolbarSkeleton />
+            <TableSkeleton />
+          </>
+        }
+      >
+        <Provider
+          key={tableScope.description + "/" + TUTORIAL_COLLECTION}
+          scope={tableScope}
+          initialValues={[
+            [currentUserAtom, currentUser],
+            [tableIdAtom, TUTORIAL_COLLECTION],
+            [tableSettingsAtom, TUTORIAL_TABLE_SETTINGS],
+            [tableSchemaAtom, TUTORIAL_TABLE_SCHEMA],
+          ]}
+        >
+          <DebugAtoms scope={tableScope} />
+          <TableSourceTutorial />
+          <Suspense
+            fallback={
+              <>
+                <TableToolbarSkeleton />
+                <TableSkeleton />
+              </>
+            }
+          >
+            <Box
+              component="main"
+              sx={{
+                ".empty-state--full-screen, #empty-table": {
+                  height: `calc(100vh - ${TOP_BAR_HEIGHT}px - min(50vh, 440px)) !important`,
+                },
+                ".table-container > .rdg": {
+                  paddingBottom:
+                    "max(env(safe-area-inset-bottom), min(50vh, 440px))",
+                  width: "100%",
+
+                  ".rdg-row, .rdg-header-row": {
+                    marginRight: `env(safe-area-inset-right)`,
+                  },
+                },
+              }}
+            >
+              <Content />
+              <TableTutorial />
+            </Box>
+          </Suspense>
+        </Provider>
+      </Suspense>
+    </ErrorBoundary>
+  );
+}
+
+function Content() {
+  const [tableColumnsOrdered] = useAtom(tableColumnsOrderedAtom, tableScope);
+  const [tableRows] = useAtom(tableRowsAtom, tableScope);
+  const openTableModal = useSetAtom(tableModalAtom, tableScope);
+  const setImportCsv = useSetAtom(importCsvAtom, tableScope);
+
+  if (tableColumnsOrdered.length === 0 || tableRows.length === 0) {
+    return (
+      <EmptyState
+        Icon={(() => null) as any}
+        message="Get started"
+        description={
+          <>
+            <Typography>There is no data in this table.</Typography>
+
+            <Typography>You can import our sample CSV file:</Typography>
+
+            <Button
+              variant="contained"
+              color="primary"
+              startIcon={<ImportIcon />}
+              onClick={() => {
+                setImportCsv({ importType: "csv", csvData });
+                openTableModal("importCsv");
+              }}
+            >
+              Import CSV
+            </Button>
+
+            <TableModals />
+          </>
+        }
+      />
+    );
+  }
+
+  return <TablePage disableSideDrawer />;
+}
diff --git a/src/theme/CheckboxIcon.tsx b/src/theme/CheckboxIcon.tsx
index d72728ff..68d8960c 100644
--- a/src/theme/CheckboxIcon.tsx
+++ b/src/theme/CheckboxIcon.tsx
@@ -68,6 +68,7 @@ export default function CheckboxIcon() {
           },
         },
       }}
+      className="checkbox-icon"
     >
       <svg viewBox="0 0 18 18">
         <polyline
diff --git a/src/theme/CheckboxIndeterminateIcon.tsx b/src/theme/CheckboxIndeterminateIcon.tsx
index 0cf4d9f1..682384f7 100644
--- a/src/theme/CheckboxIndeterminateIcon.tsx
+++ b/src/theme/CheckboxIndeterminateIcon.tsx
@@ -68,6 +68,7 @@ export default function CheckboxIndeterminateIcon() {
           },
         },
       }}
+      className="checkbox-indeterminate-icon"
     >
       <svg viewBox="0 0 18 18">
         <line
diff --git a/src/theme/RadioIcon.tsx b/src/theme/RadioIcon.tsx
index 21974850..e3777ec4 100644
--- a/src/theme/RadioIcon.tsx
+++ b/src/theme/RadioIcon.tsx
@@ -61,6 +61,7 @@ export default function RadioIcon() {
           },
         },
       }}
+      className="radio-icon"
     />
   );
 }
diff --git a/src/types/files.d.ts b/src/types/files.d.ts
index 63f9f2d0..40ca1c54 100644
--- a/src/types/files.d.ts
+++ b/src/types/files.d.ts
@@ -10,3 +10,7 @@ declare module "!!raw-loader!*" {
   const content: string;
   export default content;
 }
+declare module "*.csv" {
+  const content: string;
+  export default content;
+}

From 4786d059c621f83b3f1d8979976cec3814bcad2e Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Thu, 14 Jul 2022 22:26:18 +1000
Subject: [PATCH 027/309] fix page loading with white screen while system is in
 dark mode

---
 public/index.html | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/public/index.html b/public/index.html
index a9153101..84198f78 100644
--- a/public/index.html
+++ b/public/index.html
@@ -75,6 +75,12 @@
       href="https://fonts.googleapis.com/css2?family=JetBrains+Mono:ital,wght@0,400;0,700;1,400;1,700&display=swap"
     />
 
+    <style>
+      :root {
+        color-scheme: light dark;
+      }
+    </style>
+
     <title>Rowy</title>
 
     <meta name="title" content="Rowy – GCP as easy as ABC" />

From 7604768ec58d1cdf8d4e225e34013247c533252a Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Fri, 15 Jul 2022 12:19:58 +1000
Subject: [PATCH 028/309] AuthLayout: hide projectId if not available

---
 src/layouts/AuthLayout.tsx | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/layouts/AuthLayout.tsx b/src/layouts/AuthLayout.tsx
index 9406e83d..437fc667 100644
--- a/src/layouts/AuthLayout.tsx
+++ b/src/layouts/AuthLayout.tsx
@@ -142,13 +142,15 @@ export default function AuthLayout({
           />
         )}
 
-        <Typography
-          variant="caption"
-          color="text.disabled"
-          sx={{ display: hideProject ? "none" : "block", mb: -0.5 }}
-        >
-          Project: <span style={{ userSelect: "all" }}>{projectId}</span>
-        </Typography>
+        {projectId && (
+          <Typography
+            variant="caption"
+            color="text.disabled"
+            sx={{ display: hideProject ? "none" : "block", mb: -0.5 }}
+          >
+            Project: <span style={{ userSelect: "all" }}>{projectId}</span>
+          </Typography>
+        )}
       </Paper>
 
       <Stack

From 6163d552ff1f557b0c44ee3033f50cd88a951195 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 18 Jul 2022 13:56:54 +1000
Subject: [PATCH 029/309] update Providers

---
 src/Providers.tsx | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/Providers.tsx b/src/Providers.tsx
index c71630fa..3f591251 100644
--- a/src/Providers.tsx
+++ b/src/Providers.tsx
@@ -3,7 +3,7 @@ import ErrorFallback from "@src/components/ErrorFallback";
 // import SwrProvider from "@src/contexts/SwrContext";
 import { BrowserRouter } from "react-router-dom";
 import { HelmetProvider } from "react-helmet-async";
-import { Provider, Atom } from "jotai";
+import { Provider as JotaiProvider, Atom } from "jotai";
 import { globalScope } from "@src/atoms/globalScope";
 import { DebugAtoms } from "@src/atoms/utils";
 import LocalizationProvider from "@mui/lab/LocalizationProvider";
@@ -29,10 +29,21 @@ export default function Providers({
   initialAtomValues,
 }: IProvidersProps) {
   return (
-    <ErrorBoundary FallbackComponent={ErrorFallback}>
+    <ErrorBoundary
+      fallbackRender={
+        // Can’t use <ErrorFallback> here because it uses useLocation,
+        // which needs to be inside a <Router>
+        ({ error }) => (
+          <div role="alert">
+            <h1>Something went wrong</h1>
+            <p>{error.message}</p>
+          </div>
+        )
+      }
+    >
       <BrowserRouter>
         <HelmetProvider>
-          <Provider
+          <JotaiProvider
             key={globalScope.description}
             scope={globalScope}
             initialValues={initialAtomValues}
@@ -53,7 +64,7 @@ export default function Providers({
                 </RowyThemeProvider>
               </CacheProvider>
             </LocalizationProvider>
-          </Provider>
+          </JotaiProvider>
         </HelmetProvider>
       </BrowserRouter>
     </ErrorBoundary>

From a96b23f38d8c3ca504d09639be3e73584340d5a1 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 18 Jul 2022 13:57:31 +1000
Subject: [PATCH 030/309] Revert "bundle-analyzer"

This reverts commit dd214b96e49cb3e14e3b167e94cd174d67e8bb5f.
---
 craco.config.js |  4 +---
 package.json    |  3 +--
 yarn.lock       | 56 +------------------------------------------------
 3 files changed, 3 insertions(+), 60 deletions(-)

diff --git a/craco.config.js b/craco.config.js
index 1a175a2d..8e921d31 100644
--- a/craco.config.js
+++ b/craco.config.js
@@ -1,8 +1,7 @@
 const { whenDev } = require("@craco/craco");
 const CracoAlias = require("craco-alias");
 const CracoSwcPlugin = require("craco-swc");
-const BundleAnalyzerPlugin =
-  require("webpack-bundle-analyzer").BundleAnalyzerPlugin;
+
 module.exports = {
   plugins: [
     {
@@ -66,7 +65,6 @@ module.exports = {
     },
   },
   webpack: {
-    plugins: [new BundleAnalyzerPlugin({ analyzerMode: "server" })],
     configure: {
       resolve: {
         // Polyfill for monaco-editor-auto-typings
diff --git a/package.json b/package.json
index 0297f513..ff663d09 100644
--- a/package.json
+++ b/package.json
@@ -176,8 +176,7 @@
     "raw-loader": "^4.0.2",
     "source-map-explorer": "^2.5.2",
     "ts-jest": "^28.0.2",
-    "typedoc": "^0.22.17",
-    "webpack-bundle-analyzer": "^4.5.0"
+    "typedoc": "^0.22.17"
   },
   "resolutions": {
     "@types/react": "^18"
diff --git a/yarn.lock b/yarn.lock
index b095480f..da7f9913 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3092,11 +3092,6 @@
     schema-utils "^3.0.0"
     source-map "^0.7.3"
 
-"@polka/url@^1.0.0-next.20":
-  version "1.0.0-next.21"
-  resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1"
-  integrity sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==
-
 "@popperjs/core@^2.11.4":
   version "2.11.5"
   resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.5.tgz#db5a11bf66bdab39569719555b0f76e138d7bd64"
@@ -4393,7 +4388,7 @@ acorn-walk@^7.0.0, acorn-walk@^7.1.1:
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
   integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
 
-acorn-walk@^8.0.0, acorn-walk@^8.1.1:
+acorn-walk@^8.1.1:
   version "8.2.0"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
   integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
@@ -4403,11 +4398,6 @@ acorn@^7.0.0, acorn@^7.1.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-acorn@^8.0.4:
-  version "8.7.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
-  integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==
-
 acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.0:
   version "8.7.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
@@ -9771,11 +9761,6 @@ mri@^1.1.0:
   resolved "https://registry.yarnpkg.com/mri/-/mri-1.2.0.tgz#6721480fec2a11a4889861115a48b6cbe7cc8f0b"
   integrity sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==
 
-mrmime@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-1.0.1.tgz#5f90c825fad4bdd41dc914eff5d1a8cfdaf24f27"
-  integrity sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==
-
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -10075,11 +10060,6 @@ open@^8.0.9, open@^8.4.0:
     is-docker "^2.1.1"
     is-wsl "^2.2.0"
 
-opener@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
-  integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==
-
 optionator@^0.8.1:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
@@ -12266,15 +12246,6 @@ signal-exit@^3.0.2, signal-exit@^3.0.3:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
   integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
 
-sirv@^1.0.7:
-  version "1.0.19"
-  resolved "https://registry.yarnpkg.com/sirv/-/sirv-1.0.19.tgz#1d73979b38c7fe91fcba49c85280daa9c2363b49"
-  integrity sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ==
-  dependencies:
-    "@polka/url" "^1.0.0-next.20"
-    mrmime "^1.0.0"
-    totalist "^1.0.0"
-
 sisteransi@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
@@ -12987,11 +12958,6 @@ toposort@^2.0.2:
   resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330"
   integrity sha1-riF2gXXRVZ1IvvNUILL0li8JwzA=
 
-totalist@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/totalist/-/totalist-1.1.0.tgz#a4d65a3e546517701e3e5c37a47a70ac97fe56df"
-  integrity sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==
-
 tough-cookie@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4"
@@ -13588,21 +13554,6 @@ webidl-conversions@^6.1.0:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
   integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
 
-webpack-bundle-analyzer@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.5.0.tgz#1b0eea2947e73528754a6f9af3e91b2b6e0f79d5"
-  integrity sha512-GUMZlM3SKwS8Z+CKeIFx7CVoHn3dXFcUAjT/dcZQQmfSZGvitPfMob2ipjai7ovFFqPvTqkEZ/leL4O0YOdAYQ==
-  dependencies:
-    acorn "^8.0.4"
-    acorn-walk "^8.0.0"
-    chalk "^4.1.0"
-    commander "^7.2.0"
-    gzip-size "^6.0.0"
-    lodash "^4.17.20"
-    opener "^1.5.2"
-    sirv "^1.0.7"
-    ws "^7.3.1"
-
 webpack-dev-middleware@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.1.tgz#aa079a8dedd7e58bfeab358a9af7dab304cee57f"
@@ -14028,11 +13979,6 @@ ws@>=7.4.6:
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.0.tgz#0b738cd484bfc9303421914b11bb4011e07615bb"
   integrity sha512-uYhVJ/m9oXwEI04iIVmgLmugh2qrZihkywG9y5FfZV2ATeLIzHf93qs+tUNqlttbQK957/VX3mtwAS+UfIwA4g==
 
-ws@^7.3.1:
-  version "7.5.8"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.8.tgz#ac2729881ab9e7cbaf8787fe3469a48c5c7f636a"
-  integrity sha512-ri1Id1WinAX5Jqn9HejiGb8crfRio0Qgu8+MtL36rlTA6RLsMdWt1Az/19A2Qij6uSHUMphEFaTKa4WG+UNHNw==
-
 ws@^7.4.6:
   version "7.5.7"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67"

From 00bc81a4d89e3e1ac4f295588d622625a2d9658a Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 18 Jul 2022 14:01:29 +1000
Subject: [PATCH 031/309] RowyThemeProvider: add Outlet

---
 src/theme/RowyThemeProvider.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/theme/RowyThemeProvider.tsx b/src/theme/RowyThemeProvider.tsx
index 3ca5bf83..5aa69623 100644
--- a/src/theme/RowyThemeProvider.tsx
+++ b/src/theme/RowyThemeProvider.tsx
@@ -1,6 +1,7 @@
 import { useEffect } from "react";
 import { useAtom } from "jotai";
 import { Helmet } from "react-helmet-async";
+import { Outlet } from "react-router-dom";
 
 import { useMediaQuery, ThemeProvider, CssBaseline } from "@mui/material";
 import Favicon from "@src/assets/Favicon";
@@ -55,6 +56,7 @@ export default function RowyThemeProvider({
         <Favicon />
         <CssBaseline />
         {children}
+        <Outlet />
       </ThemeProvider>
     </>
   );

From 264a838a21fa2efe9cb1c7b0e4def60cefa8969e Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 18 Jul 2022 14:22:56 +1000
Subject: [PATCH 032/309] favicon.svg: add viewBox

---
 src/assets/favicon.svg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/favicon.svg b/src/assets/favicon.svg
index 91ab2bc1..81a0586d 100644
--- a/src/assets/favicon.svg
+++ b/src/assets/favicon.svg
@@ -1,4 +1,4 @@
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg">
+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
   <path
     d="M13 0a3 3 0 010 6l-2-.001V6H6v7a3 3 0 01-6 0V3a3 3 0 015.501-1.657A2.989 2.989 0 018 0h5zM5 11H1v2a2 2 0 001.85 1.995L3 15a2 2 0 001.995-1.85L5 13v-2zm0-5H1v4h4V6zM3 1a2 2 0 00-1.995 1.85L1 3v2h4V3a2 2 0 00-1.85-1.995L3 1zm8.001 0v4H13a2 2 0 001.995-1.85L15 3a2 2 0 00-1.85-1.995L13 1h-1.999zM10 1H8a2 2 0 00-1.995 1.85L6 3v2h4V1z"
     fill="currentColor" fill-rule="nonzero" />

From 802499708a4ec94a42f427b745e68e6f0b51feab Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 18 Jul 2022 14:40:46 +1000
Subject: [PATCH 033/309] =?UTF-8?q?globalScope=20=E2=86=92=20projectScope?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.tsx                                   |  8 +++----
 src/Providers.tsx                             |  8 +++----
 .../{globalScope => projectScope}/auth.ts     |  0
 .../{globalScope => projectScope}/index.ts    |  2 +-
 .../{globalScope => projectScope}/project.ts  |  2 +-
 .../{globalScope => projectScope}/rowyRun.ts  |  2 +-
 src/atoms/{globalScope => projectScope}/ui.ts |  6 ++---
 .../{globalScope => projectScope}/user.ts     |  0
 src/atoms/tableScope/rowActions.test.ts       |  2 +-
 src/atoms/tableScope/rowActions.ts            |  2 +-
 src/atoms/tableScope/ui.ts                    |  8 +++----
 src/components/AccessDenied.tsx               |  8 +++----
 .../CodeEditor/CodeEditorHelper.tsx           |  4 ++--
 .../CodeEditor/useMonacoCustomizations.ts     |  4 ++--
 src/components/ColumnMenu/ColumnMenu.tsx      | 16 +++++++-------
 .../ColumnConfigModal/ColumnConfig.tsx        |  8 +++----
 .../ColumnConfigModal/DefaultValueInput.tsx   |  8 +++----
 .../ColumnModals/NewColumnModal.tsx           |  4 ++--
 src/components/ConfirmDialog.tsx              |  4 ++--
 src/components/FirebaseUi.tsx                 |  6 ++---
 .../GetStartedChecklist.tsx                   |  8 +++----
 src/components/RowyRunModal.tsx               | 10 ++++-----
 .../Settings/ProjectSettings/About.tsx        |  4 ++--
 .../Settings/UserManagement/InviteUser.tsx    | 12 +++++-----
 .../Settings/UserManagement/UserItem.tsx      | 16 +++++++-------
 .../Settings/UserSettings/Theme.tsx           |  8 +++----
 src/components/Setup/SignInWithGoogle.tsx     |  4 ++--
 src/components/Setup/Steps/StepFinish.tsx     |  4 ++--
 src/components/Setup/Steps/StepRules.tsx      |  4 ++--
 .../Setup/Steps/StepStorageRules.tsx          |  4 ++--
 src/components/Setup/Steps/StepWelcome.tsx    |  4 ++--
 src/components/SideDrawer/FieldWrapper.tsx    |  8 +++----
 src/components/SideDrawer/SideDrawer.tsx      |  4 ++--
 .../SideDrawer/SideDrawerFields.tsx           |  8 +++----
 src/components/Table/BreadcrumbsSubTable.tsx  |  4 ++--
 src/components/Table/BreadcrumbsTableRoot.tsx | 10 ++++-----
 .../Table/ColumnHeader/ColumnHeader.tsx       |  8 +++----
 src/components/Table/ColumnSelect.tsx         |  4 ++--
 .../Table/ContextMenu/MenuContents.tsx        | 14 ++++++------
 src/components/Table/FinalColumnHeader.tsx    |  4 ++--
 src/components/Table/OutOfOrderIndicator.tsx  |  6 ++---
 src/components/Table/Table.tsx                |  8 +++----
 src/components/Table/TableSkeleton.tsx        |  4 ++--
 .../Table/formatters/FinalColumn.tsx          | 12 +++++-----
 .../CloudLogsModal/BuildLogs/useBuildLogs.ts  |  4 ++--
 .../CloudLogsModal/CloudLogsModal.tsx         | 10 ++++-----
 .../TableModals/CloudLogsModal/utils.ts       |  2 +-
 .../TableModals/ExportModal/ExportModal.tsx   |  4 ++--
 .../ExtensionsModal/ExtensionMigration.tsx    |  4 ++--
 .../ExtensionsModal/ExtensionModal.tsx        |  4 ++--
 .../ExtensionsModal/ExtensionsModal.tsx       | 10 ++++-----
 .../ExtensionsModal/Step1Triggers.tsx         |  6 ++---
 .../TableModals/WebhooksModal/WebhookList.tsx |  4 ++--
 .../WebhooksModal/WebhookModal.tsx            |  8 +++----
 .../WebhooksModal/WebhooksModal.tsx           | 14 ++++++------
 .../ActionsMenu/ActionsMenu.tsx               |  6 ++---
 .../ActionsMenu/ExportSettings.tsx            |  6 ++---
 .../ActionsMenu/ImportSettings.tsx            | 10 ++++-----
 .../TableSettingsDialog/DeleteMenu.tsx        | 10 ++++-----
 .../TableSettingsDialog/SuggestedRules.tsx    |  4 ++--
 .../TableSettingsDialog.tsx                   | 18 +++++++--------
 src/components/TableSettingsDialog/form.tsx   |  2 +-
 src/components/TableToolbar/AddRow.tsx        |  8 +++----
 .../TableToolbar/Filters/Filters.tsx          | 10 ++++-----
 src/components/TableToolbar/HiddenFields.tsx  |  8 +++----
 src/components/TableToolbar/ImportCsv.tsx     |  4 ++--
 src/components/TableToolbar/ReExecute.tsx     | 10 ++++-----
 src/components/TableToolbar/TableSettings.tsx |  4 ++--
 src/components/TableToolbar/TableToolbar.tsx  | 12 +++++-----
 .../TableTutorial/TableTutorial.tsx           |  4 ++--
 src/components/fields/Action/ActionFab.tsx    | 10 ++++-----
 src/components/fields/Action/Settings.tsx     | 12 +++++-----
 src/components/fields/Checkbox/TableCell.tsx  |  4 ++--
 .../ConnectTable/ConnectTableSelect.tsx       |  4 ++--
 .../fields/ConnectTable/Settings.tsx          | 12 +++++-----
 .../fields/Connector/Select/PopupContents.tsx |  4 ++--
 .../fields/Derivative/ContextMenuActions.tsx  |  4 ++--
 src/components/fields/Derivative/Settings.tsx | 10 ++++-----
 .../fields/File/SideDrawerField.tsx           |  4 ++--
 src/components/fields/File/TableCell.tsx      |  4 ++--
 .../fields/Image/SideDrawerField.tsx          |  4 ++--
 src/components/fields/Image/TableCell.tsx     |  4 ++--
 .../fields/Json/SideDrawerField.tsx           |  4 ++--
 src/components/fields/Reference/BasicCell.tsx |  4 ++--
 .../fields/Reference/EditorCell.tsx           |  4 ++--
 .../fields/Reference/SideDrawerField.tsx      |  6 ++---
 src/hooks/useFirebaseStorageUploader.tsx      |  4 ++--
 src/hooks/useFirestoreCollectionWithAtom.ts   |  6 ++---
 src/hooks/useFirestoreDocWithAtom.ts          |  6 ++---
 src/hooks/useUpdateCheck.ts                   |  8 +++----
 src/layouts/AuthLayout.tsx                    |  4 ++--
 src/layouts/Navigation/NavDrawer.tsx          | 12 +++++-----
 src/layouts/Navigation/Navigation.tsx         |  8 +++----
 src/layouts/Navigation/SettingsNav.tsx        |  4 ++--
 src/layouts/Navigation/TopBar.tsx             |  4 ++--
 src/layouts/Navigation/UpdateCheckBadge.tsx   |  4 ++--
 src/layouts/Navigation/UserMenu.tsx           | 12 +++++-----
 src/layouts/RequireAuth.tsx                   |  4 ++--
 src/pages/Auth/ImpersonatorAuthPage.tsx       |  6 ++---
 src/pages/Auth/JwtAuthPage.tsx                |  4 ++--
 src/pages/Auth/SignOutPage.tsx                |  4 ++--
 src/pages/FunctionPage.tsx                    |  4 ++--
 src/pages/FunctionsPage.tsx                   | 16 +++++++-------
 src/pages/NotFoundPage.tsx                    |  4 ++--
 src/pages/Settings/DebugSettingsPage.tsx      | 12 +++++-----
 src/pages/Settings/MembersPage.tsx            |  4 ++--
 src/pages/Settings/ProjectSettingsPage.tsx    | 12 +++++-----
 src/pages/Settings/UserSettingsPage.tsx       | 10 ++++-----
 src/pages/Table/ProvidedSubTablePage.tsx      |  4 ++--
 src/pages/Table/ProvidedTablePage.tsx         |  8 +++----
 src/pages/Table/TableTutorialPage.tsx         |  4 ++--
 src/pages/TablesPage.tsx                      | 16 +++++++-------
 src/pages/Test/JotaiTestPage.tsx              | 22 +++++++++----------
 src/pages/Test/TableTestPage.tsx              |  6 ++---
 src/sources/FunctionsSourceFirestore.tsx      |  6 ++---
 src/sources/MembersSourceFirebase.tsx         |  6 ++---
 .../ProjectSourceFirebase.tsx                 |  8 +++----
 .../ProjectSourceFirebase/useAuthUser.ts      | 12 +++++-----
 .../ProjectSourceFirebase/useSettingsDocs.ts  | 12 +++++-----
 .../useTableFunctions.ts                      | 16 +++++++-------
 .../TableSourceFirestore.tsx                  |  2 +-
 .../TableSourceFirestore/useAuditChange.ts    | 10 ++++-----
 .../TableSourceFirestore/useBulkWriteDb.ts    |  4 ++--
 src/test/testUtils.tsx                        |  4 ++--
 src/theme/RowyThemeProvider.tsx               | 10 ++++-----
 125 files changed, 428 insertions(+), 428 deletions(-)
 rename src/atoms/{globalScope => projectScope}/auth.ts (100%)
 rename src/atoms/{globalScope => projectScope}/index.ts (77%)
 rename src/atoms/{globalScope => projectScope}/project.ts (99%)
 rename src/atoms/{globalScope => projectScope}/rowyRun.ts (98%)
 rename src/atoms/{globalScope => projectScope}/ui.ts (96%)
 rename src/atoms/{globalScope => projectScope}/user.ts (100%)

diff --git a/src/App.tsx b/src/App.tsx
index a4aeaf12..4ce92835 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -10,10 +10,10 @@ import NotFound from "@src/pages/NotFoundPage";
 import RequireAuth from "@src/layouts/RequireAuth";
 
 import {
-  globalScope,
+  projectScope,
   currentUserAtom,
   altPressAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import { ROUTES } from "@src/constants/routes";
 import useKeyPressWithAtom from "@src/hooks/useKeyPressWithAtom";
 
@@ -63,8 +63,8 @@ const ThemeTestPage = lazy(() => import("@src/pages/Test/ThemeTestPage" /* webpa
 // const RowyRunTestPage = lazy(() => import("@src/pages/RowyRunTestPage" /* webpackChunkName: "RowyRunTestPage" */));
 
 export default function App() {
-  const [currentUser] = useAtom(currentUserAtom, globalScope);
-  useKeyPressWithAtom("Alt", altPressAtom, globalScope);
+  const [currentUser] = useAtom(currentUserAtom, projectScope);
+  useKeyPressWithAtom("Alt", altPressAtom, projectScope);
 
   return (
     <Suspense fallback={<Loading fullScreen />}>
diff --git a/src/Providers.tsx b/src/Providers.tsx
index 3f591251..4bb24f48 100644
--- a/src/Providers.tsx
+++ b/src/Providers.tsx
@@ -4,7 +4,7 @@ import ErrorFallback from "@src/components/ErrorFallback";
 import { BrowserRouter } from "react-router-dom";
 import { HelmetProvider } from "react-helmet-async";
 import { Provider as JotaiProvider, Atom } from "jotai";
-import { globalScope } from "@src/atoms/globalScope";
+import { projectScope } from "@src/atoms/projectScope";
 import { DebugAtoms } from "@src/atoms/utils";
 import LocalizationProvider from "@mui/lab/LocalizationProvider";
 import AdapterDateFns from "@mui/lab/AdapterDateFns";
@@ -44,11 +44,11 @@ export default function Providers({
       <BrowserRouter>
         <HelmetProvider>
           <JotaiProvider
-            key={globalScope.description}
-            scope={globalScope}
+            key={projectScope.description}
+            scope={projectScope}
             initialValues={initialAtomValues}
           >
-            <DebugAtoms scope={globalScope} />
+            <DebugAtoms scope={projectScope} />
             <LocalizationProvider dateAdapter={AdapterDateFns}>
               <CacheProvider value={muiCache}>
                 <RowyThemeProvider>
diff --git a/src/atoms/globalScope/auth.ts b/src/atoms/projectScope/auth.ts
similarity index 100%
rename from src/atoms/globalScope/auth.ts
rename to src/atoms/projectScope/auth.ts
diff --git a/src/atoms/globalScope/index.ts b/src/atoms/projectScope/index.ts
similarity index 77%
rename from src/atoms/globalScope/index.ts
rename to src/atoms/projectScope/index.ts
index aed968a4..0385906c 100644
--- a/src/atoms/globalScope/index.ts
+++ b/src/atoms/projectScope/index.ts
@@ -1,5 +1,5 @@
 /** Scope for atoms stored at the root of the app */
-export const globalScope = Symbol("globalScope");
+export const projectScope = Symbol("projectScope");
 
 export * from "./auth";
 export * from "./project";
diff --git a/src/atoms/globalScope/project.ts b/src/atoms/projectScope/project.ts
similarity index 99%
rename from src/atoms/globalScope/project.ts
rename to src/atoms/projectScope/project.ts
index 82b9c0d2..4295a897 100644
--- a/src/atoms/globalScope/project.ts
+++ b/src/atoms/projectScope/project.ts
@@ -60,7 +60,7 @@ export const projectSettingsAtom = atom<ProjectSettings>({});
  *
  * @example Basic usage:
  * ```
- * const [updateProjectSettings] = useAtom(updateProjectSettingsAtom, globalScope);
+ * const [updateProjectSettings] = useAtom(updateProjectSettingsAtom, projectScope);
  * if (updateProjectSettings) updateProjectSettings({ ... });
  * ```
  */
diff --git a/src/atoms/globalScope/rowyRun.ts b/src/atoms/projectScope/rowyRun.ts
similarity index 98%
rename from src/atoms/globalScope/rowyRun.ts
rename to src/atoms/projectScope/rowyRun.ts
index 7ca9cf94..1699be63 100644
--- a/src/atoms/globalScope/rowyRun.ts
+++ b/src/atoms/projectScope/rowyRun.ts
@@ -51,7 +51,7 @@ export interface IRowyRunRequestProps {
  *
  * @example Basic usage:
  * ```
- * const [rowyRun] = useAtom(rowyRunAtom, globalScope);
+ * const [rowyRun] = useAtom(rowyRunAtom, projectScope);
  * ...
  * await rowyRun(...);
  * ```
diff --git a/src/atoms/globalScope/ui.ts b/src/atoms/projectScope/ui.ts
similarity index 96%
rename from src/atoms/globalScope/ui.ts
rename to src/atoms/projectScope/ui.ts
index ba6275fb..9d7c8281 100644
--- a/src/atoms/globalScope/ui.ts
+++ b/src/atoms/projectScope/ui.ts
@@ -53,7 +53,7 @@ export type ConfirmDialogProps = {
  *
  * @example Basic usage:
  * ```
- * const confirm = useSetAtom(confirmDialogAtom, globalScope);
+ * const confirm = useSetAtom(confirmDialogAtom, projectScope);
  * confirm({ handleConfirm: () => ... });
  * ```
  */
@@ -79,7 +79,7 @@ export type RowyRunModalState = {
  *
  * @example Basic usage:
  * ```
- * const openRowyRunModal = useSetAtom(rowyRunModalAtom, globalScope);
+ * const openRowyRunModal = useSetAtom(rowyRunModalAtom, projectScope);
  * openRowyRunModal({ feature: ... , version: ... });
  * ```
  *
@@ -111,7 +111,7 @@ export type TableSettingsDialogState = {
  *
  * @example Basic usage:
  * ```
- * const openTableSettingsDialog = useSetAtom(tableSettingsDialogAtom, globalScope);
+ * const openTableSettingsDialog = useSetAtom(tableSettingsDialogAtom, projectScope);
  * openTableSettingsDialog({ data: ... });
  * ```
  *
diff --git a/src/atoms/globalScope/user.ts b/src/atoms/projectScope/user.ts
similarity index 100%
rename from src/atoms/globalScope/user.ts
rename to src/atoms/projectScope/user.ts
diff --git a/src/atoms/tableScope/rowActions.test.ts b/src/atoms/tableScope/rowActions.test.ts
index 9d6d1eeb..fe35d654 100644
--- a/src/atoms/tableScope/rowActions.test.ts
+++ b/src/atoms/tableScope/rowActions.test.ts
@@ -4,7 +4,7 @@ import { useAtomValue, useSetAtom } from "jotai";
 import { useAtomCallback } from "jotai/utils";
 import { find, findIndex, sortBy } from "lodash-es";
 
-import { currentUserAtom } from "@src/atoms/globalScope";
+import { currentUserAtom } from "@src/atoms/projectScope";
 import {
   tableScope,
   tableSettingsAtom,
diff --git a/src/atoms/tableScope/rowActions.ts b/src/atoms/tableScope/rowActions.ts
index 3abbf516..f5225ca4 100644
--- a/src/atoms/tableScope/rowActions.ts
+++ b/src/atoms/tableScope/rowActions.ts
@@ -8,7 +8,7 @@ import {
   unset,
 } from "lodash-es";
 
-import { currentUserAtom } from "@src/atoms/globalScope";
+import { currentUserAtom } from "@src/atoms/projectScope";
 import {
   auditChangeAtom,
   tableSettingsAtom,
diff --git a/src/atoms/tableScope/ui.ts b/src/atoms/tableScope/ui.ts
index 0b03051f..287aa5b0 100644
--- a/src/atoms/tableScope/ui.ts
+++ b/src/atoms/tableScope/ui.ts
@@ -10,7 +10,7 @@ import { SEVERITY_LEVELS } from "@src/components/TableModals/CloudLogsModal/Clou
  *
  * @example Basic usage:
  * ```
- * const openColumnMenu = useSetAtom(columnMenuAtom, globalScope);
+ * const openColumnMenu = useSetAtom(columnMenuAtom, projectScope);
  * openColumnMenu({ column, anchorEl: ... });
  * ```
  *
@@ -30,7 +30,7 @@ export const columnMenuAtom = atom<{
  *
  * @example Basic usage:
  * ```
- * const openColumnModal = useSetAtom(columnModalAtom, globalScope);
+ * const openColumnModal = useSetAtom(columnModalAtom, projectScope);
  * openColumnModal({ type: "...", column });
  * ```
  *
@@ -56,7 +56,7 @@ export type TableFiltersPopoverState = {
  *
  * @example Basic usage:
  * ```
- * const openTableFiltersPopover = useSetAtom(tableFiltersPopoverAtom, globalScope);
+ * const openTableFiltersPopover = useSetAtom(tableFiltersPopoverAtom, projectScope);
  * openTableFiltersPopover({ query: ... });
  * ```
  *
@@ -84,7 +84,7 @@ export const sideDrawerShowHiddenFieldsAtom = atomWithStorage(
  *
  * @example Basic usage:
  * ```
- * const openTableModal = useSetAtom(tableModalAtom, globalScope);
+ * const openTableModal = useSetAtom(tableModalAtom, projectScope);
  * openTableModal("...");
  * ```
  *
diff --git a/src/components/AccessDenied.tsx b/src/components/AccessDenied.tsx
index 5577e0e5..fbc0b81f 100644
--- a/src/components/AccessDenied.tsx
+++ b/src/components/AccessDenied.tsx
@@ -16,16 +16,16 @@ import SecurityIcon from "@mui/icons-material/SecurityOutlined";
 import EmptyState from "@src/components/EmptyState";
 
 import {
-  globalScope,
+  projectScope,
   currentUserAtom,
   userRolesAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import { WIKI_LINKS } from "@src/constants/externalLinks";
 import { ROUTES } from "@src/constants/routes";
 
 export default function AccessDenied({ resetErrorBoundary }: FallbackProps) {
-  const [currentUser] = useAtom(currentUserAtom, globalScope);
-  const [userRoles] = useAtom(userRolesAtom, globalScope);
+  const [currentUser] = useAtom(currentUserAtom, projectScope);
+  const [userRoles] = useAtom(userRolesAtom, projectScope);
 
   if (!currentUser) window.location.reload();
 
diff --git a/src/components/CodeEditor/CodeEditorHelper.tsx b/src/components/CodeEditor/CodeEditorHelper.tsx
index 5360f336..0b816c36 100644
--- a/src/components/CodeEditor/CodeEditorHelper.tsx
+++ b/src/components/CodeEditor/CodeEditorHelper.tsx
@@ -5,7 +5,7 @@ import SecretsIcon from "@mui/icons-material/VpnKeyOutlined";
 import FunctionsIcon from "@mui/icons-material/CloudOutlined";
 import DocsIcon from "@mui/icons-material/DescriptionOutlined";
 
-import { globalScope, projectIdAtom } from "@src/atoms/globalScope";
+import { projectScope, projectIdAtom } from "@src/atoms/projectScope";
 
 export interface ICodeEditorHelperProps {
   docLink: string;
@@ -19,7 +19,7 @@ export default function CodeEditorHelper({
   docLink,
   additionalVariables,
 }: ICodeEditorHelperProps) {
-  const [projectId] = useAtom(projectIdAtom, globalScope);
+  const [projectId] = useAtom(projectIdAtom, projectScope);
 
   const availableVariables = [
     {
diff --git a/src/components/CodeEditor/useMonacoCustomizations.ts b/src/components/CodeEditor/useMonacoCustomizations.ts
index 3b023fcc..73b2bd53 100644
--- a/src/components/CodeEditor/useMonacoCustomizations.ts
+++ b/src/components/CodeEditor/useMonacoCustomizations.ts
@@ -30,7 +30,7 @@ import utilsDefs from "!!raw-loader!./utils.d.ts";
 import rowyUtilsDefs from "!!raw-loader!./rowy.d.ts";
 import extensionsDefs from "!!raw-loader!./extensions.d.ts";
 import { runRoutes } from "@src/constants/runRoutes";
-import { rowyRunAtom, globalScope } from "@src/atoms/globalScope";
+import { rowyRunAtom, projectScope } from "@src/atoms/projectScope";
 import { getFieldProp } from "@src/components/fields";
 
 export interface IUseMonacoCustomizationsProps {
@@ -63,7 +63,7 @@ export default function useMonacoCustomizations({
   const theme = useTheme();
   const monaco = useMonaco();
   const [tableRows] = useAtom(tableRowsAtom, tableScope);
-  const [rowyRun] = useAtom(rowyRunAtom, globalScope);
+  const [rowyRun] = useAtom(rowyRunAtom, projectScope);
   const [tableColumnsOrdered] = useAtom(tableColumnsOrderedAtom, tableScope);
   useEffect(() => {
     return () => {
diff --git a/src/components/ColumnMenu/ColumnMenu.tsx b/src/components/ColumnMenu/ColumnMenu.tsx
index 1bfde791..ea394bba 100644
--- a/src/components/ColumnMenu/ColumnMenu.tsx
+++ b/src/components/ColumnMenu/ColumnMenu.tsx
@@ -31,14 +31,14 @@ import MenuContents, { IMenuContentsProps } from "./MenuContents";
 import ColumnHeader from "@src/components/Table/Column";
 
 import {
-  globalScope,
+  projectScope,
   userRolesAtom,
   userSettingsAtom,
   updateUserSettingsAtom,
   confirmDialogAtom,
   rowyRunAtom,
   altPressAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import {
   tableScope,
   tableIdAtom,
@@ -74,11 +74,11 @@ export interface IMenuModalProps {
 }
 
 export default function ColumnMenu() {
-  const [userRoles] = useAtom(userRolesAtom, globalScope);
-  const [userSettings] = useAtom(userSettingsAtom, globalScope);
-  const [updateUserSettings] = useAtom(updateUserSettingsAtom, globalScope);
-  const confirm = useSetAtom(confirmDialogAtom, globalScope);
-  const [rowyRun] = useAtom(rowyRunAtom, globalScope);
+  const [userRoles] = useAtom(userRolesAtom, projectScope);
+  const [userSettings] = useAtom(userSettingsAtom, projectScope);
+  const [updateUserSettings] = useAtom(updateUserSettingsAtom, projectScope);
+  const confirm = useSetAtom(confirmDialogAtom, projectScope);
+  const [rowyRun] = useAtom(rowyRunAtom, projectScope);
   const [tableId] = useAtom(tableIdAtom, tableScope);
   const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
   const updateColumn = useSetAtom(updateColumnAtom, tableScope);
@@ -92,7 +92,7 @@ export default function ColumnMenu() {
   );
   const [tableNextPage] = useAtom(tableNextPageAtom, tableScope);
 
-  const [altPress] = useAtom(altPressAtom, globalScope);
+  const [altPress] = useAtom(altPressAtom, projectScope);
   const { enqueueSnackbar, closeSnackbar } = useSnackbar();
 
   if (!columnMenu) return null;
diff --git a/src/components/ColumnModals/ColumnConfigModal/ColumnConfig.tsx b/src/components/ColumnModals/ColumnConfigModal/ColumnConfig.tsx
index f0f43a12..072c22e9 100644
--- a/src/components/ColumnModals/ColumnConfigModal/ColumnConfig.tsx
+++ b/src/components/ColumnModals/ColumnConfigModal/ColumnConfig.tsx
@@ -13,10 +13,10 @@ import { InlineErrorFallback } from "@src/components/ErrorFallback";
 import Loading from "@src/components/Loading";
 
 import {
-  globalScope,
+  projectScope,
   rowyRunAtom,
   confirmDialogAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import {
   tableScope,
   tableSettingsAtom,
@@ -35,10 +35,10 @@ export default function ColumnConfigModal({
   onClose,
   column,
 }: IColumnModalProps) {
-  const [rowyRun] = useAtom(rowyRunAtom, globalScope);
+  const [rowyRun] = useAtom(rowyRunAtom, projectScope);
   const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
   const updateColumn = useSetAtom(updateColumnAtom, tableScope);
-  const confirm = useSetAtom(confirmDialogAtom, globalScope);
+  const confirm = useSetAtom(confirmDialogAtom, projectScope);
   const { enqueueSnackbar, closeSnackbar } = useSnackbar();
   const snackLogContext = useSnackLogContext();
 
diff --git a/src/components/ColumnModals/ColumnConfigModal/DefaultValueInput.tsx b/src/components/ColumnModals/ColumnConfigModal/DefaultValueInput.tsx
index 8ca2925b..52ff712a 100644
--- a/src/components/ColumnModals/ColumnConfigModal/DefaultValueInput.tsx
+++ b/src/components/ColumnModals/ColumnConfigModal/DefaultValueInput.tsx
@@ -14,10 +14,10 @@ import { WIKI_LINKS } from "@src/constants/externalLinks";
 /* eslint-disable import/no-webpack-loader-syntax */
 import defaultValueDefs from "!!raw-loader!./defaultValue.d.ts";
 import {
-  globalScope,
+  projectScope,
   compatibleRowyRunVersionAtom,
   projectSettingsAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import { ColumnConfig } from "@src/types/table";
 
 const CodeEditorComponent = lazy(
@@ -40,7 +40,7 @@ interface ICodeEditorProps {
 function CodeEditor({ type, column, handleChange }: ICodeEditorProps) {
   const [compatibleRowyRunVersion] = useAtom(
     compatibleRowyRunVersionAtom,
-    globalScope
+    projectScope
   );
 
   const functionBodyOnly = compatibleRowyRunVersion!({ maxVersion: "1.3.10" });
@@ -92,7 +92,7 @@ export default function DefaultValueInput({
   handleChange,
   column,
 }: IDefaultValueInputProps) {
-  const [projectSettings] = useAtom(projectSettingsAtom, globalScope);
+  const [projectSettings] = useAtom(projectSettingsAtom, projectScope);
 
   const _type =
     column.type !== FieldType.derivative
diff --git a/src/components/ColumnModals/NewColumnModal.tsx b/src/components/ColumnModals/NewColumnModal.tsx
index c77d8850..7bbe8003 100644
--- a/src/components/ColumnModals/NewColumnModal.tsx
+++ b/src/components/ColumnModals/NewColumnModal.tsx
@@ -8,7 +8,7 @@ import { TextField, Typography, Button } from "@mui/material";
 import Modal from "@src/components/Modal";
 import FieldsDropdown from "./FieldsDropdown";
 
-import { globalScope, updateTableAtom } from "@src/atoms/globalScope";
+import { projectScope, updateTableAtom } from "@src/atoms/projectScope";
 import {
   tableScope,
   tableSettingsAtom,
@@ -29,7 +29,7 @@ const AUDIT_FIELD_TYPES = [
 export default function NewColumnModal({
   onClose,
 }: Pick<IColumnModalProps, "onClose">) {
-  const [updateTable] = useAtom(updateTableAtom, globalScope);
+  const [updateTable] = useAtom(updateTableAtom, projectScope);
   const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
   const addColumn = useSetAtom(addColumnAtom, tableScope);
   const [columnModal, setColumnModal] = useAtom(columnModalAtom, tableScope);
diff --git a/src/components/ConfirmDialog.tsx b/src/components/ConfirmDialog.tsx
index 9fb9b846..dd37b76d 100644
--- a/src/components/ConfirmDialog.tsx
+++ b/src/components/ConfirmDialog.tsx
@@ -12,7 +12,7 @@ import {
 } from "@mui/material";
 
 import { SlideTransitionMui } from "@src/components/Modal/SlideTransition";
-import { globalScope, confirmDialogAtom } from "@src/atoms/globalScope";
+import { projectScope, confirmDialogAtom } from "@src/atoms/projectScope";
 
 /**
  * Display a confirm dialog using `confirmDialogAtom` in `globalState`
@@ -39,7 +39,7 @@ export default function ConfirmDialog() {
       buttonLayout = "horizontal",
     },
     setState,
-  ] = useAtom(confirmDialogAtom, globalScope);
+  ] = useAtom(confirmDialogAtom, projectScope);
   const handleClose = () => setState({ open: false });
 
   const [dryText, setDryText] = useState("");
diff --git a/src/components/FirebaseUi.tsx b/src/components/FirebaseUi.tsx
index 08c26f92..e9e7744e 100644
--- a/src/components/FirebaseUi.tsx
+++ b/src/components/FirebaseUi.tsx
@@ -9,7 +9,7 @@ import { makeStyles } from "tss-react/mui";
 import { Typography } from "@mui/material";
 import { alpha } from "@mui/material/styles";
 
-import { globalScope, publicSettingsAtom } from "@src/atoms/globalScope";
+import { projectScope, publicSettingsAtom } from "@src/atoms/projectScope";
 import { firebaseAuthAtom } from "@src/sources/ProjectSourceFirebase";
 import { defaultUiConfig, getSignInOptions } from "@src/config/firebaseui";
 
@@ -217,8 +217,8 @@ export interface IFirebaseUiProps {
 
 export default function FirebaseUi(props: IFirebaseUiProps) {
   const { classes, cx } = useStyles();
-  const [firebaseAuth] = useAtom(firebaseAuthAtom, globalScope);
-  const [publicSettings] = useAtom(publicSettingsAtom, globalScope);
+  const [firebaseAuth] = useAtom(firebaseAuthAtom, projectScope);
+  const [publicSettings] = useAtom(publicSettingsAtom, projectScope);
 
   const signInOptions: typeof publicSettings.signInOptions = useMemo(
     () =>
diff --git a/src/components/GetStartedChecklist/GetStartedChecklist.tsx b/src/components/GetStartedChecklist/GetStartedChecklist.tsx
index 9ae90fa2..f68c60f0 100644
--- a/src/components/GetStartedChecklist/GetStartedChecklist.tsx
+++ b/src/components/GetStartedChecklist/GetStartedChecklist.tsx
@@ -12,10 +12,10 @@ import SteppedAccordion from "@src/components/SteppedAccordion";
 import StepsProgress from "@src/components/StepsProgress";
 
 import {
-  globalScope,
+  projectScope,
   getStartedChecklistAtom,
   tableSettingsDialogAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import {
   NAV_DRAWER_WIDTH,
   NAV_DRAWER_COLLAPSED_WIDTH,
@@ -31,10 +31,10 @@ export default function GetStartedChecklist({
   navPermanent,
   ...props
 }: IGetStartedChecklistProps) {
-  const [open, setOpen] = useAtom(getStartedChecklistAtom, globalScope);
+  const [open, setOpen] = useAtom(getStartedChecklistAtom, projectScope);
   const openTableSettingsDialog = useSetAtom(
     tableSettingsDialogAtom,
-    globalScope
+    projectScope
   );
 
   if (!open) return null;
diff --git a/src/components/RowyRunModal.tsx b/src/components/RowyRunModal.tsx
index f801eb9c..290fa931 100644
--- a/src/components/RowyRunModal.tsx
+++ b/src/components/RowyRunModal.tsx
@@ -13,11 +13,11 @@ import Logo from "@src/assets/LogoRowyRun";
 import InlineOpenInNewIcon from "@src/components/InlineOpenInNewIcon";
 
 import {
-  globalScope,
+  projectScope,
   userRolesAtom,
   projectSettingsAtom,
   rowyRunModalAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import { ROUTES } from "@src/constants/routes";
 import { WIKI_LINKS } from "@src/constants/externalLinks";
 
@@ -27,11 +27,11 @@ import { WIKI_LINKS } from "@src/constants/externalLinks";
  * @see {@link rowyRunModalAtom | Usage example}
  */
 export default function RowyRunModal() {
-  const [userRoles] = useAtom(userRolesAtom, globalScope);
-  const [projectSettings] = useAtom(projectSettingsAtom, globalScope);
+  const [userRoles] = useAtom(userRolesAtom, projectScope);
+  const [projectSettings] = useAtom(projectSettingsAtom, projectScope);
   const [rowyRunModal, setRowyRunModal] = useAtom(
     rowyRunModalAtom,
-    globalScope
+    projectScope
   );
 
   const handleClose = () => setRowyRunModal({ ...rowyRunModal, open: false });
diff --git a/src/components/Settings/ProjectSettings/About.tsx b/src/components/Settings/ProjectSettings/About.tsx
index a2bedd65..28fd206f 100644
--- a/src/components/Settings/ProjectSettings/About.tsx
+++ b/src/components/Settings/ProjectSettings/About.tsx
@@ -10,12 +10,12 @@ import Logo from "@src/assets/Logo";
 import InlineOpenInNewIcon from "@src/components/InlineOpenInNewIcon";
 
 import meta from "@root/package.json";
-import { globalScope, projectIdAtom } from "@src/atoms/globalScope";
+import { projectScope, projectIdAtom } from "@src/atoms/projectScope";
 import useUpdateCheck from "@src/hooks/useUpdateCheck";
 import { EXTERNAL_LINKS, WIKI_LINKS } from "@src/constants/externalLinks";
 
 export default function About() {
-  const [projectId] = useAtom(projectIdAtom, globalScope);
+  const [projectId] = useAtom(projectIdAtom, projectScope);
 
   const [latestUpdate, checkForUpdates, loading] = useUpdateCheck();
 
diff --git a/src/components/Settings/UserManagement/InviteUser.tsx b/src/components/Settings/UserManagement/InviteUser.tsx
index dc6e1414..a0062324 100644
--- a/src/components/Settings/UserManagement/InviteUser.tsx
+++ b/src/components/Settings/UserManagement/InviteUser.tsx
@@ -16,20 +16,20 @@ import MultiSelect from "@rowy/multiselect";
 import Modal from "@src/components/Modal";
 
 import {
-  globalScope,
+  projectScope,
   projectRolesAtom,
   projectSettingsAtom,
   rowyRunAtom,
   rowyRunModalAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import { ROUTES } from "@src/constants/routes";
 import { runRoutes } from "@src/constants/runRoutes";
 
 export default function InviteUser() {
-  const [projectRoles] = useAtom(projectRolesAtom, globalScope);
-  const [projectSettings] = useAtom(projectSettingsAtom, globalScope);
-  const [rowyRun] = useAtom(rowyRunAtom, globalScope);
-  const openRowyRunModal = useSetAtom(rowyRunModalAtom, globalScope);
+  const [projectRoles] = useAtom(projectRolesAtom, projectScope);
+  const [projectSettings] = useAtom(projectSettingsAtom, projectScope);
+  const [rowyRun] = useAtom(rowyRunAtom, projectScope);
+  const openRowyRunModal = useSetAtom(rowyRunModalAtom, projectScope);
   const { enqueueSnackbar } = useSnackbar();
 
   const [open, setOpen] = useState(false);
diff --git a/src/components/Settings/UserManagement/UserItem.tsx b/src/components/Settings/UserManagement/UserItem.tsx
index 2c87108b..5415088c 100644
--- a/src/components/Settings/UserManagement/UserItem.tsx
+++ b/src/components/Settings/UserManagement/UserItem.tsx
@@ -17,7 +17,7 @@ import DeleteIcon from "@mui/icons-material/DeleteOutlined";
 import MultiSelect from "@rowy/multiselect";
 
 import {
-  globalScope,
+  projectScope,
   projectRolesAtom,
   projectSettingsAtom,
   rowyRunAtom,
@@ -25,7 +25,7 @@ import {
   UserSettings,
   updateUserAtom,
   confirmDialogAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import { runRoutes } from "@src/constants/runRoutes";
 import { USERS } from "@src/config/dbPaths";
 
@@ -35,13 +35,13 @@ export default function UserItem({
   roles: rolesProp,
 }: UserSettings) {
   const { enqueueSnackbar, closeSnackbar } = useSnackbar();
-  const confirm = useSetAtom(confirmDialogAtom, globalScope);
-  const openRowyRunModal = useSetAtom(rowyRunModalAtom, globalScope);
+  const confirm = useSetAtom(confirmDialogAtom, projectScope);
+  const openRowyRunModal = useSetAtom(rowyRunModalAtom, projectScope);
 
-  const [projectRoles] = useAtom(projectRolesAtom, globalScope);
-  const [projectSettings] = useAtom(projectSettingsAtom, globalScope);
-  const [rowyRun] = useAtom(rowyRunAtom, globalScope);
-  const [updateUser] = useAtom(updateUserAtom, globalScope);
+  const [projectRoles] = useAtom(projectRolesAtom, projectScope);
+  const [projectSettings] = useAtom(projectSettingsAtom, projectScope);
+  const [rowyRun] = useAtom(rowyRunAtom, projectScope);
+  const [updateUser] = useAtom(updateUserAtom, projectScope);
 
   const [value, setValue] = useState(Array.isArray(rolesProp) ? rolesProp : []);
   const allRoles = new Set(["ADMIN", ...(projectRoles ?? []), ...value]);
diff --git a/src/components/Settings/UserSettings/Theme.tsx b/src/components/Settings/UserSettings/Theme.tsx
index 6cb8ce9a..6f6f1c83 100644
--- a/src/components/Settings/UserSettings/Theme.tsx
+++ b/src/components/Settings/UserSettings/Theme.tsx
@@ -12,19 +12,19 @@ import {
 } from "@mui/material";
 
 import {
-  globalScope,
+  projectScope,
   themeAtom,
   themeOverriddenAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 
 export default function Theme({
   settings,
   updateSettings,
 }: IUserSettingsChildProps) {
-  const [theme, setTheme] = useAtom(themeAtom, globalScope);
+  const [theme, setTheme] = useAtom(themeAtom, projectScope);
   const [themeOverridden, setThemeOverridden] = useAtom(
     themeOverriddenAtom,
-    globalScope
+    projectScope
   );
 
   return (
diff --git a/src/components/Setup/SignInWithGoogle.tsx b/src/components/Setup/SignInWithGoogle.tsx
index e9dfe87f..cb851af3 100644
--- a/src/components/Setup/SignInWithGoogle.tsx
+++ b/src/components/Setup/SignInWithGoogle.tsx
@@ -5,7 +5,7 @@ import { signInWithPopup, GoogleAuthProvider, signOut } from "firebase/auth";
 import { Typography } from "@mui/material";
 import LoadingButton, { LoadingButtonProps } from "@mui/lab/LoadingButton";
 
-import { globalScope } from "@src/atoms/globalScope";
+import { projectScope } from "@src/atoms/projectScope";
 import { firebaseAuthAtom } from "@src/sources/ProjectSourceFirebase";
 
 const googleProvider = new GoogleAuthProvider();
@@ -19,7 +19,7 @@ export default function SignInWithGoogle({
   matchEmail,
   ...props
 }: ISignInWithGoogleProps) {
-  const [firebaseAuth] = useAtom(firebaseAuthAtom, globalScope);
+  const [firebaseAuth] = useAtom(firebaseAuthAtom, projectScope);
   const [status, setStatus] = useState<"IDLE" | "LOADING" | string>("IDLE");
 
   const handleSignIn = async () => {
diff --git a/src/components/Setup/Steps/StepFinish.tsx b/src/components/Setup/Steps/StepFinish.tsx
index b5ee5c10..a540da7c 100644
--- a/src/components/Setup/Steps/StepFinish.tsx
+++ b/src/components/Setup/Steps/StepFinish.tsx
@@ -19,7 +19,7 @@ import ThumbDownIcon from "@mui/icons-material/ThumbDownAlt";
 import ThumbDownOffIcon from "@mui/icons-material/ThumbDownOffAlt";
 
 import { analytics, logEvent } from "@src/analytics";
-import { globalScope } from "@src/atoms/globalScope";
+import { projectScope } from "@src/atoms/projectScope";
 import { firebaseDbAtom } from "@src/sources/ProjectSourceFirebase";
 import { ROUTES } from "@src/constants/routes";
 import { SETTINGS } from "config/dbPaths";
@@ -35,7 +35,7 @@ export default {
 } as ISetupStep;
 
 function StepFinish() {
-  const [firebaseDb] = useAtom(firebaseDbAtom, globalScope);
+  const [firebaseDb] = useAtom(firebaseDbAtom, projectScope);
   const { enqueueSnackbar } = useSnackbar();
 
   useEffect(() => {
diff --git a/src/components/Setup/Steps/StepRules.tsx b/src/components/Setup/Steps/StepRules.tsx
index 41d91969..6215dea1 100644
--- a/src/components/Setup/Steps/StepRules.tsx
+++ b/src/components/Setup/Steps/StepRules.tsx
@@ -19,7 +19,7 @@ import DoneIcon from "@mui/icons-material/Done";
 
 import SetupItem from "@src/components/Setup/SetupItem";
 
-import { globalScope, projectIdAtom } from "@src/atoms/globalScope";
+import { projectScope, projectIdAtom } from "@src/atoms/projectScope";
 import { CONFIG } from "@src/config/dbPaths";
 import {
   RULES_START,
@@ -44,7 +44,7 @@ export default {
 } as ISetupStep;
 
 function StepRules({ isComplete, setComplete }: ISetupStepBodyProps) {
-  const [projectId] = useAtom(projectIdAtom, globalScope);
+  const [projectId] = useAtom(projectIdAtom, projectScope);
   const { enqueueSnackbar } = useSnackbar();
 
   const [adminRule, setAdminRule] = useState(true);
diff --git a/src/components/Setup/Steps/StepStorageRules.tsx b/src/components/Setup/Steps/StepStorageRules.tsx
index d2aea134..65f89f17 100644
--- a/src/components/Setup/Steps/StepStorageRules.tsx
+++ b/src/components/Setup/Steps/StepStorageRules.tsx
@@ -12,7 +12,7 @@ import DoneIcon from "@mui/icons-material/Done";
 
 import SetupItem from "@src/components/Setup/SetupItem";
 
-import { globalScope, projectIdAtom } from "@src/atoms/globalScope";
+import { projectScope, projectIdAtom } from "@src/atoms/projectScope";
 import {
   RULES_START,
   RULES_END,
@@ -31,7 +31,7 @@ export default {
 const rules = RULES_START + REQUIRED_RULES + RULES_END;
 
 function StepStorageRules({ isComplete, setComplete }: ISetupStepBodyProps) {
-  const [projectId] = useAtom(projectIdAtom, globalScope);
+  const [projectId] = useAtom(projectIdAtom, projectScope);
   const { enqueueSnackbar } = useSnackbar();
 
   return (
diff --git a/src/components/Setup/Steps/StepWelcome.tsx b/src/components/Setup/Steps/StepWelcome.tsx
index dfabf8e8..99e20352 100644
--- a/src/components/Setup/Steps/StepWelcome.tsx
+++ b/src/components/Setup/Steps/StepWelcome.tsx
@@ -13,7 +13,7 @@ import {
 } from "@mui/material";
 
 import { EXTERNAL_LINKS } from "@src/constants/externalLinks";
-import { globalScope, projectIdAtom } from "@src/atoms/globalScope";
+import { projectScope, projectIdAtom } from "@src/atoms/projectScope";
 
 export default {
   id: "welcome",
@@ -33,7 +33,7 @@ export default {
 } as ISetupStep;
 
 function StepWelcome({ isComplete, setComplete }: ISetupStepBodyProps) {
-  const [projectId] = useAtom(projectIdAtom, globalScope);
+  const [projectId] = useAtom(projectIdAtom, projectScope);
 
   return (
     <>
diff --git a/src/components/SideDrawer/FieldWrapper.tsx b/src/components/SideDrawer/FieldWrapper.tsx
index c47e8de2..620cf60d 100644
--- a/src/components/SideDrawer/FieldWrapper.tsx
+++ b/src/components/SideDrawer/FieldWrapper.tsx
@@ -18,10 +18,10 @@ import { InlineErrorFallback } from "@src/components/ErrorFallback";
 import FieldSkeleton from "./FieldSkeleton";
 
 import {
-  globalScope,
+  projectScope,
   projectIdAtom,
   altPressAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import { FieldType } from "@src/constants/fields";
 import { getFieldProp } from "@src/components/fields";
 import { getLabelId, getFieldId } from "./utils";
@@ -47,8 +47,8 @@ export default function FieldWrapper({
   hidden,
   index,
 }: IFieldWrapperProps) {
-  const [projectId] = useAtom(projectIdAtom, globalScope);
-  const [altPress] = useAtom(altPressAtom, globalScope);
+  const [projectId] = useAtom(projectIdAtom, projectScope);
+  const [altPress] = useAtom(altPressAtom, projectScope);
 
   return (
     <div>
diff --git a/src/components/SideDrawer/SideDrawer.tsx b/src/components/SideDrawer/SideDrawer.tsx
index 3b48f046..eafdcdfa 100644
--- a/src/components/SideDrawer/SideDrawer.tsx
+++ b/src/components/SideDrawer/SideDrawer.tsx
@@ -16,7 +16,7 @@ import ErrorFallback from "@src/components/ErrorFallback";
 import StyledDrawer from "./StyledDrawer";
 import SideDrawerFields from "./SideDrawerFields";
 
-import { globalScope, userSettingsAtom } from "@src/atoms/globalScope";
+import { projectScope, userSettingsAtom } from "@src/atoms/projectScope";
 import {
   tableScope,
   tableIdAtom,
@@ -36,7 +36,7 @@ export default function SideDrawer({
 }: {
   dataGridRef?: React.MutableRefObject<DataGridHandle | null>;
 }) {
-  const [userSettings] = useAtom(userSettingsAtom, globalScope);
+  const [userSettings] = useAtom(userSettingsAtom, projectScope);
   const [tableId] = useAtom(tableIdAtom, tableScope);
   const [tableColumnsOrdered] = useAtom(tableColumnsOrderedAtom, tableScope);
   const [tableRows] = useAtom(tableRowsAtom, tableScope);
diff --git a/src/components/SideDrawer/SideDrawerFields.tsx b/src/components/SideDrawer/SideDrawerFields.tsx
index 2e7addd2..7b6a6578 100644
--- a/src/components/SideDrawer/SideDrawerFields.tsx
+++ b/src/components/SideDrawer/SideDrawerFields.tsx
@@ -9,10 +9,10 @@ import MemoizedField from "./MemoizedField";
 import SaveState from "./SaveState";
 
 import {
-  globalScope,
+  projectScope,
   userRolesAtom,
   userSettingsAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import {
   tableScope,
   tableIdAtom,
@@ -30,8 +30,8 @@ export interface ISideDrawerFieldsProps {
 }
 
 export default function SideDrawerFields({ row }: ISideDrawerFieldsProps) {
-  const [userRoles] = useAtom(userRolesAtom, globalScope);
-  const [userSettings] = useAtom(userSettingsAtom, globalScope);
+  const [userRoles] = useAtom(userRolesAtom, projectScope);
+  const [userSettings] = useAtom(userSettingsAtom, projectScope);
   const [tableId] = useAtom(tableIdAtom, tableScope);
   const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
   const [tableColumnsOrdered] = useAtom(tableColumnsOrderedAtom, tableScope);
diff --git a/src/components/Table/BreadcrumbsSubTable.tsx b/src/components/Table/BreadcrumbsSubTable.tsx
index b7e0dbcb..78b38281 100644
--- a/src/components/Table/BreadcrumbsSubTable.tsx
+++ b/src/components/Table/BreadcrumbsSubTable.tsx
@@ -6,7 +6,7 @@ import { Stack, Breadcrumbs, Link, Typography, Tooltip } from "@mui/material";
 import MoreHorizIcon from "@mui/icons-material/MoreHoriz";
 import ReadOnlyIcon from "@mui/icons-material/EditOffOutlined";
 
-import { globalScope, userRolesAtom } from "@src/atoms/globalScope";
+import { projectScope, userRolesAtom } from "@src/atoms/projectScope";
 import { ROUTES } from "@src/constants/routes";
 import { TableSettings } from "@src/types/table";
 
@@ -23,7 +23,7 @@ export default function BreadcrumbsSubTable({
   rootTableLink,
   parentLabel,
 }: IBreadcrumbsSubTableProps) {
-  const [userRoles] = useAtom(userRolesAtom, globalScope);
+  const [userRoles] = useAtom(userRolesAtom, projectScope);
   const [searchParams] = useSearchParams();
   const splitSubTableId = subTableSettings.id.split("/");
 
diff --git a/src/components/Table/BreadcrumbsTableRoot.tsx b/src/components/Table/BreadcrumbsTableRoot.tsx
index bf6dabc9..dd15526d 100644
--- a/src/components/Table/BreadcrumbsTableRoot.tsx
+++ b/src/components/Table/BreadcrumbsTableRoot.tsx
@@ -16,11 +16,11 @@ import InfoTooltip from "@src/components/InfoTooltip";
 import RenderedMarkdown from "@src/components/RenderedMarkdown";
 
 import {
-  globalScope,
+  projectScope,
   userRolesAtom,
   tableDescriptionDismissedAtom,
   tablesAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import { ROUTES } from "@src/constants/routes";
 
 /**
@@ -30,12 +30,12 @@ import { ROUTES } from "@src/constants/routes";
 export default function BreadcrumbsTableRoot(props: StackProps) {
   const { id } = useParams();
 
-  const [userRoles] = useAtom(userRolesAtom, globalScope);
+  const [userRoles] = useAtom(userRolesAtom, projectScope);
   const [dismissed, setDismissed] = useAtom(
     tableDescriptionDismissedAtom,
-    globalScope
+    projectScope
   );
-  const [tables] = useAtom(tablesAtom, globalScope);
+  const [tables] = useAtom(tablesAtom, projectScope);
 
   const tableSettings = find(tables, ["id", id]);
   if (!tableSettings) return null;
diff --git a/src/components/Table/ColumnHeader/ColumnHeader.tsx b/src/components/Table/ColumnHeader/ColumnHeader.tsx
index 511d0714..37e8f6ad 100644
--- a/src/components/Table/ColumnHeader/ColumnHeader.tsx
+++ b/src/components/Table/ColumnHeader/ColumnHeader.tsx
@@ -19,10 +19,10 @@ import LockIcon from "@mui/icons-material/LockOutlined";
 import ColumnHeaderSort from "./ColumnHeaderSort";
 
 import {
-  globalScope,
+  projectScope,
   userRolesAtom,
   altPressAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import {
   tableScope,
   updateColumnAtom,
@@ -54,10 +54,10 @@ export interface IDraggableHeaderRendererProps {
 export default function DraggableHeaderRenderer({
   column,
 }: IDraggableHeaderRendererProps) {
-  const [userRoles] = useAtom(userRolesAtom, globalScope);
+  const [userRoles] = useAtom(userRolesAtom, projectScope);
   const updateColumn = useSetAtom(updateColumnAtom, tableScope);
   const openColumnMenu = useSetAtom(columnMenuAtom, tableScope);
-  const [altPress] = useAtom(altPressAtom, globalScope);
+  const [altPress] = useAtom(altPressAtom, projectScope);
 
   const [{ isDragging }, dragRef] = useDrag({
     type: "COLUMN_DRAG",
diff --git a/src/components/Table/ColumnSelect.tsx b/src/components/Table/ColumnSelect.tsx
index 99a651c2..d5b3fa15 100644
--- a/src/components/Table/ColumnSelect.tsx
+++ b/src/components/Table/ColumnSelect.tsx
@@ -4,7 +4,7 @@ import MultiSelect, { MultiSelectProps } from "@rowy/multiselect";
 import { Stack, StackProps, Typography, Chip } from "@mui/material";
 import { TableColumn as TableColumnIcon } from "@src/assets/icons";
 
-import { globalScope, altPressAtom } from "@src/atoms/globalScope";
+import { projectScope, altPressAtom } from "@src/atoms/projectScope";
 import { tableScope, tableColumnsOrderedAtom } from "@src/atoms/tableScope";
 import { ColumnConfig } from "@src/types/table";
 import { FieldType } from "@src/constants/fields";
@@ -91,7 +91,7 @@ export function ColumnItem({
   children,
   ...props
 }: IColumnItemProps) {
-  const [altPress] = useAtom(altPressAtom, globalScope);
+  const [altPress] = useAtom(altPressAtom, projectScope);
 
   const isNew = option.index === undefined && !option.type;
 
diff --git a/src/components/Table/ContextMenu/MenuContents.tsx b/src/components/Table/ContextMenu/MenuContents.tsx
index 10c617c0..ae53a4a0 100644
--- a/src/components/Table/ContextMenu/MenuContents.tsx
+++ b/src/components/Table/ContextMenu/MenuContents.tsx
@@ -17,13 +17,13 @@ import FilterIcon from "@mui/icons-material/FilterList";
 import ContextMenuItem, { IContextMenuItem } from "./ContextMenuItem";
 
 import {
-  globalScope,
+  projectScope,
   projectIdAtom,
   userRolesAtom,
   altPressAtom,
   tableAddRowIdTypeAtom,
   confirmDialogAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import {
   tableScope,
   tableSettingsAtom,
@@ -42,11 +42,11 @@ interface IMenuContentsProps {
 }
 
 export default function MenuContents({ onClose }: IMenuContentsProps) {
-  const [projectId] = useAtom(projectIdAtom, globalScope);
-  const [userRoles] = useAtom(userRolesAtom, globalScope);
-  const [altPress] = useAtom(altPressAtom, globalScope);
-  const [addRowIdType] = useAtom(tableAddRowIdTypeAtom, globalScope);
-  const confirm = useSetAtom(confirmDialogAtom, globalScope);
+  const [projectId] = useAtom(projectIdAtom, projectScope);
+  const [userRoles] = useAtom(userRolesAtom, projectScope);
+  const [altPress] = useAtom(altPressAtom, projectScope);
+  const [addRowIdType] = useAtom(tableAddRowIdTypeAtom, projectScope);
+  const confirm = useSetAtom(confirmDialogAtom, projectScope);
   const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
   const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
   const [tableRows] = useAtom(tableRowsAtom, tableScope);
diff --git a/src/components/Table/FinalColumnHeader.tsx b/src/components/Table/FinalColumnHeader.tsx
index b360af0a..b425d1b1 100644
--- a/src/components/Table/FinalColumnHeader.tsx
+++ b/src/components/Table/FinalColumnHeader.tsx
@@ -4,11 +4,11 @@ import { Column } from "react-data-grid";
 import { Button } from "@mui/material";
 import { AddColumn as AddColumnIcon } from "@src/assets/icons";
 
-import { globalScope, userRolesAtom } from "@src/atoms/globalScope";
+import { projectScope, userRolesAtom } from "@src/atoms/projectScope";
 import { tableScope, columnModalAtom } from "@src/atoms/tableScope";
 
 const FinalColumnHeader: Column<any>["headerRenderer"] = ({ column }) => {
-  const [userRoles] = useAtom(userRolesAtom, globalScope);
+  const [userRoles] = useAtom(userRolesAtom, projectScope);
   const openColumnModal = useSetAtom(columnModalAtom, tableScope);
 
   if (!userRoles.includes("ADMIN")) return null;
diff --git a/src/components/Table/OutOfOrderIndicator.tsx b/src/components/Table/OutOfOrderIndicator.tsx
index 3b9367b6..337b3d50 100644
--- a/src/components/Table/OutOfOrderIndicator.tsx
+++ b/src/components/Table/OutOfOrderIndicator.tsx
@@ -6,9 +6,9 @@ import WarningIcon from "@mui/icons-material/WarningAmber";
 import { OUT_OF_ORDER_MARGIN } from "./TableContainer";
 
 import {
-  globalScope,
+  projectScope,
   tableOutOfOrderDismissedAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 
 const Dot = styled("div")(({ theme }) => ({
   position: "absolute",
@@ -35,7 +35,7 @@ export default function OutOfOrderIndicator({
 }: IOutOfOrderIndicatorProps) {
   const [dismissed, setDismissed] = useAtom(
     tableOutOfOrderDismissedAtom,
-    globalScope
+    projectScope
   );
 
   return (
diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index 4c77f850..cf3a3dff 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -26,10 +26,10 @@ import Loading from "@src/components/Loading";
 import ContextMenu from "./ContextMenu";
 
 import {
-  globalScope,
+  projectScope,
   userRolesAtom,
   userSettingsAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import {
   tableScope,
   tableIdAtom,
@@ -63,8 +63,8 @@ export default function Table({
 }: {
   dataGridRef?: React.MutableRefObject<DataGridHandle | null>;
 }) {
-  const [userRoles] = useAtom(userRolesAtom, globalScope);
-  const [userSettings] = useAtom(userSettingsAtom, globalScope);
+  const [userRoles] = useAtom(userRolesAtom, projectScope);
+  const [userSettings] = useAtom(userSettingsAtom, projectScope);
 
   const [tableId] = useAtom(tableIdAtom, tableScope);
   const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
diff --git a/src/components/Table/TableSkeleton.tsx b/src/components/Table/TableSkeleton.tsx
index 7f9b1905..e264fde7 100644
--- a/src/components/Table/TableSkeleton.tsx
+++ b/src/components/Table/TableSkeleton.tsx
@@ -6,7 +6,7 @@ import { Fade, Stack, Skeleton, Button } from "@mui/material";
 import { AddColumn as AddColumnIcon } from "@src/assets/icons";
 import Column from "./Column";
 
-import { globalScope, userSettingsAtom } from "@src/atoms/globalScope";
+import { projectScope, userSettingsAtom } from "@src/atoms/projectScope";
 import {
   tableScope,
   tableIdAtom,
@@ -65,7 +65,7 @@ export function HeaderRowSkeleton() {
 }
 
 const useDisplayedColumns = () => {
-  const [userSettings] = useAtom(userSettingsAtom, globalScope);
+  const [userSettings] = useAtom(userSettingsAtom, projectScope);
   const [tableId] = useAtom(tableIdAtom, tableScope);
   const [tableColumnsOrdered] = useAtom(tableColumnsOrderedAtom, tableScope);
   const userDocHiddenFields =
diff --git a/src/components/Table/formatters/FinalColumn.tsx b/src/components/Table/formatters/FinalColumn.tsx
index b2724889..d5d57934 100644
--- a/src/components/Table/formatters/FinalColumn.tsx
+++ b/src/components/Table/formatters/FinalColumn.tsx
@@ -6,12 +6,12 @@ import { CopyCells as CopyCellsIcon } from "@src/assets/icons";
 import DeleteIcon from "@mui/icons-material/DeleteOutlined";
 
 import {
-  globalScope,
+  projectScope,
   userRolesAtom,
   tableAddRowIdTypeAtom,
   altPressAtom,
   confirmDialogAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import {
   tableScope,
   tableSettingsAtom,
@@ -21,15 +21,15 @@ import {
 import { TableRow } from "@src/types/table";
 
 export default function FinalColumn({ row }: FormatterProps<TableRow, any>) {
-  const [userRoles] = useAtom(userRolesAtom, globalScope);
-  const [addRowIdType] = useAtom(tableAddRowIdTypeAtom, globalScope);
-  const confirm = useSetAtom(confirmDialogAtom, globalScope);
+  const [userRoles] = useAtom(userRolesAtom, projectScope);
+  const [addRowIdType] = useAtom(tableAddRowIdTypeAtom, projectScope);
+  const confirm = useSetAtom(confirmDialogAtom, projectScope);
 
   const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
   const addRow = useSetAtom(addRowAtom, tableScope);
   const deleteRow = useSetAtom(deleteRowAtom, tableScope);
 
-  const [altPress] = useAtom(altPressAtom, globalScope);
+  const [altPress] = useAtom(altPressAtom, projectScope);
   const handleDelete = () => deleteRow(row._rowy_ref.path);
 
   if (!userRoles.includes("ADMIN") && tableSettings.readOnly === true)
diff --git a/src/components/TableModals/CloudLogsModal/BuildLogs/useBuildLogs.ts b/src/components/TableModals/CloudLogsModal/BuildLogs/useBuildLogs.ts
index 63ab0561..9b3ec4ad 100644
--- a/src/components/TableModals/CloudLogsModal/BuildLogs/useBuildLogs.ts
+++ b/src/components/TableModals/CloudLogsModal/BuildLogs/useBuildLogs.ts
@@ -11,12 +11,12 @@ import {
   DocumentData,
 } from "firebase/firestore";
 
-import { globalScope } from "@src/atoms/globalScope";
+import { projectScope } from "@src/atoms/projectScope";
 import { firebaseDbAtom } from "@src/sources/ProjectSourceFirebase";
 import { tableScope, tableSchemaAtom } from "@src/atoms/tableScope";
 
 export default function useBuildLogs() {
-  const [firebaseDb] = useAtom(firebaseDbAtom, globalScope);
+  const [firebaseDb] = useAtom(firebaseDbAtom, projectScope);
   const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
   const functionConfigPath = tableSchema.functionConfigPath;
 
diff --git a/src/components/TableModals/CloudLogsModal/CloudLogsModal.tsx b/src/components/TableModals/CloudLogsModal/CloudLogsModal.tsx
index 4b7f690a..e69acc44 100644
--- a/src/components/TableModals/CloudLogsModal/CloudLogsModal.tsx
+++ b/src/components/TableModals/CloudLogsModal/CloudLogsModal.tsx
@@ -26,11 +26,11 @@ import EmptyState from "@src/components/EmptyState";
 import CloudLogSeverityIcon, { SEVERITY_LEVELS } from "./CloudLogSeverityIcon";
 
 import {
-  globalScope,
+  projectScope,
   projectIdAtom,
   rowyRunAtom,
   compatibleRowyRunVersionAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import {
   tableScope,
   tableSettingsAtom,
@@ -40,11 +40,11 @@ import {
 import { cloudLogFetcher } from "./utils";
 
 export default function CloudLogsModal({ onClose }: ITableModalProps) {
-  const [projectId] = useAtom(projectIdAtom, globalScope);
-  const [rowyRun] = useAtom(rowyRunAtom, globalScope);
+  const [projectId] = useAtom(projectIdAtom, projectScope);
+  const [rowyRun] = useAtom(rowyRunAtom, projectScope);
   const [compatibleRowyRunVersion] = useAtom(
     compatibleRowyRunVersionAtom,
-    globalScope
+    projectScope
   );
   const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
   const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
diff --git a/src/components/TableModals/CloudLogsModal/utils.ts b/src/components/TableModals/CloudLogsModal/utils.ts
index 895a7295..e8b33f7e 100644
--- a/src/components/TableModals/CloudLogsModal/utils.ts
+++ b/src/components/TableModals/CloudLogsModal/utils.ts
@@ -1,5 +1,5 @@
 import { sub } from "date-fns";
-import { rowyRunAtom } from "@src/atoms/globalScope";
+import { rowyRunAtom } from "@src/atoms/projectScope";
 import { CloudLogFilters } from "@src/atoms/tableScope";
 
 export const cloudLogFetcher = (
diff --git a/src/components/TableModals/ExportModal/ExportModal.tsx b/src/components/TableModals/ExportModal/ExportModal.tsx
index 49db08ad..6b12dd9f 100644
--- a/src/components/TableModals/ExportModal/ExportModal.tsx
+++ b/src/components/TableModals/ExportModal/ExportModal.tsx
@@ -20,7 +20,7 @@ import Modal from "@src/components/Modal";
 import ExportDetails from "./ModalContentsExport";
 import DownloadDetails from "./ModalContentsDownload";
 
-import { globalScope } from "@src/atoms/globalScope";
+import { projectScope } from "@src/atoms/projectScope";
 import {
   tableScope,
   tableSettingsAtom,
@@ -40,7 +40,7 @@ export interface IExportModalContentsProps {
 export default function Export({ onClose }: ITableModalProps) {
   const [mode, setMode] = useState<"Export" | "Download">("Export");
 
-  const [firebaseDb] = useAtom(firebaseDbAtom, globalScope);
+  const [firebaseDb] = useAtom(firebaseDbAtom, projectScope);
   const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
   const [tableFilters] = useAtom(tableFiltersAtom, tableScope);
   const [tableSorts] = useAtom(tableSortsAtom, tableScope);
diff --git a/src/components/TableModals/ExtensionsModal/ExtensionMigration.tsx b/src/components/TableModals/ExtensionsModal/ExtensionMigration.tsx
index cca4b01f..6133f34d 100644
--- a/src/components/TableModals/ExtensionsModal/ExtensionMigration.tsx
+++ b/src/components/TableModals/ExtensionsModal/ExtensionMigration.tsx
@@ -10,7 +10,7 @@ import GoIcon from "@mui/icons-material/ChevronRight";
 
 import Modal from "@src/components/Modal";
 
-import { globalScope, currentUserAtom } from "@src/atoms/globalScope";
+import { projectScope, currentUserAtom } from "@src/atoms/projectScope";
 import {
   tableScope,
   tableSettingsAtom,
@@ -29,7 +29,7 @@ export default function ExtensionMigration({
   handleClose,
   handleUpgradeComplete,
 }: IExtensionMigrationProps) {
-  const [currentUser] = useAtom(currentUserAtom, globalScope);
+  const [currentUser] = useAtom(currentUserAtom, projectScope);
   const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
   const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
   const [updateTableSchema] = useAtom(updateTableSchemaAtom, tableScope);
diff --git a/src/components/TableModals/ExtensionsModal/ExtensionModal.tsx b/src/components/TableModals/ExtensionsModal/ExtensionModal.tsx
index dc0d0df2..493df6a4 100644
--- a/src/components/TableModals/ExtensionsModal/ExtensionModal.tsx
+++ b/src/components/TableModals/ExtensionsModal/ExtensionModal.tsx
@@ -12,7 +12,7 @@ import Step2RequiredFields from "./Step2RequiredFields";
 import Step3Conditions from "./Step3Conditions";
 import Step4Body from "./Step4Body";
 
-import { globalScope, confirmDialogAtom } from "@src/atoms/globalScope";
+import { projectScope, confirmDialogAtom } from "@src/atoms/projectScope";
 import { extensionNames, IExtension } from "./utils";
 
 type StepValidation = Record<"condition" | "extensionBody", boolean>;
@@ -39,7 +39,7 @@ export default function ExtensionModal({
   mode,
   extensionObject: initialObject,
 }: IExtensionModalProps) {
-  const confirm = useSetAtom(confirmDialogAtom, globalScope);
+  const confirm = useSetAtom(confirmDialogAtom, projectScope);
 
   const [extensionObject, setExtensionObject] =
     useState<IExtension>(initialObject);
diff --git a/src/components/TableModals/ExtensionsModal/ExtensionsModal.tsx b/src/components/TableModals/ExtensionsModal/ExtensionsModal.tsx
index c6154bb1..57f6fbee 100644
--- a/src/components/TableModals/ExtensionsModal/ExtensionsModal.tsx
+++ b/src/components/TableModals/ExtensionsModal/ExtensionsModal.tsx
@@ -10,11 +10,11 @@ import ExtensionModal from "./ExtensionModal";
 import ExtensionMigration from "./ExtensionMigration";
 
 import {
-  globalScope,
+  projectScope,
   currentUserAtom,
   rowyRunAtom,
   confirmDialogAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import {
   tableScope,
   tableSettingsAtom,
@@ -32,9 +32,9 @@ import {
 } from "@src/utils/table";
 
 export default function ExtensionsModal({ onClose }: ITableModalProps) {
-  const [currentUser] = useAtom(currentUserAtom, globalScope);
-  const [rowyRun] = useAtom(rowyRunAtom, globalScope);
-  const confirm = useSetAtom(confirmDialogAtom, globalScope);
+  const [currentUser] = useAtom(currentUserAtom, projectScope);
+  const [rowyRun] = useAtom(rowyRunAtom, projectScope);
+  const confirm = useSetAtom(confirmDialogAtom, projectScope);
   const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
   const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
   const [updateTableSchema] = useAtom(updateTableSchemaAtom, tableScope);
diff --git a/src/components/TableModals/ExtensionsModal/Step1Triggers.tsx b/src/components/TableModals/ExtensionsModal/Step1Triggers.tsx
index 5fc0a1fc..4bb293b2 100644
--- a/src/components/TableModals/ExtensionsModal/Step1Triggers.tsx
+++ b/src/components/TableModals/ExtensionsModal/Step1Triggers.tsx
@@ -14,9 +14,9 @@ import MultiSelect from "@rowy/multiselect";
 import ColumnSelect from "@src/components/Table/ColumnSelect";
 
 import {
-  globalScope,
+  projectScope,
   compatibleRowyRunVersionAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import { FieldType } from "@src/constants/fields";
 import { triggerTypes } from "./utils";
 
@@ -26,7 +26,7 @@ export default function Step1Triggers({
 }: IExtensionModalStepProps) {
   const [compatibleRowyRunVersion] = useAtom(
     compatibleRowyRunVersionAtom,
-    globalScope
+    projectScope
   );
 
   return (
diff --git a/src/components/TableModals/WebhooksModal/WebhookList.tsx b/src/components/TableModals/WebhooksModal/WebhookList.tsx
index 95d5671d..d2f6b670 100644
--- a/src/components/TableModals/WebhooksModal/WebhookList.tsx
+++ b/src/components/TableModals/WebhooksModal/WebhookList.tsx
@@ -22,7 +22,7 @@ import EmptyState from "@src/components/EmptyState";
 
 import { webhookNames, IWebhook } from "./utils";
 import { DATE_TIME_FORMAT } from "@src/constants/dates";
-import { globalScope, projectSettingsAtom } from "@src/atoms/globalScope";
+import { projectScope, projectSettingsAtom } from "@src/atoms/projectScope";
 import {
   tableScope,
   tableSettingsAtom,
@@ -43,7 +43,7 @@ export default function WebhookList({
   handleEdit,
   handleDelete,
 }: IWebhookListProps) {
-  const [projectSettings] = useAtom(projectSettingsAtom, globalScope);
+  const [projectSettings] = useAtom(projectSettingsAtom, projectScope);
   const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
   const setModal = useSetAtom(tableModalAtom, tableScope);
   const setCloudLogFilters = useSetAtom(cloudLogFiltersAtom, tableScope);
diff --git a/src/components/TableModals/WebhooksModal/WebhookModal.tsx b/src/components/TableModals/WebhooksModal/WebhookModal.tsx
index e749b2be..8575c0b5 100644
--- a/src/components/TableModals/WebhooksModal/WebhookModal.tsx
+++ b/src/components/TableModals/WebhooksModal/WebhookModal.tsx
@@ -22,10 +22,10 @@ import Step2Conditions from "./Step2Conditions";
 import Step3Body from "./Step3Parser";
 
 import {
-  globalScope,
+  projectScope,
   projectSettingsAtom,
   confirmDialogAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import { tableScope, tableSettingsAtom } from "@src/atoms/tableScope";
 import { webhookNames, IWebhook } from "./utils";
 
@@ -54,8 +54,8 @@ export default function WebhookModal({
   mode,
   webhookObject: initialObject,
 }: IWebhookModalProps) {
-  const [projectSettings] = useAtom(projectSettingsAtom, globalScope);
-  const confirm = useSetAtom(confirmDialogAtom, globalScope);
+  const [projectSettings] = useAtom(projectSettingsAtom, projectScope);
+  const confirm = useSetAtom(confirmDialogAtom, projectScope);
   const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
 
   const [webhookObject, setWebhookObject] = useState<IWebhook>(initialObject);
diff --git a/src/components/TableModals/WebhooksModal/WebhooksModal.tsx b/src/components/TableModals/WebhooksModal/WebhooksModal.tsx
index 7dc8bfe4..c7d4e30f 100644
--- a/src/components/TableModals/WebhooksModal/WebhooksModal.tsx
+++ b/src/components/TableModals/WebhooksModal/WebhooksModal.tsx
@@ -12,13 +12,13 @@ import WebhookList from "./WebhookList";
 import WebhookModal from "./WebhookModal";
 
 import {
-  globalScope,
+  projectScope,
   currentUserAtom,
   rowyRunAtom,
   compatibleRowyRunVersionAtom,
   rowyRunModalAtom,
   confirmDialogAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import {
   tableScope,
   tableSettingsAtom,
@@ -32,14 +32,14 @@ import { analytics, logEvent } from "@src/analytics";
 import { getTableSchemaPath } from "@src/utils/table";
 
 export default function WebhooksModal({ onClose }: ITableModalProps) {
-  const [currentUser] = useAtom(currentUserAtom, globalScope);
-  const [rowyRun] = useAtom(rowyRunAtom, globalScope);
+  const [currentUser] = useAtom(currentUserAtom, projectScope);
+  const [rowyRun] = useAtom(rowyRunAtom, projectScope);
   const [compatibleRowyRunVersion] = useAtom(
     compatibleRowyRunVersionAtom,
-    globalScope
+    projectScope
   );
-  const openRowyRunModal = useSetAtom(rowyRunModalAtom, globalScope);
-  const confirm = useSetAtom(confirmDialogAtom, globalScope);
+  const openRowyRunModal = useSetAtom(rowyRunModalAtom, projectScope);
+  const confirm = useSetAtom(confirmDialogAtom, projectScope);
   const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
   const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
   const [updateTableSchema] = useAtom(updateTableSchemaAtom, tableScope);
diff --git a/src/components/TableSettingsDialog/ActionsMenu/ActionsMenu.tsx b/src/components/TableSettingsDialog/ActionsMenu/ActionsMenu.tsx
index c566b8a0..3dc853a4 100644
--- a/src/components/TableSettingsDialog/ActionsMenu/ActionsMenu.tsx
+++ b/src/components/TableSettingsDialog/ActionsMenu/ActionsMenu.tsx
@@ -10,10 +10,10 @@ import ImportSettings from "./ImportSettings";
 import ExportSettings from "./ExportSettings";
 
 import {
-  globalScope,
+  projectScope,
   tableSettingsDialogIdAtom,
   TableSettingsDialogState,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 
 export interface IActionsMenuProps {
   mode: TableSettingsDialogState["mode"];
@@ -31,7 +31,7 @@ export default function ActionsMenu({
 
   const setTableSettingsDialogId = useSetAtom(
     tableSettingsDialogIdAtom,
-    globalScope
+    projectScope
   );
 
   // On open, set tableSettingsDialogIdAtom so the derived
diff --git a/src/components/TableSettingsDialog/ActionsMenu/ExportSettings.tsx b/src/components/TableSettingsDialog/ActionsMenu/ExportSettings.tsx
index 225d3f78..5b1518d6 100644
--- a/src/components/TableSettingsDialog/ActionsMenu/ExportSettings.tsx
+++ b/src/components/TableSettingsDialog/ActionsMenu/ExportSettings.tsx
@@ -11,9 +11,9 @@ import Modal from "@src/components/Modal";
 import CodeEditor from "@src/components/CodeEditor";
 
 import {
-  globalScope,
+  projectScope,
   tableSettingsDialogSchemaAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import { analytics, logEvent } from "@src/analytics";
 
 export interface IExportSettingsProps {
@@ -28,7 +28,7 @@ export default function ExportSettings({
   const [open, setOpen] = useState(false);
 
   const { _suggestedRules, ...values } = useWatch({ control });
-  const [tableSchema] = useAtom(tableSettingsDialogSchemaAtom, globalScope);
+  const [tableSchema] = useAtom(tableSettingsDialogSchemaAtom, projectScope);
 
   const formattedJson = stringify(
     { ...values, _schema: merge(tableSchema, values._schema) },
diff --git a/src/components/TableSettingsDialog/ActionsMenu/ImportSettings.tsx b/src/components/TableSettingsDialog/ActionsMenu/ImportSettings.tsx
index eb40cf3c..7b37f0ca 100644
--- a/src/components/TableSettingsDialog/ActionsMenu/ImportSettings.tsx
+++ b/src/components/TableSettingsDialog/ActionsMenu/ImportSettings.tsx
@@ -12,11 +12,11 @@ import Modal from "@src/components/Modal";
 import DiffEditor from "@src/components/CodeEditor/DiffEditor";
 
 import {
-  globalScope,
+  projectScope,
   confirmDialogAtom,
   tableSettingsDialogSchemaAtom,
   tableSettingsDialogAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import { analytics, logEvent } from "@src/analytics";
 
 export interface IImportSettingsProps {
@@ -36,7 +36,7 @@ export default function ImportSettings({
   const [valid, setValid] = useState(true);
 
   const { _suggestedRules, ...values } = useWatch({ control });
-  const [tableSchema] = useAtom(tableSettingsDialogSchemaAtom, globalScope);
+  const [tableSchema] = useAtom(tableSettingsDialogSchemaAtom, projectScope);
 
   const formattedJson = stringify(
     { ...values, _schema: merge(tableSchema, values._schema) },
@@ -58,10 +58,10 @@ export default function ImportSettings({
     closeMenu();
   };
 
-  const confirm = useSetAtom(confirmDialogAtom, globalScope);
+  const confirm = useSetAtom(confirmDialogAtom, projectScope);
   const { enqueueSnackbar } = useSnackbar();
   const { setValue } = useFormMethods;
-  const [tableSettingsDialog] = useAtom(tableSettingsDialogAtom, globalScope);
+  const [tableSettingsDialog] = useAtom(tableSettingsDialogAtom, projectScope);
 
   const handleImport = () => {
     logEvent(analytics, "import_tableSettings");
diff --git a/src/components/TableSettingsDialog/DeleteMenu.tsx b/src/components/TableSettingsDialog/DeleteMenu.tsx
index b1d90c04..538679f8 100644
--- a/src/components/TableSettingsDialog/DeleteMenu.tsx
+++ b/src/components/TableSettingsDialog/DeleteMenu.tsx
@@ -7,11 +7,11 @@ import { IconButton, Menu, MenuItem, DialogContentText } from "@mui/material";
 import DeleteIcon from "@mui/icons-material/DeleteOutlined";
 
 import {
-  globalScope,
+  projectScope,
   confirmDialogAtom,
   updateTableAtom,
   deleteTableAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import { TableSettings } from "@src/types/table";
 import { ROUTES } from "@src/constants/routes";
 import { analytics, logEvent } from "@src/analytics";
@@ -27,10 +27,10 @@ export default function DeleteMenu({ clearDialog, data }: IDeleteMenuProps) {
   const handleClose = () => setAnchorEl(null);
 
   const navigate = useNavigate();
-  const confirm = useSetAtom(confirmDialogAtom, globalScope);
+  const confirm = useSetAtom(confirmDialogAtom, projectScope);
   const { enqueueSnackbar, closeSnackbar } = useSnackbar();
 
-  const [updateTable] = useAtom(updateTableAtom, globalScope);
+  const [updateTable] = useAtom(updateTableAtom, projectScope);
   const handleResetStructure = async () => {
     const snack = enqueueSnackbar("Resetting columns…", { persist: true });
     await updateTable!(
@@ -42,7 +42,7 @@ export default function DeleteMenu({ clearDialog, data }: IDeleteMenuProps) {
     enqueueSnackbar("Columns reset");
   };
 
-  const [deleteTable] = useAtom(deleteTableAtom, globalScope);
+  const [deleteTable] = useAtom(deleteTableAtom, projectScope);
   const handleDelete = async () => {
     const snack = enqueueSnackbar("Deleting table…", { persist: true });
     await deleteTable!(data!.id);
diff --git a/src/components/TableSettingsDialog/SuggestedRules.tsx b/src/components/TableSettingsDialog/SuggestedRules.tsx
index 205357f3..0a1ef55a 100644
--- a/src/components/TableSettingsDialog/SuggestedRules.tsx
+++ b/src/components/TableSettingsDialog/SuggestedRules.tsx
@@ -13,7 +13,7 @@ import {
 import InlineOpenInNewIcon from "@src/components/InlineOpenInNewIcon";
 import { IFieldComponentProps } from "@rowy/form-builder";
 
-import { globalScope, projectIdAtom } from "@src/atoms/globalScope";
+import { projectScope, projectIdAtom } from "@src/atoms/projectScope";
 
 type customizationOptions = "allRead" | "authRead" | "subcollections" | "user";
 
@@ -23,7 +23,7 @@ export default function SuggestedRules({
   useFormMethods: { control },
   label,
 }: ISuggestedRulesProps) {
-  const [projectId] = useAtom(projectIdAtom, globalScope);
+  const [projectId] = useAtom(projectIdAtom, projectScope);
 
   const watched = useWatch({
     control,
diff --git a/src/components/TableSettingsDialog/TableSettingsDialog.tsx b/src/components/TableSettingsDialog/TableSettingsDialog.tsx
index 3850e30e..52e15fca 100644
--- a/src/components/TableSettingsDialog/TableSettingsDialog.tsx
+++ b/src/components/TableSettingsDialog/TableSettingsDialog.tsx
@@ -17,7 +17,7 @@ import ActionsMenu from "./ActionsMenu";
 import DeleteMenu from "./DeleteMenu";
 
 import {
-  globalScope,
+  projectScope,
   tableSettingsDialogAtom,
   tablesAtom,
   projectRolesAtom,
@@ -26,7 +26,7 @@ import {
   createTableAtom,
   updateTableAtom,
   AdditionalTableSettings,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import { TableSettings } from "@src/types/table";
 import { analytics, logEvent } from "@src/analytics";
 
@@ -60,16 +60,16 @@ const customComponents = {
 export default function TableSettingsDialog() {
   const [{ open, mode, data }, setTableSettingsDialog] = useAtom(
     tableSettingsDialogAtom,
-    globalScope
+    projectScope
   );
   const clearDialog = () => setTableSettingsDialog({ open: false });
 
-  const [projectRoles] = useAtom(projectRolesAtom, globalScope);
-  const [tables] = useAtom(tablesAtom, globalScope);
-  const [rowyRun] = useAtom(rowyRunAtom, globalScope);
+  const [projectRoles] = useAtom(projectRolesAtom, projectScope);
+  const [tables] = useAtom(tablesAtom, projectScope);
+  const [rowyRun] = useAtom(rowyRunAtom, projectScope);
 
   const navigate = useNavigate();
-  const confirm = useSetAtom(confirmDialogAtom, globalScope);
+  const confirm = useSetAtom(confirmDialogAtom, projectScope);
   const snackLogContext = useSnackLogContext();
   const { enqueueSnackbar, closeSnackbar } = useSnackbar();
 
@@ -91,8 +91,8 @@ export default function TableSettingsDialog() {
     }
   );
 
-  const [createTable] = useAtom(createTableAtom, globalScope);
-  const [updateTable] = useAtom(updateTableAtom, globalScope);
+  const [createTable] = useAtom(createTableAtom, projectScope);
+  const [updateTable] = useAtom(updateTableAtom, projectScope);
 
   if (!open) return null;
 
diff --git a/src/components/TableSettingsDialog/form.tsx b/src/components/TableSettingsDialog/form.tsx
index 7a8ac27c..11942034 100644
--- a/src/components/TableSettingsDialog/form.tsx
+++ b/src/components/TableSettingsDialog/form.tsx
@@ -1,6 +1,6 @@
 import { find } from "lodash-es";
 import { Field, FieldType } from "@rowy/form-builder";
-import { TableSettingsDialogState } from "@src/atoms/globalScope";
+import { TableSettingsDialogState } from "@src/atoms/projectScope";
 
 import { Link, ListItemText, Typography } from "@mui/material";
 import OpenInNewIcon from "@src/components/InlineOpenInNewIcon";
diff --git a/src/components/TableToolbar/AddRow.tsx b/src/components/TableToolbar/AddRow.tsx
index 4c2aae58..c6372865 100644
--- a/src/components/TableToolbar/AddRow.tsx
+++ b/src/components/TableToolbar/AddRow.tsx
@@ -17,10 +17,10 @@ import {
 } from "@src/assets/icons";
 
 import {
-  globalScope,
+  projectScope,
   userRolesAtom,
   tableAddRowIdTypeAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import {
   tableScope,
   tableSettingsAtom,
@@ -30,12 +30,12 @@ import {
 } from "@src/atoms/tableScope";
 
 export default function AddRow() {
-  const [userRoles] = useAtom(userRolesAtom, globalScope);
+  const [userRoles] = useAtom(userRolesAtom, projectScope);
   const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
   const [tableFilters] = useAtom(tableFiltersAtom, tableScope);
   const [tableSorts] = useAtom(tableSortsAtom, tableScope);
   const addRow = useSetAtom(addRowAtom, tableScope);
-  const [idType, setIdType] = useAtom(tableAddRowIdTypeAtom, globalScope);
+  const [idType, setIdType] = useAtom(tableAddRowIdTypeAtom, projectScope);
 
   const anchorEl = useRef<HTMLDivElement>(null);
   const [open, setOpen] = useState(false);
diff --git a/src/components/TableToolbar/Filters/Filters.tsx b/src/components/TableToolbar/Filters/Filters.tsx
index aa9d509c..b1c6b77e 100644
--- a/src/components/TableToolbar/Filters/Filters.tsx
+++ b/src/components/TableToolbar/Filters/Filters.tsx
@@ -21,11 +21,11 @@ import FiltersPopover from "./FiltersPopover";
 import FilterInputs from "./FilterInputs";
 
 import {
-  globalScope,
+  projectScope,
   userSettingsAtom,
   updateUserSettingsAtom,
   userRolesAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import {
   tableScope,
   tableIdAtom,
@@ -52,9 +52,9 @@ enum FilterType {
 }
 
 export default function Filters() {
-  const [userSettings] = useAtom(userSettingsAtom, globalScope);
-  const [updateUserSettings] = useAtom(updateUserSettingsAtom, globalScope);
-  const [userRoles] = useAtom(userRolesAtom, globalScope);
+  const [userSettings] = useAtom(userSettingsAtom, projectScope);
+  const [updateUserSettings] = useAtom(updateUserSettingsAtom, projectScope);
+  const [userRoles] = useAtom(userRolesAtom, projectScope);
   const [tableId] = useAtom(tableIdAtom, tableScope);
   const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
   const [tableColumnsOrdered] = useAtom(tableColumnsOrderedAtom, tableScope);
diff --git a/src/components/TableToolbar/HiddenFields.tsx b/src/components/TableToolbar/HiddenFields.tsx
index 22b5b497..8015f6f5 100644
--- a/src/components/TableToolbar/HiddenFields.tsx
+++ b/src/components/TableToolbar/HiddenFields.tsx
@@ -12,17 +12,17 @@ import ColumnSelect, { ColumnItem } from "@src/components/Table/ColumnSelect";
 import ButtonWithStatus from "@src/components/ButtonWithStatus";
 
 import {
-  globalScope,
+  projectScope,
   userSettingsAtom,
   updateUserSettingsAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import { tableScope, tableIdAtom } from "@src/atoms/tableScope";
 import { formatSubTableName } from "@src/utils/table";
 
 export default function HiddenFields() {
   const buttonRef = useRef<HTMLButtonElement>(null);
 
-  const [userSettings] = useAtom(userSettingsAtom, globalScope);
+  const [userSettings] = useAtom(userSettingsAtom, projectScope);
   const [tableId] = useAtom(tableIdAtom, tableScope);
 
   const [open, setOpen] = useState(false);
@@ -47,7 +47,7 @@ export default function HiddenFields() {
   // }));
 
   // Save when MultiSelect closes
-  const [updateUserSettings] = useAtom(updateUserSettingsAtom, globalScope);
+  const [updateUserSettings] = useAtom(updateUserSettingsAtom, projectScope);
   const handleSave = () => {
     // Only update if there were any changes because it’s slow to update
     if (!isEqual(hiddenFields, userDocHiddenFields) && updateUserSettings) {
diff --git a/src/components/TableToolbar/ImportCsv.tsx b/src/components/TableToolbar/ImportCsv.tsx
index 316e239b..dbd93c8e 100644
--- a/src/components/TableToolbar/ImportCsv.tsx
+++ b/src/components/TableToolbar/ImportCsv.tsx
@@ -25,7 +25,7 @@ import { Import as ImportIcon } from "@src/assets/icons";
 import { Upload as FileUploadIcon } from "@src/assets/icons";
 import CheckIcon from "@mui/icons-material/CheckCircle";
 
-import { globalScope, userRolesAtom } from "@src/atoms/globalScope";
+import { projectScope, userRolesAtom } from "@src/atoms/projectScope";
 import {
   tableScope,
   tableSettingsAtom,
@@ -48,7 +48,7 @@ export interface IImportCsvProps {
 }
 
 export default function ImportCsv({ render, PopoverProps }: IImportCsvProps) {
-  const [userRoles] = useAtom(userRolesAtom, globalScope);
+  const [userRoles] = useAtom(userRolesAtom, projectScope);
   const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
   const [{ importType, csvData }, setImportCsv] = useAtom(
     importCsvAtom,
diff --git a/src/components/TableToolbar/ReExecute.tsx b/src/components/TableToolbar/ReExecute.tsx
index 93457454..11a8fec0 100644
--- a/src/components/TableToolbar/ReExecute.tsx
+++ b/src/components/TableToolbar/ReExecute.tsx
@@ -13,10 +13,10 @@ import Modal from "@src/components/Modal";
 import CircularProgressOptical from "@src/components/CircularProgressOptical";
 
 import {
-  globalScope,
+  projectScope,
   projectSettingsAtom,
   rowyRunModalAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import { firebaseDbAtom } from "@src/sources/ProjectSourceFirebase";
 import { tableScope, tableSettingsAtom } from "@src/atoms/tableScope";
 
@@ -28,10 +28,10 @@ export default function ReExecute() {
   const [updating, setUpdating] = useState(false);
   const handleClose = () => setOpen(false);
 
-  const [projectSettings] = useAtom(projectSettingsAtom, globalScope);
-  const openRowyRunModal = useSetAtom(rowyRunModalAtom, globalScope);
+  const [projectSettings] = useAtom(projectSettingsAtom, projectScope);
+  const openRowyRunModal = useSetAtom(rowyRunModalAtom, projectScope);
   const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
-  const [firebaseDb] = useAtom(firebaseDbAtom, globalScope);
+  const [firebaseDb] = useAtom(firebaseDbAtom, projectScope);
 
   if (!firebaseDb) return null;
 
diff --git a/src/components/TableToolbar/TableSettings.tsx b/src/components/TableToolbar/TableSettings.tsx
index 06fd6899..3b3d0ef8 100644
--- a/src/components/TableToolbar/TableSettings.tsx
+++ b/src/components/TableToolbar/TableSettings.tsx
@@ -3,14 +3,14 @@ import { useAtom, useSetAtom } from "jotai";
 import TableToolbarButton from "./TableToolbarButton";
 import SettingsIcon from "@mui/icons-material/SettingsOutlined";
 
-import { globalScope, tableSettingsDialogAtom } from "@src/atoms/globalScope";
+import { projectScope, tableSettingsDialogAtom } from "@src/atoms/projectScope";
 import { tableScope, tableSettingsAtom } from "@src/atoms/tableScope";
 
 export default function TableSettings() {
   const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
   const openTableSettingsDialog = useSetAtom(
     tableSettingsDialogAtom,
-    globalScope
+    projectScope
   );
 
   return (
diff --git a/src/components/TableToolbar/TableToolbar.tsx b/src/components/TableToolbar/TableToolbar.tsx
index 5f555b13..31587bbd 100644
--- a/src/components/TableToolbar/TableToolbar.tsx
+++ b/src/components/TableToolbar/TableToolbar.tsx
@@ -18,12 +18,12 @@ import HiddenFields from "./HiddenFields";
 import RowHeight from "./RowHeight";
 
 import {
-  globalScope,
+  projectScope,
   projectSettingsAtom,
   userRolesAtom,
   compatibleRowyRunVersionAtom,
   rowyRunModalAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import {
   tableScope,
   tableSettingsAtom,
@@ -42,13 +42,13 @@ const ReExecute = lazy(() => import("./ReExecute" /* webpackChunkName: "ReExecut
 export const TABLE_TOOLBAR_HEIGHT = 44;
 
 export default function TableToolbar() {
-  const [projectSettings] = useAtom(projectSettingsAtom, globalScope);
-  const [userRoles] = useAtom(userRolesAtom, globalScope);
+  const [projectSettings] = useAtom(projectSettingsAtom, projectScope);
+  const [userRoles] = useAtom(userRolesAtom, projectScope);
   const [compatibleRowyRunVersion] = useAtom(
     compatibleRowyRunVersionAtom,
-    globalScope
+    projectScope
   );
-  const openRowyRunModal = useSetAtom(rowyRunModalAtom, globalScope);
+  const openRowyRunModal = useSetAtom(rowyRunModalAtom, projectScope);
   const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
   const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
   const openTableModal = useSetAtom(tableModalAtom, tableScope);
diff --git a/src/components/TableTutorial/TableTutorial.tsx b/src/components/TableTutorial/TableTutorial.tsx
index 7d61d521..0df79ef7 100644
--- a/src/components/TableTutorial/TableTutorial.tsx
+++ b/src/components/TableTutorial/TableTutorial.tsx
@@ -17,12 +17,12 @@ import ArrowForwardIcon from "@mui/icons-material/ArrowForward";
 import StepsProgress from "@src/components/StepsProgress";
 import { TUTORIAL_STEPS } from "./Steps";
 
-import { globalScope, confirmDialogAtom } from "@src/atoms/globalScope";
+import { projectScope, confirmDialogAtom } from "@src/atoms/projectScope";
 import { ROUTES } from "@src/constants/routes";
 import { NAV_DRAWER_COLLAPSED_WIDTH } from "@src/layouts/Navigation/NavDrawer";
 
 export default function TableTutorial() {
-  const confirm = useSetAtom(confirmDialogAtom, globalScope);
+  const confirm = useSetAtom(confirmDialogAtom, projectScope);
   const navigate = useNavigate();
 
   const [completed, setCompleted] = useState(
diff --git a/src/components/fields/Action/ActionFab.tsx b/src/components/fields/Action/ActionFab.tsx
index 67f00847..2a122f2b 100644
--- a/src/components/fields/Action/ActionFab.tsx
+++ b/src/components/fields/Action/ActionFab.tsx
@@ -12,10 +12,10 @@ import CircularProgressOptical from "@src/components/CircularProgressOptical";
 
 import { firebaseFunctionsAtom } from "@src/sources/ProjectSourceFirebase";
 import {
-  globalScope,
+  projectScope,
   confirmDialogAtom,
   rowyRunAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import { tableScope, tableSettingsAtom } from "@src/atoms/tableScope";
 import { useActionParams } from "./FormDialog/Context";
 import { runRoutes } from "@src/constants/runRoutes";
@@ -54,10 +54,10 @@ export default function ActionFab({
   disabled,
   ...props
 }: IActionFabProps) {
-  const confirm = useSetAtom(confirmDialogAtom, globalScope);
-  const [rowyRun] = useAtom(rowyRunAtom, globalScope);
+  const confirm = useSetAtom(confirmDialogAtom, projectScope);
+  const [rowyRun] = useAtom(rowyRunAtom, projectScope);
   const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
-  const [firebaseFunctions] = useAtom(firebaseFunctionsAtom, globalScope);
+  const [firebaseFunctions] = useAtom(firebaseFunctionsAtom, projectScope);
 
   const { enqueueSnackbar } = useSnackbar();
   const { requestParams } = useActionParams();
diff --git a/src/components/fields/Action/Settings.tsx b/src/components/fields/Action/Settings.tsx
index 1ecf60e1..bf5fce43 100644
--- a/src/components/fields/Action/Settings.tsx
+++ b/src/components/fields/Action/Settings.tsx
@@ -32,12 +32,12 @@ import InlineOpenInNewIcon from "@src/components/InlineOpenInNewIcon";
 import FormFieldSnippets from "./FormFieldSnippets";
 
 import {
-  globalScope,
+  projectScope,
   projectIdAtom,
   projectRolesAtom,
   projectSettingsAtom,
   compatibleRowyRunVersionAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import { tableScope, tableColumnsOrderedAtom } from "@src/atoms/tableScope";
 import { WIKI_LINKS } from "@src/constants/externalLinks";
 
@@ -59,12 +59,12 @@ const CodeEditor = lazy(
 );
 
 const Settings = ({ config, onChange, fieldName }: ISettingsProps) => {
-  const [projectId] = useAtom(projectIdAtom, globalScope);
-  const [roles] = useAtom(projectRolesAtom, globalScope);
-  const [settings] = useAtom(projectSettingsAtom, globalScope);
+  const [projectId] = useAtom(projectIdAtom, projectScope);
+  const [roles] = useAtom(projectRolesAtom, projectScope);
+  const [settings] = useAtom(projectSettingsAtom, projectScope);
   const [compatibleRowyRunVersion] = useAtom(
     compatibleRowyRunVersionAtom,
-    globalScope
+    projectScope
   );
   const [tableColumnsOrdered] = useAtom(tableColumnsOrderedAtom, tableScope);
 
diff --git a/src/components/fields/Checkbox/TableCell.tsx b/src/components/fields/Checkbox/TableCell.tsx
index 54f67f08..5cef0a3b 100644
--- a/src/components/fields/Checkbox/TableCell.tsx
+++ b/src/components/fields/Checkbox/TableCell.tsx
@@ -3,7 +3,7 @@ import { useSetAtom } from "jotai";
 import { get } from "lodash-es";
 
 import { FormControlLabel, Switch } from "@mui/material";
-import { globalScope, confirmDialogAtom } from "@src/atoms/globalScope";
+import { projectScope, confirmDialogAtom } from "@src/atoms/projectScope";
 
 const replacer = (data: any) => (m: string, key: string) => {
   const objKey = key.split(":")[0];
@@ -18,7 +18,7 @@ export default function Checkbox({
   onSubmit,
   disabled,
 }: IHeavyCellProps) {
-  const confirm = useSetAtom(confirmDialogAtom, globalScope);
+  const confirm = useSetAtom(confirmDialogAtom, projectScope);
 
   const handleChange = () => {
     if (column?.config?.confirmation) {
diff --git a/src/components/fields/ConnectTable/ConnectTableSelect.tsx b/src/components/fields/ConnectTable/ConnectTableSelect.tsx
index 5b78f4d7..3b4086ac 100644
--- a/src/components/fields/ConnectTable/ConnectTableSelect.tsx
+++ b/src/components/fields/ConnectTable/ConnectTableSelect.tsx
@@ -11,7 +11,7 @@ import MultiSelect, { MultiSelectProps } from "@rowy/multiselect";
 import Loading from "@src/components/Loading";
 import InlineOpenInNewIcon from "@src/components/InlineOpenInNewIcon";
 
-import { globalScope, rowyRunAtom } from "@src/atoms/globalScope";
+import { projectScope, rowyRunAtom } from "@src/atoms/projectScope";
 import { tableScope } from "@src/atoms/tableScope";
 import { runRoutes } from "@src/constants/runRoutes";
 import { WIKI_LINKS } from "@src/constants/externalLinks";
@@ -76,7 +76,7 @@ export default function ConnectTableSelect({
 }: IConnectTableSelectProps) {
   const { enqueueSnackbar } = useSnackbar();
 
-  const [rowyRun] = useAtom(rowyRunAtom, globalScope);
+  const [rowyRun] = useAtom(rowyRunAtom, projectScope);
   const [algoliaAppId, setAlgoliaAppId] = useAtom(algoliaAppIdAtom, tableScope);
 
   useEffect(() => {
diff --git a/src/components/fields/ConnectTable/Settings.tsx b/src/components/fields/ConnectTable/Settings.tsx
index 6135e175..d763a559 100644
--- a/src/components/fields/ConnectTable/Settings.tsx
+++ b/src/components/fields/ConnectTable/Settings.tsx
@@ -17,20 +17,20 @@ import InlineOpenInNewIcon from "@src/components/InlineOpenInNewIcon";
 import WarningIcon from "@mui/icons-material/WarningAmberOutlined";
 
 import {
-  globalScope,
+  projectScope,
   getTableSchemaAtom,
   tablesAtom,
   projectSettingsAtom,
   rowyRunModalAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import { FieldType } from "@src/constants/fields";
 import { WIKI_LINKS } from "@src/constants/externalLinks";
 
 export default function Settings({ onChange, config }: ISettingsProps) {
-  const [tables] = useAtom(tablesAtom, globalScope);
-  const [projectSettings] = useAtom(projectSettingsAtom, globalScope);
-  const openRowyRunModal = useSetAtom(rowyRunModalAtom, globalScope);
-  const [getTableSchema] = useAtom(getTableSchemaAtom, globalScope);
+  const [tables] = useAtom(tablesAtom, projectScope);
+  const [projectSettings] = useAtom(projectSettingsAtom, projectScope);
+  const openRowyRunModal = useSetAtom(rowyRunModalAtom, projectScope);
+  const [getTableSchema] = useAtom(getTableSchemaAtom, projectScope);
 
   useEffect(() => {
     if (!projectSettings.rowyRunUrl)
diff --git a/src/components/fields/Connector/Select/PopupContents.tsx b/src/components/fields/Connector/Select/PopupContents.tsx
index c101123d..29453471 100644
--- a/src/components/fields/Connector/Select/PopupContents.tsx
+++ b/src/components/fields/Connector/Select/PopupContents.tsx
@@ -25,7 +25,7 @@ import useStyles from "./styles";
 import Loading from "@src/components/Loading";
 import { getLabel } from "@src/components/fields/Connector/utils";
 import { useSnackbar } from "notistack";
-import { globalScope, rowyRunAtom } from "@src/atoms/globalScope";
+import { projectScope, rowyRunAtom } from "@src/atoms/projectScope";
 import { tableScope, tableSettingsAtom } from "@src/atoms/tableScope";
 import { getTableSchemaPath } from "@src/utils/table";
 
@@ -39,7 +39,7 @@ export default function PopupContents({
   column,
   docRef,
 }: IPopupContentsProps) {
-  const [rowyRun] = useAtom(rowyRunAtom, globalScope);
+  const [rowyRun] = useAtom(rowyRunAtom, projectScope);
   const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
 
   const { enqueueSnackbar } = useSnackbar();
diff --git a/src/components/fields/Derivative/ContextMenuActions.tsx b/src/components/fields/Derivative/ContextMenuActions.tsx
index 4596d927..f877301f 100644
--- a/src/components/fields/Derivative/ContextMenuActions.tsx
+++ b/src/components/fields/Derivative/ContextMenuActions.tsx
@@ -5,7 +5,7 @@ import { useSnackbar } from "notistack";
 import ReEvalIcon from "@mui/icons-material/ReplayOutlined";
 import EvalIcon from "@mui/icons-material/PlayCircleOutline";
 
-import { globalScope, rowyRunAtom } from "@src/atoms/globalScope";
+import { projectScope, rowyRunAtom } from "@src/atoms/projectScope";
 import {
   tableScope,
   tableSettingsAtom,
@@ -26,7 +26,7 @@ export const ContextMenuActions: IFieldConfig["contextMenuActions"] = (
   selectedCell,
   reset
 ) => {
-  const [rowyRun] = useAtom(rowyRunAtom, globalScope);
+  const [rowyRun] = useAtom(rowyRunAtom, projectScope);
   const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
   const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
   const [tableRows] = useAtom(tableRowsAtom, tableScope);
diff --git a/src/components/fields/Derivative/Settings.tsx b/src/components/fields/Derivative/Settings.tsx
index 57c25d72..e084bc32 100644
--- a/src/components/fields/Derivative/Settings.tsx
+++ b/src/components/fields/Derivative/Settings.tsx
@@ -9,11 +9,11 @@ import FieldsDropdown from "@src/components/ColumnModals/FieldsDropdown";
 import CodeEditorHelper from "@src/components/CodeEditor/CodeEditorHelper";
 
 import {
-  globalScope,
+  projectScope,
   compatibleRowyRunVersionAtom,
   projectSettingsAtom,
   rowyRunModalAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import { tableScope, tableColumnsOrderedAtom } from "@src/atoms/tableScope";
 import { FieldType } from "@src/constants/fields";
 import { WIKI_LINKS } from "@src/constants/externalLinks";
@@ -40,12 +40,12 @@ export default function Settings({
   onBlur,
   errors,
 }: ISettingsProps) {
-  const [projectSettings] = useAtom(projectSettingsAtom, globalScope);
+  const [projectSettings] = useAtom(projectSettingsAtom, projectScope);
   const [compatibleRowyRunVersion] = useAtom(
     compatibleRowyRunVersionAtom,
-    globalScope
+    projectScope
   );
-  const openRowyRunModal = useSetAtom(rowyRunModalAtom, globalScope);
+  const openRowyRunModal = useSetAtom(rowyRunModalAtom, projectScope);
   const [tableColumnsOrdered] = useAtom(tableColumnsOrderedAtom, tableScope);
 
   useEffect(() => {
diff --git a/src/components/fields/File/SideDrawerField.tsx b/src/components/fields/File/SideDrawerField.tsx
index 0bc14268..c28e0866 100644
--- a/src/components/fields/File/SideDrawerField.tsx
+++ b/src/components/fields/File/SideDrawerField.tsx
@@ -21,7 +21,7 @@ import CircularProgressOptical from "@src/components/CircularProgressOptical";
 import { DATE_TIME_FORMAT } from "@src/constants/dates";
 
 import { fieldSx, getFieldId } from "@src/components/SideDrawer/utils";
-import { globalScope, confirmDialogAtom } from "@src/atoms/globalScope";
+import { projectScope, confirmDialogAtom } from "@src/atoms/projectScope";
 import { FileValue } from "@src/types/table";
 
 export default function File_({
@@ -32,7 +32,7 @@ export default function File_({
   onSubmit,
   disabled,
 }: ISideDrawerFieldProps) {
-  const confirm = useSetAtom(confirmDialogAtom, globalScope);
+  const confirm = useSetAtom(confirmDialogAtom, projectScope);
 
   const { uploaderState, upload, deleteUpload } = useUploader();
 
diff --git a/src/components/fields/File/TableCell.tsx b/src/components/fields/File/TableCell.tsx
index 407553b2..685cf62e 100644
--- a/src/components/fields/File/TableCell.tsx
+++ b/src/components/fields/File/TableCell.tsx
@@ -11,7 +11,7 @@ import { Upload as UploadIcon } from "@src/assets/icons";
 import ChipList from "@src/components/Table/formatters/ChipList";
 import CircularProgressOptical from "@src/components/CircularProgressOptical";
 
-import { globalScope, confirmDialogAtom } from "@src/atoms/globalScope";
+import { projectScope, confirmDialogAtom } from "@src/atoms/projectScope";
 import { tableScope, updateFieldAtom } from "@src/atoms/tableScope";
 import useUploader from "@src/hooks/useFirebaseStorageUploader";
 import { FileIcon } from ".";
@@ -26,7 +26,7 @@ export default function File_({
   disabled,
   docRef,
 }: IHeavyCellProps) {
-  const confirm = useSetAtom(confirmDialogAtom, globalScope);
+  const confirm = useSetAtom(confirmDialogAtom, projectScope);
   const updateField = useSetAtom(updateFieldAtom, tableScope);
 
   const { uploaderState, upload, deleteUpload } = useUploader();
diff --git a/src/components/fields/Image/SideDrawerField.tsx b/src/components/fields/Image/SideDrawerField.tsx
index 2436a2dd..9780b831 100644
--- a/src/components/fields/Image/SideDrawerField.tsx
+++ b/src/components/fields/Image/SideDrawerField.tsx
@@ -23,7 +23,7 @@ import OpenIcon from "@mui/icons-material/OpenInNewOutlined";
 import Thumbnail from "@src/components/Thumbnail";
 import CircularProgressOptical from "@src/components/CircularProgressOptical";
 
-import { globalScope, confirmDialogAtom } from "@src/atoms/globalScope";
+import { projectScope, confirmDialogAtom } from "@src/atoms/projectScope";
 import { IMAGE_MIME_TYPES } from ".";
 import { fieldSx, getFieldId } from "@src/components/SideDrawer/utils";
 
@@ -88,7 +88,7 @@ export default function Image_({
   onSubmit,
   disabled,
 }: ISideDrawerFieldProps) {
-  const confirm = useSetAtom(confirmDialogAtom, globalScope);
+  const confirm = useSetAtom(confirmDialogAtom, projectScope);
   const { uploaderState, upload, deleteUpload } = useUploader();
   const { progress } = uploaderState;
 
diff --git a/src/components/fields/Image/TableCell.tsx b/src/components/fields/Image/TableCell.tsx
index c846be9e..84a44904 100644
--- a/src/components/fields/Image/TableCell.tsx
+++ b/src/components/fields/Image/TableCell.tsx
@@ -22,7 +22,7 @@ import OpenIcon from "@mui/icons-material/OpenInNewOutlined";
 import Thumbnail from "@src/components/Thumbnail";
 import CircularProgressOptical from "@src/components/CircularProgressOptical";
 
-import { globalScope, confirmDialogAtom } from "@src/atoms/globalScope";
+import { projectScope, confirmDialogAtom } from "@src/atoms/projectScope";
 import {
   tableSchemaAtom,
   tableScope,
@@ -92,7 +92,7 @@ export default function Image_({
   disabled,
   docRef,
 }: IHeavyCellProps) {
-  const confirm = useSetAtom(confirmDialogAtom, globalScope);
+  const confirm = useSetAtom(confirmDialogAtom, projectScope);
   const updateField = useSetAtom(updateFieldAtom, tableScope);
   const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
   const { uploaderState, upload, deleteUpload } = useUploader();
diff --git a/src/components/fields/Json/SideDrawerField.tsx b/src/components/fields/Json/SideDrawerField.tsx
index 52efa335..d6b15595 100644
--- a/src/components/fields/Json/SideDrawerField.tsx
+++ b/src/components/fields/Json/SideDrawerField.tsx
@@ -15,7 +15,7 @@ import TabList from "@mui/lab/TabList";
 import TabPanel from "@mui/lab/TabPanel";
 
 import { fieldSx, getFieldId } from "@src/components/SideDrawer/utils";
-import { globalScope, jsonEditorAtom } from "@src/atoms/globalScope";
+import { projectScope, jsonEditorAtom } from "@src/atoms/projectScope";
 import config from ".";
 
 const isValidJson = (val: any) => {
@@ -37,7 +37,7 @@ export default function Json({
 }: ISideDrawerFieldProps) {
   const theme = useTheme();
 
-  const [editor, setEditor] = useAtom(jsonEditorAtom, globalScope);
+  const [editor, setEditor] = useAtom(jsonEditorAtom, projectScope);
   const [codeValid, setCodeValid] = useState(true);
 
   const sanitizedValue =
diff --git a/src/components/fields/Reference/BasicCell.tsx b/src/components/fields/Reference/BasicCell.tsx
index 5ccab9b0..b75b62d2 100644
--- a/src/components/fields/Reference/BasicCell.tsx
+++ b/src/components/fields/Reference/BasicCell.tsx
@@ -4,10 +4,10 @@ import { IBasicCellProps } from "@src/components/fields/types";
 import { Stack, IconButton } from "@mui/material";
 import LaunchIcon from "@mui/icons-material/Launch";
 
-import { globalScope, projectIdAtom } from "@src/atoms/globalScope";
+import { projectScope, projectIdAtom } from "@src/atoms/projectScope";
 
 export default function Reference({ value }: IBasicCellProps) {
-  const [projectId] = useAtom(projectIdAtom, globalScope);
+  const [projectId] = useAtom(projectIdAtom, projectScope);
 
   const path = value?.path ?? "";
   if (!path) return null;
diff --git a/src/components/fields/Reference/EditorCell.tsx b/src/components/fields/Reference/EditorCell.tsx
index d68ceb9b..824a8585 100644
--- a/src/components/fields/Reference/EditorCell.tsx
+++ b/src/components/fields/Reference/EditorCell.tsx
@@ -5,14 +5,14 @@ import { get } from "lodash-es";
 
 import { TextField } from "@mui/material";
 
-import { globalScope } from "@src/atoms/globalScope";
+import { projectScope } from "@src/atoms/projectScope";
 import { firebaseDbAtom } from "@src/sources/ProjectSourceFirebase";
 import { tableScope, updateFieldAtom } from "@src/atoms/tableScope";
 import { doc, deleteField } from "firebase/firestore";
 
 /** WARNING: THIS DOES NOT WORK IN REACT 18 STRICT MODE */
 export default function TextEditor({ row, column }: EditorProps<any>) {
-  const [firebaseDb] = useAtom(firebaseDbAtom, globalScope);
+  const [firebaseDb] = useAtom(firebaseDbAtom, projectScope);
   const updateField = useSetAtom(updateFieldAtom, tableScope);
 
   const inputRef = useRef<HTMLInputElement>(null);
diff --git a/src/components/fields/Reference/SideDrawerField.tsx b/src/components/fields/Reference/SideDrawerField.tsx
index b8f09e81..2c13b345 100644
--- a/src/components/fields/Reference/SideDrawerField.tsx
+++ b/src/components/fields/Reference/SideDrawerField.tsx
@@ -5,7 +5,7 @@ import { ISideDrawerFieldProps } from "@src/components/fields/types";
 import { Stack, TextField, IconButton } from "@mui/material";
 import LaunchIcon from "@mui/icons-material/Launch";
 
-import { globalScope, projectIdAtom } from "@src/atoms/globalScope";
+import { projectScope, projectIdAtom } from "@src/atoms/projectScope";
 import { firebaseDbAtom } from "@src/sources/ProjectSourceFirebase";
 import { getFieldId } from "@src/components/SideDrawer/utils";
 
@@ -16,8 +16,8 @@ export default function Reference({
   onSubmit,
   disabled,
 }: ISideDrawerFieldProps) {
-  const [projectId] = useAtom(projectIdAtom, globalScope);
-  const [firebaseDb] = useAtom(firebaseDbAtom, globalScope);
+  const [projectId] = useAtom(projectIdAtom, projectScope);
+  const [firebaseDb] = useAtom(firebaseDbAtom, projectScope);
 
   const transformedValue =
     Boolean(value) && "path" in value && typeof value.path === "string"
diff --git a/src/hooks/useFirebaseStorageUploader.tsx b/src/hooks/useFirebaseStorageUploader.tsx
index b4dd0d5b..16fbd521 100644
--- a/src/hooks/useFirebaseStorageUploader.tsx
+++ b/src/hooks/useFirebaseStorageUploader.tsx
@@ -12,7 +12,7 @@ import {
 import { Paper, Button } from "@mui/material";
 import InlineOpenInNewIcon from "@src/components/InlineOpenInNewIcon";
 
-import { globalScope } from "@src/atoms/globalScope";
+import { projectScope } from "@src/atoms/projectScope";
 import { firebaseStorageAtom } from "@src/sources/ProjectSourceFirebase";
 import { WIKI_LINKS } from "@src/constants/externalLinks";
 import { FileValue } from "@src/types/table";
@@ -39,7 +39,7 @@ export type UploadProps = {
 
 // TODO: GENERALIZE INTO ATOM
 const useFirebaseStorageUploader = () => {
-  const [firebaseStorage] = useAtom(firebaseStorageAtom, globalScope);
+  const [firebaseStorage] = useAtom(firebaseStorageAtom, projectScope);
   const { enqueueSnackbar } = useSnackbar();
 
   const [uploaderState, uploaderDispatch] = useReducer(uploadReducer, {
diff --git a/src/hooks/useFirestoreCollectionWithAtom.ts b/src/hooks/useFirestoreCollectionWithAtom.ts
index e1578f78..23bc2ce5 100644
--- a/src/hooks/useFirestoreCollectionWithAtom.ts
+++ b/src/hooks/useFirestoreCollectionWithAtom.ts
@@ -26,7 +26,7 @@ import {
 } from "firebase/firestore";
 import { useErrorHandler } from "react-error-boundary";
 
-import { globalScope } from "@src/atoms/globalScope";
+import { projectScope } from "@src/atoms/projectScope";
 import {
   UpdateCollectionDocFunction,
   DeleteCollectionDocFunction,
@@ -67,7 +67,7 @@ interface IUseFirestoreCollectionWithAtomOptions<T> {
 
 /**
  * Attaches a listener for a Firestore collection and unsubscribes on unmount.
- * Gets the Firestore instance initiated in globalScope.
+ * Gets the Firestore instance initiated in projectScope.
  * Updates an atom and Suspends that atom until the first snapshot is received.
  *
  * @param dataAtom - Atom to store data in
@@ -96,7 +96,7 @@ export function useFirestoreCollectionWithAtom<T = TableRow>(
     nextPageAtom,
   } = options || {};
 
-  const [firebaseDb] = useAtom(firebaseDbAtom, globalScope);
+  const [firebaseDb] = useAtom(firebaseDbAtom, projectScope);
   const setDataAtom = useSetAtom(dataAtom, dataScope);
   const handleError = useErrorHandler();
 
diff --git a/src/hooks/useFirestoreDocWithAtom.ts b/src/hooks/useFirestoreDocWithAtom.ts
index 8e63ce76..e7691155 100644
--- a/src/hooks/useFirestoreDocWithAtom.ts
+++ b/src/hooks/useFirestoreDocWithAtom.ts
@@ -15,7 +15,7 @@ import {
 } from "firebase/firestore";
 import { useErrorHandler } from "react-error-boundary";
 
-import { globalScope } from "@src/atoms/globalScope";
+import { projectScope } from "@src/atoms/projectScope";
 import { UpdateDocFunction, TableRow } from "@src/types/table";
 import { firebaseDbAtom } from "@src/sources/ProjectSourceFirebase";
 
@@ -35,7 +35,7 @@ interface IUseFirestoreDocWithAtomOptions<T> {
 
 /**
  * Attaches a listener for a Firestore document and unsubscribes on unmount.
- * Gets the Firestore instance initiated in globalScope.
+ * Gets the Firestore instance initiated in projectScope.
  * Updates an atom and Suspends that atom until the first snapshot is received.
  *
  * @param dataAtom - Atom to store data in
@@ -58,7 +58,7 @@ export function useFirestoreDocWithAtom<T = TableRow>(
     updateDataAtom,
   } = options || {};
 
-  const [firebaseDb] = useAtom(firebaseDbAtom, globalScope);
+  const [firebaseDb] = useAtom(firebaseDbAtom, projectScope);
   const setDataAtom = useSetAtom(dataAtom, dataScope);
   const setUpdateDataAtom = useSetAtom(
     options?.updateDataAtom || (dataAtom as any),
diff --git a/src/hooks/useUpdateCheck.ts b/src/hooks/useUpdateCheck.ts
index e4468403..d84e20d0 100644
--- a/src/hooks/useUpdateCheck.ts
+++ b/src/hooks/useUpdateCheck.ts
@@ -4,10 +4,10 @@ import { differenceInDays } from "date-fns";
 import { compare } from "compare-versions";
 
 import {
-  globalScope,
+  projectScope,
   rowyRunAtom,
   rowyRunLatestUpdateAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import meta from "@root/package.json";
 import { EXTERNAL_LINKS } from "@src/constants/externalLinks";
 import { runRoutes } from "@src/constants/runRoutes";
@@ -29,11 +29,11 @@ const UPDATE_ENDPOINTS = {
  * @returns [latestUpdate, checkForUpdates, loading]
  */
 export default function useUpdateCheck() {
-  const [rowyRun] = useAtom(rowyRunAtom, globalScope);
+  const [rowyRun] = useAtom(rowyRunAtom, projectScope);
   // Store latest release from GitHub
   const [latestUpdate, setLatestUpdate] = useAtom(
     rowyRunLatestUpdateAtom,
-    globalScope
+    projectScope
   );
   const [loading, setLoading] = useState(false);
 
diff --git a/src/layouts/AuthLayout.tsx b/src/layouts/AuthLayout.tsx
index 437fc667..031056c1 100644
--- a/src/layouts/AuthLayout.tsx
+++ b/src/layouts/AuthLayout.tsx
@@ -15,7 +15,7 @@ import Logo from "@src/assets/Logo";
 import bgTableLight from "@src/assets/bg-table-light.webp";
 import bgTableDark from "@src/assets/bg-table-dark.webp";
 
-import { globalScope, projectIdAtom } from "@src/atoms/globalScope";
+import { projectScope, projectIdAtom } from "@src/atoms/projectScope";
 import { EXTERNAL_LINKS } from "@src/constants/externalLinks";
 
 export interface IAuthLayoutProps {
@@ -37,7 +37,7 @@ export default function AuthLayout({
   children,
   loading,
 }: IAuthLayoutProps) {
-  const [projectId] = useAtom(projectIdAtom, globalScope);
+  const [projectId] = useAtom(projectIdAtom, projectScope);
   const fullScreenHeight = use100vh() ?? 0;
 
   const linkProps: LinkProps = {
diff --git a/src/layouts/Navigation/NavDrawer.tsx b/src/layouts/Navigation/NavDrawer.tsx
index bb9b5e53..a15014f0 100644
--- a/src/layouts/Navigation/NavDrawer.tsx
+++ b/src/layouts/Navigation/NavDrawer.tsx
@@ -38,12 +38,12 @@ import CommunityMenu from "./CommunityMenu";
 import HelpMenu from "./HelpMenu";
 
 import {
-  globalScope,
+  projectScope,
   userSettingsAtom,
   tablesAtom,
   tableSettingsDialogAtom,
   getStartedChecklistAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import { TableSettings } from "@src/types/table";
 import { ROUTES } from "@src/constants/routes";
 import { EXTERNAL_LINKS, WIKI_LINKS } from "@src/constants/externalLinks";
@@ -63,15 +63,15 @@ export default function NavDrawer({
   isPermanent,
   onClose,
 }: INavDrawerProps) {
-  const [tables] = useAtom(tablesAtom, globalScope);
-  const [userSettings] = useAtom(userSettingsAtom, globalScope);
+  const [tables] = useAtom(tablesAtom, projectScope);
+  const [userSettings] = useAtom(userSettingsAtom, projectScope);
   const openTableSettingsDialog = useSetAtom(
     tableSettingsDialogAtom,
-    globalScope
+    projectScope
   );
   const openGetStartedChecklist = useSetAtom(
     getStartedChecklistAtom,
-    globalScope
+    projectScope
   );
 
   const [hover, setHover] = useState(false);
diff --git a/src/layouts/Navigation/Navigation.tsx b/src/layouts/Navigation/Navigation.tsx
index f996dc53..332313bd 100644
--- a/src/layouts/Navigation/Navigation.tsx
+++ b/src/layouts/Navigation/Navigation.tsx
@@ -14,17 +14,17 @@ import Loading from "@src/components/Loading";
 import GetStartedChecklist from "@src/components/GetStartedChecklist";
 
 import {
-  globalScope,
+  projectScope,
   projectIdAtom,
   navOpenAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import { ROUTE_TITLES } from "@src/constants/routes";
 import { useDocumentTitle } from "@src/hooks/useDocumentTitle";
 
 export default function Navigation({ children }: React.PropsWithChildren<{}>) {
-  const [projectId] = useAtom(projectIdAtom, globalScope);
+  const [projectId] = useAtom(projectIdAtom, projectScope);
 
-  const [open, setOpen] = useAtom(navOpenAtom, globalScope);
+  const [open, setOpen] = useAtom(navOpenAtom, projectScope);
   const isPermanent = useMediaQuery((theme: any) => theme.breakpoints.up("md"));
 
   const { pathname } = useLocation();
diff --git a/src/layouts/Navigation/SettingsNav.tsx b/src/layouts/Navigation/SettingsNav.tsx
index 750bccd1..e54076c6 100644
--- a/src/layouts/Navigation/SettingsNav.tsx
+++ b/src/layouts/Navigation/SettingsNav.tsx
@@ -16,7 +16,7 @@ import { ChevronDown } from "@src/assets/icons";
 import NavItem from "./NavItem";
 import UpdateCheckBadge from "./UpdateCheckBadge";
 
-import { globalScope, userRolesAtom } from "@src/atoms/globalScope";
+import { projectScope, userRolesAtom } from "@src/atoms/projectScope";
 import { ROUTES } from "@src/constants/routes";
 
 export interface ISettingsNavProps {
@@ -28,7 +28,7 @@ export default function SettingsNav({
   closeDrawer,
   collapsed,
 }: ISettingsNavProps) {
-  const [userRoles] = useAtom(userRolesAtom, globalScope);
+  const [userRoles] = useAtom(userRolesAtom, projectScope);
   const { pathname } = useLocation();
   const [open, setOpen] = useState(pathname.includes(ROUTES.settings));
 
diff --git a/src/layouts/Navigation/TopBar.tsx b/src/layouts/Navigation/TopBar.tsx
index 7ac9c80e..3ea8db8d 100644
--- a/src/layouts/Navigation/TopBar.tsx
+++ b/src/layouts/Navigation/TopBar.tsx
@@ -22,7 +22,7 @@ import { NAV_DRAWER_WIDTH, NAV_DRAWER_COLLAPSED_WIDTH } from "./NavDrawer";
 import UserMenu from "./UserMenu";
 import UpdateCheckBadge from "./UpdateCheckBadge";
 
-import { globalScope, userRolesAtom } from "@src/atoms/globalScope";
+import { projectScope, userRolesAtom } from "@src/atoms/projectScope";
 import { ROUTES, ROUTE_TITLES } from "@src/constants/routes";
 
 export const TOP_BAR_HEIGHT = 56;
@@ -42,7 +42,7 @@ export default function TopBar({
   routeTitle,
   title,
 }: ITopBarProps) {
-  const [userRoles] = useAtom(userRolesAtom, globalScope);
+  const [userRoles] = useAtom(userRolesAtom, projectScope);
 
   const trigger = useScrollTrigger({ disableHysteresis: true, threshold: 0 });
   const menuIcon = open ? <MenuCloseIcon /> : <MenuIcon />;
diff --git a/src/layouts/Navigation/UpdateCheckBadge.tsx b/src/layouts/Navigation/UpdateCheckBadge.tsx
index 7c142d55..314eb413 100644
--- a/src/layouts/Navigation/UpdateCheckBadge.tsx
+++ b/src/layouts/Navigation/UpdateCheckBadge.tsx
@@ -2,11 +2,11 @@ import { useAtom } from "jotai";
 
 import { Badge, BadgeProps } from "@mui/material";
 
-import { globalScope, userRolesAtom } from "@src/atoms/globalScope";
+import { projectScope, userRolesAtom } from "@src/atoms/projectScope";
 import useUpdateCheck from "@src/hooks/useUpdateCheck";
 
 export default function UpdateCheckBadge(props: Partial<BadgeProps>) {
-  const [userRoles] = useAtom(userRolesAtom, globalScope);
+  const [userRoles] = useAtom(userRolesAtom, projectScope);
   const [latestUpdate] = useUpdateCheck();
 
   if (
diff --git a/src/layouts/Navigation/UserMenu.tsx b/src/layouts/Navigation/UserMenu.tsx
index 75cf8d18..6d72cbc8 100644
--- a/src/layouts/Navigation/UserMenu.tsx
+++ b/src/layouts/Navigation/UserMenu.tsx
@@ -20,12 +20,12 @@ import AccountCircleIcon from "@mui/icons-material/AccountCircleOutlined";
 import { ChevronRight as ChevronRightIcon } from "@src/assets/icons";
 
 import {
-  globalScope,
+  projectScope,
   projectIdAtom,
   userSettingsAtom,
   themeAtom,
   themeOverriddenAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import { ROUTES } from "@src/constants/routes";
 
 export default function UserMenu(props: IconButtonProps) {
@@ -33,12 +33,12 @@ export default function UserMenu(props: IconButtonProps) {
   const [open, setOpen] = useState(false);
   const [themeSubMenu, setThemeSubMenu] = useState<HTMLElement | null>(null);
 
-  const [projectId] = useAtom(projectIdAtom, globalScope);
-  const [userSettings] = useAtom(userSettingsAtom, globalScope);
-  const [theme, setTheme] = useAtom(themeAtom, globalScope);
+  const [projectId] = useAtom(projectIdAtom, projectScope);
+  const [userSettings] = useAtom(userSettingsAtom, projectScope);
+  const [theme, setTheme] = useAtom(themeAtom, projectScope);
   const [themeOverridden, setThemeOverridden] = useAtom(
     themeOverriddenAtom,
-    globalScope
+    projectScope
   );
 
   const displayName = userSettings.user?.displayName;
diff --git a/src/layouts/RequireAuth.tsx b/src/layouts/RequireAuth.tsx
index 07d56e8b..f568b23a 100644
--- a/src/layouts/RequireAuth.tsx
+++ b/src/layouts/RequireAuth.tsx
@@ -3,7 +3,7 @@ import { useLocation, Navigate } from "react-router-dom";
 
 import Loading from "@src/components/Loading";
 
-import { globalScope, currentUserAtom } from "@src/atoms/globalScope";
+import { projectScope, currentUserAtom } from "@src/atoms/projectScope";
 import { ROUTES } from "@src/constants/routes";
 
 export interface IRequireAuthProps {
@@ -11,7 +11,7 @@ export interface IRequireAuthProps {
 }
 
 export default function RequireAuth({ children }: IRequireAuthProps) {
-  const [currentUser] = useAtom(currentUserAtom, globalScope);
+  const [currentUser] = useAtom(currentUserAtom, projectScope);
   const location = useLocation();
 
   if (currentUser === undefined)
diff --git a/src/pages/Auth/ImpersonatorAuthPage.tsx b/src/pages/Auth/ImpersonatorAuthPage.tsx
index 8e7b71c3..44874226 100644
--- a/src/pages/Auth/ImpersonatorAuthPage.tsx
+++ b/src/pages/Auth/ImpersonatorAuthPage.tsx
@@ -12,13 +12,13 @@ import { Typography, Button, TextField } from "@mui/material";
 import AuthLayout from "@src/layouts/AuthLayout";
 import FirebaseUi from "@src/components/FirebaseUi";
 
-import { globalScope, rowyRunAtom } from "@src/atoms/globalScope";
+import { projectScope, rowyRunAtom } from "@src/atoms/projectScope";
 import { firebaseAuthAtom } from "@src/sources/ProjectSourceFirebase";
 import { runRoutes } from "@src/constants/runRoutes";
 
 export default function ImpersonatorAuthPage() {
-  const [firebaseAuth] = useAtom(firebaseAuthAtom, globalScope);
-  const [rowyRun] = useAtom(rowyRunAtom, globalScope);
+  const [firebaseAuth] = useAtom(firebaseAuthAtom, projectScope);
+  const [rowyRun] = useAtom(rowyRunAtom, projectScope);
 
   const { enqueueSnackbar } = useSnackbar();
 
diff --git a/src/pages/Auth/JwtAuthPage.tsx b/src/pages/Auth/JwtAuthPage.tsx
index aec88ec7..9f89d485 100644
--- a/src/pages/Auth/JwtAuthPage.tsx
+++ b/src/pages/Auth/JwtAuthPage.tsx
@@ -7,11 +7,11 @@ import { TextField, Button } from "@mui/material";
 
 import AuthLayout from "@src/layouts/AuthLayout";
 
-import { globalScope } from "@src/atoms/globalScope";
+import { projectScope } from "@src/atoms/projectScope";
 import { firebaseAuthAtom } from "@src/sources/ProjectSourceFirebase";
 
 export default function JwtAuthPage() {
-  const [firebaseAuth] = useAtom(firebaseAuthAtom, globalScope);
+  const [firebaseAuth] = useAtom(firebaseAuthAtom, projectScope);
   const { enqueueSnackbar } = useSnackbar();
 
   const [jwt, setJWT] = useState("");
diff --git a/src/pages/Auth/SignOutPage.tsx b/src/pages/Auth/SignOutPage.tsx
index f45ecf07..80e4a4b8 100644
--- a/src/pages/Auth/SignOutPage.tsx
+++ b/src/pages/Auth/SignOutPage.tsx
@@ -7,11 +7,11 @@ import { Button } from "@mui/material";
 
 import AuthLayout from "@src/layouts/AuthLayout";
 
-import { globalScope } from "@src/atoms/globalScope";
+import { projectScope } from "@src/atoms/projectScope";
 import { firebaseAuthAtom } from "@src/sources/ProjectSourceFirebase";
 
 export default function SignOutPage() {
-  const [firebaseAuth] = useAtom(firebaseAuthAtom, globalScope);
+  const [firebaseAuth] = useAtom(firebaseAuthAtom, projectScope);
 
   useEffect(() => {
     signOut(firebaseAuth);
diff --git a/src/pages/FunctionPage.tsx b/src/pages/FunctionPage.tsx
index 3810ba4d..721eefb1 100644
--- a/src/pages/FunctionPage.tsx
+++ b/src/pages/FunctionPage.tsx
@@ -10,7 +10,7 @@ import { Fade } from "@mui/material";
 //import EmptyTable from "@src/components/Table/EmptyTable";
 import Function from "@src/components/Function";
 
-import { currentUserAtom, globalScope } from "@src/atoms/globalScope";
+import { currentUserAtom, projectScope } from "@src/atoms/projectScope";
 // import TableSourceFirestore from "@src/sources/TableSourceFirestore";
 // import {
 //   tableScope,
@@ -40,7 +40,7 @@ export default function FunctionPage() {
 
 function ProvidedFunctionPage() {
   const { id } = useParams();
-  const [currentUser] = useAtom(currentUserAtom, globalScope);
+  const [currentUser] = useAtom(currentUserAtom, projectScope);
 
   return (
     <Suspense
diff --git a/src/pages/FunctionsPage.tsx b/src/pages/FunctionsPage.tsx
index 18f944eb..dd1dcd93 100644
--- a/src/pages/FunctionsPage.tsx
+++ b/src/pages/FunctionsPage.tsx
@@ -28,14 +28,14 @@ import HomeWelcomePrompt from "@src/components/Functions/HomeWelcomePrompt";
 import EmptyState from "@src/components/EmptyState";
 
 import {
-  globalScope,
+  projectScope,
   userRolesAtom,
   userSettingsAtom,
   updateUserSettingsAtom,
   tablesAtom,
   tablesViewAtom,
   tableSettingsDialogAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import { TableSettings } from "@src/types/table";
 import { ROUTES } from "@src/constants/routes";
 import useBasicSearch from "@src/hooks/useBasicSearch";
@@ -44,14 +44,14 @@ import { TOP_BAR_HEIGHT } from "@src/layouts/Navigation/TopBar";
 const SEARCH_KEYS = ["id", "name", "section", "description"];
 
 export default function HomePage() {
-  const [userRoles] = useAtom(userRolesAtom, globalScope);
-  const [userSettings] = useAtom(userSettingsAtom, globalScope);
-  const [updateUserSettings] = useAtom(updateUserSettingsAtom, globalScope);
-  const [tables] = useAtom(tablesAtom, globalScope);
-  const [view, setView] = useAtom(tablesViewAtom, globalScope);
+  const [userRoles] = useAtom(userRolesAtom, projectScope);
+  const [userSettings] = useAtom(userSettingsAtom, projectScope);
+  const [updateUserSettings] = useAtom(updateUserSettingsAtom, projectScope);
+  const [tables] = useAtom(tablesAtom, projectScope);
+  const [view, setView] = useAtom(tablesViewAtom, projectScope);
   const openTableSettingsDialog = useSetAtom(
     tableSettingsDialogAtom,
-    globalScope
+    projectScope
   );
 
   const [results, query, handleQuery] = useBasicSearch(
diff --git a/src/pages/NotFoundPage.tsx b/src/pages/NotFoundPage.tsx
index abd1f780..6a93e35f 100644
--- a/src/pages/NotFoundPage.tsx
+++ b/src/pages/NotFoundPage.tsx
@@ -12,10 +12,10 @@ import EmptyState from "@src/components/EmptyState";
 
 import meta from "@root/package.json";
 import { ROUTES } from "@src/constants/routes";
-import { globalScope, currentUserAtom } from "@src/atoms/globalScope";
+import { projectScope, currentUserAtom } from "@src/atoms/projectScope";
 
 export default function NotFound() {
-  const [currentUser] = useAtom(currentUserAtom, globalScope);
+  const [currentUser] = useAtom(currentUserAtom, projectScope);
 
   if (currentUser)
     return (
diff --git a/src/pages/Settings/DebugSettingsPage.tsx b/src/pages/Settings/DebugSettingsPage.tsx
index d6ad22fa..bf230b02 100644
--- a/src/pages/Settings/DebugSettingsPage.tsx
+++ b/src/pages/Settings/DebugSettingsPage.tsx
@@ -12,11 +12,11 @@ import { Container, Stack, Button } from "@mui/material";
 import SettingsSection from "@src/components/Settings/SettingsSection";
 
 import {
-  globalScope,
+  projectScope,
   projectSettingsAtom,
   allUsersAtom,
   updateUserAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import UserManagementSourceFirebase from "@src/sources/MembersSourceFirebase";
 import { firebaseDbAtom } from "@src/sources/ProjectSourceFirebase";
 import { USERS } from "@src/config/dbPaths";
@@ -30,10 +30,10 @@ export interface IProjectSettingsChildProps {
 }
 
 export default function DebugSettingsPage() {
-  const [firebaseDb] = useAtom(firebaseDbAtom, globalScope);
-  const [projectSettings] = useAtom(projectSettingsAtom, globalScope);
-  const [users] = useAtom(allUsersAtom, globalScope);
-  const [updateUser] = useAtom(updateUserAtom, globalScope);
+  const [firebaseDb] = useAtom(firebaseDbAtom, projectScope);
+  const [projectSettings] = useAtom(projectSettingsAtom, projectScope);
+  const [users] = useAtom(allUsersAtom, projectScope);
+  const [updateUser] = useAtom(updateUserAtom, projectScope);
   const { enqueueSnackbar, closeSnackbar } = useSnackbar();
 
   return (
diff --git a/src/pages/Settings/MembersPage.tsx b/src/pages/Settings/MembersPage.tsx
index 2431e608..fdf276de 100644
--- a/src/pages/Settings/MembersPage.tsx
+++ b/src/pages/Settings/MembersPage.tsx
@@ -18,14 +18,14 @@ import UserItem from "@src/components/Settings/UserManagement/UserItem";
 import UserSkeleton from "@src/components/Settings/UserManagement/UserSkeleton";
 import InviteUser from "@src/components/Settings/UserManagement/InviteUser";
 
-import { globalScope, allUsersAtom } from "@src/atoms/globalScope";
+import { projectScope, allUsersAtom } from "@src/atoms/projectScope";
 import MembersSourceFirebase from "@src/sources/MembersSourceFirebase";
 import useBasicSearch from "@src/hooks/useBasicSearch";
 
 const SEARCH_KEYS = ["id", "user.displayName", "user.email"];
 
 function MembersPage() {
-  const [users] = useAtom(allUsersAtom, globalScope);
+  const [users] = useAtom(allUsersAtom, projectScope);
   const [results, query, handleQuery] = useBasicSearch(users, SEARCH_KEYS);
 
   return (
diff --git a/src/pages/Settings/ProjectSettingsPage.tsx b/src/pages/Settings/ProjectSettingsPage.tsx
index abef69cc..a8454954 100644
--- a/src/pages/Settings/ProjectSettingsPage.tsx
+++ b/src/pages/Settings/ProjectSettingsPage.tsx
@@ -12,12 +12,12 @@ import Authentication from "@src/components/Settings/ProjectSettings/Authenticat
 import Customization from "@src/components/Settings/ProjectSettings/Customization";
 
 import {
-  globalScope,
+  projectScope,
   projectSettingsAtom,
   updateProjectSettingsAtom,
   publicSettingsAtom,
   updatePublicSettingsAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 
 export interface IProjectSettingsChildProps {
   settings: Record<string, any>;
@@ -27,14 +27,14 @@ export interface IProjectSettingsChildProps {
 }
 
 export default function ProjectSettingsPage() {
-  const [projectSettings] = useAtom(projectSettingsAtom, globalScope);
-  const [publicSettings] = useAtom(publicSettingsAtom, globalScope);
+  const [projectSettings] = useAtom(projectSettingsAtom, projectScope);
+  const [publicSettings] = useAtom(publicSettingsAtom, projectScope);
 
   const { enqueueSnackbar } = useSnackbar();
 
   const [_updateProjectSettingsDoc] = useAtom(
     updateProjectSettingsAtom,
-    globalScope
+    projectScope
   );
   const updateProjectSettings = useDebouncedCallback((data) => {
     if (_updateProjectSettingsDoc) {
@@ -55,7 +55,7 @@ export default function ProjectSettingsPage() {
 
   const [_updatePublicSettingsDoc] = useAtom(
     updatePublicSettingsAtom,
-    globalScope
+    projectScope
   );
   const updatePublicSettings = useDebouncedCallback(
     (data: Record<string, any>) => {
diff --git a/src/pages/Settings/UserSettingsPage.tsx b/src/pages/Settings/UserSettingsPage.tsx
index b9c26ef0..53536a2b 100644
--- a/src/pages/Settings/UserSettingsPage.tsx
+++ b/src/pages/Settings/UserSettingsPage.tsx
@@ -12,11 +12,11 @@ import Theme from "@src/components/Settings/UserSettings/Theme";
 import Personalization from "@src/components/Settings/UserSettings/Personalization";
 
 import {
-  globalScope,
+  projectScope,
   currentUserAtom,
   userSettingsAtom,
   updateUserSettingsAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 
 export interface IUserSettingsChildProps {
   settings: Record<string, any>;
@@ -24,11 +24,11 @@ export interface IUserSettingsChildProps {
 }
 
 export default function UserSettingsPage() {
-  const [currentUser] = useAtom(currentUserAtom, globalScope);
-  const [userSettings] = useAtom(userSettingsAtom, globalScope);
+  const [currentUser] = useAtom(currentUserAtom, projectScope);
+  const [userSettings] = useAtom(userSettingsAtom, projectScope);
   const { enqueueSnackbar } = useSnackbar();
 
-  const [_updateUserSettings] = useAtom(updateUserSettingsAtom, globalScope);
+  const [_updateUserSettings] = useAtom(updateUserSettingsAtom, projectScope);
   const updateSettings = useDebouncedCallback((data) => {
     if (_updateUserSettings) {
       _updateUserSettings(data).then(() => enqueueSnackbar("Saved"));
diff --git a/src/pages/Table/ProvidedSubTablePage.tsx b/src/pages/Table/ProvidedSubTablePage.tsx
index 1f7b41fb..2b3e090b 100644
--- a/src/pages/Table/ProvidedSubTablePage.tsx
+++ b/src/pages/Table/ProvidedSubTablePage.tsx
@@ -14,7 +14,7 @@ import TablePage from "./TablePage";
 import TableToolbarSkeleton from "@src/components/TableToolbar/TableToolbarSkeleton";
 import TableSkeleton from "@src/components/Table/TableSkeleton";
 
-import { globalScope, currentUserAtom } from "@src/atoms/globalScope";
+import { projectScope, currentUserAtom } from "@src/atoms/projectScope";
 import {
   tableScope,
   tableIdAtom,
@@ -34,7 +34,7 @@ export default function ProvidedSubTablePage() {
   // Get params from URL: /subTable/:docPath/:subTableKey
   const { docPath, subTableKey } = useParams();
 
-  const [currentUser] = useAtom(currentUserAtom, globalScope);
+  const [currentUser] = useAtom(currentUserAtom, projectScope);
 
   // Get table settings and the source column from root table
   const [rootTableSettings] = useAtom(tableSettingsAtom, tableScope);
diff --git a/src/pages/Table/ProvidedTablePage.tsx b/src/pages/Table/ProvidedTablePage.tsx
index 3f3aa0b7..777b59e5 100644
--- a/src/pages/Table/ProvidedTablePage.tsx
+++ b/src/pages/Table/ProvidedTablePage.tsx
@@ -14,10 +14,10 @@ import TableToolbarSkeleton from "@src/components/TableToolbar/TableToolbarSkele
 import TableSkeleton from "@src/components/Table/TableSkeleton";
 
 import {
-  globalScope,
+  projectScope,
   currentUserAtom,
   tablesAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import {
   tableScope,
   tableIdAtom,
@@ -31,8 +31,8 @@ import {
 export default function ProvidedTablePage() {
   const { id } = useParams();
   const outlet = useOutlet();
-  const [currentUser] = useAtom(currentUserAtom, globalScope);
-  const [tables] = useAtom(tablesAtom, globalScope);
+  const [currentUser] = useAtom(currentUserAtom, projectScope);
+  const [tables] = useAtom(tablesAtom, projectScope);
 
   const tableSettings = useMemo(() => find(tables, ["id", id]), [tables, id]);
   if (!tableSettings) throw new Error(ERROR_TABLE_NOT_FOUND + ": " + id);
diff --git a/src/pages/Table/TableTutorialPage.tsx b/src/pages/Table/TableTutorialPage.tsx
index 8a0a7425..356ad446 100644
--- a/src/pages/Table/TableTutorialPage.tsx
+++ b/src/pages/Table/TableTutorialPage.tsx
@@ -14,7 +14,7 @@ import TableTutorial from "@src/components/TableTutorial";
 import EmptyState from "@src/components/EmptyState";
 import TableModals from "@src/components/TableModals";
 
-import { globalScope, currentUserAtom } from "@src/atoms/globalScope";
+import { projectScope, currentUserAtom } from "@src/atoms/projectScope";
 import {
   tableScope,
   tableIdAtom,
@@ -39,7 +39,7 @@ import * as csvData from "@src/components/TableTutorial/data";
  * Wraps `TablePage` with the data for a top-level table.
  */
 export default function TableTutorialPage() {
-  const [currentUser] = useAtom(currentUserAtom, globalScope);
+  const [currentUser] = useAtom(currentUserAtom, projectScope);
 
   return (
     <ErrorBoundary FallbackComponent={ErrorFallback}>
diff --git a/src/pages/TablesPage.tsx b/src/pages/TablesPage.tsx
index cfa03d5a..ea133c07 100644
--- a/src/pages/TablesPage.tsx
+++ b/src/pages/TablesPage.tsx
@@ -28,14 +28,14 @@ import HomeWelcomePrompt from "@src/components/Tables/HomeWelcomePrompt";
 import EmptyState from "@src/components/EmptyState";
 
 import {
-  globalScope,
+  projectScope,
   userRolesAtom,
   userSettingsAtom,
   updateUserSettingsAtom,
   tablesAtom,
   tablesViewAtom,
   tableSettingsDialogAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import { TableSettings } from "@src/types/table";
 import { ROUTES } from "@src/constants/routes";
 import useBasicSearch from "@src/hooks/useBasicSearch";
@@ -44,14 +44,14 @@ import { TOP_BAR_HEIGHT } from "@src/layouts/Navigation/TopBar";
 const SEARCH_KEYS = ["id", "name", "section", "description"];
 
 export default function HomePage() {
-  const [userRoles] = useAtom(userRolesAtom, globalScope);
-  const [userSettings] = useAtom(userSettingsAtom, globalScope);
-  const [updateUserSettings] = useAtom(updateUserSettingsAtom, globalScope);
-  const [tables] = useAtom(tablesAtom, globalScope);
-  const [view, setView] = useAtom(tablesViewAtom, globalScope);
+  const [userRoles] = useAtom(userRolesAtom, projectScope);
+  const [userSettings] = useAtom(userSettingsAtom, projectScope);
+  const [updateUserSettings] = useAtom(updateUserSettingsAtom, projectScope);
+  const [tables] = useAtom(tablesAtom, projectScope);
+  const [view, setView] = useAtom(tablesViewAtom, projectScope);
   const openTableSettingsDialog = useSetAtom(
     tableSettingsDialogAtom,
-    globalScope
+    projectScope
   );
 
   const [results, query, handleQuery] = useBasicSearch(
diff --git a/src/pages/Test/JotaiTestPage.tsx b/src/pages/Test/JotaiTestPage.tsx
index 3f932733..4a3e92df 100644
--- a/src/pages/Test/JotaiTestPage.tsx
+++ b/src/pages/Test/JotaiTestPage.tsx
@@ -1,7 +1,7 @@
 import { useState } from "react";
 import { useAtom } from "jotai";
 import {
-  globalScope,
+  projectScope,
   projectIdAtom,
   currentUserAtom,
   userRolesAtom,
@@ -9,7 +9,7 @@ import {
   publicSettingsAtom,
   projectSettingsAtom,
   rowyRunAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import { firebaseAuthAtom } from "@src/sources/ProjectSourceFirebase";
 import { Button } from "@mui/material";
 import MultiSelect from "@rowy/multiselect";
@@ -33,21 +33,21 @@ function CurrentUser({ currentUser }: { currentUser: User }) {
 }
 
 function JotaiTest() {
-  const [firebaseAuth] = useAtom(firebaseAuthAtom, globalScope);
-  const [projectId] = useAtom(projectIdAtom, globalScope);
-  const [currentUser] = useAtom(currentUserAtom, globalScope);
-  const [userRoles] = useAtom(userRolesAtom, globalScope);
-  const [publicSettings] = useAtom(publicSettingsAtom, globalScope);
-  const [projectSettings] = useAtom(projectSettingsAtom, globalScope);
-  const [userSettings] = useAtom(userSettingsAtom, globalScope);
-  const [rowyRun] = useAtom(rowyRunAtom, globalScope);
+  const [firebaseAuth] = useAtom(firebaseAuthAtom, projectScope);
+  const [projectId] = useAtom(projectIdAtom, projectScope);
+  const [currentUser] = useAtom(currentUserAtom, projectScope);
+  const [userRoles] = useAtom(userRolesAtom, projectScope);
+  const [publicSettings] = useAtom(publicSettingsAtom, projectScope);
+  const [projectSettings] = useAtom(projectSettingsAtom, projectScope);
+  const [userSettings] = useAtom(userSettingsAtom, projectScope);
+  const [rowyRun] = useAtom(rowyRunAtom, projectScope);
 
   const [count, setCount] = useState(0);
   const { enqueueSnackbar } = useSnackbar();
 
   useFirestoreDocWithAtom(
     publicSettingsAtom,
-    globalScope,
+    projectScope,
     "_rowy_/publicSettings"
   );
 
diff --git a/src/pages/Test/TableTestPage.tsx b/src/pages/Test/TableTestPage.tsx
index f7e635a5..da89a31d 100644
--- a/src/pages/Test/TableTestPage.tsx
+++ b/src/pages/Test/TableTestPage.tsx
@@ -18,7 +18,7 @@ import TableToolbarSkeleton from "@src/components/TableToolbar/TableToolbarSkele
 import TableSkeleton from "@src/components/Table/TableSkeleton";
 
 import { firebaseDbAtom } from "@src/sources/ProjectSourceFirebase";
-import { currentUserAtom, globalScope } from "@src/atoms/globalScope";
+import { currentUserAtom, projectScope } from "@src/atoms/projectScope";
 import { doc, setDoc, updateDoc } from "firebase/firestore";
 import { TABLE_SCHEMAS } from "@src/config/dbPaths";
 
@@ -35,7 +35,7 @@ function TableTestPage() {
 
   console.log(tableId, tableSettings, tableSchema);
 
-  const [firebaseDb] = useAtom(firebaseDbAtom, globalScope);
+  const [firebaseDb] = useAtom(firebaseDbAtom, projectScope);
 
   return (
     <div>
@@ -105,7 +105,7 @@ function TableTestPage() {
 
 export default function ProvidedTableTestPage() {
   const { id } = useParams();
-  const [currentUser] = useAtom(currentUserAtom, globalScope);
+  const [currentUser] = useAtom(currentUserAtom, projectScope);
 
   return (
     <Suspense
diff --git a/src/sources/FunctionsSourceFirestore.tsx b/src/sources/FunctionsSourceFirestore.tsx
index 8d7f74fc..d39ddca9 100644
--- a/src/sources/FunctionsSourceFirestore.tsx
+++ b/src/sources/FunctionsSourceFirestore.tsx
@@ -2,16 +2,16 @@ import { memo } from "react";
 
 import useFirestoreCollectionWithAtom from "@src/hooks/useFirestoreCollectionWithAtom";
 import {
-  globalScope,
+  projectScope,
   FunctionsIndexAtom,
   updateFunctionAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import { FUNCTION_SCHEMAS } from "@src/config/dbPaths";
 
 const FunctionsSource = memo(function FunctionsSource() {
   useFirestoreCollectionWithAtom(
     FunctionsIndexAtom,
-    globalScope,
+    projectScope,
     FUNCTION_SCHEMAS,
     {
       updateDocAtom: updateFunctionAtom,
diff --git a/src/sources/MembersSourceFirebase.tsx b/src/sources/MembersSourceFirebase.tsx
index aa4acde5..4fd76347 100644
--- a/src/sources/MembersSourceFirebase.tsx
+++ b/src/sources/MembersSourceFirebase.tsx
@@ -2,17 +2,17 @@ import { memo } from "react";
 
 import useFirestoreCollectionWithAtom from "@src/hooks/useFirestoreCollectionWithAtom";
 import {
-  globalScope,
+  projectScope,
   allUsersAtom,
   updateUserAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import { USERS } from "@src/config/dbPaths";
 
 /**
  * When rendered, provides atom values for top-level tables
  */
 const MembersSourceFirebase = memo(function MembersSourceFirebase() {
-  useFirestoreCollectionWithAtom(allUsersAtom, globalScope, USERS, {
+  useFirestoreCollectionWithAtom(allUsersAtom, projectScope, USERS, {
     updateDocAtom: updateUserAtom,
   });
 
diff --git a/src/sources/ProjectSourceFirebase/ProjectSourceFirebase.tsx b/src/sources/ProjectSourceFirebase/ProjectSourceFirebase.tsx
index ed3ab37d..fcca0fac 100644
--- a/src/sources/ProjectSourceFirebase/ProjectSourceFirebase.tsx
+++ b/src/sources/ProjectSourceFirebase/ProjectSourceFirebase.tsx
@@ -1,7 +1,7 @@
 import { memo, useEffect } from "react";
 import { useAtom, useSetAtom } from "jotai";
 
-import { globalScope, projectIdAtom } from "@src/atoms/globalScope";
+import { projectScope, projectIdAtom } from "@src/atoms/projectScope";
 import { firebaseConfigAtom } from "./init";
 
 import { useAuthUser } from "./useAuthUser";
@@ -10,12 +10,12 @@ import { useTableFunctions } from "./useTableFunctions";
 
 /**
  * When rendered, connects to a Firebase project and populates
- * all atoms in src/atoms/globalScope/project.
+ * all atoms in src/atoms/projectScope/project.
  */
 export const ProjectSourceFirebase = memo(function ProjectSourceFirebase() {
   // Set projectId from Firebase project
-  const [firebaseConfig] = useAtom(firebaseConfigAtom, globalScope);
-  const setProjectId = useSetAtom(projectIdAtom, globalScope);
+  const [firebaseConfig] = useAtom(firebaseConfigAtom, projectScope);
+  const setProjectId = useSetAtom(projectIdAtom, projectScope);
   useEffect(() => {
     setProjectId(firebaseConfig.projectId || "");
   }, [firebaseConfig.projectId, setProjectId]);
diff --git a/src/sources/ProjectSourceFirebase/useAuthUser.ts b/src/sources/ProjectSourceFirebase/useAuthUser.ts
index 8928710f..5adbd337 100644
--- a/src/sources/ProjectSourceFirebase/useAuthUser.ts
+++ b/src/sources/ProjectSourceFirebase/useAuthUser.ts
@@ -5,11 +5,11 @@ import { useErrorHandler } from "react-error-boundary";
 import { getIdTokenResult } from "firebase/auth";
 
 import {
-  globalScope,
+  projectScope,
   currentUserAtom,
   userRolesAtom,
   updateUserSettingsAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import { firebaseAuthAtom } from "./init";
 
 /**
@@ -18,14 +18,14 @@ import { firebaseAuthAtom } from "./init";
 export function useAuthUser() {
   const elevateError = useErrorHandler();
   // Get current user and store in atoms
-  const [firebaseAuth] = useAtom(firebaseAuthAtom, globalScope);
-  const setCurrentUser = useSetAtom(currentUserAtom, globalScope);
-  const setUserRoles = useSetAtom(userRolesAtom, globalScope);
+  const [firebaseAuth] = useAtom(firebaseAuthAtom, projectScope);
+  const setCurrentUser = useSetAtom(currentUserAtom, projectScope);
+  const setUserRoles = useSetAtom(userRolesAtom, projectScope);
   // Must use `useAtomCallback`, otherwise `useAtom(updateUserSettingsAtom)`
   // will cause infinite re-render
   const updateUserSettings = useAtomCallback(
     useCallback((get) => get(updateUserSettingsAtom), []),
-    globalScope
+    projectScope
   );
 
   useEffect(() => {
diff --git a/src/sources/ProjectSourceFirebase/useSettingsDocs.ts b/src/sources/ProjectSourceFirebase/useSettingsDocs.ts
index 274c3617..97a4861a 100644
--- a/src/sources/ProjectSourceFirebase/useSettingsDocs.ts
+++ b/src/sources/ProjectSourceFirebase/useSettingsDocs.ts
@@ -1,7 +1,7 @@
 import { useAtom } from "jotai";
 
 import {
-  globalScope,
+  projectScope,
   projectSettingsAtom,
   updateProjectSettingsAtom,
   publicSettingsAtom,
@@ -9,7 +9,7 @@ import {
   currentUserAtom,
   userSettingsAtom,
   updateUserSettingsAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 
 import useFirestoreDocWithAtom from "@src/hooks/useFirestoreDocWithAtom";
 import { SETTINGS, PUBLIC_SETTINGS, USERS } from "@src/config/dbPaths";
@@ -19,10 +19,10 @@ import { SETTINGS, PUBLIC_SETTINGS, USERS } from "@src/config/dbPaths";
  * Also sets functions to update those documents.
  */
 export function useSettingsDocs() {
-  const [currentUser] = useAtom(currentUserAtom, globalScope);
+  const [currentUser] = useAtom(currentUserAtom, projectScope);
 
   // Store public settings in atom
-  useFirestoreDocWithAtom(publicSettingsAtom, globalScope, PUBLIC_SETTINGS, {
+  useFirestoreDocWithAtom(publicSettingsAtom, projectScope, PUBLIC_SETTINGS, {
     updateDataAtom: updatePublicSettingsAtom,
   });
 
@@ -30,7 +30,7 @@ export function useSettingsDocs() {
   // If they have no access, display AccessDenied screen via ErrorBoundary.
   useFirestoreDocWithAtom(
     projectSettingsAtom,
-    globalScope,
+    projectScope,
     currentUser ? SETTINGS : undefined,
     { updateDataAtom: updateProjectSettingsAtom }
   );
@@ -39,7 +39,7 @@ export function useSettingsDocs() {
     JSON.parse((currentUser as any)?.reloadUserInfo?.customAttributes ?? "{}")
       ?.roles ?? [];
   // Store user settings in atom when a user is signed in
-  useFirestoreDocWithAtom(userSettingsAtom, globalScope, USERS, {
+  useFirestoreDocWithAtom(userSettingsAtom, projectScope, USERS, {
     pathSegments: [currentUser?.uid],
     createIfNonExistent: currentUser
       ? {
diff --git a/src/sources/ProjectSourceFirebase/useTableFunctions.ts b/src/sources/ProjectSourceFirebase/useTableFunctions.ts
index fdc33119..379f55d2 100644
--- a/src/sources/ProjectSourceFirebase/useTableFunctions.ts
+++ b/src/sources/ProjectSourceFirebase/useTableFunctions.ts
@@ -5,7 +5,7 @@ import { doc, getDoc, setDoc, deleteDoc } from "firebase/firestore";
 import { camelCase, find, findIndex, isEmpty } from "lodash-es";
 
 import {
-  globalScope,
+  projectScope,
   projectSettingsAtom,
   createTableAtom,
   updateTableAtom,
@@ -13,7 +13,7 @@ import {
   getTableSchemaAtom,
   AdditionalTableSettings,
   MinimumTableSettings,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import { firebaseDbAtom } from "./init";
 
 import {
@@ -26,17 +26,17 @@ import { FieldType } from "@src/constants/fields";
 import { getFieldProp } from "@src/components/fields";
 
 export function useTableFunctions() {
-  const [firebaseDb] = useAtom(firebaseDbAtom, globalScope);
+  const [firebaseDb] = useAtom(firebaseDbAtom, projectScope);
 
   // Create a function to get the latest tables from project settings,
   // so we don’t create new functions when tables change
   const readTables = useAtomCallback(
     useCallback((get) => get(projectSettingsAtom).tables, []),
-    globalScope
+    projectScope
   );
 
   // Set the createTable function
-  const setCreateTable = useSetAtom(createTableAtom, globalScope);
+  const setCreateTable = useSetAtom(createTableAtom, projectScope);
   useEffect(() => {
     setCreateTable(
       () =>
@@ -123,7 +123,7 @@ export function useTableFunctions() {
   }, [firebaseDb, readTables, setCreateTable]);
 
   // Set the createTable function
-  const setUpdateTable = useSetAtom(updateTableAtom, globalScope);
+  const setUpdateTable = useSetAtom(updateTableAtom, projectScope);
   useEffect(() => {
     setUpdateTable(
       () =>
@@ -169,7 +169,7 @@ export function useTableFunctions() {
   }, [firebaseDb, readTables, setUpdateTable]);
 
   // Set the deleteTable function
-  const setDeleteTable = useSetAtom(deleteTableAtom, globalScope);
+  const setDeleteTable = useSetAtom(deleteTableAtom, projectScope);
   useEffect(() => {
     setDeleteTable(() => async (id: string) => {
       // Get latest tables
@@ -199,7 +199,7 @@ export function useTableFunctions() {
   }, [firebaseDb, readTables, setDeleteTable]);
 
   // Set the getTableSchema function
-  const setGetTableSchema = useSetAtom(getTableSchemaAtom, globalScope);
+  const setGetTableSchema = useSetAtom(getTableSchemaAtom, projectScope);
   useEffect(() => {
     setGetTableSchema(() => async (id: string) => {
       // Get latest tables
diff --git a/src/sources/TableSourceFirestore/TableSourceFirestore.tsx b/src/sources/TableSourceFirestore/TableSourceFirestore.tsx
index 652d9eee..7d8a5470 100644
--- a/src/sources/TableSourceFirestore/TableSourceFirestore.tsx
+++ b/src/sources/TableSourceFirestore/TableSourceFirestore.tsx
@@ -30,7 +30,7 @@ import { getTableSchemaPath } from "@src/utils/table";
  * When rendered, provides atom values for top-level tables and sub-tables
  */
 export const TableSourceFirestore = memo(function TableSourceFirestore() {
-  // Get tableSettings from tableId and tables in globalScope
+  // Get tableSettings from tableId and tables in projectScope
   const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
   const isCollectionGroup = tableSettings?.tableType === "collectionGroup";
 
diff --git a/src/sources/TableSourceFirestore/useAuditChange.ts b/src/sources/TableSourceFirestore/useAuditChange.ts
index 362af735..64bf97ab 100644
--- a/src/sources/TableSourceFirestore/useAuditChange.ts
+++ b/src/sources/TableSourceFirestore/useAuditChange.ts
@@ -2,11 +2,11 @@ import { useEffect } from "react";
 import { useAtom, useSetAtom } from "jotai";
 
 import {
-  globalScope,
+  projectScope,
   rowyRunAtom,
   compatibleRowyRunVersionAtom,
   currentUserAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 import {
   tableScope,
   tableSettingsAtom,
@@ -20,12 +20,12 @@ import { rowyUser } from "@src/utils/table";
  */
 export default function useAuditChange() {
   const setAuditChange = useSetAtom(auditChangeAtom, tableScope);
-  const [rowyRun] = useAtom(rowyRunAtom, globalScope);
-  const [currentUser] = useAtom(currentUserAtom, globalScope);
+  const [rowyRun] = useAtom(rowyRunAtom, projectScope);
+  const [currentUser] = useAtom(currentUserAtom, projectScope);
 
   const [compatibleRowyRunVersion] = useAtom(
     compatibleRowyRunVersionAtom,
-    globalScope
+    projectScope
   );
   const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
 
diff --git a/src/sources/TableSourceFirestore/useBulkWriteDb.ts b/src/sources/TableSourceFirestore/useBulkWriteDb.ts
index 4993f456..03726d96 100644
--- a/src/sources/TableSourceFirestore/useBulkWriteDb.ts
+++ b/src/sources/TableSourceFirestore/useBulkWriteDb.ts
@@ -3,7 +3,7 @@ import { useAtom, useSetAtom } from "jotai";
 import { chunk, set } from "lodash-es";
 import { doc, writeBatch, deleteField } from "firebase/firestore";
 
-import { globalScope } from "@src/atoms/globalScope";
+import { projectScope } from "@src/atoms/projectScope";
 import { tableScope, _bulkWriteDbAtom } from "@src/atoms/tableScope";
 import { BulkWriteFunction } from "@src/types/table";
 import { firebaseDbAtom } from "@src/sources/ProjectSourceFirebase";
@@ -13,7 +13,7 @@ import { firebaseDbAtom } from "@src/sources/ProjectSourceFirebase";
  */
 export default function useBulkWriteDb() {
   // Set _bulkWriteDb function
-  const [firebaseDb] = useAtom(firebaseDbAtom, globalScope);
+  const [firebaseDb] = useAtom(firebaseDbAtom, projectScope);
   const setBulkWriteDb = useSetAtom(_bulkWriteDbAtom, tableScope);
   useEffect(() => {
     setBulkWriteDb(
diff --git a/src/test/testUtils.tsx b/src/test/testUtils.tsx
index a01286d1..97409536 100644
--- a/src/test/testUtils.tsx
+++ b/src/test/testUtils.tsx
@@ -20,7 +20,7 @@ import {
   firebaseAuthAtom,
   firebaseDbAtom,
 } from "@src/sources/ProjectSourceFirebase";
-import { currentUserAtom } from "@src/atoms/globalScope";
+import { currentUserAtom } from "@src/atoms/projectScope";
 
 /** Initialize Firebase */
 console.log("Initializing Firebase...");
@@ -31,7 +31,7 @@ const db = initializeFirestore(app, { ignoreUndefinedProperties: true });
 connectFirestoreEmulator(db, "localhost", 9299);
 
 /**
- * Render with Jotai `globalScope` providers
+ * Render with Jotai `projectScope` providers
  * & `ProjectSourceFirebase` component
  */
 export const customRender = (
diff --git a/src/theme/RowyThemeProvider.tsx b/src/theme/RowyThemeProvider.tsx
index 5aa69623..2b6faa52 100644
--- a/src/theme/RowyThemeProvider.tsx
+++ b/src/theme/RowyThemeProvider.tsx
@@ -7,11 +7,11 @@ import { useMediaQuery, ThemeProvider, CssBaseline } from "@mui/material";
 import Favicon from "@src/assets/Favicon";
 
 import {
-  globalScope,
+  projectScope,
   themeAtom,
   themeOverriddenAtom,
   customizedThemesAtom,
-} from "@src/atoms/globalScope";
+} from "@src/atoms/projectScope";
 
 /**
  * Injects the MUI theme with customizations from project and user settings.
@@ -20,9 +20,9 @@ import {
 export default function RowyThemeProvider({
   children,
 }: React.PropsWithChildren<{}>) {
-  const [theme, setTheme] = useAtom(themeAtom, globalScope);
-  const [themeOverridden] = useAtom(themeOverriddenAtom, globalScope);
-  const [customizedThemes] = useAtom(customizedThemesAtom, globalScope);
+  const [theme, setTheme] = useAtom(themeAtom, projectScope);
+  const [themeOverridden] = useAtom(themeOverriddenAtom, projectScope);
+  const [customizedThemes] = useAtom(customizedThemesAtom, projectScope);
 
   // Infer theme based on system settings
   const prefersDarkTheme = useMediaQuery("(prefers-color-scheme: dark)", {

From 65fd440ec28c345d0ed390b4d6102008c0f74637 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 18 Jul 2022 20:46:36 +1000
Subject: [PATCH 034/309] restructure NavDrawer

---
 .../{ => NavDrawer}/CommunityMenu.tsx         |   0
 .../Navigation/{ => NavDrawer}/HelpMenu.tsx   |   0
 .../Navigation/{ => NavDrawer}/NavDrawer.tsx  | 146 ++++++------------
 .../NavDrawer/NavDrawerContents.tsx           | 100 ++++++++++++
 .../Navigation/{ => NavDrawer}/NavItem.tsx    |   0
 .../{ => NavDrawer}/NavTableSection.tsx       |   0
 .../{ => NavDrawer}/SettingsNav.tsx           |   2 +-
 src/layouts/Navigation/NavDrawer/index.ts     |   2 +
 src/layouts/Navigation/Navigation.tsx         |   2 +
 9 files changed, 151 insertions(+), 101 deletions(-)
 rename src/layouts/Navigation/{ => NavDrawer}/CommunityMenu.tsx (100%)
 rename src/layouts/Navigation/{ => NavDrawer}/HelpMenu.tsx (100%)
 rename src/layouts/Navigation/{ => NavDrawer}/NavDrawer.tsx (76%)
 create mode 100644 src/layouts/Navigation/NavDrawer/NavDrawerContents.tsx
 rename src/layouts/Navigation/{ => NavDrawer}/NavItem.tsx (100%)
 rename src/layouts/Navigation/{ => NavDrawer}/NavTableSection.tsx (100%)
 rename src/layouts/Navigation/{ => NavDrawer}/SettingsNav.tsx (97%)
 create mode 100644 src/layouts/Navigation/NavDrawer/index.ts

diff --git a/src/layouts/Navigation/CommunityMenu.tsx b/src/layouts/Navigation/NavDrawer/CommunityMenu.tsx
similarity index 100%
rename from src/layouts/Navigation/CommunityMenu.tsx
rename to src/layouts/Navigation/NavDrawer/CommunityMenu.tsx
diff --git a/src/layouts/Navigation/HelpMenu.tsx b/src/layouts/Navigation/NavDrawer/HelpMenu.tsx
similarity index 100%
rename from src/layouts/Navigation/HelpMenu.tsx
rename to src/layouts/Navigation/NavDrawer/HelpMenu.tsx
diff --git a/src/layouts/Navigation/NavDrawer.tsx b/src/layouts/Navigation/NavDrawer/NavDrawer.tsx
similarity index 76%
rename from src/layouts/Navigation/NavDrawer.tsx
rename to src/layouts/Navigation/NavDrawer/NavDrawer.tsx
index a15014f0..499c9c6f 100644
--- a/src/layouts/Navigation/NavDrawer.tsx
+++ b/src/layouts/Navigation/NavDrawer/NavDrawer.tsx
@@ -1,6 +1,5 @@
 import { useState } from "react";
-import { useAtom, useSetAtom } from "jotai";
-import { find, groupBy } from "lodash-es";
+import { useSetAtom } from "jotai";
 import { colord } from "colord";
 
 import {
@@ -10,15 +9,13 @@ import {
   Stack,
   IconButton,
   List,
+  Box,
   ListItemIcon,
   ListItemText,
-  Divider,
   ListItemSecondaryAction,
-  Box,
+  Divider,
 } from "@mui/material";
 import CloseIcon from "@mui/icons-material/MenuOpen";
-import HomeIcon from "@mui/icons-material/HomeOutlined";
-import AddIcon from "@mui/icons-material/Add";
 import DocsIcon from "@mui/icons-material/LibraryBooksOutlined";
 import LearningIcon from "@mui/icons-material/LocalLibraryOutlined";
 import HelpIcon from "@mui/icons-material/HelpOutline";
@@ -31,24 +28,14 @@ import {
 
 import Logo from "@src/assets/Logo";
 import NavItem from "./NavItem";
-import SettingsNav from "./SettingsNav";
-import NavTableSection from "./NavTableSection";
 import StepsProgress from "@src/components/StepsProgress";
 import CommunityMenu from "./CommunityMenu";
 import HelpMenu from "./HelpMenu";
+import { INavDrawerContentsProps } from "./NavDrawerContents";
 
-import {
-  projectScope,
-  userSettingsAtom,
-  tablesAtom,
-  tableSettingsDialogAtom,
-  getStartedChecklistAtom,
-} from "@src/atoms/projectScope";
-import { TableSettings } from "@src/types/table";
-import { ROUTES } from "@src/constants/routes";
+import { projectScope, getStartedChecklistAtom } from "@src/atoms/projectScope";
 import { EXTERNAL_LINKS, WIKI_LINKS } from "@src/constants/externalLinks";
-import { TOP_BAR_HEIGHT } from "./TopBar";
-
+import { TOP_BAR_HEIGHT } from "@src/layouts/Navigation/TopBar";
 export const NAV_DRAWER_WIDTH = 256;
 export const NAV_DRAWER_COLLAPSED_WIDTH = 56;
 
@@ -56,50 +43,34 @@ export interface INavDrawerProps extends DrawerProps {
   open: boolean;
   isPermanent: boolean;
   onClose: NonNullable<DrawerProps["onClose"]>;
+  Contents: React.ComponentType<INavDrawerContentsProps>;
 }
 
 export default function NavDrawer({
   open,
   isPermanent,
   onClose,
+  Contents,
 }: INavDrawerProps) {
-  const [tables] = useAtom(tablesAtom, projectScope);
-  const [userSettings] = useAtom(userSettingsAtom, projectScope);
-  const openTableSettingsDialog = useSetAtom(
-    tableSettingsDialogAtom,
-    projectScope
-  );
-  const openGetStartedChecklist = useSetAtom(
-    getStartedChecklistAtom,
-    projectScope
-  );
-
-  const [hover, setHover] = useState(false);
-  const [communityMenuAnchorEl, setCommunityMenuAnchorEl] =
-    useState<HTMLButtonElement | null>(null);
-  const [helpMenuAnchorEl, setHelpMenuAnchorEl] =
-    useState<HTMLButtonElement | null>(null);
-
-  const menuOpen = communityMenuAnchorEl || helpMenuAnchorEl;
-
-  const favorites = Array.isArray(userSettings.favoriteTables)
-    ? userSettings.favoriteTables
-    : [];
-  const sections = {
-    Favorites: favorites
-      .map((id) => find(tables, { id }))
-      .filter((x) => x !== undefined) as TableSettings[],
-    ...groupBy(tables, "section"),
-  };
-
+  const [hover, setHover] = useState<boolean | "persist">(false);
   const collapsed = !open && isPermanent;
-  const tempExpanded = (hover || menuOpen) && collapsed;
+  const tempExpanded = hover && collapsed;
   const width =
     collapsed && !tempExpanded ? NAV_DRAWER_COLLAPSED_WIDTH : NAV_DRAWER_WIDTH;
   const closeDrawer = isPermanent
     ? undefined
     : (e: {}) => onClose(e, "escapeKeyDown");
 
+  const openGetStartedChecklist = useSetAtom(
+    getStartedChecklistAtom,
+    projectScope
+  );
+
+  const [communityMenuAnchorEl, setCommunityMenuAnchorEl] =
+    useState<HTMLButtonElement | null>(null);
+  const [helpMenuAnchorEl, setHelpMenuAnchorEl] =
+    useState<HTMLButtonElement | null>(null);
+
   const externalLinkIcon = (
     <ListItemSecondaryAction sx={{ right: 10 }}>
       <InlineOpenInNewIcon />
@@ -188,8 +159,10 @@ export default function NavDrawer({
         ]}
         PaperProps={{
           elevation: isPermanent ? 0 : 8,
-          onMouseEnter: () => setHover(true),
-          onMouseLeave: () => setHover(false),
+          onMouseEnter: () =>
+            setHover((h) => (h === "persist" ? "persist" : true)),
+          onMouseLeave: () =>
+            setHover((h) => (h === "persist" ? "persist" : false)),
         }}
       >
         {!isPermanent && (
@@ -230,51 +203,14 @@ export default function NavDrawer({
               backgroundColor: "var(--nav-bg)",
             }}
           >
-            <li>
-              <NavItem to={ROUTES.tables} onClick={closeDrawer}>
-                <ListItemIcon>
-                  <HomeIcon />
-                </ListItemIcon>
-                <ListItemText primary="Home" />
-              </NavItem>
-            </li>
-
-            <SettingsNav
-              closeDrawer={closeDrawer as any}
-              collapsed={isPermanent && !open && !tempExpanded}
+            <Contents
+              closeDrawer={closeDrawer}
+              open={open}
+              isPermanent={isPermanent}
+              tempExpanded={tempExpanded}
+              setHover={setHover}
             />
 
-            <Divider variant="middle" sx={{ my: 1 }} />
-
-            {sections &&
-              Object.entries(sections)
-                .filter(([, tables]) => tables.length > 0)
-                .map(([section, tables]) => (
-                  <NavTableSection
-                    key={section}
-                    section={section}
-                    tables={tables}
-                    closeDrawer={closeDrawer}
-                    collapsed={isPermanent && !open && !tempExpanded}
-                  />
-                ))}
-
-            <li>
-              <NavItem
-                {...({ component: "button" } as any)}
-                onClick={(e: any) => {
-                  if (closeDrawer) closeDrawer(e);
-                  openTableSettingsDialog({});
-                }}
-                sx={{ mb: 1 }}
-              >
-                <ListItemIcon>
-                  <AddIcon />
-                </ListItemIcon>
-                <ListItemText primary="Create table…" />
-              </NavItem>
-            </li>
-
             <List
               component="li"
               disablePadding
@@ -356,9 +292,10 @@ export default function NavDrawer({
 
                 <li>
                   <NavItem
-                    onClick={(e: any) =>
-                      setCommunityMenuAnchorEl(e.currentTarget)
-                    }
+                    onClick={(e: any) => {
+                      setCommunityMenuAnchorEl(e.currentTarget);
+                      setHover("persist");
+                    }}
                   >
                     <ListItemIcon>
                       <CommunityIcon />
@@ -370,13 +307,19 @@ export default function NavDrawer({
                   </NavItem>
                   <CommunityMenu
                     anchorEl={communityMenuAnchorEl}
-                    onClose={() => setCommunityMenuAnchorEl(null)}
+                    onClose={() => {
+                      setCommunityMenuAnchorEl(null);
+                      setHover(false);
+                    }}
                   />
                 </li>
 
                 <li>
                   <NavItem
-                    onClick={(e: any) => setHelpMenuAnchorEl(e.currentTarget)}
+                    onClick={(e: any) => {
+                      setHelpMenuAnchorEl(e.currentTarget);
+                      setHover("persist");
+                    }}
                   >
                     <ListItemIcon>
                       <HelpIcon />
@@ -388,7 +331,10 @@ export default function NavDrawer({
                   </NavItem>
                   <HelpMenu
                     anchorEl={helpMenuAnchorEl}
-                    onClose={() => setHelpMenuAnchorEl(null)}
+                    onClose={() => {
+                      setHelpMenuAnchorEl(null);
+                      setHover(false);
+                    }}
                   />
                 </li>
               </ol>
diff --git a/src/layouts/Navigation/NavDrawer/NavDrawerContents.tsx b/src/layouts/Navigation/NavDrawer/NavDrawerContents.tsx
new file mode 100644
index 00000000..75214827
--- /dev/null
+++ b/src/layouts/Navigation/NavDrawer/NavDrawerContents.tsx
@@ -0,0 +1,100 @@
+import { useAtom, useSetAtom } from "jotai";
+import { find, groupBy } from "lodash-es";
+
+import { ListItemIcon, ListItemText, Divider } from "@mui/material";
+import HomeIcon from "@mui/icons-material/HomeOutlined";
+import AddIcon from "@mui/icons-material/Add";
+
+import NavItem from "./NavItem";
+import SettingsNav from "./SettingsNav";
+import NavTableSection from "./NavTableSection";
+
+import {
+  projectScope,
+  userSettingsAtom,
+  tablesAtom,
+  tableSettingsDialogAtom,
+} from "@src/atoms/projectScope";
+import { TableSettings } from "@src/types/table";
+import { ROUTES } from "@src/constants/routes";
+
+export interface INavDrawerContentsProps {
+  closeDrawer: ((e: {}) => void) | undefined;
+  open: boolean;
+  isPermanent: boolean;
+  tempExpanded: boolean;
+  setHover: React.Dispatch<React.SetStateAction<boolean | "persist">>;
+}
+
+export default function NavDrawerContents({
+  closeDrawer,
+  open,
+  isPermanent,
+  tempExpanded,
+}: INavDrawerContentsProps) {
+  const [tables] = useAtom(tablesAtom, projectScope);
+  const [userSettings] = useAtom(userSettingsAtom, projectScope);
+  const openTableSettingsDialog = useSetAtom(
+    tableSettingsDialogAtom,
+    projectScope
+  );
+
+  const favorites = Array.isArray(userSettings.favoriteTables)
+    ? userSettings.favoriteTables
+    : [];
+  const sections = {
+    Favorites: favorites
+      .map((id) => find(tables, { id }))
+      .filter((x) => x !== undefined) as TableSettings[],
+    ...groupBy(tables, "section"),
+  };
+
+  return (
+    <>
+      <li>
+        <NavItem to={ROUTES.tables} onClick={closeDrawer}>
+          <ListItemIcon>
+            <HomeIcon />
+          </ListItemIcon>
+          <ListItemText primary="Home" />
+        </NavItem>
+      </li>
+
+      <SettingsNav
+        closeDrawer={closeDrawer as any}
+        collapsed={isPermanent && !open && !tempExpanded}
+      />
+
+      <Divider variant="middle" sx={{ my: 1 }} />
+
+      {sections &&
+        Object.entries(sections)
+          .filter(([, tables]) => tables.length > 0)
+          .map(([section, tables]) => (
+            <NavTableSection
+              key={section}
+              section={section}
+              tables={tables}
+              closeDrawer={closeDrawer}
+              collapsed={isPermanent && !open && !tempExpanded}
+            />
+          ))}
+
+      <li>
+        <NavItem
+          {...({ component: "button" } as any)}
+          onClick={(e: any) => {
+            if (closeDrawer) closeDrawer(e);
+            openTableSettingsDialog({});
+          }}
+          sx={{ mb: 1 }}
+        >
+          <ListItemIcon>
+            <AddIcon />
+          </ListItemIcon>
+          <ListItemText primary="Create table…" />
+        </NavItem>
+      </li>
+    </>
+  );
+}
diff --git a/src/layouts/Navigation/NavItem.tsx b/src/layouts/Navigation/NavDrawer/NavItem.tsx
similarity index 100%
rename from src/layouts/Navigation/NavItem.tsx
rename to src/layouts/Navigation/NavDrawer/NavItem.tsx
diff --git a/src/layouts/Navigation/NavTableSection.tsx b/src/layouts/Navigation/NavDrawer/NavTableSection.tsx
similarity index 100%
rename from src/layouts/Navigation/NavTableSection.tsx
rename to src/layouts/Navigation/NavDrawer/NavTableSection.tsx
diff --git a/src/layouts/Navigation/SettingsNav.tsx b/src/layouts/Navigation/NavDrawer/SettingsNav.tsx
similarity index 97%
rename from src/layouts/Navigation/SettingsNav.tsx
rename to src/layouts/Navigation/NavDrawer/SettingsNav.tsx
index e54076c6..dc1dc0f1 100644
--- a/src/layouts/Navigation/SettingsNav.tsx
+++ b/src/layouts/Navigation/NavDrawer/SettingsNav.tsx
@@ -14,7 +14,7 @@ import SettingsIcon from "@mui/icons-material/SettingsOutlined";
 import { ChevronDown } from "@src/assets/icons";
 
 import NavItem from "./NavItem";
-import UpdateCheckBadge from "./UpdateCheckBadge";
+import UpdateCheckBadge from "@src/layouts/Navigation/UpdateCheckBadge";
 
 import { projectScope, userRolesAtom } from "@src/atoms/projectScope";
 import { ROUTES } from "@src/constants/routes";
diff --git a/src/layouts/Navigation/NavDrawer/index.ts b/src/layouts/Navigation/NavDrawer/index.ts
new file mode 100644
index 00000000..9e0fc9f1
--- /dev/null
+++ b/src/layouts/Navigation/NavDrawer/index.ts
@@ -0,0 +1,2 @@
+export * from "./NavDrawer";
+export { default } from "./NavDrawer";
diff --git a/src/layouts/Navigation/Navigation.tsx b/src/layouts/Navigation/Navigation.tsx
index 332313bd..f17053a1 100644
--- a/src/layouts/Navigation/Navigation.tsx
+++ b/src/layouts/Navigation/Navigation.tsx
@@ -7,6 +7,7 @@ import { useMediaQuery, Stack, GlobalStyles } from "@mui/material";
 
 import TopBar, { TOP_BAR_HEIGHT } from "./TopBar";
 import NavDrawer from "./NavDrawer";
+import NavDrawerContents from "./NavDrawer/NavDrawerContents";
 import ErrorFallback, {
   IErrorFallbackProps,
 } from "@src/components/ErrorFallback";
@@ -51,6 +52,7 @@ export default function Navigation({ children }: React.PropsWithChildren<{}>) {
           open={open}
           isPermanent={isPermanent}
           onClose={() => setOpen(false)}
+          Contents={NavDrawerContents}
         />
         <GetStartedChecklist navOpen={open} navPermanent={isPermanent} />
 

From d54115c9960205b13e5019175dca2417a4694d0d Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 20 Jul 2022 14:50:23 +1000
Subject: [PATCH 035/309] sync changes with rowy.app

---
 src/components/AccessDenied.tsx               |  1 +
 src/components/ErrorFallback.tsx              | 48 ++++++++++++-------
 .../NavDrawer/NavDrawerContents.tsx           |  6 +--
 .../Navigation/NavDrawer/NavTableSection.tsx  |  2 +-
 src/pages/NotFoundPage.tsx                    |  7 ++-
 src/theme/components.tsx                      |  6 +++
 6 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/src/components/AccessDenied.tsx b/src/components/AccessDenied.tsx
index fbc0b81f..792e9af3 100644
--- a/src/components/AccessDenied.tsx
+++ b/src/components/AccessDenied.tsx
@@ -31,6 +31,7 @@ export default function AccessDenied({ resetErrorBoundary }: FallbackProps) {
 
   return (
     <EmptyState
+      role="alert"
       fullScreen
       Icon={SecurityIcon}
       message="Access denied"
diff --git a/src/components/ErrorFallback.tsx b/src/components/ErrorFallback.tsx
index 93764d63..d1c541b5 100644
--- a/src/components/ErrorFallback.tsx
+++ b/src/components/ErrorFallback.tsx
@@ -2,7 +2,7 @@ import { useState, useEffect } from "react";
 import { FallbackProps } from "react-error-boundary";
 import { useLocation, Link } from "react-router-dom";
 
-import { Button } from "@mui/material";
+import { Typography, Button } from "@mui/material";
 import ReloadIcon from "@mui/icons-material/Refresh";
 import InlineOpenInNewIcon from "@src/components/InlineOpenInNewIcon";
 import { Tables as TablesIcon } from "@src/assets/icons";
@@ -17,18 +17,11 @@ export const ERROR_TABLE_NOT_FOUND = "Table not found";
 
 export interface IErrorFallbackProps extends FallbackProps, IEmptyStateProps {}
 
-export default function ErrorFallback({
+export function ErrorFallbackContents({
   error,
   resetErrorBoundary,
   ...props
 }: IErrorFallbackProps) {
-  // Reset error boundary when navigating away from the page
-  const location = useLocation();
-  const [errorPathname] = useState(location.pathname);
-  useEffect(() => {
-    if (errorPathname !== location.pathname) resetErrorBoundary();
-  }, [errorPathname, location.pathname, resetErrorBoundary]);
-
   if ((error as any).code === "permission-denied")
     return (
       <AccessDenied error={error} resetErrorBoundary={resetErrorBoundary} />
@@ -38,13 +31,17 @@ export default function ErrorFallback({
     message: "Something went wrong",
     description: (
       <>
-        <span>
+        <Typography variant="inherit" style={{ whiteSpace: "pre-line" }}>
           {(error as any).code && <b>{(error as any).code}: </b>}
           {error.message}
-        </span>
+        </Typography>
         <Button
           size={props.basic ? "small" : "medium"}
-          href={meta.repository.url.replace(".git", "") + "/issues/new/choose"}
+          href={
+            meta.repository.url.replace(".git", "") +
+            "/issues/new?labels=bug&template=bug_report.md&title=Error: " +
+            error.message.replace("\n", " ")
+          }
           target="_blank"
           rel="noopener noreferrer"
         >
@@ -60,7 +57,9 @@ export default function ErrorFallback({
       message: ERROR_TABLE_NOT_FOUND,
       description: (
         <>
-          <span>Make sure you have the right ID</span>
+          <Typography variant="inherit">
+            Make sure you have the right ID
+          </Typography>
           <code>{error.message.replace(ERROR_TABLE_NOT_FOUND + ": ", "")}</code>
           <Button
             size={props.basic ? "small" : "medium"}
@@ -84,7 +83,9 @@ export default function ErrorFallback({
       message: "New update available",
       description: (
         <>
-          <span>Reload this page to get the latest update</span>
+          <Typography variant="inherit">
+            Reload this page to get the latest update
+          </Typography>
           <Button
             size={props.basic ? "small" : "medium"}
             variant="outlined"
@@ -99,12 +100,25 @@ export default function ErrorFallback({
     };
   }
 
-  return <EmptyState fullScreen {...renderProps} {...props} />;
+  return <EmptyState role="alert" fullScreen {...renderProps} {...props} />;
+}
+
+export default function ErrorFallback(props: IErrorFallbackProps) {
+  const { resetErrorBoundary } = props;
+
+  // Reset error boundary when navigating away from the page
+  const location = useLocation();
+  const [errorPathname] = useState(location.pathname);
+  useEffect(() => {
+    if (errorPathname !== location.pathname) resetErrorBoundary();
+  }, [errorPathname, location.pathname, resetErrorBoundary]);
+
+  return <ErrorFallbackContents {...props} />;
 }
 
 export function InlineErrorFallback(props: IErrorFallbackProps) {
   return (
-    <ErrorFallback
+    <ErrorFallbackContents
       {...props}
       fullScreen={false}
       basic
@@ -115,5 +129,5 @@ export function InlineErrorFallback(props: IErrorFallbackProps) {
 }
 
 export function NonFullScreenErrorFallback(props: IErrorFallbackProps) {
-  return <ErrorFallback {...props} fullScreen={false} />;
+  return <ErrorFallbackContents {...props} fullScreen={false} />;
 }
diff --git a/src/layouts/Navigation/NavDrawer/NavDrawerContents.tsx b/src/layouts/Navigation/NavDrawer/NavDrawerContents.tsx
index 75214827..04f1062c 100644
--- a/src/layouts/Navigation/NavDrawer/NavDrawerContents.tsx
+++ b/src/layouts/Navigation/NavDrawer/NavDrawerContents.tsx
@@ -2,7 +2,7 @@ import { useAtom, useSetAtom } from "jotai";
 import { find, groupBy } from "lodash-es";
 
 import { ListItemIcon, ListItemText, Divider } from "@mui/material";
-import HomeIcon from "@mui/icons-material/HomeOutlined";
+import { Tables as TablesIcon } from "@src/assets/icons";
 import AddIcon from "@mui/icons-material/Add";
 
 import NavItem from "./NavItem";
@@ -54,9 +54,9 @@ export default function NavDrawerContents({
       <li>
         <NavItem to={ROUTES.tables} onClick={closeDrawer}>
           <ListItemIcon>
-            <HomeIcon />
+            <TablesIcon />
           </ListItemIcon>
-          <ListItemText primary="Home" />
+          <ListItemText primary="Tables" />
         </NavItem>
       </li>
 
diff --git a/src/layouts/Navigation/NavDrawer/NavTableSection.tsx b/src/layouts/Navigation/NavDrawer/NavTableSection.tsx
index 6867fae6..5a1c0930 100644
--- a/src/layouts/Navigation/NavDrawer/NavTableSection.tsx
+++ b/src/layouts/Navigation/NavDrawer/NavTableSection.tsx
@@ -48,7 +48,7 @@ export default function NavTableSection({
           {isFavorites ? <FavoriteIcon /> : <FolderIcon />}
         </ListItemIcon>
 
-        <ListItemText primary={section} style={{ textAlign: "left" }} />
+        <ListItemText primary={section} />
 
         <ListItemSecondaryAction>
           <ChevronDown
diff --git a/src/pages/NotFoundPage.tsx b/src/pages/NotFoundPage.tsx
index 6a93e35f..41a3f22c 100644
--- a/src/pages/NotFoundPage.tsx
+++ b/src/pages/NotFoundPage.tsx
@@ -2,8 +2,7 @@ import { useAtom } from "jotai";
 import { Link } from "react-router-dom";
 
 import { Button } from "@mui/material";
-import { Go as GoIcon } from "@src/assets/icons";
-import HomeIcon from "@mui/icons-material/HomeOutlined";
+import { Go as GoIcon, Tables as TablesIcon } from "@src/assets/icons";
 
 import AuthLayout from "@src/layouts/AuthLayout";
 import Navigation from "@src/layouts/Navigation";
@@ -29,9 +28,9 @@ export default function NotFound() {
               sx={{ mt: 3 }}
               component={Link}
               to={ROUTES.home}
-              startIcon={<HomeIcon />}
+              startIcon={<TablesIcon />}
             >
-              Home
+              Tables
             </Button>
           }
           style={{ marginTop: -TOP_BAR_HEIGHT }}
diff --git a/src/theme/components.tsx b/src/theme/components.tsx
index 342a92ea..6cf7c4ca 100644
--- a/src/theme/components.tsx
+++ b/src/theme/components.tsx
@@ -1339,6 +1339,12 @@ export const components = (theme: Theme): ThemeOptions => {
         },
       },
 
+      MuiSkeleton: {
+        styleOverrides: {
+          rectangular: { borderRadius: theme.shape.borderRadius },
+        },
+      },
+
       MuiRating: {
         styleOverrides: {
           iconFilled: { color: theme.palette.text.secondary },

From b641af8c8fd5750f805d7daf6241190d8c889d30 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 20 Jul 2022 14:51:17 +1000
Subject: [PATCH 036/309] fix nav items not accessible with Tab

---
 src/layouts/Navigation/NavItem.tsx | 46 ++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/src/layouts/Navigation/NavItem.tsx b/src/layouts/Navigation/NavItem.tsx
index c33bf6f3..23f53138 100644
--- a/src/layouts/Navigation/NavItem.tsx
+++ b/src/layouts/Navigation/NavItem.tsx
@@ -1,29 +1,45 @@
 import { Link, useLocation } from "react-router-dom";
 import { MenuItem, MenuItemProps } from "@mui/material";
+import { spreadSx } from "@src/utils/ui";
 
-export default function NavItem(props: MenuItemProps<typeof Link>) {
+const linkProps = { target: "_blank", rel: "noopener noreferrer" };
+
+export default function NavItem(
+  props: MenuItemProps<typeof Link | "a" | "button">
+) {
   const { pathname } = useLocation();
 
   return (
     <MenuItem
-      component={Link}
-      selected={pathname === props.to}
+      role="none"
+      tabIndex={0}
+      component={"to" in props ? Link : "href" in props ? "a" : "button"}
+      selected={"to" in props ? pathname === props.to : false}
       {...props}
-      sx={{
-        "& .MuiListItemText-primary": {
-          typography: "button",
+      {...("href" in props ? linkProps : {})}
+      sx={[
+        {
+          overflow: "hidden",
+          textAlign: "left",
           color: "text.secondary",
-        },
-        "& .MuiListItemIcon-root": { opacity: 0.87 },
 
-        "&:hover, &.Mui-selected": {
-          "& .MuiListItemText-primary": { color: "text.primary" },
-          "& .MuiSvgIcon-root": { color: "text.primary" },
-        },
+          "& .MuiListItemText-primary": {
+            typography: "button",
+            overflow: "hidden",
+          },
+          "& .MuiSvgIcon-root": {
+            color: "inherit",
+            opacity: 0.87,
+            display: "block",
+          },
 
-        ...props.sx,
-        "&&::before": { left: "auto", right: 0 },
-      }}
+          "&:hover, &.Mui-selected": {
+            "& .MuiListItemText-primary": { color: "text.primary" },
+            "& .MuiSvgIcon-root": { color: "text.primary" },
+          },
+        },
+        ...spreadSx(props.sx),
+      ]}
     />
   );
 }

From d6395dffffb7472dc70e5b527e379bde5432424d Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 20 Jul 2022 15:08:33 +1000
Subject: [PATCH 037/309] =?UTF-8?q?Percentage:=20don=E2=80=99t=20display?=
 =?UTF-8?q?=20if=20value=20null=20or=20undefined?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fields/Percentage/BasicCell.tsx           | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/components/fields/Percentage/BasicCell.tsx b/src/components/fields/Percentage/BasicCell.tsx
index c2dbef58..5f6228aa 100644
--- a/src/components/fields/Percentage/BasicCell.tsx
+++ b/src/components/fields/Percentage/BasicCell.tsx
@@ -5,17 +5,19 @@ import { useTheme } from "@mui/material";
 export default function Percentage({ value }: IBasicCellProps) {
   const theme = useTheme();
 
+  if (value === null || value === undefined) return null;
+
   const percentage = typeof value === "number" ? value : 0;
   return (
-      <div
-        style={{
-          textAlign: "right",
-          color: theme.palette.text.primary,
-          position: "relative",
-          zIndex: 1,
-        }}
-      >
-        {Math.round(percentage * 100)}%
-      </div>
+    <div
+      style={{
+        textAlign: "right",
+        color: theme.palette.text.primary,
+        position: "relative",
+        zIndex: 1,
+      }}
+    >
+      {Math.round(percentage * 100)}%
+    </div>
   );
 }

From 91b110dcb26ab53eb942eece030a24020b111cc5 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 20 Jul 2022 15:19:00 +1000
Subject: [PATCH 038/309] fix NavDrawer causing compile to fail

---
 src/layouts/Navigation/NavDrawer.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/Navigation/NavDrawer.tsx b/src/layouts/Navigation/NavDrawer.tsx
index cabc1c66..f68cdfdf 100644
--- a/src/layouts/Navigation/NavDrawer.tsx
+++ b/src/layouts/Navigation/NavDrawer.tsx
@@ -232,7 +232,7 @@ export default function NavDrawer({
               {...({ component: "button" } as any)}
               style={{ textAlign: "left" }}
               sx={{ mb: 1 }}
-              onClick={(e) => {
+              onClick={(e: any) => {
                 if (closeDrawer) closeDrawer(e);
                 openTableSettingsDialog({});
               }}

From 38d422c0cb57e1eb990b34f7ab2dfa79ecb46f30 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 20 Jul 2022 15:19:24 +1000
Subject: [PATCH 039/309] bump workspaces to v3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d646de6f..a6bc52bf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rowy",
-  "version": "2.7.0-alpha",
+  "version": "3.0.0-alpha",
   "homepage": "https://rowy.io",
   "repository": {
     "type": "git",

From f4b50f31befb9c5f85c38a46fce0664fcf614931 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 20 Jul 2022 16:12:57 +1000
Subject: [PATCH 040/309] fix NavDrawer hover state being updated when unused

---
 src/layouts/Navigation/NavDrawer/NavDrawer.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/layouts/Navigation/NavDrawer/NavDrawer.tsx b/src/layouts/Navigation/NavDrawer/NavDrawer.tsx
index 499c9c6f..ef95c7ee 100644
--- a/src/layouts/Navigation/NavDrawer/NavDrawer.tsx
+++ b/src/layouts/Navigation/NavDrawer/NavDrawer.tsx
@@ -52,9 +52,11 @@ export default function NavDrawer({
   onClose,
   Contents,
 }: INavDrawerProps) {
-  const [hover, setHover] = useState<boolean | "persist">(false);
+  const [hover, _setHover] = useState<boolean | "persist">(false);
   const collapsed = !open && isPermanent;
+  const setHover = collapsed ? _setHover : () => {};
   const tempExpanded = hover && collapsed;
+
   const width =
     collapsed && !tempExpanded ? NAV_DRAWER_COLLAPSED_WIDTH : NAV_DRAWER_WIDTH;
   const closeDrawer = isPermanent

From d8c7b15ccc054fff6990824c9f9d41b3185fbf13 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 Jul 2022 06:17:13 +0000
Subject: [PATCH 041/309] Bump terser from 5.12.1 to 5.14.2

Bumps [terser](https://github.com/terser/terser) from 5.12.1 to 5.14.2.
- [Release notes](https://github.com/terser/terser/releases)
- [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/terser/terser/commits)

---
updated-dependencies:
- dependency-name: terser
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 74 ++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 48 insertions(+), 26 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index b6d9a423..fa729f4e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2822,15 +2822,37 @@
     "@types/yargs" "^17.0.8"
     chalk "^4.0.0"
 
+"@jridgewell/gen-mapping@^0.3.0":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"
+  integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==
+  dependencies:
+    "@jridgewell/set-array" "^1.0.1"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
 "@jridgewell/resolve-uri@^3.0.3":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz#68eb521368db76d040a6315cdb24bf2483037b9c"
-  integrity sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
+  integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
+
+"@jridgewell/set-array@^1.0.1":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
+  integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
+
+"@jridgewell/source-map@^0.3.2":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb"
+  integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==
+  dependencies:
+    "@jridgewell/gen-mapping" "^0.3.0"
+    "@jridgewell/trace-mapping" "^0.3.9"
 
 "@jridgewell/sourcemap-codec@^1.4.10":
-  version "1.4.11"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz#771a1d8d744eeb71b6adb35808e1a6c7b9b8c8ec"
-  integrity sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg==
+  version "1.4.14"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
+  integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
 
 "@jridgewell/trace-mapping@^0.3.0":
   version "0.3.4"
@@ -2840,6 +2862,14 @@
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
+"@jridgewell/trace-mapping@^0.3.9":
+  version "0.3.14"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz#b231a081d8f66796e475ad588a1ef473112701ed"
+  integrity sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.0.3"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+
 "@leichtgewicht/ip-codec@^2.0.1":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.3.tgz#0300943770e04231041a51bd39f0439b5c7ab4f0"
@@ -4404,9 +4434,9 @@ acorn@^7.0.0, acorn@^7.1.1:
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
 acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.0:
-  version "8.7.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
-  integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==
+  version "8.7.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
+  integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==
 
 address@^1.0.1, address@^1.1.2:
   version "1.1.2"
@@ -5062,9 +5092,9 @@ buffer-equal@0.0.1:
   integrity sha1-kbx0sR6kBbyRa8aqkI+q+ltKrEs=
 
 buffer-from@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
-  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
+  integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
 buffer@^6.0.3:
   version "6.0.3"
@@ -12373,15 +12403,7 @@ source-map-resolve@^0.6.0:
     atob "^2.1.2"
     decode-uri-component "^0.2.0"
 
-source-map-support@^0.5.6:
-  version "0.5.19"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
-  integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map-support@~0.5.20:
+source-map-support@^0.5.6, source-map-support@~0.5.20:
   version "0.5.21"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
   integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
@@ -12399,7 +12421,7 @@ source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
-source-map@^0.7.3, source-map@~0.7.2:
+source-map@^0.7.3:
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
   integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
@@ -12890,13 +12912,13 @@ terser-webpack-plugin@^5.1.3, terser-webpack-plugin@^5.2.5:
     terser "^5.7.2"
 
 terser@^5.0.0, terser@^5.10.0, terser@^5.7.2:
-  version "5.12.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.12.1.tgz#4cf2ebed1f5bceef5c83b9f60104ac4a78b49e9c"
-  integrity sha512-NXbs+7nisos5E+yXwAD+y7zrcTkMqb0dEJxIGtSKPdCBzopf7ni4odPul2aechpV7EXNvOudYOX2bb5tln1jbQ==
+  version "5.14.2"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.2.tgz#9ac9f22b06994d736174f4091aa368db896f1c10"
+  integrity sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==
   dependencies:
+    "@jridgewell/source-map" "^0.3.2"
     acorn "^8.5.0"
     commander "^2.20.0"
-    source-map "~0.7.2"
     source-map-support "~0.5.20"
 
 test-exclude@^6.0.0:

From 52e408ce8c2c14a4e12f103855499c1afc6fa793 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Thu, 21 Jul 2022 16:39:53 +1000
Subject: [PATCH 042/309] nav updates

---
 package.json                                  |   3 +
 src/components/EmojiAvatar.tsx                |  66 ++++++++
 .../Settings/UserManagement/UserItem.tsx      |   8 +-
 src/hooks/useScrollToHash.ts                  |  51 ++++++
 .../Navigation/NavDrawer/CommunityMenu.tsx    |   2 +-
 src/layouts/Navigation/NavDrawer/HelpMenu.tsx |   2 +-
 .../Navigation/NavDrawer/NavDrawer.tsx        |   4 +-
 src/layouts/Navigation/NavDrawer/NavItem.tsx  |  22 ++-
 src/pages/Settings/DebugSettingsPage.tsx      |   2 +
 src/pages/Settings/ProjectSettingsPage.tsx    |   2 +
 src/pages/Settings/UserSettingsPage.tsx       |   2 +
 src/pages/TablesPage.tsx                      |   3 +
 yarn.lock                                     | 152 +++++++++++++++++-
 13 files changed, 308 insertions(+), 11 deletions(-)
 create mode 100644 src/components/EmojiAvatar.tsx
 create mode 100644 src/hooks/useScrollToHash.ts

diff --git a/package.json b/package.json
index a6bc52bf..b224e159 100644
--- a/package.json
+++ b/package.json
@@ -37,6 +37,7 @@
     "jszip": "^3.10.0",
     "lodash-es": "^4.17.21",
     "match-sorter": "^6.3.1",
+    "material-ui-popup-state": "^4.0.1",
     "mdi-material-ui": "^7.3.0",
     "monaco-editor-auto-typings": "^0.4.0",
     "notistack": "^2.0.4",
@@ -64,6 +65,7 @@
     "react-scripts": "^5.0.0",
     "react-usestateref": "^1.0.8",
     "remark-gfm": "^3.0.1",
+    "seedrandom": "^3.0.5",
     "stream-browserify": "^3.0.0",
     "swr": "^1.3.0",
     "tinymce": "^5",
@@ -159,6 +161,7 @@
     "@types/react-dom": "^18.0.0",
     "@types/react-router-dom": "^5.3.3",
     "@types/react-router-hash-link": "^2.4.5",
+    "@types/seedrandom": "^3.0.2",
     "@typescript-eslint/parser": "^5.18.0",
     "craco-alias": "^3.0.1",
     "craco-swc": "^0.5.1",
diff --git a/src/components/EmojiAvatar.tsx b/src/components/EmojiAvatar.tsx
new file mode 100644
index 00000000..ea11a4b2
--- /dev/null
+++ b/src/components/EmojiAvatar.tsx
@@ -0,0 +1,66 @@
+import seedrandom from "seedrandom";
+import { colord } from "colord";
+
+import { useTheme, Avatar, AvatarProps } from "@mui/material";
+import { spreadSx } from "@src/utils/ui";
+
+export interface IEmojiAvatarProps extends Partial<AvatarProps> {
+  bgColor?: string;
+  emoji?: string;
+  fallback: string;
+  size?: number;
+}
+
+export default function EmojiAvatar({
+  bgColor,
+  emoji,
+  fallback,
+  children,
+  size = 40,
+  ...props
+}: IEmojiAvatarProps) {
+  const theme = useTheme();
+  const darkMode = theme.palette.mode === "dark";
+
+  const bgcolor = bgColor || generateRandomColor(fallback, darkMode);
+  const bgcolorLch = colord(bgcolor).toLch();
+  const textColor = colord({
+    l:
+      bgcolorLch.l > 50
+        ? Math.max(bgcolorLch.l - 50, 0)
+        : Math.min(bgcolorLch.l + 50, 100),
+    c: 30,
+    h: bgcolorLch.h,
+  }).toHslString();
+
+  return (
+    <Avatar
+      {...props}
+      sx={[
+        {
+          bgcolor,
+          color: textColor,
+          width: size,
+          height: size,
+          fontSize: size * 0.45,
+        },
+        props.variant === "rounded" && { borderRadius: size / 40 },
+        ...spreadSx(props.sx),
+      ]}
+    >
+      {children ||
+        emoji ||
+        fallback
+          .split(" ")
+          .slice(0, 2)
+          .map((s) => s.slice(0, 1))
+          .join("")}
+    </Avatar>
+  );
+}
+
+const generateRandomColor = (seed: string, darkMode: boolean) => {
+  const rng = seedrandom(seed);
+  const color = colord({ l: darkMode ? 30 : 90, c: 15, h: rng() * 360 });
+  return color.toHslString();
+};
diff --git a/src/components/Settings/UserManagement/UserItem.tsx b/src/components/Settings/UserManagement/UserItem.tsx
index 5415088c..53e0b26b 100644
--- a/src/components/Settings/UserManagement/UserItem.tsx
+++ b/src/components/Settings/UserManagement/UserItem.tsx
@@ -15,6 +15,7 @@ import { Copy as CopyIcon } from "@src/assets/icons";
 import DeleteIcon from "@mui/icons-material/DeleteOutlined";
 
 import MultiSelect from "@rowy/multiselect";
+import EmojiAvatar from "@src/components/EmojiAvatar";
 
 import {
   projectScope,
@@ -72,9 +73,10 @@ export default function UserItem({
   const listItemChildren = (
     <>
       <ListItemAvatar>
-        <Avatar src={user?.photoURL}>
-          {user?.displayName ? user.displayName[0] : undefined}
-        </Avatar>
+        <EmojiAvatar
+          src={user?.photoURL}
+          fallback={user?.displayName || _rowy_ref?.id || "?"}
+        />
       </ListItemAvatar>
       <ListItemText
         primary={user?.displayName}
diff --git a/src/hooks/useScrollToHash.ts b/src/hooks/useScrollToHash.ts
new file mode 100644
index 00000000..7b333453
--- /dev/null
+++ b/src/hooks/useScrollToHash.ts
@@ -0,0 +1,51 @@
+import { useLocation } from "react-router-dom";
+import { useLayoutEffect } from "react";
+
+/** Scrolls to the hash in the URL on component mount */
+export function useScrollToHash() {
+  const { pathname, hash } = useLocation();
+
+  useLayoutEffect(() => {
+    if (hash) {
+      const id = hash.replace("#", "");
+      const element = document.getElementById(id);
+
+      if (element) {
+        element.scrollIntoView();
+
+        /**
+         * From rafgraph/react-router-hash-link
+         * https://github.com/rafgraph/react-router-hash-link/blob/2084a987b2f34479005ffbcb16ab7b9dc1fd6c93/src/HashLink.jsx
+         *
+         * Copyright (c) 2017 Rafael Pedicini, MIT License
+         */
+
+        let originalTabIndex = element.getAttribute("tabindex");
+        if (originalTabIndex === null && !isInteractiveElement(element)) {
+          element.setAttribute("tabindex", "-1");
+        }
+        element.focus({ preventScroll: true });
+        if (originalTabIndex === null && !isInteractiveElement(element)) {
+          element.removeAttribute("tabindex");
+        }
+      }
+    }
+  }, [pathname, hash]);
+}
+
+export default useScrollToHash;
+
+/**
+ * From rafgraph/react-router-hash-link
+ * https://github.com/rafgraph/react-router-hash-link/blob/2084a987b2f34479005ffbcb16ab7b9dc1fd6c93/src/HashLink.jsx
+ *
+ * Copyright (c) 2017 Rafael Pedicini, MIT License
+ */
+function isInteractiveElement(element: HTMLElement) {
+  const formTags = ["BUTTON", "INPUT", "SELECT", "TEXTAREA"];
+  const linkTags = ["A", "AREA"];
+  return (
+    (formTags.includes(element.tagName) && !element.hasAttribute("disabled")) ||
+    (linkTags.includes(element.tagName) && element.hasAttribute("href"))
+  );
+}
diff --git a/src/layouts/Navigation/NavDrawer/CommunityMenu.tsx b/src/layouts/Navigation/NavDrawer/CommunityMenu.tsx
index ec68e76a..5d027992 100644
--- a/src/layouts/Navigation/NavDrawer/CommunityMenu.tsx
+++ b/src/layouts/Navigation/NavDrawer/CommunityMenu.tsx
@@ -38,7 +38,7 @@ export default function HelpMenu({
       anchorOrigin={{ vertical: "bottom", horizontal: "right" }}
       transformOrigin={{ vertical: "bottom", horizontal: "left" }}
       sx={{ "& .MuiPaper-root": { mt: 1.5, py: 1 } }}
-      PaperProps={{ elevation: 10 }}
+      PaperProps={{ elevation: 12 }}
     >
       <ListSubheader
         sx={{
diff --git a/src/layouts/Navigation/NavDrawer/HelpMenu.tsx b/src/layouts/Navigation/NavDrawer/HelpMenu.tsx
index f0050f40..5ec00f04 100644
--- a/src/layouts/Navigation/NavDrawer/HelpMenu.tsx
+++ b/src/layouts/Navigation/NavDrawer/HelpMenu.tsx
@@ -47,7 +47,7 @@ export default function HelpMenu({
       anchorOrigin={{ vertical: "bottom", horizontal: "right" }}
       transformOrigin={{ vertical: "bottom", horizontal: "left" }}
       sx={{ "& .MuiPaper-root": { mt: 1.5, py: 1 } }}
-      PaperProps={{ elevation: 10 }}
+      PaperProps={{ elevation: 12 }}
     >
       <ListSubheader
         sx={{
diff --git a/src/layouts/Navigation/NavDrawer/NavDrawer.tsx b/src/layouts/Navigation/NavDrawer/NavDrawer.tsx
index 499c9c6f..ef95c7ee 100644
--- a/src/layouts/Navigation/NavDrawer/NavDrawer.tsx
+++ b/src/layouts/Navigation/NavDrawer/NavDrawer.tsx
@@ -52,9 +52,11 @@ export default function NavDrawer({
   onClose,
   Contents,
 }: INavDrawerProps) {
-  const [hover, setHover] = useState<boolean | "persist">(false);
+  const [hover, _setHover] = useState<boolean | "persist">(false);
   const collapsed = !open && isPermanent;
+  const setHover = collapsed ? _setHover : () => {};
   const tempExpanded = hover && collapsed;
+
   const width =
     collapsed && !tempExpanded ? NAV_DRAWER_COLLAPSED_WIDTH : NAV_DRAWER_WIDTH;
   const closeDrawer = isPermanent
diff --git a/src/layouts/Navigation/NavDrawer/NavItem.tsx b/src/layouts/Navigation/NavDrawer/NavItem.tsx
index 23f53138..5174f11c 100644
--- a/src/layouts/Navigation/NavDrawer/NavItem.tsx
+++ b/src/layouts/Navigation/NavDrawer/NavItem.tsx
@@ -1,19 +1,33 @@
 import { Link, useLocation } from "react-router-dom";
+import { HashLink } from "react-router-hash-link";
+
 import { MenuItem, MenuItemProps } from "@mui/material";
 import { spreadSx } from "@src/utils/ui";
 
 const linkProps = { target: "_blank", rel: "noopener noreferrer" };
 
-export default function NavItem(
-  props: MenuItemProps<typeof Link | "a" | "button">
-) {
+type NavItemComponent = typeof HashLink | typeof Link | "a" | "button";
+
+export default function NavItem(props: MenuItemProps<NavItemComponent>) {
   const { pathname } = useLocation();
 
+  let component: NavItemComponent = "button";
+  if ("to" in props) {
+    component = Link;
+    if (
+      typeof props.to === "string" ? props.to.includes("#") : !!props.to.hash
+    ) {
+      component = HashLink;
+    }
+  } else if ("href" in props) {
+    component = "a";
+  }
+
   return (
     <MenuItem
       role="none"
       tabIndex={0}
-      component={"to" in props ? Link : "href" in props ? "a" : "button"}
+      component={component}
       selected={"to" in props ? pathname === props.to : false}
       {...props}
       {...("href" in props ? linkProps : {})}
diff --git a/src/pages/Settings/DebugSettingsPage.tsx b/src/pages/Settings/DebugSettingsPage.tsx
index bf230b02..45c2c77f 100644
--- a/src/pages/Settings/DebugSettingsPage.tsx
+++ b/src/pages/Settings/DebugSettingsPage.tsx
@@ -21,6 +21,7 @@ import UserManagementSourceFirebase from "@src/sources/MembersSourceFirebase";
 import { firebaseDbAtom } from "@src/sources/ProjectSourceFirebase";
 import { USERS } from "@src/config/dbPaths";
 import { getTableSchemaPath } from "@src/utils/table";
+import { useScrollToHash } from "@src/hooks/useScrollToHash";
 
 export interface IProjectSettingsChildProps {
   settings: Record<string, any>;
@@ -35,6 +36,7 @@ export default function DebugSettingsPage() {
   const [users] = useAtom(allUsersAtom, projectScope);
   const [updateUser] = useAtom(updateUserAtom, projectScope);
   const { enqueueSnackbar, closeSnackbar } = useSnackbar();
+  useScrollToHash();
 
   return (
     <Container maxWidth="sm" sx={{ px: 1, pt: 1, pb: 7 + 3 + 3 }}>
diff --git a/src/pages/Settings/ProjectSettingsPage.tsx b/src/pages/Settings/ProjectSettingsPage.tsx
index a8454954..96f0e93c 100644
--- a/src/pages/Settings/ProjectSettingsPage.tsx
+++ b/src/pages/Settings/ProjectSettingsPage.tsx
@@ -18,6 +18,7 @@ import {
   publicSettingsAtom,
   updatePublicSettingsAtom,
 } from "@src/atoms/projectScope";
+import { useScrollToHash } from "@src/hooks/useScrollToHash";
 
 export interface IProjectSettingsChildProps {
   settings: Record<string, any>;
@@ -31,6 +32,7 @@ export default function ProjectSettingsPage() {
   const [publicSettings] = useAtom(publicSettingsAtom, projectScope);
 
   const { enqueueSnackbar } = useSnackbar();
+  useScrollToHash();
 
   const [_updateProjectSettingsDoc] = useAtom(
     updateProjectSettingsAtom,
diff --git a/src/pages/Settings/UserSettingsPage.tsx b/src/pages/Settings/UserSettingsPage.tsx
index 53536a2b..be4d43ec 100644
--- a/src/pages/Settings/UserSettingsPage.tsx
+++ b/src/pages/Settings/UserSettingsPage.tsx
@@ -17,6 +17,7 @@ import {
   userSettingsAtom,
   updateUserSettingsAtom,
 } from "@src/atoms/projectScope";
+import { useScrollToHash } from "@src/hooks/useScrollToHash";
 
 export interface IUserSettingsChildProps {
   settings: Record<string, any>;
@@ -27,6 +28,7 @@ export default function UserSettingsPage() {
   const [currentUser] = useAtom(currentUserAtom, projectScope);
   const [userSettings] = useAtom(userSettingsAtom, projectScope);
   const { enqueueSnackbar } = useSnackbar();
+  useScrollToHash();
 
   const [_updateUserSettings] = useAtom(updateUserSettingsAtom, projectScope);
   const updateSettings = useDebouncedCallback((data) => {
diff --git a/src/pages/TablesPage.tsx b/src/pages/TablesPage.tsx
index ea133c07..4c914754 100644
--- a/src/pages/TablesPage.tsx
+++ b/src/pages/TablesPage.tsx
@@ -40,6 +40,7 @@ import { TableSettings } from "@src/types/table";
 import { ROUTES } from "@src/constants/routes";
 import useBasicSearch from "@src/hooks/useBasicSearch";
 import { TOP_BAR_HEIGHT } from "@src/layouts/Navigation/TopBar";
+import { useScrollToHash } from "@src/hooks/useScrollToHash";
 
 const SEARCH_KEYS = ["id", "name", "section", "description"];
 
@@ -54,6 +55,8 @@ export default function HomePage() {
     projectScope
   );
 
+  useScrollToHash();
+
   const [results, query, handleQuery] = useBasicSearch(
     tables ?? [],
     SEARCH_KEYS
diff --git a/yarn.lock b/yarn.lock
index da7f9913..b6edf05b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2096,6 +2096,17 @@
     "@emotion/weak-memoize" "^0.2.5"
     stylis "4.0.13"
 
+"@emotion/cache@^11.9.3":
+  version "11.9.3"
+  resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.9.3.tgz#96638449f6929fd18062cfe04d79b29b44c0d6cb"
+  integrity sha512-0dgkI/JKlCXa+lEXviaMtGBL0ynpx4osh7rjOXE71q9bIF8G+XhJgvi+wDu0B0IdCVx37BffiwXlN9I3UuzFvg==
+  dependencies:
+    "@emotion/memoize" "^0.7.4"
+    "@emotion/sheet" "^1.1.1"
+    "@emotion/utils" "^1.0.0"
+    "@emotion/weak-memoize" "^0.2.5"
+    stylis "4.0.13"
+
 "@emotion/hash@^0.8.0":
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413"
@@ -2108,6 +2119,13 @@
   dependencies:
     "@emotion/memoize" "^0.7.4"
 
+"@emotion/is-prop-valid@^1.1.3":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.1.3.tgz#f0907a416368cf8df9e410117068e20fe87c0a3a"
+  integrity sha512-RFg04p6C+1uO19uG8N+vqanzKqiM9eeV1LDOG3bmkYmuOj7NbKNlFC/4EZq5gnwAIlcC/jOT24f8Td0iax2SXA==
+  dependencies:
+    "@emotion/memoize" "^0.7.4"
+
 "@emotion/memoize@^0.7.4", "@emotion/memoize@^0.7.5":
   version "0.7.5"
   resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.5.tgz#2c40f81449a4e554e9fc6396910ed4843ec2be50"
@@ -2153,6 +2171,11 @@
   resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.1.0.tgz#56d99c41f0a1cda2726a05aa6a20afd4c63e58d2"
   integrity sha512-u0AX4aSo25sMAygCuQTzS+HsImZFuS8llY8O7b9MDRzbJM0kVJlAz6KNDqcG7pOuQZJmj/8X/rAW+66kMnMW+g==
 
+"@emotion/sheet@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.1.1.tgz#015756e2a9a3c7c5f11d8ec22966a8dbfbfac787"
+  integrity sha512-J3YPccVRMiTZxYAY0IOq3kd+hUP8idY8Kz6B/Cyo+JuXq52Ek+zbPbSQUrVQp95aJ+lsAW7DPL1P2Z+U1jGkKA==
+
 "@emotion/styled@^11.8.1":
   version "11.8.1"
   resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-11.8.1.tgz#856f6f63aceef0eb783985fa2322e2bf66d04e17"
@@ -2902,6 +2925,20 @@
     prop-types "^15.7.2"
     react-is "^17.0.2"
 
+"@mui/base@5.0.0-alpha.90":
+  version "5.0.0-alpha.90"
+  resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.90.tgz#73700ba74e5c75096ee5d0bfe3ba4a3b3b81beef"
+  integrity sha512-hNKwzr+RkiuGsGrakz8Q2i5ezr4Dz4b4Qsdipt9SiMrhuFAra/i501VSaEIzwec9LC4G+vtW4fE7yJBB0XaAYw==
+  dependencies:
+    "@babel/runtime" "^7.17.2"
+    "@emotion/is-prop-valid" "^1.1.3"
+    "@mui/types" "^7.1.4"
+    "@mui/utils" "^5.9.1"
+    "@popperjs/core" "^2.11.5"
+    clsx "^1.2.1"
+    prop-types "^15.8.1"
+    react-is "^18.2.0"
+
 "@mui/icons-material@5.6.0":
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.6.0.tgz#bce757f7c7a8eb31b238311a15fa0a0bcdf9ec39"
@@ -2943,6 +2980,23 @@
     react-is "^17.0.2"
     react-transition-group "^4.4.2"
 
+"@mui/material@^5.0.0":
+  version "5.9.1"
+  resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.9.1.tgz#92990e6d4035792430dcf548b91db6f335aebdd3"
+  integrity sha512-c09SbaMm7Rl7Df9JRkXwPWNbnfrutmHERTJC46OJ9OMAM9+HGQihIbGln1k2Xj65jb3E+G498FZFAoSrrBDvwQ==
+  dependencies:
+    "@babel/runtime" "^7.17.2"
+    "@mui/base" "5.0.0-alpha.90"
+    "@mui/system" "^5.9.1"
+    "@mui/types" "^7.1.4"
+    "@mui/utils" "^5.9.1"
+    "@types/react-transition-group" "^4.4.5"
+    clsx "^1.2.1"
+    csstype "^3.1.0"
+    prop-types "^15.8.1"
+    react-is "^18.2.0"
+    react-transition-group "^4.4.2"
+
 "@mui/private-theming@^5.6.0":
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.6.0.tgz#b907e055a0a19caf554d5b43209a143edaa9b398"
@@ -2952,6 +3006,15 @@
     "@mui/utils" "^5.6.0"
     prop-types "^15.7.2"
 
+"@mui/private-theming@^5.9.1":
+  version "5.9.1"
+  resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.9.1.tgz#4f714ed9ebd587373dc77b3fc69e9f3e720f0190"
+  integrity sha512-eIh2IZJInNTdgPLMo9cruzm8UDX5amBBxxsSoNre7lRj3wcsu3TG5OKjIbzkf4VxHHEhdPeNNQyt92k7L78u2A==
+  dependencies:
+    "@babel/runtime" "^7.17.2"
+    "@mui/utils" "^5.9.1"
+    prop-types "^15.8.1"
+
 "@mui/styled-engine@^5.6.0":
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.6.0.tgz#c7c34d2e319158559cef49b796457a4e6a4c58f7"
@@ -2961,6 +3024,16 @@
     "@emotion/cache" "^11.7.1"
     prop-types "^15.7.2"
 
+"@mui/styled-engine@^5.8.7":
+  version "5.8.7"
+  resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.8.7.tgz#63d0779c07677fe76d4705a02c7ae99f89b50780"
+  integrity sha512-tVqtowjbYmiRq+qcqXK731L9eWoL9H8xTRhuTgaDGKdch1zlt4I2UwInUe1w2N9N/u3/jHsFbLcl1Un3uOwpQg==
+  dependencies:
+    "@babel/runtime" "^7.17.2"
+    "@emotion/cache" "^11.9.3"
+    csstype "^3.1.0"
+    prop-types "^15.8.1"
+
 "@mui/styles@5.6.0":
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/@mui/styles/-/styles-5.6.0.tgz#c57b80974ca31c980acdd58d13b21d46fbcd81cf"
@@ -2998,11 +3071,30 @@
     csstype "^3.0.11"
     prop-types "^15.7.2"
 
+"@mui/system@^5.9.1":
+  version "5.9.1"
+  resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.9.1.tgz#dadd1094b1582781cc524b112a0a126f60b23c25"
+  integrity sha512-ZixTmc2+sYp++avoYJ38eM70nfwwudN06vYCU4kfwa4nQPiH+bhLYZnfYkcXRKiDR/hfT0dptbOOfQGZqBYczQ==
+  dependencies:
+    "@babel/runtime" "^7.17.2"
+    "@mui/private-theming" "^5.9.1"
+    "@mui/styled-engine" "^5.8.7"
+    "@mui/types" "^7.1.4"
+    "@mui/utils" "^5.9.1"
+    clsx "^1.2.1"
+    csstype "^3.1.0"
+    prop-types "^15.8.1"
+
 "@mui/types@^7.1.3":
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.1.3.tgz#d7636f3046110bcccc63e6acfd100e2ad9ca712a"
   integrity sha512-DDF0UhMBo4Uezlk+6QxrlDbchF79XG6Zs0zIewlR4c0Dt6GKVFfUtzPtHCH1tTbcSlq/L2bGEdiaoHBJ9Y1gSA==
 
+"@mui/types@^7.1.4":
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.1.4.tgz#4185c05d6df63ec673cda15feab80440abadc764"
+  integrity sha512-uveM3byMbthO+6tXZ1n2zm0W3uJCQYtwt/v5zV5I77v2v18u0ITkb8xwhsDD2i3V2Kye7SaNR6FFJ6lMuY/WqQ==
+
 "@mui/utils@^5.2.3", "@mui/utils@^5.6.0":
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.6.0.tgz#0ec741f5ac7c89ac76054832bed2d6e17ab1c011"
@@ -3025,6 +3117,17 @@
     prop-types "^15.8.1"
     react-is "^17.0.2"
 
+"@mui/utils@^5.9.1":
+  version "5.9.1"
+  resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.9.1.tgz#2b2c9dadbf8ba6561e145b5688fb7df5ef15a934"
+  integrity sha512-8+4adOR3xusyJwvbnZxcjqcmbWvl7Og+260ZKIrSvwnFs0aLubL+8MhiceeDDGcmb0bTKxfUgRJ96j32Jb7P+A==
+  dependencies:
+    "@babel/runtime" "^7.17.2"
+    "@types/prop-types" "^15.7.5"
+    "@types/react-is" "^16.7.1 || ^17.0.0"
+    prop-types "^15.8.1"
+    react-is "^18.2.0"
+
 "@mui/x-date-pickers@5.0.0-alpha.0":
   version "5.0.0-alpha.0"
   resolved "https://registry.yarnpkg.com/@mui/x-date-pickers/-/x-date-pickers-5.0.0-alpha.0.tgz#a62ffbab453d3c2dcd4ec20bd4f3f6338ad2ed3f"
@@ -3092,7 +3195,7 @@
     schema-utils "^3.0.0"
     source-map "^0.7.3"
 
-"@popperjs/core@^2.11.4":
+"@popperjs/core@^2.11.4", "@popperjs/core@^2.11.5":
   version "2.11.5"
   resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.5.tgz#db5a11bf66bdab39569719555b0f76e138d7bd64"
   integrity sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw==
@@ -3983,6 +4086,13 @@
   dependencies:
     "@types/react" "*"
 
+"@types/react-transition-group@^4.4.5":
+  version "4.4.5"
+  resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.5.tgz#aae20dcf773c5aa275d5b9f7cdbca638abc5e416"
+  integrity sha512-juKD/eiSM3/xZYzjuzH6ZwpP+/lejltmiS3QEzV/vmb/Q8+HfDmxu+Baga8UEMGBqV88Nbg4l2hY/K2DkyaLLA==
+  dependencies:
+    "@types/react" "*"
+
 "@types/react@*", "@types/react@^18", "@types/react@^18.0.5":
   version "18.0.5"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.5.tgz#1a4d4b705ae6af5aed369dec22800b20f89f5301"
@@ -4009,6 +4119,11 @@
   resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39"
   integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==
 
+"@types/seedrandom@^3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@types/seedrandom/-/seedrandom-3.0.2.tgz#7f30db28221067a90b02e73ffd46b6685b18df1a"
+  integrity sha512-YPLqEOo0/X8JU3rdiq+RgUKtQhQtrppE766y7vMTu8dGML7TVtZNiiiaC/hhU9Zqw9UYopXxhuWWENclMVBwKQ==
+
 "@types/serve-index@^1.9.1":
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.1.tgz#1b5e85370a192c01ec6cec4735cf2917337a6278"
@@ -5242,6 +5357,11 @@ cjs-module-lexer@^1.0.0:
   resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz#9f84ba3244a512f3a54e5277e8eef4c489864e40"
   integrity sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==
 
+classnames@^2.2.6:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e"
+  integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==
+
 clean-css@^5.2.2:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.3.0.tgz#ad3d8238d5f3549e83d5f87205189494bc7cbb59"
@@ -5291,6 +5411,11 @@ clsx@^1.1.0, clsx@^1.1.1:
   resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188"
   integrity sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA==
 
+clsx@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12"
+  integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==
+
 co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
@@ -5833,6 +5958,11 @@ csstype@^3.0.11, csstype@^3.0.2:
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.11.tgz#d66700c5eacfac1940deb4e3ee5642792d85cd33"
   integrity sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw==
 
+csstype@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.0.tgz#4ddcac3718d787cf9df0d1b7d15033925c8f29f2"
+  integrity sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA==
+
 csv-parse@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/csv-parse/-/csv-parse-5.1.0.tgz#e587e969bf0385ecf4f36f584ed5ddebba0237ab"
@@ -9168,6 +9298,16 @@ material-design-lite@^1.2.0:
   resolved "https://registry.yarnpkg.com/material-design-lite/-/material-design-lite-1.3.0.tgz#d004ce3fee99a1eeb74a78b8a325134a5f1171d3"
   integrity sha1-0ATOP+6Zoe63Sni4oyUTSl8RcdM=
 
+material-ui-popup-state@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/material-ui-popup-state/-/material-ui-popup-state-4.0.1.tgz#356258aa5d6be40d22512c1e9bb4c58f303d0e3f"
+  integrity sha512-4Ywj2QFOaS4mirRRtX4xps1waJQPa+IIEnVj/nnA4+aglinEcPkALPq+akAlvzKAjkjkmIjiku8SbdmTl0hTCQ==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@mui/material" "^5.0.0"
+    classnames "^2.2.6"
+    prop-types "^15.7.2"
+
 mdast-util-definitions@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-5.1.0.tgz#b6d10ef00a3c4cf191e8d9a5fa58d7f4a366f817"
@@ -11338,6 +11478,11 @@ react-is@^18.0.0:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.1.0.tgz#61aaed3096d30eacf2a2127118b5b41387d32a67"
   integrity sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==
 
+react-is@^18.2.0:
+  version "18.2.0"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
+  integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
+
 react-json-view@^1.21.3:
   version "1.21.3"
   resolved "https://registry.yarnpkg.com/react-json-view/-/react-json-view-1.21.3.tgz#f184209ee8f1bf374fb0c41b0813cff54549c475"
@@ -12052,6 +12197,11 @@ schema-utils@^4.0.0:
     ajv-formats "^2.1.1"
     ajv-keywords "^5.0.0"
 
+seedrandom@^3.0.5:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-3.0.5.tgz#54edc85c95222525b0c7a6f6b3543d8e0b3aa0a7"
+  integrity sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==
+
 select-hose@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"

From 4f4db19b48d75056ff69fd1cc8a3fed7fa7c5d81 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 25 Jul 2022 13:25:11 +1000
Subject: [PATCH 043/309] global theme updates

---
 public/index.html                             |  11 +-
 public/site.webmanifest                       |   2 -
 src/assets/Logo.tsx                           |  16 +--
 src/assets/logo-sticker.svg                   |   4 +-
 src/components/CircularProgressOptical.tsx    |   6 +-
 src/components/CircularProgressTimed.tsx      | 114 ++++++++++++++++++
 src/components/Modal/FadeTransition.tsx       |  76 ++++++++++++
 src/components/Modal/Modal.tsx                |   2 +-
 .../Navigation/NavDrawer/NavDrawer.tsx        |  28 +++--
 src/theme/components.tsx                      |  29 +++--
 10 files changed, 247 insertions(+), 41 deletions(-)
 create mode 100644 src/components/CircularProgressTimed.tsx
 create mode 100644 src/components/Modal/FadeTransition.tsx

diff --git a/public/index.html b/public/index.html
index 84198f78..4e7116ce 100644
--- a/public/index.html
+++ b/public/index.html
@@ -6,16 +6,7 @@
       name="viewport"
       content="width=device-width, initial-scale=1, viewport-fit=cover"
     />
-    <meta
-      name="theme-color"
-      content="#FAF9FB"
-      media="(prefers-color-scheme: light)"
-    />
-    <meta
-      name="theme-color"
-      content="#0F0F12"
-      media="(prefers-color-scheme: dark)"
-    />
+
     <meta name="color-scheme" content="default" />
 
     <meta name="apple-mobile-web-app-capable" content="yes" />
diff --git a/public/site.webmanifest b/public/site.webmanifest
index 291e3eee..27987815 100644
--- a/public/site.webmanifest
+++ b/public/site.webmanifest
@@ -13,7 +13,5 @@
       "type": "image/png"
     }
   ],
-  "theme_color": "#4200ff",
-  "background_color": "#4200ff",
   "display": "standalone"
 }
diff --git a/src/assets/Logo.tsx b/src/assets/Logo.tsx
index c4037f30..35692bcc 100644
--- a/src/assets/Logo.tsx
+++ b/src/assets/Logo.tsx
@@ -21,19 +21,19 @@ export default function Logo({ size = 1.5, ...props }: ILogoProps) {
       <title id="rowy-logo-title">Rowy</title>
 
       <defs>
-        <linearGradient x1="83.349%" y1="50%" x2="0%" y2="50%" id="b">
+        <linearGradient x1="83.349%" y1="50%" x2="0%" y2="50%" id="rowy-b">
           <stop stopColor="#F0A" offset="0%" />
           <stop stopColor="#FA0" offset="100%" />
         </linearGradient>
-        <linearGradient x1="50%" y1="16.276%" x2="50%" y2="100%" id="c">
+        <linearGradient x1="50%" y1="16.276%" x2="50%" y2="100%" id="rowy-c">
           <stop stopColor="#4200FF" offset="0%" />
           <stop stopColor="#F0A" offset="100%" />
         </linearGradient>
-        <linearGradient x1="83.052%" y1="50%" x2="0%" y2="50%" id="d">
+        <linearGradient x1="83.052%" y1="50%" x2="0%" y2="50%" id="rowy-d">
           <stop stopColor="#0AF" offset="0%" />
           <stop stopColor="#0FA" offset="100%" />
         </linearGradient>
-        <linearGradient x1="100%" y1="50%" x2="16.614%" y2="50%" id="e">
+        <linearGradient x1="100%" y1="50%" x2="16.614%" y2="50%" id="rowy-e">
           <stop stopColor="#0AF" offset="0%" />
           <stop stopColor="#4200FF" offset="100%" />
         </linearGradient>
@@ -41,22 +41,22 @@ export default function Logo({ size = 1.5, ...props }: ILogoProps) {
 
       <path
         d="M6 10v6H3a3 3 0 010-6h3zm-1 5v-4H3a2 2 0 00-1.995 1.85L1 13a2 2 0 001.85 1.995L3 15h2z"
-        fill="url(#b)"
+        fill="url(#rowy-b)"
         transform="rotate(-90 3 13)"
       />
       <path
         d="M6 6H0V3a3 3 0 116 0v3zM1 5h4V3a2 2 0 00-1.85-1.995L3 1a2 2 0 00-1.995 1.85L1 3v2z"
         fill="#4200FF"
       />
-      <path d="M6 5v6H0V5h6zM5 6H1v4h4V6z" fill="url(#c)" />
+      <path d="M6 5v6H0V5h6zM5 6H1v4h4V6z" fill="url(#rowy-c)" />
       <path
         d="M16 0v6h-3a3 3 0 010-6h3zm-1.001 5V1H13a2 2 0 00-1.995 1.85L11 3a2 2 0 001.85 1.995L13 5h1.999z"
-        fill="url(#d)"
+        fill="url(#rowy-d)"
         transform="rotate(-180 13 3)"
       />
       <path
         d="M11 0v6H5V3a3 3 0 013-3h3zm-1 1H8a2 2 0 00-1.995 1.85L6 3v2h4V1z"
-        fill="url(#e)"
+        fill="url(#rowy-e)"
       />
 
       <path
diff --git a/src/assets/logo-sticker.svg b/src/assets/logo-sticker.svg
index b6696ee0..a67864ed 100644
--- a/src/assets/logo-sticker.svg
+++ b/src/assets/logo-sticker.svg
@@ -1,5 +1,5 @@
 <svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 72 23">
-  <g clip-path="url(#a)">
+  <g clip-path="url(#sticker)">
     <path fill-rule="evenodd" clip-rule="evenodd" d="M0 15V5A5 5 0 0 1 7.5.669 4.977 4.977 0 0 1 10 0h5a5 5 0 0 1 0 10h-5v5a5 5 0 0 1-10 0Z" fill="#fff"/>
     <path fill-rule="evenodd" clip-rule="evenodd" d="M20 5a2 2 0 0 1 2-2h6c.721 0 1.354.382 1.705.955A8.212 8.212 0 0 1 34 2.75c1.573 0 3.044.44 4.295 1.205A2 2 0 0 1 40 3h2a2 2 0 0 1 1.897 1.368L45 7.675l1.103-3.307A2 2 0 0 1 48 3h2a2 2 0 0 1 1.897 1.368L53 7.675l1.103-3.307A2 2 0 0 1 56 3h4a2 2 0 0 1 1.828 1.188L64 9.076l2.172-4.888A2 2 0 0 1 68 3h2a2 2 0 0 1 1.832 2.802l-7 16A2 2 0 0 1 63 23h-2a2 2 0 0 1-1.828-2.812l1.643-3.697-2.568-5.907-2.35 7.049A2 2 0 0 1 54 19h-2a2 2 0 0 1-1.897-1.367L49 14.325l-1.103 3.308A2 2 0 0 1 46 19h-2a2 2 0 0 1-1.897-1.367l-.88-2.642A8.253 8.253 0 0 1 26 13.024V17a2 2 0 0 1-2.001 2h-2a2 2 0 0 1-2-2V5Z" fill="#fff"/>
     <path fill-rule="evenodd" clip-rule="evenodd" d="M34 4.75a6.25 6.25 0 1 1 0 12.5 6.25 6.25 0 0 1 0-12.5Zm0 2a4.25 4.25 0 1 0 0 8.5 4.25 4.25 0 0 0 0-8.5ZM22 17V5h6v2h-4v10h-2Zm24 0 3-9 3 9h2l4-12 5 11.5-2 4.5h2l7-16h-2l-4 9-4-9h-4l-3 9-3-9h-2l-3 9-3-9h-2l4 12h2Z" fill="#000"/>
@@ -28,7 +28,7 @@
       <stop stop-color="#0AF"/>
       <stop offset="1" stop-color="#4200FF"/>
     </linearGradient>
-    <clipPath id="a">
+    <clipPath id="sticker">
       <path fill="#fff" d="M0 0h72v23H0z"/>
     </clipPath>
   </defs>
diff --git a/src/components/CircularProgressOptical.tsx b/src/components/CircularProgressOptical.tsx
index be71800d..b4c60236 100644
--- a/src/components/CircularProgressOptical.tsx
+++ b/src/components/CircularProgressOptical.tsx
@@ -1,9 +1,13 @@
 import { CircularProgress, CircularProgressProps } from "@mui/material";
 
+export interface ICircularProgressOpticalProps extends CircularProgressProps {
+  size?: number;
+}
+
 export default function CircularProgressOptical({
   size = 40,
   ...props
-}: CircularProgressProps & { size?: number }) {
+}: ICircularProgressOpticalProps) {
   const DEFAULT_SIZE = 40;
   const DEFAULT_THICKNESS = 3.6;
   const linearThickness = (DEFAULT_SIZE / size) * DEFAULT_THICKNESS;
diff --git a/src/components/CircularProgressTimed.tsx b/src/components/CircularProgressTimed.tsx
new file mode 100644
index 00000000..12c62862
--- /dev/null
+++ b/src/components/CircularProgressTimed.tsx
@@ -0,0 +1,114 @@
+import { useState, useEffect } from "react";
+
+import CircularProgressOptical, {
+  ICircularProgressOpticalProps,
+} from "@src/components/CircularProgressOptical";
+import { Box } from "@mui/material";
+
+export interface ICircularProgressTimedProps
+  extends ICircularProgressOpticalProps {
+  duration: number;
+  complete: boolean;
+}
+
+export default function CircularProgressTimed({
+  duration,
+  complete,
+  size = 64,
+  ...props
+}: ICircularProgressTimedProps) {
+  const [count, setCount] = useState(0);
+
+  useEffect(() => {
+    if (complete) {
+      setCount(0);
+      return;
+    }
+
+    const interval = setInterval(() => {
+      setCount((c) => {
+        if (c >= duration) {
+          clearInterval(interval);
+          return c;
+        }
+        return c + 1;
+      });
+    }, 1000);
+
+    return () => clearInterval(interval);
+  }, [duration, complete]);
+
+  const DEFAULT_SIZE = 24;
+  const DEFAULT_THICKNESS = 2.6;
+  const linearThickness = (DEFAULT_SIZE / size) * DEFAULT_THICKNESS;
+  const opticalRatio = 1 - (1 - size / DEFAULT_SIZE) / 2;
+
+  return (
+    <Box
+      sx={{ position: "relative", width: size, height: size, ...props.sx }}
+      style={props.style}
+    >
+      <CircularProgressOptical
+        {...props}
+        size={size}
+        variant="determinate"
+        value={complete ? 100 : Math.min(90, (count / duration) * 90)}
+        style={{ position: "absolute", top: 0, left: 0 }}
+        sx={{
+          transition: (theme) =>
+            theme.transitions.create(["color"], {
+              easing: theme.transitions.easing.easeOut,
+              duration: theme.transitions.duration.standard,
+            }),
+        }}
+        color={complete ? "success" : "primary"}
+      />
+      {complete ? (
+        <Box
+          component="svg"
+          viewBox="0 -0.5 18 18"
+          sx={{
+            position: "absolute",
+            inset: size * 0.33 * 0.5,
+
+            "& .tick": {
+              stroke: (theme) => theme.palette.success.main,
+              strokeDasharray: 18,
+
+              animationName: "draw-tick",
+              animationTimingFunction: (theme) =>
+                theme.transitions.easing.easeOut,
+              animationDuration: (theme) =>
+                theme.transitions.duration.standard + "ms",
+              animationDelay: (theme) =>
+                theme.transitions.duration.standard + "ms",
+              animationFillMode: "both",
+
+              "@keyframes draw-tick": {
+                from: { strokeDashoffset: 18 },
+                to: { strokeDashoffset: 0 },
+              },
+            },
+          }}
+        >
+          <polyline
+            strokeWidth={linearThickness * opticalRatio}
+            strokeLinecap="round"
+            strokeLinejoin="round"
+            points="2.705 8.29 7 12.585 15.295 4.29"
+            fill="none"
+            className="tick"
+          />
+        </Box>
+      ) : (
+        <CircularProgressOptical
+          {...props}
+          size={size}
+          style={{ position: "absolute", top: 0, left: 0 }}
+          sx={{ color: "primary.contrastText", opacity: 0.33 }}
+          disableShrink
+        />
+      )}
+    </Box>
+  );
+}
diff --git a/src/components/Modal/FadeTransition.tsx b/src/components/Modal/FadeTransition.tsx
new file mode 100644
index 00000000..48e4441d
--- /dev/null
+++ b/src/components/Modal/FadeTransition.tsx
@@ -0,0 +1,76 @@
+import { forwardRef, cloneElement } from "react";
+import { useTheme } from "@mui/material";
+import { Transition } from "react-transition-group";
+import { TransitionProps } from "react-transition-group/Transition";
+import { TransitionProps as MuiTransitionProps } from "@mui/material/transitions";
+
+export const FadeTransition: React.ForwardRefExoticComponent<
+  Pick<TransitionProps, React.ReactText> & React.RefAttributes<any>
+> = forwardRef(
+  ({ children, ...props }: TransitionProps, ref: React.Ref<any>) => {
+    const theme = useTheme();
+
+    if (!children) return null;
+
+    const defaultStyle = {
+      opacity: 0,
+      transform: "scale(0.8)",
+
+      transition: theme.transitions.create(["transform", "opacity"], {
+        duration: "300ms",
+        easing: theme.transitions.easing.strong,
+      }),
+    };
+
+    const transitionStyles = {
+      entering: {
+        willChange: "transform, opacity",
+      },
+
+      entered: {
+        opacity: 1,
+        transform: "none",
+      },
+
+      exiting: {
+        opacity: 0,
+        transform: "scale(0.8)",
+
+        transitionDuration: theme.transitions.duration.leavingScreen,
+      },
+
+      exited: {
+        opacity: 0,
+        transform: "none",
+        transition: "none",
+      },
+
+      unmounted: {},
+    };
+
+    return (
+      <Transition
+        appear
+        timeout={{ enter: 0, exit: theme.transitions.duration.leavingScreen }}
+        {...props}
+      >
+        {(state) =>
+          cloneElement(children as any, {
+            style: { ...defaultStyle, ...transitionStyles[state] },
+            tabIndex: -1,
+            ref,
+          })
+        }
+      </Transition>
+    );
+  }
+);
+
+export default FadeTransition;
+
+export const FadeTransitionMui = forwardRef(function Transition(
+  props: MuiTransitionProps & { children?: React.ReactElement<any, any> },
+  ref: React.Ref<unknown>
+) {
+  return <FadeTransition ref={ref} {...props} />;
+});
diff --git a/src/components/Modal/Modal.tsx b/src/components/Modal/Modal.tsx
index 9a991f3f..475ae796 100644
--- a/src/components/Modal/Modal.tsx
+++ b/src/components/Modal/Modal.tsx
@@ -76,7 +76,7 @@ export default function Modal({
 
     setOpen(false);
     setEmphasizeCloseButton(false);
-    setTimeout(() => onClose(setOpen), 300);
+    setTimeout(() => onClose(setOpen), 195 * 2);
   };
 
   return (
diff --git a/src/layouts/Navigation/NavDrawer/NavDrawer.tsx b/src/layouts/Navigation/NavDrawer/NavDrawer.tsx
index ef95c7ee..30c895d4 100644
--- a/src/layouts/Navigation/NavDrawer/NavDrawer.tsx
+++ b/src/layouts/Navigation/NavDrawer/NavDrawer.tsx
@@ -1,4 +1,4 @@
-import { useState } from "react";
+import { useState, Suspense } from "react";
 import { useSetAtom } from "jotai";
 import { colord } from "colord";
 
@@ -14,6 +14,7 @@ import {
   ListItemText,
   ListItemSecondaryAction,
   Divider,
+  Skeleton,
 } from "@mui/material";
 import CloseIcon from "@mui/icons-material/MenuOpen";
 import DocsIcon from "@mui/icons-material/LibraryBooksOutlined";
@@ -205,13 +206,24 @@ export default function NavDrawer({
               backgroundColor: "var(--nav-bg)",
             }}
           >
-            <Contents
-              closeDrawer={closeDrawer}
-              open={open}
-              isPermanent={isPermanent}
-              tempExpanded={tempExpanded}
-              setHover={setHover}
-            />
+            <Suspense
+              fallback={new Array(3).fill(undefined).map((_, i) => (
+                <Skeleton
+                  key={i}
+                  height={32}
+                  variant="rectangular"
+                  sx={{ mx: 0.5, my: 0.25 }}
+                />
+              ))}
+            >
+              <Contents
+                closeDrawer={closeDrawer}
+                open={open}
+                isPermanent={isPermanent}
+                tempExpanded={tempExpanded}
+                setHover={setHover}
+              />
+            </Suspense>
 
             <List
               component="li"
diff --git a/src/theme/components.tsx b/src/theme/components.tsx
index 6cf7c4ca..fc941109 100644
--- a/src/theme/components.tsx
+++ b/src/theme/components.tsx
@@ -88,7 +88,7 @@ export const components = (theme: Theme): ThemeOptions => {
             },
 
             "#root": {
-              transformOrigin: `50% ${theme.spacing(1)}`,
+              transformOrigin: `50% 0%`,
               transition: theme.transitions.create([
                 "transform",
                 "border-radius",
@@ -257,7 +257,7 @@ export const components = (theme: Theme): ThemeOptions => {
           },
 
           paper: {
-            borderRadius: (theme.shape.borderRadius as number) * 2,
+            borderRadius: (theme.shape.borderRadius as number) * 3,
 
             "--dialog-spacing": theme.spacing(3),
             [theme.breakpoints.down("sm")]: {
@@ -271,10 +271,8 @@ export const components = (theme: Theme): ThemeOptions => {
           paperFullScreen: {
             borderBottomLeftRadius: 0,
             borderBottomRightRadius: 0,
-            marginTop: `calc(env(safe-area-inset-top) + ${theme.spacing(2)})`,
-            maxHeight: `calc(100% - env(safe-area-inset-top) - ${theme.spacing(
-              2
-            )})`,
+            marginTop: `calc(env(safe-area-inset-top) + 10px)`,
+            maxHeight: `calc(100% - env(safe-area-inset-top) - 10px)`,
             maxWidth: "100% !important",
 
             paddingLeft: "env(safe-area-inset-left)",
@@ -292,7 +290,7 @@ export const components = (theme: Theme): ThemeOptions => {
                   theme.palette.mode === "dark" ? "80" : "75"
                 }%)`,
 
-                transform: `scale(0.9) translateY(${theme.spacing(1)})`,
+                transform: `scale(0.9)`,
                 transition: theme.transitions.create(
                   ["transform", "border-radius"],
                   {
@@ -395,7 +393,17 @@ export const components = (theme: Theme): ThemeOptions => {
             caretColor: theme.palette.primary.main,
             ".Mui-error &": { caretColor: theme.palette.error.main },
           },
-          inputSizeSmall: theme.typography.body2 as any,
+          inputSizeSmall: {
+            ...(theme.typography.body2 as any),
+            [theme.breakpoints.only("xs")]: {
+              ...(theme.typography.body1 as any),
+              "&, &.MuiSelect-select": {
+                minHeight: `${theme.typography.body1.lineHeight}em`,
+              },
+              paddingTop: theme.spacing(0.5),
+              paddingBottom: theme.spacing(0.5),
+            },
+          },
         },
       },
       MuiFilledInput: {
@@ -535,7 +543,10 @@ export const components = (theme: Theme): ThemeOptions => {
             ".MuiMenu-list &": { whiteSpace: "normal" },
           },
           primary: {
-            ".MuiSelect-select &": theme.typography.body2,
+            ".MuiSelect-select &": {
+              ...(theme.typography.body2 as any),
+              [theme.breakpoints.only("xs")]: theme.typography.body1,
+            },
           },
           secondary: {
             ".MuiSelect-select &": { display: "none" },

From a50360214f4fa797e5fa736011247ee103e6acb7 Mon Sep 17 00:00:00 2001
From: shamsmosowi <shams.mosowi@gmail.com>
Date: Mon, 25 Jul 2022 20:51:15 +0200
Subject: [PATCH 044/309] show text field if collections array is empy

---
 src/components/TableSettingsDialog/TableSettingsDialog.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/TableSettingsDialog/TableSettingsDialog.tsx b/src/components/TableSettingsDialog/TableSettingsDialog.tsx
index 3850e30e..7d48121c 100644
--- a/src/components/TableSettingsDialog/TableSettingsDialog.tsx
+++ b/src/components/TableSettingsDialog/TableSettingsDialog.tsx
@@ -232,7 +232,9 @@ export default function TableSettingsDialog() {
       })),
       ["section", "label"]
     ),
-    Array.isArray(collections) ? collections.filter((x) => x !== CONFIG) : null
+    Array.isArray(collections) && collections.length !== 0
+      ? collections.filter((x) => x !== CONFIG)
+      : null
   );
 
   return (

From b64c6c49098e52cf34ed08b81284ba25a01fcc16 Mon Sep 17 00:00:00 2001
From: shamsmosowi <shams.mosowi@gmail.com>
Date: Tue, 26 Jul 2022 16:24:23 +0200
Subject: [PATCH 045/309] column ids

---
 src/components/ColumnMenu/ColumnMenu.tsx      | 22 +++++++++++++++----
 src/components/ColumnMenu/MenuContents.tsx    |  2 ++
 .../Table/ColumnHeader/ColumnHeader.tsx       |  2 ++
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/components/ColumnMenu/ColumnMenu.tsx b/src/components/ColumnMenu/ColumnMenu.tsx
index 1bfde791..2408acd6 100644
--- a/src/components/ColumnMenu/ColumnMenu.tsx
+++ b/src/components/ColumnMenu/ColumnMenu.tsx
@@ -124,8 +124,9 @@ export default function ColumnMenu() {
   };
 
   const localViewActions: IMenuContentsProps["menuItems"] = [
-    { type: "subheader" },
+    { type: "subheader", key: "subLocalView" },
     {
+      key: "sortDesc",
       label: "Sort: descending",
       activeLabel: "Remove sort: descending",
       icon: <ArrowDownwardIcon />,
@@ -139,6 +140,7 @@ export default function ColumnMenu() {
       disabled: column.type === FieldType.id,
     },
     {
+      key: "sortAsc",
       label: "Sort: ascending",
       activeLabel: "Remove sort: ascending",
       icon: <ArrowUpwardIcon />,
@@ -152,6 +154,7 @@ export default function ColumnMenu() {
       disabled: column.type === FieldType.id,
     },
     {
+      key: "hide",
       label: "Hide",
       icon: <VisibilityIcon />,
       onClick: () => {
@@ -168,6 +171,7 @@ export default function ColumnMenu() {
       disabled: !updateUserSettings,
     },
     {
+      key: "filter",
       label: "Filter…",
       icon: <FilterIcon />,
       onClick: () => {
@@ -187,9 +191,10 @@ export default function ColumnMenu() {
   ];
 
   const configActions: IMenuContentsProps["menuItems"] = [
-    { type: "subheader" },
+    { type: "subheader", key: "subActionsConfig" },
     {
       label: "Lock",
+      key: "lock",
       activeLabel: "Unlock",
       icon: <LockOpenIcon />,
       activeIcon: <LockIcon />,
@@ -204,6 +209,7 @@ export default function ColumnMenu() {
     },
     {
       label: "Disable resize",
+      key: "disableResize",
       activeLabel: "Enable resize",
       icon: <CellResizeIcon />,
       onClick: () => {
@@ -217,6 +223,7 @@ export default function ColumnMenu() {
     },
     {
       label: "Freeze",
+      key: "freeze",
       activeLabel: "Unfreeze",
       icon: <FreezeIcon />,
       activeIcon: <UnfreezeIcon />,
@@ -229,6 +236,7 @@ export default function ColumnMenu() {
     // { type: "subheader" },
     {
       label: "Rename…",
+      key: "rename",
       icon: <EditIcon />,
       onClick: () => {
         openColumnModal({ type: "name", columnKey: column.key });
@@ -237,6 +245,7 @@ export default function ColumnMenu() {
     },
     {
       label: `Edit type: ${getFieldProp("name", column.type)}…`,
+      key: "editType",
       // This is based on the cell type
       icon: getFieldProp("icon", column.type),
       onClick: () => {
@@ -246,6 +255,7 @@ export default function ColumnMenu() {
     },
     {
       label: `Column config…`,
+      key: "columConfig",
       icon: <SettingsIcon />,
       onClick: () => {
         openColumnModal({ type: "config", columnKey: column.key });
@@ -299,8 +309,9 @@ export default function ColumnMenu() {
     }
   };
   const derivativeActions: IMenuContentsProps["menuItems"] = [
-    { type: "subheader" },
+    { type: "subheader", key: "sub-derivative" },
     {
+      key: "evaluateAll",
       label: altPress ? "Evaluate all" : "Evaluate all…",
       icon: <EvalIcon />,
       onClick: altPress
@@ -323,9 +334,10 @@ export default function ColumnMenu() {
   ];
 
   const columnActions: IMenuContentsProps["menuItems"] = [
-    { type: "subheader" },
+    { type: "subheader", key: "subActions" },
     {
       label: "Insert to the left…",
+      key: "insertLeft",
       icon: <ColumnPlusBeforeIcon />,
       onClick: () => {
         openColumnModal({ type: "new", index: column.index - 1 });
@@ -334,6 +346,7 @@ export default function ColumnMenu() {
     },
     {
       label: "Insert to the right…",
+      key: "insertRight",
       icon: <ColumnPlusAfterIcon />,
       onClick: () => {
         openColumnModal({ type: "new", index: column.index + 1 });
@@ -342,6 +355,7 @@ export default function ColumnMenu() {
     },
     {
       label: `Delete column${altPress ? "" : "…"}`,
+      key: "delete",
       icon: <ColumnRemoveIcon />,
       onClick: altPress
         ? handleDeleteColumn
diff --git a/src/components/ColumnMenu/MenuContents.tsx b/src/components/ColumnMenu/MenuContents.tsx
index d442b77d..c14754f0 100644
--- a/src/components/ColumnMenu/MenuContents.tsx
+++ b/src/components/ColumnMenu/MenuContents.tsx
@@ -4,6 +4,7 @@ import { MenuItem, ListItemIcon, ListSubheader, Divider } from "@mui/material";
 
 export interface IMenuContentsProps {
   menuItems: {
+    key: string;
     type?: string;
     label?: string;
     activeLabel?: string;
@@ -36,6 +37,7 @@ export default function MenuContents({ menuItems }: IMenuContentsProps) {
         return (
           <MenuItem
             key={index}
+            id={`column-menu-item-${item.key}`}
             onClick={item.onClick}
             color={item.color}
             selected={item.active}
diff --git a/src/components/Table/ColumnHeader/ColumnHeader.tsx b/src/components/Table/ColumnHeader/ColumnHeader.tsx
index 511d0714..7a879a71 100644
--- a/src/components/Table/ColumnHeader/ColumnHeader.tsx
+++ b/src/components/Table/ColumnHeader/ColumnHeader.tsx
@@ -88,6 +88,7 @@ export default function DraggableHeaderRenderer({
   return (
     <Grid
       key={column.key}
+      id={`column-header-${column.key}`}
       ref={(ref) => {
         dragRef(ref);
         dropRef(ref);
@@ -213,6 +214,7 @@ export default function DraggableHeaderRenderer({
           <IconButton
             size="small"
             aria-label={`Column settings for ${column.name as string}`}
+            id={`column-settings-${column.key}`}
             color="inherit"
             onClick={handleOpenMenu}
             ref={buttonRef}

From 7176c9dcc4ec814615f82c308fd295762374970f Mon Sep 17 00:00:00 2001
From: shamsmosowi <shams.mosowi@gmail.com>
Date: Fri, 29 Jul 2022 00:44:37 +0200
Subject: [PATCH 046/309] row ID

---
 src/components/Table/TableRow.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/Table/TableRow.tsx b/src/components/Table/TableRow.tsx
index 0ecd229a..ca19ee77 100644
--- a/src/components/Table/TableRow.tsx
+++ b/src/components/Table/TableRow.tsx
@@ -24,6 +24,7 @@ export default function TableRow(props: RowRendererProps<any>) {
   return (
     <Row
       key={props.row._rowy_ref.path}
+      id={`row-${props.row._rowy_ref.path}`}
       onContextMenu={handleContextMenu}
       {...props}
     />

From 7d5b7387c8a264c8dc9667af589999d516661bbb Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 2 Aug 2022 23:36:51 +0200
Subject: [PATCH 047/309] update nav community, help menus

---
 src/layouts/Navigation/NavDrawer/CommunityMenu.tsx | 2 +-
 src/layouts/Navigation/NavDrawer/HelpMenu.tsx      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/layouts/Navigation/NavDrawer/CommunityMenu.tsx b/src/layouts/Navigation/NavDrawer/CommunityMenu.tsx
index ec68e76a..5d027992 100644
--- a/src/layouts/Navigation/NavDrawer/CommunityMenu.tsx
+++ b/src/layouts/Navigation/NavDrawer/CommunityMenu.tsx
@@ -38,7 +38,7 @@ export default function HelpMenu({
       anchorOrigin={{ vertical: "bottom", horizontal: "right" }}
       transformOrigin={{ vertical: "bottom", horizontal: "left" }}
       sx={{ "& .MuiPaper-root": { mt: 1.5, py: 1 } }}
-      PaperProps={{ elevation: 10 }}
+      PaperProps={{ elevation: 12 }}
     >
       <ListSubheader
         sx={{
diff --git a/src/layouts/Navigation/NavDrawer/HelpMenu.tsx b/src/layouts/Navigation/NavDrawer/HelpMenu.tsx
index f0050f40..5ec00f04 100644
--- a/src/layouts/Navigation/NavDrawer/HelpMenu.tsx
+++ b/src/layouts/Navigation/NavDrawer/HelpMenu.tsx
@@ -47,7 +47,7 @@ export default function HelpMenu({
       anchorOrigin={{ vertical: "bottom", horizontal: "right" }}
       transformOrigin={{ vertical: "bottom", horizontal: "left" }}
       sx={{ "& .MuiPaper-root": { mt: 1.5, py: 1 } }}
-      PaperProps={{ elevation: 10 }}
+      PaperProps={{ elevation: 12 }}
     >
       <ListSubheader
         sx={{

From b5c61c31a091568174f9383bf5032a885d6b5269 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 2 Aug 2022 23:43:58 +0200
Subject: [PATCH 048/309] fix create table showing empty dropdown for
 collections

---
 src/components/TableSettingsDialog/TableSettingsDialog.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/TableSettingsDialog/TableSettingsDialog.tsx b/src/components/TableSettingsDialog/TableSettingsDialog.tsx
index 73ca5bc5..79ea3971 100644
--- a/src/components/TableSettingsDialog/TableSettingsDialog.tsx
+++ b/src/components/TableSettingsDialog/TableSettingsDialog.tsx
@@ -232,7 +232,8 @@ export default function TableSettingsDialog() {
       })),
       ["section", "label"]
     ),
-    Array.isArray(collections) && collections.length !== 0
+    Array.isArray(collections) &&
+      collections.filter((x) => x !== CONFIG).length > 0
       ? collections.filter((x) => x !== CONFIG)
       : null
   );

From 52b5d755dc5b98c1c0c090b8a7c5a82f53a3cdd4 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 2 Aug 2022 23:43:58 +0200
Subject: [PATCH 049/309] fix create table showing empty dropdown for
 collections

---
 src/components/TableSettingsDialog/TableSettingsDialog.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/TableSettingsDialog/TableSettingsDialog.tsx b/src/components/TableSettingsDialog/TableSettingsDialog.tsx
index 7d48121c..dc979a80 100644
--- a/src/components/TableSettingsDialog/TableSettingsDialog.tsx
+++ b/src/components/TableSettingsDialog/TableSettingsDialog.tsx
@@ -232,7 +232,8 @@ export default function TableSettingsDialog() {
       })),
       ["section", "label"]
     ),
-    Array.isArray(collections) && collections.length !== 0
+    Array.isArray(collections) &&
+      collections.filter((x) => x !== CONFIG).length > 0
       ? collections.filter((x) => x !== CONFIG)
       : null
   );

From 489c478ecdfef27278fe981be087858712f1bc0e Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Fri, 5 Aug 2022 04:46:41 +0300
Subject: [PATCH 050/309] feat(airtable-migration): add tab panel

---
 src/components/TableToolbar/ImportCsv.tsx | 134 ++++++++++++++++++++--
 1 file changed, 127 insertions(+), 7 deletions(-)

diff --git a/src/components/TableToolbar/ImportCsv.tsx b/src/components/TableToolbar/ImportCsv.tsx
index 316e239b..d9284f37 100644
--- a/src/components/TableToolbar/ImportCsv.tsx
+++ b/src/components/TableToolbar/ImportCsv.tsx
@@ -38,6 +38,7 @@ export enum ImportMethod {
   paste = "paste",
   upload = "upload",
   url = "url",
+  airtable = "airtable",
 }
 
 export interface IImportCsvProps {
@@ -62,7 +63,7 @@ export default function ImportCsv({ render, PopoverProps }: IImportCsvProps) {
   const [open, setOpen] = useState<HTMLButtonElement | null>(null);
   const [tab, setTab] = useState("upload");
 
-  const [error, setError] = useState("");
+  const [error, setError] = useState<string | any>("");
   const validCsv =
     csvData !== null && csvData?.columns.length > 0 && csvData?.rows.length > 0;
 
@@ -170,6 +171,45 @@ export default function ImportCsv({ render, PopoverProps }: IImportCsvProps) {
       });
   }, 1000);
 
+  const [airtable, setAirtable] = useState<any>({
+    apiKey: "",
+    baseID: "",
+    tableID: "",
+  });
+  const [data, setData] = useState<any>(null);
+  const [validConnection, setValidConnection] = useState(false);
+  const handleAirtableConnection = () => {
+    if (!airtable.apiKey) {
+      setError({ apiKey: { message: "API Key is missing!" } });
+      return;
+    }
+    if (!airtable.baseID) {
+      setError({ baseID: { message: "Base ID is missing!" } });
+      return;
+    }
+    if (!airtable.tableID) {
+      setError({ tableID: { message: "Table ID is missing!" } });
+      return;
+    }
+    setLoading(true);
+    fetch(
+      `https://api.airtable.com/v0/${airtable.baseID}/${airtable.tableID}?maxRecords=1`,
+      {
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: `Bearer ${airtable.apiKey}`,
+        },
+      }
+    )
+      .then((response) => response.json())
+      .then((body) => setData(body.records))
+      .then(() => {
+        setValidConnection(true);
+        setLoading(false);
+        setError("");
+      });
+  };
+
   if (tableSettings.readOnly && !userRoles.includes("ADMIN")) return null;
 
   return (
@@ -233,6 +273,11 @@ export default function ImportCsv({ render, PopoverProps }: IImportCsvProps) {
               value="url"
               onClick={() => (importMethodRef.current = ImportMethod.url)}
             />
+            <Tab
+              label="Airtable"
+              value="airtable"
+              onClick={() => (importMethodRef.current = ImportMethod.airtable)}
+            />
           </TabList>
           <Divider style={{ marginTop: -1 }} />
 
@@ -345,12 +390,74 @@ export default function ImportCsv({ render, PopoverProps }: IImportCsvProps) {
               error={!!error}
             />
           </TabPanel>
+
+          <TabPanel value="airtable">
+            <Typography variant="caption" color="gray">
+              Forget the storage limitations of Airtable.
+            </Typography>
+            <TextField
+              variant="filled"
+              autoFocus
+              fullWidth
+              label="Airtable API Key"
+              placeholder="Insert your API key here"
+              value={airtable.apiKey}
+              onChange={(e) => {
+                setAirtable((airtable: any) => ({
+                  ...airtable,
+                  apiKey: e.currentTarget.value,
+                }));
+              }}
+              helperText={error?.apiKey?.message}
+              error={!!error?.apiKey?.message}
+            />
+            <TextField
+              variant="filled"
+              autoFocus
+              fullWidth
+              label="Airtable Base ID"
+              placeholder="Insert your Base ID here"
+              value={airtable.baseID}
+              onChange={(e) => {
+                setAirtable((airtable: any) => ({
+                  ...airtable,
+                  baseID: e.currentTarget.value,
+                }));
+              }}
+              helperText={error?.baseID?.message}
+              error={!!error?.baseID?.message}
+            />
+            <TextField
+              variant="filled"
+              autoFocus
+              fullWidth
+              label="Airtable Table Name or ID"
+              placeholder="Insert your Table Name or ID here"
+              value={airtable.tableID}
+              onChange={(e) => {
+                setAirtable((prev: any) => ({
+                  ...airtable,
+                  tableID: e.currentTarget.value,
+                }));
+              }}
+              helperText={error?.tableID?.message}
+              error={!!error?.tableID?.message}
+            />
+            {data &&
+              data.map((record: any) => (
+                <div>Airtable record: {record.id}</div>
+              ))}
+          </TabPanel>
         </TabContext>
 
         <Button
           variant="contained"
           color="primary"
-          disabled={!validCsv}
+          disabled={
+            importMethodRef.current === "airtable"
+              ? loading && validConnection
+              : !validCsv
+          }
           sx={{
             mt: -4,
             mx: "auto",
@@ -359,13 +466,26 @@ export default function ImportCsv({ render, PopoverProps }: IImportCsvProps) {
             minWidth: 100,
           }}
           onClick={() => {
-            openTableModal("importCsv");
-            logEvent(analytics, `import_${importMethodRef.current}`, {
-              type: importTypeRef.current,
-            });
+            if (importMethodRef.current === "airtable") {
+              if (!data) {
+                handleAirtableConnection();
+              } else {
+                console.log("hello");
+                openTableModal("importCsv");
+              }
+            } else {
+              openTableModal("importCsv");
+              logEvent(analytics, `import_${importMethodRef.current}`, {
+                type: importTypeRef.current,
+              });
+            }
           }}
         >
-          Continue
+          {importMethodRef.current === "airtable"
+            ? data
+              ? "Continue"
+              : "Test Connection"
+            : "Continue"}
         </Button>
       </Popover>
     </>

From 62d371e9d4009eec55eb43419e4ec7d66147fc37 Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Sun, 7 Aug 2022 03:56:49 +0300
Subject: [PATCH 051/309] feat(airtable-migration): initiate import wizard

---
 .../ImportAirtableWizard.tsx                  | 83 +++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx

diff --git a/src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx b/src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx
new file mode 100644
index 00000000..cb8121ae
--- /dev/null
+++ b/src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx
@@ -0,0 +1,83 @@
+import { useState, useCallback } from "react";
+import { useAtom, useSetAtom } from "jotai";
+import { RESET } from "jotai/utils";
+import { uniqBy } from "lodash-es";
+import { ITableModalProps } from "@src/components/TableModals";
+
+import { useTheme, useMediaQuery } from "@mui/material";
+
+import WizardDialog from "@src/components/TableModals/WizardDialog";
+import Step1Columns from "./Step1Columns";
+
+import {
+  tableScope,
+  tableModalAtom,
+  importAirtableAtom,
+  ImportAirtableData,
+} from "@src/atoms/tableScope";
+import { ColumnConfig } from "@src/types/table";
+
+export type AirtableConfig = {
+  pairs: { fieldKey: string; columnKey: string }[];
+  newColumns: ColumnConfig[];
+};
+
+export interface IStepProps {
+  airtableData: NonNullable<ImportAirtableData>;
+  config: AirtableConfig;
+  setConfig: React.Dispatch<React.SetStateAction<AirtableConfig>>;
+  updateConfig: (value: Partial<AirtableConfig>) => void;
+  isXs: boolean;
+}
+
+export default function ImportAirtableWizard({ onClose }: ITableModalProps) {
+  const [{ airtableData }] = useAtom(importAirtableAtom, tableScope);
+  const setTableModal = useSetAtom(tableModalAtom, tableScope);
+  const theme = useTheme();
+  const isXs = useMediaQuery(theme.breakpoints.down("sm"));
+
+  const [config, setConfig] = useState<AirtableConfig>({
+    pairs: [],
+    newColumns: [],
+  });
+
+  const updateConfig: IStepProps["updateConfig"] = useCallback((value) => {
+    setConfig((prev) => {
+      const pairs = uniqBy([...prev.pairs, ...(value.pairs ?? [])], "fieldKey");
+      const newColumns = uniqBy(
+        [...prev.newColumns, ...(value.newColumns ?? [])],
+        "key"
+      ).filter((col) => pairs.some((pair) => pair.columnKey === col.key));
+      return { pairs, newColumns };
+    });
+  }, []);
+
+  if (!airtableData) {
+    setTableModal(RESET);
+    return null;
+  }
+
+  return (
+    <WizardDialog
+      open
+      onClose={onClose}
+      title={`Import from Airtable`}
+      steps={[
+        {
+          title: "Hello, World!",
+          description: <span>Description</span>,
+          content: (
+            <Step1Columns
+              airtableData={airtableData}
+              config={config}
+              setConfig={setConfig}
+              updateConfig={updateConfig}
+              isXs={isXs}
+            />
+          ),
+        },
+      ]}
+      onFinish={() => {}}
+    />
+  );
+}

From 9e978c6f7cc3a9f8c5e4b9fc14cb71e7499dc2d6 Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Sun, 7 Aug 2022 04:10:29 +0300
Subject: [PATCH 052/309] feature(airtable-migration): add columns step

---
 .../ImportAirtableWizard/Step1Columns.tsx     | 273 ++++++++++++++++++
 1 file changed, 273 insertions(+)
 create mode 100644 src/components/TableModals/ImportAirtableWizard/Step1Columns.tsx

diff --git a/src/components/TableModals/ImportAirtableWizard/Step1Columns.tsx b/src/components/TableModals/ImportAirtableWizard/Step1Columns.tsx
new file mode 100644
index 00000000..dea5d586
--- /dev/null
+++ b/src/components/TableModals/ImportAirtableWizard/Step1Columns.tsx
@@ -0,0 +1,273 @@
+import { useState } from "react";
+import { useAtom } from "jotai";
+import useMemoValue from "use-memo-value";
+import { find, findIndex, camelCase, isEqual } from "lodash-es";
+
+import {
+  Grid,
+  Typography,
+  Divider,
+  FormControlLabel,
+  Checkbox,
+  Chip,
+} from "@mui/material";
+import ArrowIcon from "@mui/icons-material/ArrowForward";
+
+import { IStepProps } from ".";
+import FadeList from "@src/components/TableModals/ScrollableList";
+import Column, { COLUMN_HEADER_HEIGHT } from "@src/components/Table/Column";
+import MultiSelect from "@rowy/multiselect";
+
+import {
+  tableScope,
+  tableSchemaAtom,
+  tableColumnsOrderedAtom,
+} from "@src/atoms/tableScope";
+import { FieldType } from "@src/constants/fields";
+
+export default function Step1Columns({
+  airtableData,
+  config,
+  updateConfig,
+  setConfig,
+  isXs,
+}: IStepProps) {
+  const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
+  const [tableColumnsOrdered] = useAtom(tableColumnsOrderedAtom, tableScope);
+
+  const tableColumns = useMemoValue(
+    tableColumnsOrdered
+      .filter((column) => column.type !== FieldType.id)
+      .map((column) => ({ label: column.name, value: column.fieldName })),
+    isEqual
+  );
+
+  const [selectedFields, setSelectedFields] = useState(
+    config.pairs.map((pair) => pair.fieldKey)
+  );
+
+  const handleSelect =
+    (field: string) => (e: React.ChangeEvent<HTMLInputElement>) => {
+      const checked = e.target.checked;
+
+      if (checked) {
+        setSelectedFields((x) => [...x, field]);
+
+        // Try to match the field to a column in the table
+        const match =
+          find(tableColumns, (column) =>
+            column.label.toLowerCase().includes(field.toLowerCase())
+          )?.value ?? null;
+        if (match) {
+          setConfig((config) => ({
+            ...config,
+            pairs: [...config.pairs, { fieldKey: field, columnKey: match }],
+          }));
+        }
+      } else {
+        const newValue = [...selectedFields];
+        newValue.splice(newValue.indexOf(field), 1);
+        setSelectedFields(newValue);
+
+        // Check if this pair was already pushed to main config
+        const configPair = find(config.pairs, { fieldKey: field });
+        const configIndex = findIndex(config.pairs, { fieldKey: field });
+        console.log(configPair);
+        console.log(configIndex);
+        // Delete matching newColumn if it was created
+        if (configPair) {
+          const newColumnIndex = findIndex(config.newColumns, {
+            key: configPair.fieldKey,
+          });
+          if (newColumnIndex > -1) {
+            const newColumns = [...config.newColumns];
+            newColumns.splice(newColumnIndex, 1);
+            setConfig((config) => ({ ...config, newColumns }));
+          }
+        }
+
+        // Delete pair from main config
+        if (configIndex > -1) {
+          const newConfig = [...config.pairs];
+          newConfig.splice(configIndex, 1);
+          setConfig((config) => ({ ...config, pairs: newConfig }));
+        }
+      }
+    };
+
+  const handleChange = (fieldKey: string) => (value: string) => {
+    const columnKey = !!tableSchema.columns?.[value] ? value : camelCase(value);
+    console.log(config);
+    // Check if this pair already exists in config
+    const configIndex = findIndex(config.pairs, { fieldKey });
+    if (configIndex > -1) {
+      const pairs = [...config.pairs];
+      pairs[configIndex].fieldKey = columnKey;
+      setConfig((config) => ({ ...config, pairs }));
+    } else {
+      updateConfig({
+        pairs: [{ fieldKey, columnKey }],
+      });
+    }
+
+    if (!tableSchema.columns?.[value]) {
+      updateConfig({
+        newColumns: [
+          {
+            name: value,
+            fieldName: columnKey,
+            key: columnKey,
+            type: FieldType.shortText,
+            index: -1,
+            config: {},
+          },
+        ],
+      });
+    }
+  };
+
+  const fieldKeys = Object.keys(airtableData.records[0].fields);
+  return (
+    <div>
+      <Grid container spacing={7}>
+        {!isXs && (
+          <Grid item xs={12} sm={6}>
+            <Typography variant="subtitle2" gutterBottom component="h2">
+              Select columns ({config.pairs.length} of {fieldKeys.length})
+            </Typography>
+          </Grid>
+        )}
+        <Grid item xs={12} sm={6}>
+          <Typography variant="subtitle2" gutterBottom component="h2">
+            Table columns
+          </Typography>
+        </Grid>
+      </Grid>
+
+      <Divider />
+
+      <FadeList>
+        {fieldKeys.map((field) => {
+          const selected = selectedFields.indexOf(field) > -1;
+          const columnKey =
+            find(config.pairs, { fieldKey: field })?.columnKey ?? null;
+          const matchingColumn = columnKey
+            ? tableSchema.columns?.[columnKey] ??
+              find(config.newColumns, { key: columnKey }) ??
+              null
+            : null;
+          const isNewColumn = !!find(config.newColumns, { key: columnKey });
+          return (
+            <Grid container key={field} component="li" wrap="nowrap">
+              <Grid item xs>
+                <FormControlLabel
+                  key={field}
+                  control={
+                    <Checkbox
+                      checked={selected}
+                      aria-label={`Select column ${field}`}
+                      onChange={handleSelect(field)}
+                      color="secondary"
+                    />
+                  }
+                  label={<Column label={field} />}
+                  sx={{
+                    marginRight: 0,
+                    flex: 1,
+                    alignItems: "center",
+                    "& .MuiFormControlLabel-label": { mt: 0, flex: 1 },
+                  }}
+                />
+              </Grid>
+
+              <Grid
+                item
+                sx={{
+                  width: (theme) => theme.spacing(7),
+                  display: "flex",
+                  alignItems: "center",
+                  justifyContent: "center",
+                }}
+              >
+                <ArrowIcon color="disabled" sx={{ color: "secondary.main" }} />
+              </Grid>
+
+              <Grid item xs>
+                {selected && (
+                  <MultiSelect
+                    multiple={false}
+                    options={tableColumns}
+                    value={columnKey}
+                    onChange={handleChange(field) as any}
+                    TextFieldProps={{
+                      hiddenLabel: true,
+                      SelectProps: {
+                        renderValue: () => {
+                          if (!columnKey) return "Select or add column";
+                          else
+                            return (
+                              <>
+                                {matchingColumn?.name}
+                                {isNewColumn && (
+                                  <Chip
+                                    label="New"
+                                    size="small"
+                                    sx={{
+                                      marginLeft: (theme) =>
+                                        theme.spacing(1) + " !important",
+                                      backgroundColor: "action.focus",
+                                      pointerEvents: "none",
+                                    }}
+                                  />
+                                )}
+                              </>
+                            );
+                        },
+                        sx: [
+                          {
+                            backgroundColor: "background.default",
+                            border: (theme) =>
+                              `1px solid ${theme.palette.divider}`,
+                            borderRadius: 0,
+                            boxShadow: "none",
+                            "& .MuiSelect-select": {
+                              boxSizing: "border-box",
+                              height: COLUMN_HEADER_HEIGHT - 2,
+                              typography: "caption",
+                              fontWeight: "medium",
+                              lineHeight: "28px",
+                            },
+
+                            color: "text.secondary",
+                            "&:hover": {
+                              backgroundColor: "background.default",
+                              color: "text.primary",
+                              boxShadow: "none",
+                            },
+
+                            "&::before": { content: "none" },
+                            "&::after": { pointerEvents: "none" },
+                          },
+                          !columnKey && { color: "text.disabled" },
+                        ],
+                      },
+                    }}
+                    clearable={false}
+                    displayEmpty
+                    labelPlural="columns"
+                    freeText
+                    AddButtonProps={{ children: "Add new column…" }}
+                    AddDialogProps={{
+                      title: "Add new column",
+                      textFieldLabel: "Column name",
+                    }}
+                  />
+                )}
+              </Grid>
+            </Grid>
+          );
+        })}
+      </FadeList>
+    </div>
+  );
+}

From 628b027b6a84326b034fccba62feaf69ae6393a4 Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Sun, 7 Aug 2022 05:13:35 +0300
Subject: [PATCH 053/309] feat(airtable-migration): add select col type step

---
 .../ImportAirtableWizard/Step2NewColumns.tsx  | 139 ++++++++++++++++++
 1 file changed, 139 insertions(+)
 create mode 100644 src/components/TableModals/ImportAirtableWizard/Step2NewColumns.tsx

diff --git a/src/components/TableModals/ImportAirtableWizard/Step2NewColumns.tsx b/src/components/TableModals/ImportAirtableWizard/Step2NewColumns.tsx
new file mode 100644
index 00000000..5790f57b
--- /dev/null
+++ b/src/components/TableModals/ImportAirtableWizard/Step2NewColumns.tsx
@@ -0,0 +1,139 @@
+import { useState } from "react";
+import { find } from "lodash-es";
+import { parseJSON } from "date-fns";
+
+import { Grid, Typography, Divider, ButtonBase } from "@mui/material";
+import ChevronRightIcon from "@mui/icons-material/ChevronRight";
+
+import { IStepProps } from ".";
+import ScrollableList from "@src/components/TableModals/ScrollableList";
+import Column from "@src/components/Table/Column";
+import Cell from "@src/components/Table/Cell";
+import FieldsDropdown from "@src/components/ColumnModals/FieldsDropdown";
+
+import { FieldType } from "@src/constants/fields";
+import { SELECTABLE_TYPES } from "@src/components/TableModals/ImportExistingWizard/utils";
+
+export default function Step2NewColumns({
+  airtableData,
+  config,
+  setConfig,
+  isXs,
+}: IStepProps) {
+  const [fieldToEdit, setFieldToEdit] = useState(0);
+
+  const handleChange = (v: FieldType) => {
+    const newColumns = [...config.newColumns];
+    newColumns[fieldToEdit].type = v;
+
+    setConfig((config) => ({ ...config, newColumns }));
+  };
+
+  const fieldData =
+    airtableData.records[0].fields[config.pairs[fieldToEdit]?.fieldKey];
+
+  return (
+    <>
+      <div>
+        <Grid container spacing={2} sx={{ mb: 3 }}>
+          <Grid item xs={12} sm={6}>
+            <Typography variant="subtitle2" gutterBottom component="h2">
+              New table columns
+            </Typography>
+            <Divider />
+
+            <ScrollableList>
+              {config.newColumns.map(({ key, name, type }, i) => (
+                <li key={key}>
+                  <ButtonBase
+                    sx={{ width: "100%", textAlign: "left" }}
+                    onClick={() => setFieldToEdit(i)}
+                    aria-label={`Edit column ${key}`}
+                    focusRipple
+                  >
+                    <Column
+                      label={name}
+                      type={type}
+                      active={i === fieldToEdit}
+                      secondaryItem={i === fieldToEdit && <ChevronRightIcon />}
+                    />
+                  </ButtonBase>
+                </li>
+              ))}
+            </ScrollableList>
+          </Grid>
+          <Grid item xs={12} sm={6} style={{ paddingTop: 68 }}>
+            <FieldsDropdown
+              label={`Column type: ${config.newColumns[fieldToEdit].name}`}
+              value={config.newColumns[fieldToEdit].type}
+              onChange={handleChange}
+              hideLabel
+              options={SELECTABLE_TYPES}
+            />
+          </Grid>
+        </Grid>
+      </div>
+
+      <div>
+        <Grid container spacing={3}>
+          {!isXs && (
+            <Grid item xs={12} sm={6}>
+              <Typography variant="subtitle2" gutterBottom component="h2">
+                Raw data
+              </Typography>
+            </Grid>
+          )}
+          <Grid item xs={12} sm={6}>
+            <Typography variant="subtitle2" gutterBottom component="h2">
+              Column preview
+            </Typography>
+          </Grid>
+        </Grid>
+
+        <ScrollableList listSx={{ pt: 0 }}>
+          <Grid
+            container
+            spacing={3}
+            style={{ position: "sticky", top: 0, zIndex: 1, marginTop: 0 }}
+          >
+            {!isXs && (
+              <Grid item xs={12} sm={6} style={{ paddingTop: 0 }}>
+                <Column label={config.newColumns[fieldToEdit].key} />
+              </Grid>
+            )}
+            <Grid item xs={12} sm={6} style={{ paddingTop: 0 }}>
+              <Column
+                label={config.newColumns[fieldToEdit].name}
+                type={config.newColumns[fieldToEdit].type}
+              />
+            </Grid>
+          </Grid>
+          <Grid container wrap="nowrap">
+            {!isXs && (
+              <Grid item xs style={{ overflow: "hidden" }}>
+                <Cell
+                  field={config.newColumns[fieldToEdit].key}
+                  value={JSON.stringify(fieldData || "")
+                    .replace(/^"/, "")
+                    .replace(/"$/, "")}
+                  type={FieldType.shortText}
+                />
+              </Grid>
+            )}
+
+            {!isXs && <Grid item sx={{ width: (theme) => theme.spacing(3) }} />}
+
+            <Grid item xs style={{ overflow: "hidden" }}>
+              <Cell
+                field={config.newColumns[fieldToEdit].key}
+                value={fieldData}
+                type={config.newColumns[fieldToEdit].type}
+                name={config.newColumns[fieldToEdit].name}
+              />
+            </Grid>
+          </Grid>
+        </ScrollableList>
+      </div>
+    </>
+  );
+}

From 173e3b8cf432eeaa6c0825004aaa8b45ac7a6f10 Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Mon, 8 Aug 2022 04:26:29 +0300
Subject: [PATCH 054/309] feat(airtable-migration): add finish handler

---
 .../ImportAirtableWizard.tsx                  | 228 ++++++++++++++++--
 .../ImportAirtableWizard/Step1Columns.tsx     |   3 +-
 2 files changed, 208 insertions(+), 23 deletions(-)

diff --git a/src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx b/src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx
index cb8121ae..492b1911 100644
--- a/src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx
+++ b/src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx
@@ -1,21 +1,41 @@
-import { useState, useCallback } from "react";
+import { useState, useCallback, useRef, useMemo } from "react";
+import useMemoValue from "use-memo-value";
 import { useAtom, useSetAtom } from "jotai";
 import { RESET } from "jotai/utils";
-import { uniqBy } from "lodash-es";
+import { useSnackbar } from "notistack";
+import { uniqBy, isEqual, find } from "lodash-es";
 import { ITableModalProps } from "@src/components/TableModals";
 
-import { useTheme, useMediaQuery } from "@mui/material";
+import {
+  useTheme,
+  useMediaQuery,
+  Typography,
+  Link,
+  Alert,
+  AlertTitle,
+  Button,
+} from "@mui/material";
 
 import WizardDialog from "@src/components/TableModals/WizardDialog";
 import Step1Columns from "./Step1Columns";
 
 import {
   tableScope,
-  tableModalAtom,
+  tableSettingsAtom,
+  tableSchemaAtom,
+  addColumnAtom,
+  bulkAddRowsAtom,
   importAirtableAtom,
   ImportAirtableData,
+  tableModalAtom,
 } from "@src/atoms/tableScope";
 import { ColumnConfig } from "@src/types/table";
+import { getFieldProp } from "@src/components/fields";
+import Step2NewColumns from "./Step2NewColumns";
+import SnackbarProgress, {
+  ISnackbarProgressRef,
+} from "@src/components/SnackbarProgress";
+import { FieldType } from "@src/constants/fields";
 
 export type AirtableConfig = {
   pairs: { fieldKey: string; columnKey: string }[];
@@ -31,10 +51,21 @@ export interface IStepProps {
 }
 
 export default function ImportAirtableWizard({ onClose }: ITableModalProps) {
-  const [{ airtableData }] = useAtom(importAirtableAtom, tableScope);
+  const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
+  const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
+  const addColumn = useSetAtom(addColumnAtom, tableScope);
+  const bulkAddRows = useSetAtom(bulkAddRowsAtom, tableScope);
+  const [{ airtableData, tableId, baseId, apiKey }] = useAtom(
+    importAirtableAtom,
+    tableScope
+  );
   const setTableModal = useSetAtom(tableModalAtom, tableScope);
+  const { enqueueSnackbar, closeSnackbar } = useSnackbar();
   const theme = useTheme();
   const isXs = useMediaQuery(theme.breakpoints.down("sm"));
+  const snackbarProgressRef = useRef<ISnackbarProgressRef>();
+
+  const columns = useMemoValue(tableSchema.columns ?? {}, isEqual);
 
   const [config, setConfig] = useState<AirtableConfig>({
     pairs: [],
@@ -52,6 +83,133 @@ export default function ImportAirtableWizard({ onClose }: ITableModalProps) {
     });
   }, []);
 
+  const fetchRecords = async (offset?: string) => {
+    const url = offset
+      ? `https://api.airtable.com/v0/${baseId}/${tableId}?offset=${offset}`
+      : `https://api.airtable.com/v0/${baseId}/${tableId}`;
+    const response = await fetch(url, {
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${apiKey}`,
+      },
+    }).then((response) => response.json());
+    return response;
+  };
+
+  const airtableFieldParser = (fieldType: FieldType): any => {
+    switch (fieldType) {
+      case FieldType.multiSelect:
+        return (v: string[]) => v;
+      default:
+        return getFieldProp("csvImportParser", fieldType);
+    }
+  };
+
+  const parsedRows = (currentBatch: any[]): any[] =>
+    currentBatch.map((record) =>
+      config.pairs.reduce((a, pair) => {
+        const matchingColumn =
+          columns[pair.columnKey] ??
+          find(config.newColumns, { key: pair.columnKey });
+        const parser = airtableFieldParser(matchingColumn.type);
+        const value = parser
+          ? parser(record.fields[pair.fieldKey], matchingColumn.config)
+          : record.fields[pair.fieldKey];
+        return { ...a, [pair.columnKey]: value };
+      }, {})
+    );
+
+  const handleFinish = async () => {
+    console.time("importAirtable");
+    snackbarProgressRef.current?.setProgress(0);
+    const loadingSnackbar = enqueueSnackbar(
+      `Importing rows. This might take a while.`,
+      {
+        persist: true,
+        action: (
+          <SnackbarProgress
+            stateRef={snackbarProgressRef}
+            target={0}
+            label=" rows"
+          />
+        ),
+      }
+    );
+
+    const warningSnackbar = enqueueSnackbar(
+      "Do not close this page until the import is complete",
+      {
+        variant: "warning",
+        persist: true,
+        action: (
+          <Button
+            variant="contained"
+            color="secondary"
+            onClick={() => closeSnackbar(warningSnackbar)}
+          >
+            OK
+          </Button>
+        ),
+      }
+    );
+
+    try {
+      let currentBatch: any[] = [];
+      const fetcher = async (i: number, offset: string) => {
+        // Airtable Rate Limits: 5 req/sec , 100rows/req
+        if (!offset) return;
+        const { records, offset: currentOffset } = await fetchRecords(offset);
+        currentBatch = [...currentBatch, ...records];
+        snackbarProgressRef.current?.setTarget((prev) => prev + records.length);
+        if (i < 5) {
+          fetcher(++i, currentOffset);
+        } else {
+          setTimeout(() => {
+            bulkAddRows({
+              rows: parsedRows(currentBatch),
+              collection: tableSettings.collection,
+              onBatchCommit: () =>
+                snackbarProgressRef.current?.setProgress(
+                  (prev) => prev + currentBatch.length
+                ),
+            });
+            currentBatch = [];
+            fetcher(0, currentOffset);
+          }, 1050);
+        }
+      };
+
+      onClose();
+
+      const promises: Promise<void>[] = [];
+      for (const col of config.newColumns)
+        promises.push(addColumn({ config: col }));
+
+      await Promise.all(promises);
+
+      const { records, offset } = await fetchRecords();
+      currentBatch = records;
+      snackbarProgressRef.current?.setTarget(currentBatch.length);
+      await fetcher(1, offset);
+      if (currentBatch.length > 0) {
+        await bulkAddRows({
+          rows: parsedRows(currentBatch),
+          collection: tableSettings.collection,
+          onBatchCommit: () =>
+            snackbarProgressRef.current?.setProgress(
+              (prev) => prev + currentBatch.length
+            ),
+        });
+      }
+    } catch (e) {
+      enqueueSnackbar((e as Error).message, { variant: "error" });
+    } finally {
+      closeSnackbar(loadingSnackbar);
+      closeSnackbar(warningSnackbar);
+    }
+    console.timeEnd("importAirtable");
+  };
+
   if (!airtableData) {
     setTableModal(RESET);
     return null;
@@ -62,22 +220,50 @@ export default function ImportAirtableWizard({ onClose }: ITableModalProps) {
       open
       onClose={onClose}
       title={`Import from Airtable`}
-      steps={[
-        {
-          title: "Hello, World!",
-          description: <span>Description</span>,
-          content: (
-            <Step1Columns
-              airtableData={airtableData}
-              config={config}
-              setConfig={setConfig}
-              updateConfig={updateConfig}
-              isXs={isXs}
-            />
-          ),
-        },
-      ]}
-      onFinish={() => {}}
+      steps={
+        [
+          {
+            title: "Choose columns",
+            description: (
+              <>
+                <Typography paragraph>Base ID: {baseId}</Typography>
+                <Typography paragraph>Table ID: {tableId}</Typography>
+                <Typography paragraph>
+                  Select or add the columns to be imported to your table.
+                </Typography>
+              </>
+            ),
+            content: (
+              <Step1Columns
+                airtableData={airtableData}
+                config={config}
+                setConfig={setConfig}
+                updateConfig={updateConfig}
+                isXs={isXs}
+              />
+            ),
+          },
+          config.newColumns.length > 0 && {
+            title: "Set column types",
+            description:
+              "Set the type of each column to display your data correctly. Some column types have been suggested based on your data.",
+            content: (
+              <Step2NewColumns
+                airtableData={airtableData}
+                config={config}
+                setConfig={setConfig}
+                updateConfig={updateConfig}
+                isXs={isXs}
+              />
+            ),
+            disableNext: config.newColumns.reduce(
+              (a, c) => a || (c.type as any) === "",
+              false
+            ),
+          },
+        ].filter((x) => x) as any
+      }
+      onFinish={handleFinish}
     />
   );
 }
diff --git a/src/components/TableModals/ImportAirtableWizard/Step1Columns.tsx b/src/components/TableModals/ImportAirtableWizard/Step1Columns.tsx
index dea5d586..d7d07c06 100644
--- a/src/components/TableModals/ImportAirtableWizard/Step1Columns.tsx
+++ b/src/components/TableModals/ImportAirtableWizard/Step1Columns.tsx
@@ -72,8 +72,7 @@ export default function Step1Columns({
         // Check if this pair was already pushed to main config
         const configPair = find(config.pairs, { fieldKey: field });
         const configIndex = findIndex(config.pairs, { fieldKey: field });
-        console.log(configPair);
-        console.log(configIndex);
+
         // Delete matching newColumn if it was created
         if (configPair) {
           const newColumnIndex = findIndex(config.newColumns, {

From 9adf1c257243fa1dcedf09b2c1137138784dd077 Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Tue, 9 Aug 2022 03:07:39 +0300
Subject: [PATCH 055/309] feat(airtable-migration: improve fetcher logic

---
 .../ImportAirtableWizard.tsx                  | 98 +++++++++++--------
 1 file changed, 55 insertions(+), 43 deletions(-)

diff --git a/src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx b/src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx
index 492b1911..9c5a0dc7 100644
--- a/src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx
+++ b/src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx
@@ -1,4 +1,4 @@
-import { useState, useCallback, useRef, useMemo } from "react";
+import { useState, useCallback, useRef } from "react";
 import useMemoValue from "use-memo-value";
 import { useAtom, useSetAtom } from "jotai";
 import { RESET } from "jotai/utils";
@@ -30,7 +30,6 @@ import {
   tableModalAtom,
 } from "@src/atoms/tableScope";
 import { ColumnConfig } from "@src/types/table";
-import { getFieldProp } from "@src/components/fields";
 import Step2NewColumns from "./Step2NewColumns";
 import SnackbarProgress, {
   ISnackbarProgressRef,
@@ -64,7 +63,7 @@ export default function ImportAirtableWizard({ onClose }: ITableModalProps) {
   const theme = useTheme();
   const isXs = useMediaQuery(theme.breakpoints.down("sm"));
   const snackbarProgressRef = useRef<ISnackbarProgressRef>();
-
+  const countRef = useRef(0);
   const columns = useMemoValue(tableSchema.columns ?? {}, isEqual);
 
   const [config, setConfig] = useState<AirtableConfig>({
@@ -87,12 +86,14 @@ export default function ImportAirtableWizard({ onClose }: ITableModalProps) {
     const url = offset
       ? `https://api.airtable.com/v0/${baseId}/${tableId}?offset=${offset}`
       : `https://api.airtable.com/v0/${baseId}/${tableId}`;
+
     const response = await fetch(url, {
       headers: {
         "Content-Type": "application/json",
         Authorization: `Bearer ${apiKey}`,
       },
     }).then((response) => response.json());
+
     return response;
   };
 
@@ -101,12 +102,12 @@ export default function ImportAirtableWizard({ onClose }: ITableModalProps) {
       case FieldType.multiSelect:
         return (v: string[]) => v;
       default:
-        return getFieldProp("csvImportParser", fieldType);
+        return null;
     }
   };
 
-  const parsedRows = (currentBatch: any[]): any[] =>
-    currentBatch.map((record) =>
+  const parsedRecords = (records: any[]): any[] =>
+    records.map((record) =>
       config.pairs.reduce((a, pair) => {
         const matchingColumn =
           columns[pair.columnKey] ??
@@ -123,14 +124,14 @@ export default function ImportAirtableWizard({ onClose }: ITableModalProps) {
     console.time("importAirtable");
     snackbarProgressRef.current?.setProgress(0);
     const loadingSnackbar = enqueueSnackbar(
-      `Importing rows. This might take a while.`,
+      `Importing records. This might take a while.`,
       {
         persist: true,
         action: (
           <SnackbarProgress
             stateRef={snackbarProgressRef}
             target={0}
-            label=" rows"
+            label=" records"
           />
         ),
       }
@@ -154,53 +155,64 @@ export default function ImportAirtableWizard({ onClose }: ITableModalProps) {
     );
 
     try {
-      let currentBatch: any[] = [];
-      const fetcher = async (i: number, offset: string) => {
-        // Airtable Rate Limits: 5 req/sec , 100rows/req
-        if (!offset) return;
-        const { records, offset: currentOffset } = await fetchRecords(offset);
-        currentBatch = [...currentBatch, ...records];
-        snackbarProgressRef.current?.setTarget((prev) => prev + records.length);
-        if (i < 5) {
-          fetcher(++i, currentOffset);
-        } else {
-          setTimeout(() => {
+      const promises: Promise<void>[] = [];
+      const timeout = (ms: number): Promise<void> =>
+        new Promise((resolve) => setTimeout(() => resolve(), ms));
+
+      // Airtable Rate Limits: 5 req/sec
+      const RATE_LIMIT = { REQ_PER_SECOND: 5 };
+      const fetcher = async (i: number, offset?: string): Promise<void> => {
+        console.log(i, offset, promises);
+        if (offset) {
+          const { records, offset: nextPage } = await fetchRecords(offset);
+          snackbarProgressRef.current?.setTarget(
+            (prev) => prev + records.length
+          );
+          promises.push(
             bulkAddRows({
-              rows: parsedRows(currentBatch),
+              rows: parsedRecords(records),
               collection: tableSettings.collection,
-              onBatchCommit: () =>
-                snackbarProgressRef.current?.setProgress(
-                  (prev) => prev + currentBatch.length
-                ),
-            });
-            currentBatch = [];
-            fetcher(0, currentOffset);
-          }, 1050);
+            }).then(() => {
+              countRef.current += records.length;
+              snackbarProgressRef.current?.setProgress(
+                (prev) => prev + records.length
+              );
+            })
+          );
+          if (i < RATE_LIMIT.REQ_PER_SECOND - 1) {
+            promises.push(fetcher(++i, nextPage));
+          } else {
+            promises.push(timeout(1050).then(() => fetcher(0, nextPage)));
+          }
         }
       };
+      const recursiveAll = async (): Promise<void[]> => {
+        return Promise.all(promises).then((result) => {
+          if (result.length === promises.length) {
+            return result;
+          }
+          return recursiveAll();
+        });
+      };
 
       onClose();
 
-      const promises: Promise<void>[] = [];
       for (const col of config.newColumns)
         promises.push(addColumn({ config: col }));
 
       await Promise.all(promises);
 
-      const { records, offset } = await fetchRecords();
-      currentBatch = records;
-      snackbarProgressRef.current?.setTarget(currentBatch.length);
-      await fetcher(1, offset);
-      if (currentBatch.length > 0) {
-        await bulkAddRows({
-          rows: parsedRows(currentBatch),
-          collection: tableSettings.collection,
-          onBatchCommit: () =>
-            snackbarProgressRef.current?.setProgress(
-              (prev) => prev + currentBatch.length
-            ),
-        });
-      }
+      const { records, offset: nextPage } = await fetchRecords();
+      snackbarProgressRef.current?.setTarget(records.length);
+      countRef.current += records.length;
+      console.log("before fetcher");
+      await fetcher(1, nextPage);
+      await recursiveAll();
+      enqueueSnackbar(
+        `Imported ${Number(countRef.current).toLocaleString()} rows`,
+        { variant: "success" }
+      );
+      console.log("after fetcher");
     } catch (e) {
       enqueueSnackbar((e as Error).message, { variant: "error" });
     } finally {

From e8151ad3ffce9622486f7b9908ad09ebcb901372 Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Tue, 9 Aug 2022 04:23:15 +0300
Subject: [PATCH 056/309] feat(airtable-migration): fix new columns misorder

---
 .../ImportAirtableWizard/Step2NewColumns.tsx  | 49 +++++++++++--------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/src/components/TableModals/ImportAirtableWizard/Step2NewColumns.tsx b/src/components/TableModals/ImportAirtableWizard/Step2NewColumns.tsx
index 5790f57b..dfade0bc 100644
--- a/src/components/TableModals/ImportAirtableWizard/Step2NewColumns.tsx
+++ b/src/components/TableModals/ImportAirtableWizard/Step2NewColumns.tsx
@@ -29,8 +29,13 @@ export default function Step2NewColumns({
     setConfig((config) => ({ ...config, newColumns }));
   };
 
-  const fieldData =
-    airtableData.records[0].fields[config.pairs[fieldToEdit]?.fieldKey];
+  const currentPair = find(config.pairs, {
+    columnKey: config.newColumns[fieldToEdit]?.key,
+  });
+
+  const rowData = airtableData.records.map(
+    (record) => record.fields[currentPair?.fieldKey ?? ""]
+  );
 
   return (
     <>
@@ -108,30 +113,34 @@ export default function Step2NewColumns({
               />
             </Grid>
           </Grid>
-          <Grid container wrap="nowrap">
-            {!isXs && (
+          {rowData.slice(0, 20).map((cell, i) => (
+            <Grid container key={i} wrap="nowrap">
+              {!isXs && (
+                <Grid item xs style={{ overflow: "hidden" }}>
+                  <Cell
+                    field={config.newColumns[fieldToEdit].key}
+                    value={(JSON.stringify(cell) || "")
+                      .replace(/^"/, "")
+                      .replace(/"$/, "")}
+                    type={FieldType.shortText}
+                  />
+                </Grid>
+              )}
+
+              {!isXs && (
+                <Grid item sx={{ width: (theme) => theme.spacing(3) }} />
+              )}
+
               <Grid item xs style={{ overflow: "hidden" }}>
                 <Cell
                   field={config.newColumns[fieldToEdit].key}
-                  value={JSON.stringify(fieldData || "")
-                    .replace(/^"/, "")
-                    .replace(/"$/, "")}
-                  type={FieldType.shortText}
+                  value={cell}
+                  type={config.newColumns[fieldToEdit].type}
+                  name={config.newColumns[fieldToEdit].name}
                 />
               </Grid>
-            )}
-
-            {!isXs && <Grid item sx={{ width: (theme) => theme.spacing(3) }} />}
-
-            <Grid item xs style={{ overflow: "hidden" }}>
-              <Cell
-                field={config.newColumns[fieldToEdit].key}
-                value={fieldData}
-                type={config.newColumns[fieldToEdit].type}
-                name={config.newColumns[fieldToEdit].name}
-              />
             </Grid>
-          </Grid>
+          ))}
         </ScrollableList>
       </div>
     </>

From 499a76ab86d4676f70534839f19e2343522950f5 Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Tue, 9 Aug 2022 04:27:22 +0300
Subject: [PATCH 057/309] feat(airtable-migration): add preview step

---
 .../ImportAirtableWizard/Step3Preview.tsx     | 80 +++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 src/components/TableModals/ImportAirtableWizard/Step3Preview.tsx

diff --git a/src/components/TableModals/ImportAirtableWizard/Step3Preview.tsx b/src/components/TableModals/ImportAirtableWizard/Step3Preview.tsx
new file mode 100644
index 00000000..eb83b4c6
--- /dev/null
+++ b/src/components/TableModals/ImportAirtableWizard/Step3Preview.tsx
@@ -0,0 +1,80 @@
+import { useAtom } from "jotai";
+import { find } from "lodash-es";
+import { parseJSON } from "date-fns";
+
+import { styled, Grid } from "@mui/material";
+import Column from "@src/components/Table/Column";
+import Cell from "@src/components/Table/Cell";
+
+import { IStepProps } from ".";
+import { tableScope, tableSchemaAtom } from "@src/atoms/tableScope";
+import { FieldType } from "@src/constants/fields";
+
+const Spacer = styled(Grid)(({ theme }) => ({
+  width: theme.spacing(3),
+  height: theme.spacing(3),
+  flexShrink: 0,
+}));
+
+const ColumnWrapper = styled(Grid)(() => ({
+  width: 200,
+  flexShrink: 0,
+  marginLeft: -1,
+  "&:first-of-type": { marginLeft: 0 },
+}));
+
+export default function Step3Preview({ airtableData, config }: IStepProps) {
+  const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
+
+  const columns = config.pairs.map(({ fieldKey, columnKey }) => ({
+    fieldKey,
+    columnKey,
+    ...(tableSchema.columns?.[columnKey] ??
+      find(config.newColumns, { key: columnKey }) ??
+      {}),
+  }));
+
+  return (
+    <div style={{ minHeight: 300, height: "calc(100% - 80px)" }}>
+      <div
+        style={{
+          height: "100%",
+          display: "flex",
+          flexDirection: "column",
+          overflow: "scroll",
+        }}
+      >
+        <Grid
+          container
+          wrap="nowrap"
+          sx={{ position: "sticky", top: 0, zIndex: 1 }}
+        >
+          {columns.map(({ key, name, type }) => (
+            <ColumnWrapper item key={key}>
+              <Column label={name || ""} type={type} />
+            </ColumnWrapper>
+          ))}
+          <Spacer item />
+        </Grid>
+
+        <Grid container wrap="nowrap" style={{ flexGrow: 1 }}>
+          {columns.map(({ fieldKey, name, columnKey, type }) => (
+            <ColumnWrapper item key={fieldKey}>
+              {airtableData.records.map((record, i) => (
+                <Cell
+                  key={fieldKey + i}
+                  field={columnKey}
+                  value={record.fields[fieldKey]}
+                  type={type}
+                  name={name}
+                />
+              ))}
+              <Spacer item />
+            </ColumnWrapper>
+          ))}
+          <Spacer item />
+        </Grid>
+      </div>
+    </div>
+  );
+}

From cbc783bd87348a3788b46fbc2ae05e9576ff8f6a Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Wed, 10 Aug 2022 03:53:58 +0300
Subject: [PATCH 058/309] feat(airtable-migration): add date field parser

---
 .../TableModals/ImportAirtableWizard/Step2NewColumns.tsx | 9 +++++++--
 .../TableModals/ImportAirtableWizard/Step3Preview.tsx    | 8 ++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/components/TableModals/ImportAirtableWizard/Step2NewColumns.tsx b/src/components/TableModals/ImportAirtableWizard/Step2NewColumns.tsx
index dfade0bc..28e9630f 100644
--- a/src/components/TableModals/ImportAirtableWizard/Step2NewColumns.tsx
+++ b/src/components/TableModals/ImportAirtableWizard/Step2NewColumns.tsx
@@ -1,6 +1,6 @@
 import { useState } from "react";
 import { find } from "lodash-es";
-import { parseJSON } from "date-fns";
+import { parseISO } from "date-fns";
 
 import { Grid, Typography, Divider, ButtonBase } from "@mui/material";
 import ChevronRightIcon from "@mui/icons-material/ChevronRight";
@@ -134,7 +134,12 @@ export default function Step2NewColumns({
               <Grid item xs style={{ overflow: "hidden" }}>
                 <Cell
                   field={config.newColumns[fieldToEdit].key}
-                  value={cell}
+                  value={
+                    config.newColumns[fieldToEdit].type === FieldType.date ||
+                    config.newColumns[fieldToEdit].type === FieldType.dateTime
+                      ? parseISO(cell)
+                      : cell
+                  }
                   type={config.newColumns[fieldToEdit].type}
                   name={config.newColumns[fieldToEdit].name}
                 />
diff --git a/src/components/TableModals/ImportAirtableWizard/Step3Preview.tsx b/src/components/TableModals/ImportAirtableWizard/Step3Preview.tsx
index eb83b4c6..ae658891 100644
--- a/src/components/TableModals/ImportAirtableWizard/Step3Preview.tsx
+++ b/src/components/TableModals/ImportAirtableWizard/Step3Preview.tsx
@@ -1,6 +1,6 @@
 import { useAtom } from "jotai";
 import { find } from "lodash-es";
-import { parseJSON } from "date-fns";
+import { parseISO } from "date-fns";
 
 import { styled, Grid } from "@mui/material";
 import Column from "@src/components/Table/Column";
@@ -64,7 +64,11 @@ export default function Step3Preview({ airtableData, config }: IStepProps) {
                 <Cell
                   key={fieldKey + i}
                   field={columnKey}
-                  value={record.fields[fieldKey]}
+                  value={
+                    type === FieldType.date || type === FieldType.dateTime
+                      ? parseISO(record.fields[fieldKey])
+                      : record.fields[fieldKey]
+                  }
                   type={type}
                   name={name}
                 />

From 7a765993e102d4d7b4e84ebdc81c3bd713d0a01b Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Wed, 10 Aug 2022 04:15:46 +0300
Subject: [PATCH 059/309] feat(airtable-migration): fix date parser

---
 .../ImportAirtableWizard.tsx                  | 53 +++++++++++++------
 1 file changed, 37 insertions(+), 16 deletions(-)

diff --git a/src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx b/src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx
index 9c5a0dc7..b65c3c43 100644
--- a/src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx
+++ b/src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx
@@ -5,6 +5,7 @@ import { RESET } from "jotai/utils";
 import { useSnackbar } from "notistack";
 import { uniqBy, isEqual, find } from "lodash-es";
 import { ITableModalProps } from "@src/components/TableModals";
+import WizardDialog from "@src/components/TableModals/WizardDialog";
 
 import {
   useTheme,
@@ -16,9 +17,6 @@ import {
   Button,
 } from "@mui/material";
 
-import WizardDialog from "@src/components/TableModals/WizardDialog";
-import Step1Columns from "./Step1Columns";
-
 import {
   tableScope,
   tableSettingsAtom,
@@ -30,11 +28,15 @@ import {
   tableModalAtom,
 } from "@src/atoms/tableScope";
 import { ColumnConfig } from "@src/types/table";
-import Step2NewColumns from "./Step2NewColumns";
+
 import SnackbarProgress, {
   ISnackbarProgressRef,
 } from "@src/components/SnackbarProgress";
 import { FieldType } from "@src/constants/fields";
+import Step1Columns from "./Step1Columns";
+import Step2NewColumns from "./Step2NewColumns";
+import Step3Preview from "./Step3Preview";
+import { parseISO, isValid as isValidDate } from "date-fns";
 
 export type AirtableConfig = {
   pairs: { fieldKey: string; columnKey: string }[];
@@ -101,13 +103,20 @@ export default function ImportAirtableWizard({ onClose }: ITableModalProps) {
     switch (fieldType) {
       case FieldType.multiSelect:
         return (v: string[]) => v;
+      case FieldType.date:
+      case FieldType.dateTime:
+        return (v: string) => {
+          const date = parseISO(v);
+          return isValidDate(date) ? date.getTime() : null;
+        };
       default:
         return null;
     }
   };
 
-  const parsedRecords = (records: any[]): any[] =>
-    records.map((record) =>
+  const parseRecords = (records: any[]): any[] => {
+    if (!columns || !airtableData) return [];
+    return records.map((record) =>
       config.pairs.reduce((a, pair) => {
         const matchingColumn =
           columns[pair.columnKey] ??
@@ -116,9 +125,10 @@ export default function ImportAirtableWizard({ onClose }: ITableModalProps) {
         const value = parser
           ? parser(record.fields[pair.fieldKey], matchingColumn.config)
           : record.fields[pair.fieldKey];
-        return { ...a, [pair.columnKey]: value };
+        return { ...a, [pair.columnKey]: value, id: record.id };
       }, {})
     );
+  };
 
   const handleFinish = async () => {
     console.time("importAirtable");
@@ -170,7 +180,7 @@ export default function ImportAirtableWizard({ onClose }: ITableModalProps) {
           );
           promises.push(
             bulkAddRows({
-              rows: parsedRecords(records),
+              rows: parseRecords(records),
               collection: tableSettings.collection,
             }).then(() => {
               countRef.current += records.length;
@@ -186,12 +196,12 @@ export default function ImportAirtableWizard({ onClose }: ITableModalProps) {
           }
         }
       };
-      const recursiveAll = async (): Promise<void[]> => {
+      const resolveAll = async (): Promise<void[]> => {
         return Promise.all(promises).then((result) => {
           if (result.length === promises.length) {
             return result;
           }
-          return recursiveAll();
+          return resolveAll();
         });
       };
 
@@ -200,19 +210,16 @@ export default function ImportAirtableWizard({ onClose }: ITableModalProps) {
       for (const col of config.newColumns)
         promises.push(addColumn({ config: col }));
 
-      await Promise.all(promises);
-
       const { records, offset: nextPage } = await fetchRecords();
       snackbarProgressRef.current?.setTarget(records.length);
-      countRef.current += records.length;
-      console.log("before fetcher");
+
       await fetcher(1, nextPage);
-      await recursiveAll();
+      await resolveAll();
+
       enqueueSnackbar(
         `Imported ${Number(countRef.current).toLocaleString()} rows`,
         { variant: "success" }
       );
-      console.log("after fetcher");
     } catch (e) {
       enqueueSnackbar((e as Error).message, { variant: "error" });
     } finally {
@@ -273,6 +280,20 @@ export default function ImportAirtableWizard({ onClose }: ITableModalProps) {
               false
             ),
           },
+          {
+            title: "Preview",
+            description:
+              "Preview your data with your configured columns. You can change column types by clicking “Edit type” from the column menu at any time.",
+            content: (
+              <Step3Preview
+                airtableData={airtableData}
+                config={config}
+                setConfig={setConfig}
+                updateConfig={updateConfig}
+                isXs={isXs}
+              />
+            ),
+          },
         ].filter((x) => x) as any
       }
       onFinish={handleFinish}

From d0654cfd7dd88b35042311229fcb78652e6759ef Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Wed, 10 Aug 2022 04:25:41 +0300
Subject: [PATCH 060/309] feat(airtable-migration): add update by id

---
 src/atoms/tableScope/rowActions.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/atoms/tableScope/rowActions.ts b/src/atoms/tableScope/rowActions.ts
index 3abbf516..cbb9cb3d 100644
--- a/src/atoms/tableScope/rowActions.ts
+++ b/src/atoms/tableScope/rowActions.ts
@@ -265,8 +265,8 @@ export const bulkAddRowsAtom = atom(
 
     // Assign a random ID to each row
     const operations = rows.map((row) => ({
-      type: "add" as "add",
-      path: `${collection}/${generateId()}`,
+      type: row?.id ? ("update" as "update") : ("add" as "add"),
+      path: `${collection}/${row?.id ?? generateId()}`,
       data: { ...initialValues, ...omitRowyFields(row) },
     }));
 

From 768424913fbe8603b395f3d62f319f88901ec807 Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Wed, 10 Aug 2022 05:03:11 +0300
Subject: [PATCH 061/309] feat(airtable-migration): refactor value preview

---
 .../ImportAirtableWizard.tsx                  | 37 +++++++++++--------
 .../ImportAirtableWizard/Step2NewColumns.tsx  | 11 +++---
 .../ImportAirtableWizard/Step3Preview.tsx     |  8 ++--
 src/components/fields/Date/TableCell.tsx      |  2 +-
 4 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx b/src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx
index b65c3c43..5cc05c12 100644
--- a/src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx
+++ b/src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx
@@ -51,6 +51,26 @@ export interface IStepProps {
   isXs: boolean;
 }
 
+export const airtableFieldParser = (fieldType: FieldType) => {
+  switch (fieldType) {
+    case FieldType.percentage:
+      return (v: string) => {
+        const numValue = parseFloat(v && v.includes("%") ? v.slice(0, -1) : v);
+        return isNaN(numValue) ? null : numValue / 100;
+      };
+    case FieldType.multiSelect:
+      return (v: string[]) => v;
+    case FieldType.date:
+    case FieldType.dateTime:
+      return (v: string) => {
+        const date = parseISO(v);
+        return isValidDate(date) ? date.getTime() : null;
+      };
+    default:
+      return null;
+  }
+};
+
 export default function ImportAirtableWizard({ onClose }: ITableModalProps) {
   const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
   const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
@@ -99,21 +119,6 @@ export default function ImportAirtableWizard({ onClose }: ITableModalProps) {
     return response;
   };
 
-  const airtableFieldParser = (fieldType: FieldType): any => {
-    switch (fieldType) {
-      case FieldType.multiSelect:
-        return (v: string[]) => v;
-      case FieldType.date:
-      case FieldType.dateTime:
-        return (v: string) => {
-          const date = parseISO(v);
-          return isValidDate(date) ? date.getTime() : null;
-        };
-      default:
-        return null;
-    }
-  };
-
   const parseRecords = (records: any[]): any[] => {
     if (!columns || !airtableData) return [];
     return records.map((record) =>
@@ -123,7 +128,7 @@ export default function ImportAirtableWizard({ onClose }: ITableModalProps) {
           find(config.newColumns, { key: pair.columnKey });
         const parser = airtableFieldParser(matchingColumn.type);
         const value = parser
-          ? parser(record.fields[pair.fieldKey], matchingColumn.config)
+          ? parser(record.fields[pair.fieldKey])
           : record.fields[pair.fieldKey];
         return { ...a, [pair.columnKey]: value, id: record.id };
       }, {})
diff --git a/src/components/TableModals/ImportAirtableWizard/Step2NewColumns.tsx b/src/components/TableModals/ImportAirtableWizard/Step2NewColumns.tsx
index 28e9630f..0a73fb92 100644
--- a/src/components/TableModals/ImportAirtableWizard/Step2NewColumns.tsx
+++ b/src/components/TableModals/ImportAirtableWizard/Step2NewColumns.tsx
@@ -1,6 +1,5 @@
 import { useState } from "react";
 import { find } from "lodash-es";
-import { parseISO } from "date-fns";
 
 import { Grid, Typography, Divider, ButtonBase } from "@mui/material";
 import ChevronRightIcon from "@mui/icons-material/ChevronRight";
@@ -14,6 +13,8 @@ import FieldsDropdown from "@src/components/ColumnModals/FieldsDropdown";
 import { FieldType } from "@src/constants/fields";
 import { SELECTABLE_TYPES } from "@src/components/TableModals/ImportExistingWizard/utils";
 
+import { airtableFieldParser } from "./ImportAirtableWizard";
+
 export default function Step2NewColumns({
   airtableData,
   config,
@@ -36,6 +37,7 @@ export default function Step2NewColumns({
   const rowData = airtableData.records.map(
     (record) => record.fields[currentPair?.fieldKey ?? ""]
   );
+  console.log(airtableFieldParser(config.newColumns[fieldToEdit].type));
 
   return (
     <>
@@ -135,10 +137,9 @@ export default function Step2NewColumns({
                 <Cell
                   field={config.newColumns[fieldToEdit].key}
                   value={
-                    config.newColumns[fieldToEdit].type === FieldType.date ||
-                    config.newColumns[fieldToEdit].type === FieldType.dateTime
-                      ? parseISO(cell)
-                      : cell
+                    airtableFieldParser(config.newColumns[fieldToEdit].type)?.(
+                      cell
+                    ) ?? cell
                   }
                   type={config.newColumns[fieldToEdit].type}
                   name={config.newColumns[fieldToEdit].name}
diff --git a/src/components/TableModals/ImportAirtableWizard/Step3Preview.tsx b/src/components/TableModals/ImportAirtableWizard/Step3Preview.tsx
index ae658891..403bd48a 100644
--- a/src/components/TableModals/ImportAirtableWizard/Step3Preview.tsx
+++ b/src/components/TableModals/ImportAirtableWizard/Step3Preview.tsx
@@ -1,6 +1,5 @@
 import { useAtom } from "jotai";
 import { find } from "lodash-es";
-import { parseISO } from "date-fns";
 
 import { styled, Grid } from "@mui/material";
 import Column from "@src/components/Table/Column";
@@ -8,7 +7,7 @@ import Cell from "@src/components/Table/Cell";
 
 import { IStepProps } from ".";
 import { tableScope, tableSchemaAtom } from "@src/atoms/tableScope";
-import { FieldType } from "@src/constants/fields";
+import { airtableFieldParser } from "./ImportAirtableWizard";
 
 const Spacer = styled(Grid)(({ theme }) => ({
   width: theme.spacing(3),
@@ -65,9 +64,8 @@ export default function Step3Preview({ airtableData, config }: IStepProps) {
                   key={fieldKey + i}
                   field={columnKey}
                   value={
-                    type === FieldType.date || type === FieldType.dateTime
-                      ? parseISO(record.fields[fieldKey])
-                      : record.fields[fieldKey]
+                    airtableFieldParser(type)?.(record.fields[fieldKey]) ??
+                    record.fields[fieldKey]
                   }
                   type={type}
                   name={name}
diff --git a/src/components/fields/Date/TableCell.tsx b/src/components/fields/Date/TableCell.tsx
index e8f84685..08295168 100644
--- a/src/components/fields/Date/TableCell.tsx
+++ b/src/components/fields/Date/TableCell.tsx
@@ -27,7 +27,7 @@ export default function Date_({
   if (disabled)
     return (
       <BasicCell
-        value={value}
+        value={transformedValue}
         type={(column as any).type}
         name={column.key}
         format={format}

From c19b8df4d62083ded14c90755ee672f8bb99e379 Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Wed, 10 Aug 2022 06:10:21 +0300
Subject: [PATCH 062/309] feat(airtable-migration): fix datetime basic cell

---
 src/components/fields/DateTime/TableCell.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/fields/DateTime/TableCell.tsx b/src/components/fields/DateTime/TableCell.tsx
index 6c8b2ad5..53439ff0 100644
--- a/src/components/fields/DateTime/TableCell.tsx
+++ b/src/components/fields/DateTime/TableCell.tsx
@@ -32,7 +32,7 @@ export default function DateTime({
   if (disabled)
     return (
       <BasicCell
-        value={value}
+        value={transformedValue}
         type={(column as any).type}
         name={column.key}
         format={format}

From 4c2244237917b27631d38636fe7c8d39324a8df6 Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Wed, 10 Aug 2022 06:13:41 +0300
Subject: [PATCH 063/309] feat(airtable-migration): clean up for pr

---
 src/atoms/tableScope/ui.ts                    |  11 ++
 .../ImportAirtableWizard.tsx                  |  58 ++++----
 .../ImportAirtableWizard/Step1Columns.tsx     |   2 +-
 .../ImportAirtableWizard/Step2NewColumns.tsx  |   8 +-
 .../ImportAirtableWizard/Step3Preview.tsx     |   5 +-
 .../TableModals/ImportAirtableWizard/index.ts |   2 +
 src/components/TableModals/TableModals.tsx    |   4 +
 src/components/TableToolbar/ImportCsv.tsx     | 128 ++++++++----------
 8 files changed, 106 insertions(+), 112 deletions(-)
 create mode 100644 src/components/TableModals/ImportAirtableWizard/index.ts

diff --git a/src/atoms/tableScope/ui.ts b/src/atoms/tableScope/ui.ts
index 0b03051f..3a486fec 100644
--- a/src/atoms/tableScope/ui.ts
+++ b/src/atoms/tableScope/ui.ts
@@ -100,16 +100,27 @@ export const tableModalAtom = atomWithHash<
   | "export"
   | "importExisting"
   | "importCsv"
+  | "importAirtable"
   | null
 >("tableModal", null, { replaceState: true });
 
 export type ImportCsvData = { columns: string[]; rows: Record<string, any>[] };
+export type ImportAirtableData = { records: Record<string, any>[] };
+
 /** Store import CSV popover and wizard state */
 export const importCsvAtom = atom<{
   importType: "csv" | "tsv";
   csvData: ImportCsvData | null;
 }>({ importType: "csv", csvData: null });
 
+/** Store import Airtable popover and wizard state */
+export const importAirtableAtom = atom<{
+  airtableData: ImportAirtableData | null;
+  apiKey: string;
+  baseId: string;
+  tableId: string;
+}>({ airtableData: null, apiKey: "", baseId: "", tableId: "" });
+
 /** Store side drawer open state */
 export const sideDrawerOpenAtom = atom(false);
 
diff --git a/src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx b/src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx
index 5cc05c12..595a4002 100644
--- a/src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx
+++ b/src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx
@@ -53,13 +53,6 @@ export interface IStepProps {
 
 export const airtableFieldParser = (fieldType: FieldType) => {
   switch (fieldType) {
-    case FieldType.percentage:
-      return (v: string) => {
-        const numValue = parseFloat(v && v.includes("%") ? v.slice(0, -1) : v);
-        return isNaN(numValue) ? null : numValue / 100;
-      };
-    case FieldType.multiSelect:
-      return (v: string[]) => v;
     case FieldType.date:
     case FieldType.dateTime:
       return (v: string) => {
@@ -67,7 +60,7 @@ export const airtableFieldParser = (fieldType: FieldType) => {
         return isValidDate(date) ? date.getTime() : null;
       };
     default:
-      return null;
+      return (v: string) => v;
   }
 };
 
@@ -176,31 +169,31 @@ export default function ImportAirtableWizard({ onClose }: ITableModalProps) {
 
       // Airtable Rate Limits: 5 req/sec
       const RATE_LIMIT = { REQ_PER_SECOND: 5 };
-      const fetcher = async (i: number, offset?: string): Promise<void> => {
+      const fetcher = async (i: number = 0, offset?: string): Promise<void> => {
         console.log(i, offset, promises);
-        if (offset) {
-          const { records, offset: nextPage } = await fetchRecords(offset);
-          snackbarProgressRef.current?.setTarget(
-            (prev) => prev + records.length
-          );
-          promises.push(
-            bulkAddRows({
-              rows: parseRecords(records),
-              collection: tableSettings.collection,
-            }).then(() => {
-              countRef.current += records.length;
-              snackbarProgressRef.current?.setProgress(
-                (prev) => prev + records.length
-              );
-            })
-          );
-          if (i < RATE_LIMIT.REQ_PER_SECOND - 1) {
-            promises.push(fetcher(++i, nextPage));
-          } else {
-            promises.push(timeout(1050).then(() => fetcher(0, nextPage)));
-          }
+        const { records, offset: nextPage } = await fetchRecords(offset);
+        snackbarProgressRef.current?.setTarget((prev) => prev + records.length);
+        promises.push(
+          bulkAddRows({
+            rows: parseRecords(records),
+            collection: tableSettings.collection,
+          }).then(() => {
+            countRef.current += records.length;
+            snackbarProgressRef.current?.setProgress(
+              (prev) => prev + records.length
+            );
+          })
+        );
+        if (!nextPage) {
+          return;
+        }
+        if (i < RATE_LIMIT.REQ_PER_SECOND - 1) {
+          promises.push(fetcher(++i, nextPage));
+        } else {
+          promises.push(timeout(1050).then(() => fetcher(0, nextPage)));
         }
       };
+
       const resolveAll = async (): Promise<void[]> => {
         return Promise.all(promises).then((result) => {
           if (result.length === promises.length) {
@@ -215,10 +208,7 @@ export default function ImportAirtableWizard({ onClose }: ITableModalProps) {
       for (const col of config.newColumns)
         promises.push(addColumn({ config: col }));
 
-      const { records, offset: nextPage } = await fetchRecords();
-      snackbarProgressRef.current?.setTarget(records.length);
-
-      await fetcher(1, nextPage);
+      await fetcher();
       await resolveAll();
 
       enqueueSnackbar(
diff --git a/src/components/TableModals/ImportAirtableWizard/Step1Columns.tsx b/src/components/TableModals/ImportAirtableWizard/Step1Columns.tsx
index d7d07c06..4b5f8035 100644
--- a/src/components/TableModals/ImportAirtableWizard/Step1Columns.tsx
+++ b/src/components/TableModals/ImportAirtableWizard/Step1Columns.tsx
@@ -95,8 +95,8 @@ export default function Step1Columns({
     };
 
   const handleChange = (fieldKey: string) => (value: string) => {
+    if (!value) return;
     const columnKey = !!tableSchema.columns?.[value] ? value : camelCase(value);
-    console.log(config);
     // Check if this pair already exists in config
     const configIndex = findIndex(config.pairs, { fieldKey });
     if (configIndex > -1) {
diff --git a/src/components/TableModals/ImportAirtableWizard/Step2NewColumns.tsx b/src/components/TableModals/ImportAirtableWizard/Step2NewColumns.tsx
index 0a73fb92..3c9a7628 100644
--- a/src/components/TableModals/ImportAirtableWizard/Step2NewColumns.tsx
+++ b/src/components/TableModals/ImportAirtableWizard/Step2NewColumns.tsx
@@ -136,11 +136,9 @@ export default function Step2NewColumns({
               <Grid item xs style={{ overflow: "hidden" }}>
                 <Cell
                   field={config.newColumns[fieldToEdit].key}
-                  value={
-                    airtableFieldParser(config.newColumns[fieldToEdit].type)?.(
-                      cell
-                    ) ?? cell
-                  }
+                  value={airtableFieldParser(
+                    config.newColumns[fieldToEdit].type
+                  )?.(cell)}
                   type={config.newColumns[fieldToEdit].type}
                   name={config.newColumns[fieldToEdit].name}
                 />
diff --git a/src/components/TableModals/ImportAirtableWizard/Step3Preview.tsx b/src/components/TableModals/ImportAirtableWizard/Step3Preview.tsx
index 403bd48a..0a0a4426 100644
--- a/src/components/TableModals/ImportAirtableWizard/Step3Preview.tsx
+++ b/src/components/TableModals/ImportAirtableWizard/Step3Preview.tsx
@@ -63,10 +63,7 @@ export default function Step3Preview({ airtableData, config }: IStepProps) {
                 <Cell
                   key={fieldKey + i}
                   field={columnKey}
-                  value={
-                    airtableFieldParser(type)?.(record.fields[fieldKey]) ??
-                    record.fields[fieldKey]
-                  }
+                  value={airtableFieldParser(type)?.(record.fields[fieldKey])}
                   type={type}
                   name={name}
                 />
diff --git a/src/components/TableModals/ImportAirtableWizard/index.ts b/src/components/TableModals/ImportAirtableWizard/index.ts
new file mode 100644
index 00000000..85ca010f
--- /dev/null
+++ b/src/components/TableModals/ImportAirtableWizard/index.ts
@@ -0,0 +1,2 @@
+export * from "./ImportAirtableWizard";
+export { default } from "./ImportAirtableWizard";
diff --git a/src/components/TableModals/TableModals.tsx b/src/components/TableModals/TableModals.tsx
index 906967f3..072ea52c 100644
--- a/src/components/TableModals/TableModals.tsx
+++ b/src/components/TableModals/TableModals.tsx
@@ -15,6 +15,8 @@ const WebhooksModal = lazy(() => import("./WebhooksModal" /* webpackChunkName: "
 const ImportExistingWizard = lazy(() => import("./ImportExistingWizard" /* webpackChunkName: "TableModals-ImportExistingWizard" */));
 // prettier-ignore
 const ImportCsvWizard = lazy(() => import("./ImportCsvWizard" /* webpackChunkName: "TableModals-ImportCsvWizard" */));
+// prettier-ignore
+const ImportAirtableWizard = lazy(() => import("./ImportAirtableWizard" /* webpackChunkName: "TableModals-ImportAirtableWizard" */));
 
 export interface ITableModalProps {
   onClose: () => void;
@@ -34,6 +36,8 @@ export default function TableModals() {
   if (tableModal === "importExisting")
     return <ImportExistingWizard onClose={onClose} />;
   if (tableModal === "importCsv") return <ImportCsvWizard onClose={onClose} />;
+  if (tableModal === "importAirtable")
+    return <ImportAirtableWizard onClose={onClose} />;
 
   return null;
 }
diff --git a/src/components/TableToolbar/ImportCsv.tsx b/src/components/TableToolbar/ImportCsv.tsx
index d9284f37..181b9cc7 100644
--- a/src/components/TableToolbar/ImportCsv.tsx
+++ b/src/components/TableToolbar/ImportCsv.tsx
@@ -31,6 +31,7 @@ import {
   tableSettingsAtom,
   tableModalAtom,
   importCsvAtom,
+  importAirtableAtom,
 } from "@src/atoms/tableScope";
 import { analytics, logEvent } from "@src/analytics";
 
@@ -51,19 +52,23 @@ export interface IImportCsvProps {
 export default function ImportCsv({ render, PopoverProps }: IImportCsvProps) {
   const [userRoles] = useAtom(userRolesAtom, globalScope);
   const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
-  const [{ importType, csvData }, setImportCsv] = useAtom(
+  const [{ importType: importTypeCsv, csvData }, setImportCsv] = useAtom(
     importCsvAtom,
     tableScope
   );
+  const [{ airtableData, baseId, tableId, apiKey }, setImportAirtable] =
+    useAtom(importAirtableAtom, tableScope);
+
   const openTableModal = useSetAtom(tableModalAtom, tableScope);
   const { enqueueSnackbar } = useSnackbar();
 
-  const importTypeRef = useRef(importType);
+  const importTypeRef = useRef(importTypeCsv);
   const importMethodRef = useRef(ImportMethod.upload);
   const [open, setOpen] = useState<HTMLButtonElement | null>(null);
   const [tab, setTab] = useState("upload");
 
   const [error, setError] = useState<string | any>("");
+  const [airtableError, setAirtableError] = useState<any>({});
   const validCsv =
     csvData !== null && csvData?.columns.length > 0 && csvData?.rows.length > 0;
 
@@ -171,42 +176,44 @@ export default function ImportCsv({ render, PopoverProps }: IImportCsvProps) {
       });
   }, 1000);
 
-  const [airtable, setAirtable] = useState<any>({
-    apiKey: "",
-    baseID: "",
-    tableID: "",
-  });
-  const [data, setData] = useState<any>(null);
-  const [validConnection, setValidConnection] = useState(false);
   const handleAirtableConnection = () => {
-    if (!airtable.apiKey) {
-      setError({ apiKey: { message: "API Key is missing!" } });
+    if (!apiKey) {
+      setAirtableError({ apiKey: { message: "API Key is missing!" } });
       return;
     }
-    if (!airtable.baseID) {
-      setError({ baseID: { message: "Base ID is missing!" } });
+    if (!baseId) {
+      setAirtableError({ baseId: { message: "Base ID is missing!" } });
       return;
     }
-    if (!airtable.tableID) {
-      setError({ tableID: { message: "Table ID is missing!" } });
+    if (!tableId) {
+      setAirtableError({ tableId: { message: "Table ID is missing!" } });
       return;
     }
     setLoading(true);
-    fetch(
-      `https://api.airtable.com/v0/${airtable.baseID}/${airtable.tableID}?maxRecords=1`,
-      {
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: `Bearer ${airtable.apiKey}`,
-        },
-      }
-    )
+    fetch(`https://api.airtable.com/v0/${baseId}/${tableId}?maxRecords=20`, {
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${apiKey}`,
+      },
+    })
       .then((response) => response.json())
-      .then((body) => setData(body.records))
+      .then((body) => {
+        const { error } = body;
+
+        if (error) {
+          throw new Error(error);
+        }
+        console.log(body);
+        setImportAirtable((prev) => ({ ...prev, airtableData: body }));
+        openTableModal("importAirtable");
+      })
       .then(() => {
-        setValidConnection(true);
         setLoading(false);
-        setError("");
+        setAirtableError(null);
+      })
+      .catch((error) => {
+        console.error(error);
+        setLoading(false);
       });
   };
 
@@ -401,15 +408,15 @@ export default function ImportCsv({ render, PopoverProps }: IImportCsvProps) {
               fullWidth
               label="Airtable API Key"
               placeholder="Insert your API key here"
-              value={airtable.apiKey}
-              onChange={(e) => {
-                setAirtable((airtable: any) => ({
-                  ...airtable,
+              value={apiKey}
+              onChange={(e) =>
+                setImportAirtable((prev) => ({
+                  ...prev,
                   apiKey: e.currentTarget.value,
-                }));
-              }}
-              helperText={error?.apiKey?.message}
-              error={!!error?.apiKey?.message}
+                }))
+              }
+              helperText={airtableError?.apiKey?.message}
+              error={!!airtableError?.apiKey?.message}
             />
             <TextField
               variant="filled"
@@ -417,15 +424,15 @@ export default function ImportCsv({ render, PopoverProps }: IImportCsvProps) {
               fullWidth
               label="Airtable Base ID"
               placeholder="Insert your Base ID here"
-              value={airtable.baseID}
+              value={baseId}
               onChange={(e) => {
-                setAirtable((airtable: any) => ({
-                  ...airtable,
-                  baseID: e.currentTarget.value,
+                setImportAirtable((prev) => ({
+                  ...prev,
+                  baseId: e.currentTarget.value,
                 }));
               }}
-              helperText={error?.baseID?.message}
-              error={!!error?.baseID?.message}
+              helperText={airtableError?.baseId?.message}
+              error={!!airtableError?.baseId?.message}
             />
             <TextField
               variant="filled"
@@ -433,20 +440,16 @@ export default function ImportCsv({ render, PopoverProps }: IImportCsvProps) {
               fullWidth
               label="Airtable Table Name or ID"
               placeholder="Insert your Table Name or ID here"
-              value={airtable.tableID}
+              value={tableId}
               onChange={(e) => {
-                setAirtable((prev: any) => ({
-                  ...airtable,
-                  tableID: e.currentTarget.value,
+                setImportAirtable((prev) => ({
+                  ...prev,
+                  tableId: e.currentTarget.value,
                 }));
               }}
-              helperText={error?.tableID?.message}
-              error={!!error?.tableID?.message}
+              helperText={airtableError?.tableId?.message}
+              error={!!airtableError?.tableId?.message}
             />
-            {data &&
-              data.map((record: any) => (
-                <div>Airtable record: {record.id}</div>
-              ))}
           </TabPanel>
         </TabContext>
 
@@ -454,9 +457,7 @@ export default function ImportCsv({ render, PopoverProps }: IImportCsvProps) {
           variant="contained"
           color="primary"
           disabled={
-            importMethodRef.current === "airtable"
-              ? loading && validConnection
-              : !validCsv
+            importMethodRef.current === "airtable" ? loading : !validCsv
           }
           sx={{
             mt: -4,
@@ -467,25 +468,16 @@ export default function ImportCsv({ render, PopoverProps }: IImportCsvProps) {
           }}
           onClick={() => {
             if (importMethodRef.current === "airtable") {
-              if (!data) {
-                handleAirtableConnection();
-              } else {
-                console.log("hello");
-                openTableModal("importCsv");
-              }
+              handleAirtableConnection();
             } else {
               openTableModal("importCsv");
-              logEvent(analytics, `import_${importMethodRef.current}`, {
-                type: importTypeRef.current,
-              });
             }
+            logEvent(analytics, `import_${importMethodRef.current}`, {
+              type: importTypeRef.current,
+            });
           }}
         >
-          {importMethodRef.current === "airtable"
-            ? data
-              ? "Continue"
-              : "Test Connection"
-            : "Continue"}
+          Continue
         </Button>
       </Popover>
     </>

From 819cc0ff66e12d6d9d5ff332c94d289571ae0843 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 10 Aug 2022 11:10:48 +0200
Subject: [PATCH 064/309] fix BuildLogsSnack position with new nav

---
 .../BuildLogs/BuildLogsSnack.tsx              | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/components/TableModals/CloudLogsModal/BuildLogs/BuildLogsSnack.tsx b/src/components/TableModals/CloudLogsModal/BuildLogs/BuildLogsSnack.tsx
index 9cc98650..7d98cf18 100644
--- a/src/components/TableModals/CloudLogsModal/BuildLogs/BuildLogsSnack.tsx
+++ b/src/components/TableModals/CloudLogsModal/BuildLogs/BuildLogsSnack.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useRef, useState } from "react";
 import { throttle } from "lodash-es";
-import { useSetAtom } from "jotai";
+import { useAtom, useSetAtom } from "jotai";
 
 import { Typography, Box, Tooltip, IconButton } from "@mui/material";
 import ExpandIcon from "@mui/icons-material/ExpandLess";
@@ -14,11 +14,16 @@ import CircularProgressOptical from "@src/components/CircularProgressOptical";
 import { isTargetInsideBox } from "@src/utils/ui";
 import { useSnackLogContext } from "@src/contexts/SnackLogContext";
 import useBuildLogs from "./useBuildLogs";
+import { projectScope, navOpenAtom } from "@src/atoms/projectScope";
 import {
   tableScope,
   tableModalAtom,
   cloudLogFiltersAtom,
 } from "@src/atoms/tableScope";
+import {
+  NAV_DRAWER_WIDTH,
+  NAV_DRAWER_COLLAPSED_WIDTH,
+} from "@src/layouts/Navigation/NavDrawer";
 
 export interface IBuildLogsSnackProps {
   onClose: () => void;
@@ -33,6 +38,8 @@ export default function BuildLogsSnack({
   const { latestLog } = useBuildLogs();
   const setModal = useSetAtom(tableModalAtom, tableScope);
   const setCloudLogFilters = useSetAtom(cloudLogFiltersAtom, tableScope);
+  const [navOpen] = useAtom(navOpenAtom, projectScope);
+
   const latestActiveLog =
     latestLog?.startTimeStamp > snackLogContext.latestBuildTimestamp - 5000 ||
     latestLog?.startTimeStamp > snackLogContext.latestBuildTimestamp + 5000
@@ -83,9 +90,15 @@ export default function BuildLogsSnack({
     <Box
       sx={{
         position: "absolute",
-        left: (theme) => theme.spacing(2),
-        bottom: (theme) => theme.spacing(2),
+        left: {
+          xs: `max(env(safe-area-inset-left), 8px)`,
+          md: `max(env(safe-area-inset-left), ${
+            (navOpen ? NAV_DRAWER_WIDTH : NAV_DRAWER_COLLAPSED_WIDTH) + 8
+          }px)`,
+        },
+        bottom: `max(env(safe-area-inset-left), 8px)`,
         backgroundColor: "#282829",
+        colorScheme: "dark",
         boxShadow: 6,
         color: "#fff",
         width: 650,

From 4f25cca68a53fac24636bbbc15f35a4cd60a5ae2 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 10 Aug 2022 12:10:51 +0200
Subject: [PATCH 065/309] fix row not writing to db once all required fields
 are written

---
 src/atoms/tableScope/rowActions.ts | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/atoms/tableScope/rowActions.ts b/src/atoms/tableScope/rowActions.ts
index 3abbf516..6ddbb76d 100644
--- a/src/atoms/tableScope/rowActions.ts
+++ b/src/atoms/tableScope/rowActions.ts
@@ -346,16 +346,6 @@ export const updateFieldAtom = atom(
       update[tableSettings.auditFieldUpdatedBy || "_updatedBy"] = auditValue;
     }
 
-    // Check for required fields
-    const requiredFields = ignoreRequiredFields
-      ? []
-      : tableColumnsOrdered
-          .filter((column) => column.config?.required)
-          .map((column) => column.key);
-    const missingRequiredFields = ignoreRequiredFields
-      ? []
-      : requiredFields.filter((field) => row[field] === undefined);
-
     // Apply field update
     if (!deleteField) {
       // Check for equality. If updated value is same as current, skip update
@@ -367,6 +357,17 @@ export const updateFieldAtom = atom(
       _set(update, fieldName, value);
     }
 
+    // Check for required fields
+    const newRowValues = updateRowData(cloneDeep(row), update);
+    const requiredFields = ignoreRequiredFields
+      ? []
+      : tableColumnsOrdered
+          .filter((column) => column.config?.required)
+          .map((column) => column.key);
+    const missingRequiredFields = ignoreRequiredFields
+      ? []
+      : requiredFields.filter((field) => newRowValues[field] === undefined);
+
     // If it’s a local row, update the row in rowsLocal
     if (isLocalRow) {
       set(tableRowsLocalAtom, {
@@ -379,12 +380,11 @@ export const updateFieldAtom = atom(
       // If it has no missingRequiredFields, also write to db
       // And write entire row to handle the case where it doesn’t exist in db yet
       if (missingRequiredFields.length === 0) {
-        const rowValues = updateRowData(cloneDeep(row), update);
-        if (deleteField) unset(rowValues, fieldName);
+        if (deleteField) unset(newRowValues, fieldName);
 
         await updateRowDb(
           row._rowy_ref.path,
-          omitRowyFields(rowValues),
+          omitRowyFields(newRowValues),
           deleteField ? [fieldName] : []
         );
       }

From 688052dcc134f6b76f6ef40d84afe234bacb6cec Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Aug 2022 10:19:36 +0000
Subject: [PATCH 066/309] Bump async from 2.6.3 to 2.6.4

Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/caolan/async/releases)
- [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md)
- [Commits](https://github.com/caolan/async/compare/v2.6.3...v2.6.4)

---
updated-dependencies:
- dependency-name: async
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index da7f9913..503d0c59 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4672,9 +4672,9 @@ astral-regex@^2.0.0:
   integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
 
 async@^2.6.2:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
-  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
+  version "2.6.4"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
+  integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==
   dependencies:
     lodash "^4.17.14"
 

From 98c56f8d61fbdcb0e55b1c6ff76c214ec57b7533 Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Thu, 11 Aug 2022 03:13:23 +0300
Subject: [PATCH 067/309] feat(airtable-migration): add document id picker

---
 .../ImportAirtableWizard/Step1Columns.tsx     | 36 ++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/src/components/TableModals/ImportAirtableWizard/Step1Columns.tsx b/src/components/TableModals/ImportAirtableWizard/Step1Columns.tsx
index 4b5f8035..ac005aa3 100644
--- a/src/components/TableModals/ImportAirtableWizard/Step1Columns.tsx
+++ b/src/components/TableModals/ImportAirtableWizard/Step1Columns.tsx
@@ -10,10 +10,14 @@ import {
   FormControlLabel,
   Checkbox,
   Chip,
+  FormControl,
+  RadioGroup,
+  Radio,
 } from "@mui/material";
 import ArrowIcon from "@mui/icons-material/ArrowForward";
 
 import { IStepProps } from ".";
+import { AirtableConfig, fieldRecommendation } from "./ImportAirtableWizard";
 import FadeList from "@src/components/TableModals/ScrollableList";
 import Column, { COLUMN_HEADER_HEIGHT } from "@src/components/Table/Column";
 import MultiSelect from "@rowy/multiselect";
@@ -116,7 +120,7 @@ export default function Step1Columns({
             name: value,
             fieldName: columnKey,
             key: columnKey,
-            type: FieldType.shortText,
+            type: fieldRecommendation(value),
             index: -1,
             config: {},
           },
@@ -267,6 +271,36 @@ export default function Step1Columns({
           );
         })}
       </FadeList>
+      <Grid container marginTop={2}>
+        <Typography variant="subtitle2" gutterBottom component="h2">
+          Document Ids (Optional)
+        </Typography>
+        <Divider />
+        <Grid item xs={12}>
+          <FormControl>
+            <RadioGroup
+              defaultValue="recordId"
+              name="radio-buttons-group"
+              sx={{ flexDirection: "row" }}
+              onChange={(e) => {
+                const documentId = e.currentTarget.value as "auto" | "recordId";
+                setConfig((prev: AirtableConfig) => ({ ...prev, documentId }));
+              }}
+            >
+              <FormControlLabel
+                value="recordId"
+                control={<Radio />}
+                label="Use Airtable Record ID"
+              />
+              <FormControlLabel
+                value="auto"
+                control={<Radio />}
+                label="Auto-Generated"
+              />
+            </RadioGroup>
+          </FormControl>
+        </Grid>
+      </Grid>
     </div>
   );
 }

From 58209bb00685446ef7964bef407155ad1408306c Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Thu, 11 Aug 2022 03:39:42 +0300
Subject: [PATCH 068/309] feat(airtable-migration): add field suggestion

---
 .../ImportAirtableWizard/Step1Columns.tsx     |  7 +-
 .../TableModals/ImportAirtableWizard/utils.ts | 65 +++++++++++++++++++
 2 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 src/components/TableModals/ImportAirtableWizard/utils.ts

diff --git a/src/components/TableModals/ImportAirtableWizard/Step1Columns.tsx b/src/components/TableModals/ImportAirtableWizard/Step1Columns.tsx
index ac005aa3..12cde08a 100644
--- a/src/components/TableModals/ImportAirtableWizard/Step1Columns.tsx
+++ b/src/components/TableModals/ImportAirtableWizard/Step1Columns.tsx
@@ -17,7 +17,7 @@ import {
 import ArrowIcon from "@mui/icons-material/ArrowForward";
 
 import { IStepProps } from ".";
-import { AirtableConfig, fieldRecommendation } from "./ImportAirtableWizard";
+import { AirtableConfig } from "./ImportAirtableWizard";
 import FadeList from "@src/components/TableModals/ScrollableList";
 import Column, { COLUMN_HEADER_HEIGHT } from "@src/components/Table/Column";
 import MultiSelect from "@rowy/multiselect";
@@ -28,6 +28,7 @@ import {
   tableColumnsOrderedAtom,
 } from "@src/atoms/tableScope";
 import { FieldType } from "@src/constants/fields";
+import { suggestType } from "./utils";
 
 export default function Step1Columns({
   airtableData,
@@ -120,7 +121,9 @@ export default function Step1Columns({
             name: value,
             fieldName: columnKey,
             key: columnKey,
-            type: fieldRecommendation(value),
+            type:
+              suggestType(airtableData.records, fieldKey) ||
+              FieldType.shortText,
             index: -1,
             config: {},
           },
diff --git a/src/components/TableModals/ImportAirtableWizard/utils.ts b/src/components/TableModals/ImportAirtableWizard/utils.ts
new file mode 100644
index 00000000..3c1697cb
--- /dev/null
+++ b/src/components/TableModals/ImportAirtableWizard/utils.ts
@@ -0,0 +1,65 @@
+import { sortBy } from "lodash-es";
+import { FieldType } from "@src/constants/fields";
+import {
+  REGEX_EMAIL,
+  REGEX_PHONE,
+  REGEX_URL,
+  REGEX_HTML,
+} from "@src/components/TableModals/ImportExistingWizard/utils";
+import { isValid as isValidDate, parseISO } from "date-fns";
+
+export const inferTypeFromValue = (value: any) => {
+  if (!value || typeof value === "function") return;
+
+  if (Array.isArray(value) && typeof value[0] === "string")
+    return FieldType.multiSelect;
+  if (typeof value === "boolean") return FieldType.checkbox;
+
+  if (typeof value === "object") {
+    if ("hex" in value && "rgb" in value) return FieldType.color;
+    if ("toDate" in value) return FieldType.dateTime;
+    return FieldType.json;
+  }
+
+  if (typeof value === "number") {
+    if (Math.abs(value) > 0 && Math.abs(value) < 1) return FieldType.percentage;
+    return FieldType.number;
+  }
+
+  if (typeof value === "string") {
+    if (isValidDate(parseISO(value))) return FieldType.dateTime;
+    if (REGEX_EMAIL.test(value)) return FieldType.email;
+    if (REGEX_PHONE.test(value)) return FieldType.phone;
+    if (REGEX_URL.test(value)) return FieldType.url;
+    if (REGEX_HTML.test(value)) return FieldType.richText;
+    if (value.length >= 50) return FieldType.longText;
+    return FieldType.shortText;
+  }
+
+  return;
+};
+export const suggestType = (data: { [key: string]: any }[], field: string) => {
+  const results: Record<string, number> = {};
+
+  data.forEach((record) => {
+    const result = inferTypeFromValue(record.fields[field]);
+    if (!result) return;
+    if (results[result] === undefined) results[result] = 1;
+    else results[result] += 1;
+  });
+
+  console.log(results);
+  const sortedResults = sortBy(Object.entries(results), 1).reverse();
+  if (!sortedResults || !sortedResults[0]) return FieldType.json;
+  const bestMatch = sortedResults[0][0];
+
+  if (bestMatch === FieldType.shortText) {
+    const values = data.map((record) => record.fields[field]);
+    const uniqueValues = new Set(values);
+    const hasDuplicates = values.length !== uniqueValues.size;
+
+    if (hasDuplicates && uniqueValues.size < 30) return FieldType.singleSelect;
+  }
+
+  return bestMatch;
+};

From 80eb1d0c34fcfe5f35a2f0d84f4e5a6132284b7f Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Thu, 11 Aug 2022 06:23:57 +0300
Subject: [PATCH 069/309] feat(airtable-migration): refactorings - extract
 import methods - move fieldParser into utils - add documentID radio buttons

---
 src/components/Table/EmptyTable.tsx           |   8 +-
 .../ImportAirtableWizard.tsx                  |  36 +-
 .../ImportAirtableWizard/Step2NewColumns.tsx  |  11 +-
 .../ImportAirtableWizard/Step3Preview.tsx     |   4 +-
 .../TableModals/ImportAirtableWizard/utils.ts |  13 +
 src/components/TableToolbar/ImportCsv.tsx     | 485 ------------------
 .../TableToolbar/ImportData/ImportData.tsx    | 117 +++++
 .../ImportData/ImportFromAirtable.tsx         | 147 ++++++
 .../TableToolbar/ImportData/ImportFromCsv.tsx | 318 ++++++++++++
 src/components/TableToolbar/TableToolbar.tsx  |   4 +-
 10 files changed, 616 insertions(+), 527 deletions(-)
 delete mode 100644 src/components/TableToolbar/ImportCsv.tsx
 create mode 100644 src/components/TableToolbar/ImportData/ImportData.tsx
 create mode 100644 src/components/TableToolbar/ImportData/ImportFromAirtable.tsx
 create mode 100644 src/components/TableToolbar/ImportData/ImportFromCsv.tsx

diff --git a/src/components/Table/EmptyTable.tsx b/src/components/Table/EmptyTable.tsx
index 96c5e2d0..c5739718 100644
--- a/src/components/Table/EmptyTable.tsx
+++ b/src/components/Table/EmptyTable.tsx
@@ -4,7 +4,7 @@ import { Grid, Stack, Typography, Button, Divider } from "@mui/material";
 import { Import as ImportIcon } from "@src/assets/icons";
 import { AddColumn as AddColumnIcon } from "@src/assets/icons";
 
-import ImportCsv from "@src/components/TableToolbar/ImportCsv";
+import ImportData from "@src/components/TableToolbar/ImportData/ImportData";
 
 import {
   tableScope,
@@ -72,10 +72,10 @@ export default function EmptyTable() {
         <Grid container spacing={1}>
           <Grid item xs>
             <Typography paragraph>
-              You can import data from an external CSV file:
+              You can import data from an external source:
             </Typography>
 
-            <ImportCsv
+            <ImportData
               render={(onClick) => (
                 <Button
                   variant="contained"
@@ -83,7 +83,7 @@ export default function EmptyTable() {
                   startIcon={<ImportIcon />}
                   onClick={onClick}
                 >
-                  Import CSV
+                  Import Data
                 </Button>
               )}
               PopoverProps={{
diff --git a/src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx b/src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx
index 595a4002..2de2bc7a 100644
--- a/src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx
+++ b/src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx
@@ -7,15 +7,7 @@ import { uniqBy, isEqual, find } from "lodash-es";
 import { ITableModalProps } from "@src/components/TableModals";
 import WizardDialog from "@src/components/TableModals/WizardDialog";
 
-import {
-  useTheme,
-  useMediaQuery,
-  Typography,
-  Link,
-  Alert,
-  AlertTitle,
-  Button,
-} from "@mui/material";
+import { useTheme, useMediaQuery, Typography, Button } from "@mui/material";
 
 import {
   tableScope,
@@ -32,15 +24,15 @@ import { ColumnConfig } from "@src/types/table";
 import SnackbarProgress, {
   ISnackbarProgressRef,
 } from "@src/components/SnackbarProgress";
-import { FieldType } from "@src/constants/fields";
+import { fieldParser } from "@src/components/TableModals/ImportAirtableWizard/utils";
 import Step1Columns from "./Step1Columns";
 import Step2NewColumns from "./Step2NewColumns";
 import Step3Preview from "./Step3Preview";
-import { parseISO, isValid as isValidDate } from "date-fns";
 
 export type AirtableConfig = {
   pairs: { fieldKey: string; columnKey: string }[];
   newColumns: ColumnConfig[];
+  documentId: "auto" | "recordId";
 };
 
 export interface IStepProps {
@@ -51,19 +43,6 @@ export interface IStepProps {
   isXs: boolean;
 }
 
-export const airtableFieldParser = (fieldType: FieldType) => {
-  switch (fieldType) {
-    case FieldType.date:
-    case FieldType.dateTime:
-      return (v: string) => {
-        const date = parseISO(v);
-        return isValidDate(date) ? date.getTime() : null;
-      };
-    default:
-      return (v: string) => v;
-  }
-};
-
 export default function ImportAirtableWizard({ onClose }: ITableModalProps) {
   const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
   const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
@@ -84,6 +63,7 @@ export default function ImportAirtableWizard({ onClose }: ITableModalProps) {
   const [config, setConfig] = useState<AirtableConfig>({
     pairs: [],
     newColumns: [],
+    documentId: "recordId",
   });
 
   const updateConfig: IStepProps["updateConfig"] = useCallback((value) => {
@@ -93,7 +73,7 @@ export default function ImportAirtableWizard({ onClose }: ITableModalProps) {
         [...prev.newColumns, ...(value.newColumns ?? [])],
         "key"
       ).filter((col) => pairs.some((pair) => pair.columnKey === col.key));
-      return { pairs, newColumns };
+      return { ...prev, pairs, newColumns };
     });
   }, []);
 
@@ -119,11 +99,13 @@ export default function ImportAirtableWizard({ onClose }: ITableModalProps) {
         const matchingColumn =
           columns[pair.columnKey] ??
           find(config.newColumns, { key: pair.columnKey });
-        const parser = airtableFieldParser(matchingColumn.type);
+        const parser = fieldParser(matchingColumn.type);
         const value = parser
           ? parser(record.fields[pair.fieldKey])
           : record.fields[pair.fieldKey];
-        return { ...a, [pair.columnKey]: value, id: record.id };
+        return config.documentId === "recordId"
+          ? { ...a, [pair.columnKey]: value, id: record.id }
+          : { ...a, [pair.columnKey]: value };
       }, {})
     );
   };
diff --git a/src/components/TableModals/ImportAirtableWizard/Step2NewColumns.tsx b/src/components/TableModals/ImportAirtableWizard/Step2NewColumns.tsx
index 3c9a7628..e3b81ece 100644
--- a/src/components/TableModals/ImportAirtableWizard/Step2NewColumns.tsx
+++ b/src/components/TableModals/ImportAirtableWizard/Step2NewColumns.tsx
@@ -9,11 +9,9 @@ import ScrollableList from "@src/components/TableModals/ScrollableList";
 import Column from "@src/components/Table/Column";
 import Cell from "@src/components/Table/Cell";
 import FieldsDropdown from "@src/components/ColumnModals/FieldsDropdown";
-
 import { FieldType } from "@src/constants/fields";
 import { SELECTABLE_TYPES } from "@src/components/TableModals/ImportExistingWizard/utils";
-
-import { airtableFieldParser } from "./ImportAirtableWizard";
+import { fieldParser } from "@src/components/TableModals/ImportAirtableWizard/utils";
 
 export default function Step2NewColumns({
   airtableData,
@@ -37,7 +35,6 @@ export default function Step2NewColumns({
   const rowData = airtableData.records.map(
     (record) => record.fields[currentPair?.fieldKey ?? ""]
   );
-  console.log(airtableFieldParser(config.newColumns[fieldToEdit].type));
 
   return (
     <>
@@ -136,9 +133,9 @@ export default function Step2NewColumns({
               <Grid item xs style={{ overflow: "hidden" }}>
                 <Cell
                   field={config.newColumns[fieldToEdit].key}
-                  value={airtableFieldParser(
-                    config.newColumns[fieldToEdit].type
-                  )?.(cell)}
+                  value={fieldParser(config.newColumns[fieldToEdit].type)?.(
+                    cell
+                  )}
                   type={config.newColumns[fieldToEdit].type}
                   name={config.newColumns[fieldToEdit].name}
                 />
diff --git a/src/components/TableModals/ImportAirtableWizard/Step3Preview.tsx b/src/components/TableModals/ImportAirtableWizard/Step3Preview.tsx
index 0a0a4426..ae5c0ee8 100644
--- a/src/components/TableModals/ImportAirtableWizard/Step3Preview.tsx
+++ b/src/components/TableModals/ImportAirtableWizard/Step3Preview.tsx
@@ -7,7 +7,7 @@ import Cell from "@src/components/Table/Cell";
 
 import { IStepProps } from ".";
 import { tableScope, tableSchemaAtom } from "@src/atoms/tableScope";
-import { airtableFieldParser } from "./ImportAirtableWizard";
+import { fieldParser } from "@src/components/TableModals/ImportAirtableWizard/utils";
 
 const Spacer = styled(Grid)(({ theme }) => ({
   width: theme.spacing(3),
@@ -63,7 +63,7 @@ export default function Step3Preview({ airtableData, config }: IStepProps) {
                 <Cell
                   key={fieldKey + i}
                   field={columnKey}
-                  value={airtableFieldParser(type)?.(record.fields[fieldKey])}
+                  value={fieldParser(type)?.(record.fields[fieldKey])}
                   type={type}
                   name={name}
                 />
diff --git a/src/components/TableModals/ImportAirtableWizard/utils.ts b/src/components/TableModals/ImportAirtableWizard/utils.ts
index 3c1697cb..ab8d4490 100644
--- a/src/components/TableModals/ImportAirtableWizard/utils.ts
+++ b/src/components/TableModals/ImportAirtableWizard/utils.ts
@@ -63,3 +63,16 @@ export const suggestType = (data: { [key: string]: any }[], field: string) => {
 
   return bestMatch;
 };
+
+export const fieldParser = (fieldType: FieldType) => {
+  switch (fieldType) {
+    case FieldType.date:
+    case FieldType.dateTime:
+      return (v: string) => {
+        const date = parseISO(v);
+        return isValidDate(date) ? date.getTime() : null;
+      };
+    default:
+      return (v: any) => v;
+  }
+};
diff --git a/src/components/TableToolbar/ImportCsv.tsx b/src/components/TableToolbar/ImportCsv.tsx
deleted file mode 100644
index 181b9cc7..00000000
--- a/src/components/TableToolbar/ImportCsv.tsx
+++ /dev/null
@@ -1,485 +0,0 @@
-import { useState, useCallback, useRef } from "react";
-import { useAtom, useSetAtom } from "jotai";
-import { parse } from "csv-parse/browser/esm";
-import { useDropzone } from "react-dropzone";
-import { useDebouncedCallback } from "use-debounce";
-import { useSnackbar } from "notistack";
-
-import {
-  Button,
-  Popover,
-  PopoverProps as MuiPopoverProps,
-  Grid,
-  Typography,
-  TextField,
-  FormHelperText,
-  Divider,
-} from "@mui/material";
-import Tab from "@mui/material/Tab";
-import TabContext from "@mui/lab/TabContext";
-import TabList from "@mui/lab/TabList";
-import TabPanel from "@mui/lab/TabPanel";
-
-import TableToolbarButton from "./TableToolbarButton";
-import { Import as ImportIcon } from "@src/assets/icons";
-import { Upload as FileUploadIcon } from "@src/assets/icons";
-import CheckIcon from "@mui/icons-material/CheckCircle";
-
-import { globalScope, userRolesAtom } from "@src/atoms/globalScope";
-import {
-  tableScope,
-  tableSettingsAtom,
-  tableModalAtom,
-  importCsvAtom,
-  importAirtableAtom,
-} from "@src/atoms/tableScope";
-import { analytics, logEvent } from "@src/analytics";
-
-export enum ImportMethod {
-  paste = "paste",
-  upload = "upload",
-  url = "url",
-  airtable = "airtable",
-}
-
-export interface IImportCsvProps {
-  render?: (
-    onClick: (event: React.MouseEvent<HTMLButtonElement>) => void
-  ) => React.ReactNode;
-  PopoverProps?: Partial<MuiPopoverProps>;
-}
-
-export default function ImportCsv({ render, PopoverProps }: IImportCsvProps) {
-  const [userRoles] = useAtom(userRolesAtom, globalScope);
-  const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
-  const [{ importType: importTypeCsv, csvData }, setImportCsv] = useAtom(
-    importCsvAtom,
-    tableScope
-  );
-  const [{ airtableData, baseId, tableId, apiKey }, setImportAirtable] =
-    useAtom(importAirtableAtom, tableScope);
-
-  const openTableModal = useSetAtom(tableModalAtom, tableScope);
-  const { enqueueSnackbar } = useSnackbar();
-
-  const importTypeRef = useRef(importTypeCsv);
-  const importMethodRef = useRef(ImportMethod.upload);
-  const [open, setOpen] = useState<HTMLButtonElement | null>(null);
-  const [tab, setTab] = useState("upload");
-
-  const [error, setError] = useState<string | any>("");
-  const [airtableError, setAirtableError] = useState<any>({});
-  const validCsv =
-    csvData !== null && csvData?.columns.length > 0 && csvData?.rows.length > 0;
-
-  const handleOpen = (event: React.MouseEvent<HTMLButtonElement>) =>
-    setOpen(event.currentTarget);
-  const handleClose = () => {
-    setOpen(null);
-    setImportCsv({ importType: "csv", csvData: null });
-    setTab("upload");
-    setError("");
-  };
-  const popoverId = open ? "csv-popover" : undefined;
-
-  const parseCsv = useCallback(
-    (csvString: string) =>
-      parse(csvString, { delimiter: [",", "\t"] }, (err, rows) => {
-        if (err) {
-          setError(err.message);
-        } else {
-          const columns = rows.shift() ?? [];
-          if (columns.length === 0) {
-            setError("No columns detected");
-          } else {
-            const mappedRows = rows.map((row: any) =>
-              row.reduce(
-                (a: any, c: any, i: number) => ({ ...a, [columns[i]]: c }),
-                {}
-              )
-            );
-            setImportCsv({
-              importType: importTypeRef.current,
-              csvData: { columns, rows: mappedRows },
-            });
-            setError("");
-          }
-        }
-      }),
-    [setImportCsv]
-  );
-
-  const onDrop = useCallback(
-    async (acceptedFiles: File[]) => {
-      try {
-        const file = acceptedFiles[0];
-        const reader = new FileReader();
-        reader.onload = (event: any) => parseCsv(event.target.result);
-        reader.readAsText(file);
-        importTypeRef.current =
-          file.type === "text/tab-separated-values" ? "tsv" : "csv";
-      } catch (error) {
-        enqueueSnackbar(`Please import a .tsv or .csv file`, {
-          variant: "error",
-          anchorOrigin: {
-            vertical: "top",
-            horizontal: "center",
-          },
-        });
-      }
-    },
-    [enqueueSnackbar, parseCsv]
-  );
-
-  const { getRootProps, getInputProps, isDragActive } = useDropzone({
-    onDrop,
-    multiple: false,
-    accept: ["text/csv", "text/tab-separated-values"],
-  });
-
-  function setDataTypeRef(data: string) {
-    const getFirstLine = data?.match(/^(.*)/)?.[0];
-    /*
-     *  Catching edge case with regex
-     *  EG: "hello\tworld"\tFirst
-     *  - find \t between quotes, and replace with '\s'
-     *  - w/ the \t pattern test it against the formatted string
-     */
-    const strInQuotes = /"(.*?)"/;
-    const tabsWithSpace = (str: string) => str.replace("\t", "s");
-    const formatString =
-      getFirstLine?.replace(strInQuotes, tabsWithSpace) ?? "";
-    const tabPattern = /\t/;
-    return tabPattern.test(formatString)
-      ? (importTypeRef.current = "tsv")
-      : (importTypeRef.current = "csv");
-  }
-  const handlePaste = useDebouncedCallback((value: string) => {
-    parseCsv(value);
-    setDataTypeRef(value);
-  }, 1000);
-
-  const [loading, setLoading] = useState(false);
-  const handleUrl = useDebouncedCallback((value: string) => {
-    setLoading(true);
-    setError("");
-    fetch(value, { mode: "no-cors" })
-      .then((res) => res.text())
-      .then((data) => {
-        parseCsv(data);
-        setDataTypeRef(data);
-        setLoading(false);
-      })
-      .catch((e) => {
-        setError(e.message);
-        setLoading(false);
-      });
-  }, 1000);
-
-  const handleAirtableConnection = () => {
-    if (!apiKey) {
-      setAirtableError({ apiKey: { message: "API Key is missing!" } });
-      return;
-    }
-    if (!baseId) {
-      setAirtableError({ baseId: { message: "Base ID is missing!" } });
-      return;
-    }
-    if (!tableId) {
-      setAirtableError({ tableId: { message: "Table ID is missing!" } });
-      return;
-    }
-    setLoading(true);
-    fetch(`https://api.airtable.com/v0/${baseId}/${tableId}?maxRecords=20`, {
-      headers: {
-        "Content-Type": "application/json",
-        Authorization: `Bearer ${apiKey}`,
-      },
-    })
-      .then((response) => response.json())
-      .then((body) => {
-        const { error } = body;
-
-        if (error) {
-          throw new Error(error);
-        }
-        console.log(body);
-        setImportAirtable((prev) => ({ ...prev, airtableData: body }));
-        openTableModal("importAirtable");
-      })
-      .then(() => {
-        setLoading(false);
-        setAirtableError(null);
-      })
-      .catch((error) => {
-        console.error(error);
-        setLoading(false);
-      });
-  };
-
-  if (tableSettings.readOnly && !userRoles.includes("ADMIN")) return null;
-
-  return (
-    <>
-      {render ? (
-        render(handleOpen)
-      ) : (
-        <TableToolbarButton
-          title="Import CSV or TSV"
-          onClick={handleOpen}
-          icon={<ImportIcon />}
-        />
-      )}
-
-      <Popover
-        id={popoverId}
-        open={!!open}
-        anchorEl={open}
-        onClose={handleClose}
-        anchorOrigin={{
-          vertical: "bottom",
-          horizontal: "right",
-        }}
-        transformOrigin={{
-          vertical: "top",
-          horizontal: "right",
-        }}
-        {...PopoverProps}
-        sx={{
-          "& .MuiTabPanel-root": { py: 2, px: 3, width: 400, height: 200 },
-        }}
-      >
-        <TabContext value={tab}>
-          <TabList
-            onChange={(_, v) => {
-              setTab(v);
-              setImportCsv({
-                importType: importTypeRef.current,
-                csvData: null,
-              });
-              setError("");
-            }}
-            aria-label="Import CSV method tabs"
-            action={(actions) =>
-              setTimeout(() => actions?.updateIndicator(), 200)
-            }
-            variant="fullWidth"
-          >
-            <Tab
-              label="Upload"
-              value="upload"
-              onClick={() => (importMethodRef.current = ImportMethod.upload)}
-            />
-            <Tab
-              label="Paste"
-              value="paste"
-              onClick={() => (importMethodRef.current = ImportMethod.paste)}
-            />
-            <Tab
-              label="URL"
-              value="url"
-              onClick={() => (importMethodRef.current = ImportMethod.url)}
-            />
-            <Tab
-              label="Airtable"
-              value="airtable"
-              onClick={() => (importMethodRef.current = ImportMethod.airtable)}
-            />
-          </TabList>
-          <Divider style={{ marginTop: -1 }} />
-
-          <TabPanel value="upload">
-            <Grid
-              container
-              justifyContent="center"
-              alignContent="center"
-              alignItems="center"
-              direction="column"
-              {...getRootProps()}
-              sx={[
-                {
-                  height: 137,
-                  borderRadius: 1,
-                  border: `dashed 2px currentColor`,
-                  borderColor: "divider",
-                  backgroundColor: "action.input",
-                  cursor: "pointer",
-
-                  "& svg": {
-                    opacity: (theme) => theme.palette.action.activeOpacity,
-                  },
-
-                  "&:focus": {
-                    borderColor: "primary.main",
-                    color: "primary.main",
-                    outline: "none",
-                  },
-                },
-                error ? { borderColor: "error.main", color: "error.main" } : {},
-              ]}
-            >
-              <input {...getInputProps()} />
-              {isDragActive ? (
-                <Typography variant="button" color="primary">
-                  Drop CSV or TSV file here…
-                </Typography>
-              ) : (
-                <>
-                  <Grid item>
-                    {validCsv ? <CheckIcon /> : <FileUploadIcon />}
-                  </Grid>
-                  <Grid item>
-                    <Typography variant="button" color="inherit">
-                      {validCsv
-                        ? "Valid CSV or TSV"
-                        : "Click to upload or drop CSV or TSV file here"}
-                    </Typography>
-                  </Grid>
-                </>
-              )}
-            </Grid>
-
-            {error && (
-              <FormHelperText error sx={{ my: 0.5, mx: 1.5 }}>
-                {error}
-              </FormHelperText>
-            )}
-          </TabPanel>
-
-          <TabPanel value="paste">
-            <TextField
-              variant="filled"
-              multiline
-              inputProps={{ minRows: 3 }}
-              autoFocus
-              fullWidth
-              label="Paste CSV or TSV text"
-              placeholder="column, column, …"
-              onChange={(e) => {
-                if (csvData !== null)
-                  setImportCsv({
-                    importType: importTypeRef.current,
-                    csvData: null,
-                  });
-                handlePaste(e.target.value);
-              }}
-              sx={{
-                typography: "body2",
-                fontFamily: "fontFamilyMono",
-
-                "& .MuiInputBase-input": {
-                  whiteSpace: "nowrap",
-                  overflow: "auto",
-                  fontFamily: "mono",
-                },
-              }}
-              helperText={error}
-              error={!!error}
-            />
-          </TabPanel>
-
-          <TabPanel value="url">
-            <TextField
-              variant="filled"
-              autoFocus
-              fullWidth
-              label="Paste URL to CSV or TSV file"
-              placeholder="https://"
-              onChange={(e) => {
-                if (csvData !== null)
-                  setImportCsv({
-                    importType: importTypeRef.current,
-                    csvData: null,
-                  });
-                handleUrl(e.target.value);
-              }}
-              helperText={loading ? "Fetching…" : error}
-              error={!!error}
-            />
-          </TabPanel>
-
-          <TabPanel value="airtable">
-            <Typography variant="caption" color="gray">
-              Forget the storage limitations of Airtable.
-            </Typography>
-            <TextField
-              variant="filled"
-              autoFocus
-              fullWidth
-              label="Airtable API Key"
-              placeholder="Insert your API key here"
-              value={apiKey}
-              onChange={(e) =>
-                setImportAirtable((prev) => ({
-                  ...prev,
-                  apiKey: e.currentTarget.value,
-                }))
-              }
-              helperText={airtableError?.apiKey?.message}
-              error={!!airtableError?.apiKey?.message}
-            />
-            <TextField
-              variant="filled"
-              autoFocus
-              fullWidth
-              label="Airtable Base ID"
-              placeholder="Insert your Base ID here"
-              value={baseId}
-              onChange={(e) => {
-                setImportAirtable((prev) => ({
-                  ...prev,
-                  baseId: e.currentTarget.value,
-                }));
-              }}
-              helperText={airtableError?.baseId?.message}
-              error={!!airtableError?.baseId?.message}
-            />
-            <TextField
-              variant="filled"
-              autoFocus
-              fullWidth
-              label="Airtable Table Name or ID"
-              placeholder="Insert your Table Name or ID here"
-              value={tableId}
-              onChange={(e) => {
-                setImportAirtable((prev) => ({
-                  ...prev,
-                  tableId: e.currentTarget.value,
-                }));
-              }}
-              helperText={airtableError?.tableId?.message}
-              error={!!airtableError?.tableId?.message}
-            />
-          </TabPanel>
-        </TabContext>
-
-        <Button
-          variant="contained"
-          color="primary"
-          disabled={
-            importMethodRef.current === "airtable" ? loading : !validCsv
-          }
-          sx={{
-            mt: -4,
-            mx: "auto",
-            mb: 2,
-            display: "flex",
-            minWidth: 100,
-          }}
-          onClick={() => {
-            if (importMethodRef.current === "airtable") {
-              handleAirtableConnection();
-            } else {
-              openTableModal("importCsv");
-            }
-            logEvent(analytics, `import_${importMethodRef.current}`, {
-              type: importTypeRef.current,
-            });
-          }}
-        >
-          Continue
-        </Button>
-      </Popover>
-    </>
-  );
-}
diff --git a/src/components/TableToolbar/ImportData/ImportData.tsx b/src/components/TableToolbar/ImportData/ImportData.tsx
new file mode 100644
index 00000000..bbe83543
--- /dev/null
+++ b/src/components/TableToolbar/ImportData/ImportData.tsx
@@ -0,0 +1,117 @@
+import { useState, useRef } from "react";
+import { useAtom } from "jotai";
+
+import {
+  Popover,
+  PopoverProps as MuiPopoverProps,
+  Divider,
+} from "@mui/material";
+import Tab from "@mui/material/Tab";
+import TabContext from "@mui/lab/TabContext";
+import TabList from "@mui/lab/TabList";
+import TabPanel from "@mui/lab/TabPanel";
+
+import { Import as ImportIcon } from "@src/assets/icons";
+
+import { globalScope, userRolesAtom } from "@src/atoms/globalScope";
+import { tableScope, tableSettingsAtom } from "@src/atoms/tableScope";
+import TableToolbarButton from "@src/components/TableToolbar/TableToolbarButton";
+import ImportFromCsv from "@src/components/TableToolbar/ImportData/ImportFromCsv";
+import ImportFromAirtable from "@src/components/TableToolbar/ImportData/ImportFromAirtable";
+
+export interface IImportDataProps {
+  render?: (
+    onClick: (event: React.MouseEvent<HTMLButtonElement>) => void
+  ) => React.ReactNode;
+  PopoverProps?: Partial<MuiPopoverProps>;
+}
+
+export enum ImportMethod {
+  csv = "csv",
+  airtable = "airtable",
+}
+
+export default function ImportData({ render, PopoverProps }: IImportDataProps) {
+  const [userRoles] = useAtom(userRolesAtom, globalScope);
+  const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
+
+  const importMethodRef = useRef(ImportMethod.csv);
+  const [open, setOpen] = useState<HTMLButtonElement | null>(null);
+  const [tab, setTab] = useState("csv");
+  const handleOpen = (event: React.MouseEvent<HTMLButtonElement>) =>
+    setOpen(event.currentTarget);
+
+  const handleClose = () => {
+    setOpen(null);
+    setTab("csv");
+  };
+  const popoverId = open ? "import-popover" : undefined;
+
+  if (tableSettings.readOnly && !userRoles.includes("ADMIN")) return null;
+
+  return (
+    <>
+      {render ? (
+        render(handleOpen)
+      ) : (
+        <TableToolbarButton
+          title="Import Data"
+          onClick={handleOpen}
+          icon={<ImportIcon />}
+        />
+      )}
+
+      <Popover
+        id={popoverId}
+        open={!!open}
+        anchorEl={open}
+        onClose={handleClose}
+        anchorOrigin={{
+          vertical: "bottom",
+          horizontal: "right",
+        }}
+        transformOrigin={{
+          vertical: "top",
+          horizontal: "right",
+        }}
+        {...PopoverProps}
+        sx={{
+          "& .MuiTabPanel-root": {
+            width: 500,
+          },
+        }}
+      >
+        <TabContext value={tab}>
+          <TabList
+            onChange={(_, v) => setTab(v)}
+            aria-label="Import Data method tabs"
+            action={(actions) =>
+              setTimeout(() => actions?.updateIndicator(), 200)
+            }
+            variant="fullWidth"
+          >
+            <Tab
+              label="CSV/TSV"
+              value="csv"
+              onClick={() => (importMethodRef.current = ImportMethod.csv)}
+            />
+            <Tab
+              label="Airtable"
+              value="airtable"
+              onClick={() => (importMethodRef.current = ImportMethod.airtable)}
+            />
+          </TabList>
+          <Divider style={{ marginTop: -1 }} />
+
+          <TabPanel value="csv" id="import-csv-tab" sx={{ padding: 0 }}>
+            <ImportFromCsv />
+          </TabPanel>
+
+          <TabPanel value="airtable" id="import-airtable-tab" sx={{ pb: 0 }}>
+            <ImportFromAirtable />
+          </TabPanel>
+        </TabContext>
+      </Popover>
+    </>
+  );
+}
diff --git a/src/components/TableToolbar/ImportData/ImportFromAirtable.tsx b/src/components/TableToolbar/ImportData/ImportFromAirtable.tsx
new file mode 100644
index 00000000..e7988b6b
--- /dev/null
+++ b/src/components/TableToolbar/ImportData/ImportFromAirtable.tsx
@@ -0,0 +1,147 @@
+import { useState, useEffect } from "react";
+import { useAtom, useSetAtom } from "jotai";
+
+import { Button, Typography, TextField } from "@mui/material";
+
+import {
+  tableModalAtom,
+  importAirtableAtom,
+  tableScope,
+} from "@src/atoms/tableScope";
+import { analytics, logEvent } from "@src/analytics";
+
+export default function ImportFromAirtable() {
+  const [{ baseId, tableId, apiKey }, setImportAirtable] = useAtom(
+    importAirtableAtom,
+    tableScope
+  );
+  const openTableModal = useSetAtom(tableModalAtom, tableScope);
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState<any>({});
+
+  useEffect(() => {
+    return () => {
+      setImportAirtable({
+        airtableData: null,
+        apiKey: "",
+        baseId: "",
+        tableId: "",
+      });
+    };
+  }, [setImportAirtable]);
+
+  const handleAirtableConnection = () => {
+    if (!apiKey) {
+      setError({ apiKey: { message: "API Key is missing!" } });
+      return;
+    }
+    if (!baseId) {
+      setError({ baseId: { message: "Base ID is missing!" } });
+      return;
+    }
+    if (!tableId) {
+      setError({ tableId: { message: "Table ID is missing!" } });
+      return;
+    }
+    setLoading(true);
+    fetch(`https://api.airtable.com/v0/${baseId}/${tableId}?maxRecords=20`, {
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${apiKey}`,
+      },
+    })
+      .then((response) => response.json())
+      .then((body) => {
+        const { error } = body;
+        if (error) {
+          throw new Error(error);
+        }
+
+        setImportAirtable((prev) => ({ ...prev, airtableData: body }));
+        openTableModal("importAirtable");
+      })
+      .then(() => {
+        setLoading(false);
+        setError(null);
+      })
+      .catch((error) => {
+        console.error(error);
+        setLoading(false);
+      });
+  };
+
+  return (
+    <>
+      <Typography variant="caption" color="gray">
+        Forget the storage limitations of Airtable. Migrate your app data from
+        Airtable to a more scalable Firestore database that you can easily
+        manage with Rowy.
+      </Typography>
+      <TextField
+        variant="filled"
+        autoFocus
+        fullWidth
+        label="Airtable API Key"
+        placeholder="Insert your API key here"
+        value={apiKey}
+        onChange={(e) =>
+          setImportAirtable((prev) => ({
+            ...prev,
+            apiKey: e.currentTarget.value,
+          }))
+        }
+        helperText={error?.apiKey?.message}
+        error={!!error?.apiKey?.message}
+      />
+      <TextField
+        variant="filled"
+        autoFocus
+        fullWidth
+        label="Airtable Base ID"
+        placeholder="Insert your Base ID here"
+        value={baseId}
+        onChange={(e) => {
+          setImportAirtable((prev) => ({
+            ...prev,
+            baseId: e.currentTarget.value,
+          }));
+        }}
+        helperText={error?.baseId?.message}
+        error={!!error?.baseId?.message}
+      />
+      <TextField
+        variant="filled"
+        autoFocus
+        fullWidth
+        label="Airtable Table Name or ID"
+        placeholder="Insert your Table Name or ID here"
+        value={tableId}
+        onChange={(e) => {
+          setImportAirtable((prev) => ({
+            ...prev,
+            tableId: e.currentTarget.value,
+          }));
+        }}
+        helperText={error?.tableId?.message}
+        error={!!error?.tableId?.message}
+      />
+      <Button
+        variant="contained"
+        color="primary"
+        disabled={loading}
+        sx={{
+          my: 2,
+          mx: "auto",
+          display: "flex",
+          minWidth: 100,
+        }}
+        onClick={() => {
+          handleAirtableConnection();
+          logEvent(analytics, `import_airtable`);
+        }}
+      >
+        Continue
+      </Button>
+    </>
+  );
+}
diff --git a/src/components/TableToolbar/ImportData/ImportFromCsv.tsx b/src/components/TableToolbar/ImportData/ImportFromCsv.tsx
new file mode 100644
index 00000000..40ec3f84
--- /dev/null
+++ b/src/components/TableToolbar/ImportData/ImportFromCsv.tsx
@@ -0,0 +1,318 @@
+import { useState, useCallback, useRef, useEffect } from "react";
+import { useAtom, useSetAtom } from "jotai";
+import { parse } from "csv-parse/browser/esm";
+import { useDropzone } from "react-dropzone";
+import { useDebouncedCallback } from "use-debounce";
+import { useSnackbar } from "notistack";
+
+import {
+  Button,
+  Grid,
+  Typography,
+  TextField,
+  FormHelperText,
+  Divider,
+} from "@mui/material";
+import Tab from "@mui/material/Tab";
+import TabContext from "@mui/lab/TabContext";
+import TabList from "@mui/lab/TabList";
+import TabPanel from "@mui/lab/TabPanel";
+
+import { Upload as FileUploadIcon } from "@src/assets/icons";
+import CheckIcon from "@mui/icons-material/CheckCircle";
+
+import {
+  tableModalAtom,
+  importCsvAtom,
+  tableScope,
+} from "@src/atoms/tableScope";
+import { analytics, logEvent } from "@src/analytics";
+
+export enum ImportMethod {
+  paste = "paste",
+  upload = "upload",
+  url = "url",
+}
+
+export default function ImportFromCsv() {
+  const [{ importType: importTypeCsv, csvData }, setImportCsv] = useAtom(
+    importCsvAtom,
+    tableScope
+  );
+  const [tab, setTab] = useState("upload");
+  const openTableModal = useSetAtom(tableModalAtom, tableScope);
+  const importMethodRef = useRef(ImportMethod.upload);
+  const importTypeRef = useRef(importTypeCsv);
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState<string | any>("");
+  const { enqueueSnackbar } = useSnackbar();
+  const validCsv =
+    csvData !== null && csvData?.columns.length > 0 && csvData?.rows.length > 0;
+
+  useEffect(() => {
+    return () => {
+      setImportCsv({ importType: "csv", csvData: null });
+    };
+  }, [setImportCsv]);
+
+  const parseCsv = useCallback(
+    (csvString: string) =>
+      parse(csvString, { delimiter: [",", "\t"] }, (err, rows) => {
+        if (err) {
+          setError(err.message);
+        } else {
+          const columns = rows.shift() ?? [];
+          if (columns.length === 0) {
+            setError("No columns detected");
+          } else {
+            const mappedRows = rows.map((row: any) =>
+              row.reduce(
+                (a: any, c: any, i: number) => ({ ...a, [columns[i]]: c }),
+                {}
+              )
+            );
+            setImportCsv({
+              importType: importTypeRef.current,
+              csvData: { columns, rows: mappedRows },
+            });
+            setError("");
+          }
+        }
+      }),
+    [setImportCsv]
+  );
+
+  const onDrop = useCallback(
+    async (acceptedFiles: File[]) => {
+      try {
+        const file = acceptedFiles[0];
+        const reader = new FileReader();
+        reader.onload = (event: any) => parseCsv(event.target.result);
+        reader.readAsText(file);
+        importTypeRef.current =
+          file.type === "text/tab-separated-values" ? "tsv" : "csv";
+      } catch (error) {
+        enqueueSnackbar(`Please import a .tsv or .csv file`, {
+          variant: "error",
+          anchorOrigin: {
+            vertical: "top",
+            horizontal: "center",
+          },
+        });
+      }
+    },
+    [enqueueSnackbar, parseCsv]
+  );
+
+  const { getRootProps, getInputProps, isDragActive } = useDropzone({
+    onDrop,
+    multiple: false,
+    accept: ["text/csv", "text/tab-separated-values"],
+  });
+
+  function setDataTypeRef(data: string) {
+    const getFirstLine = data?.match(/^(.*)/)?.[0];
+    /*
+     *  Catching edge case with regex
+     *  EG: "hello\tworld"\tFirst
+     *  - find \t between quotes, and replace with '\s'
+     *  - w/ the \t pattern test it against the formatted string
+     */
+    const strInQuotes = /"(.*?)"/;
+    const tabsWithSpace = (str: string) => str.replace("\t", "s");
+    const formatString =
+      getFirstLine?.replace(strInQuotes, tabsWithSpace) ?? "";
+    const tabPattern = /\t/;
+    return tabPattern.test(formatString)
+      ? (importTypeRef.current = "tsv")
+      : (importTypeRef.current = "csv");
+  }
+  const handlePaste = useDebouncedCallback((value: string) => {
+    parseCsv(value);
+    setDataTypeRef(value);
+  }, 1000);
+
+  const handleUrl = useDebouncedCallback((value: string) => {
+    setLoading(true);
+    setError("");
+    fetch(value, { mode: "no-cors" })
+      .then((res) => res.text())
+      .then((data) => {
+        parseCsv(data);
+        setDataTypeRef(data);
+        setLoading(false);
+      })
+      .catch((e) => {
+        setError(e.message);
+        setLoading(false);
+      });
+  }, 1000);
+
+  return (
+    <>
+      <TabContext value={tab}>
+        <TabList
+          onChange={(_, v) => {
+            setTab(v);
+            setImportCsv({
+              importType: importTypeRef.current,
+              csvData: null,
+            });
+            setError("");
+          }}
+          aria-label="Import CSV method tabs"
+          action={(actions) =>
+            setTimeout(() => actions?.updateIndicator(), 200)
+          }
+          variant="fullWidth"
+        >
+          <Tab
+            label="Upload"
+            value="upload"
+            onClick={() => (importMethodRef.current = ImportMethod.upload)}
+          />
+          <Tab
+            label="Paste"
+            value="paste"
+            onClick={() => (importMethodRef.current = ImportMethod.paste)}
+          />
+          <Tab
+            label="URL"
+            value="url"
+            onClick={() => (importMethodRef.current = ImportMethod.url)}
+          />
+        </TabList>
+        <Divider style={{ marginTop: -1 }} />
+
+        <TabPanel value="upload">
+          <Grid
+            container
+            justifyContent="center"
+            alignContent="center"
+            alignItems="center"
+            direction="column"
+            {...getRootProps()}
+            sx={[
+              {
+                height: 137,
+                borderRadius: 1,
+                border: `dashed 2px currentColor`,
+                borderColor: "divider",
+                backgroundColor: "action.input",
+                cursor: "pointer",
+
+                "& svg": {
+                  opacity: (theme) => theme.palette.action.activeOpacity,
+                },
+
+                "&:focus": {
+                  borderColor: "primary.main",
+                  color: "primary.main",
+                  outline: "none",
+                },
+              },
+              error ? { borderColor: "error.main", color: "error.main" } : {},
+            ]}
+          >
+            <input {...getInputProps()} />
+            {isDragActive ? (
+              <Typography variant="button" color="primary">
+                Drop CSV or TSV file here…
+              </Typography>
+            ) : (
+              <>
+                <Grid item>
+                  {validCsv ? <CheckIcon /> : <FileUploadIcon />}
+                </Grid>
+                <Grid item>
+                  <Typography variant="button" color="inherit">
+                    {validCsv
+                      ? "Valid CSV or TSV"
+                      : "Click to upload or drop CSV or TSV file here"}
+                  </Typography>
+                </Grid>
+              </>
+            )}
+          </Grid>
+
+          {error && (
+            <FormHelperText error sx={{ my: 0.5, mx: 1.5 }}>
+              {error}
+            </FormHelperText>
+          )}
+        </TabPanel>
+
+        <TabPanel value="paste">
+          <TextField
+            variant="filled"
+            multiline
+            inputProps={{ minRows: 3 }}
+            autoFocus
+            fullWidth
+            label="Paste CSV or TSV text"
+            placeholder="column, column, …"
+            onChange={(e) => {
+              if (csvData !== null)
+                setImportCsv({
+                  importType: importTypeRef.current,
+                  csvData: null,
+                });
+              handlePaste(e.target.value);
+            }}
+            sx={{
+              typography: "body2",
+              fontFamily: "fontFamilyMono",
+
+              "& .MuiInputBase-input": {
+                whiteSpace: "nowrap",
+                overflow: "auto",
+                fontFamily: "mono",
+              },
+            }}
+            helperText={error}
+            error={!!error}
+          />
+        </TabPanel>
+
+        <TabPanel value="url">
+          <TextField
+            variant="filled"
+            autoFocus
+            fullWidth
+            label="Paste URL to CSV or TSV file"
+            placeholder="https://"
+            onChange={(e) => {
+              if (csvData !== null)
+                setImportCsv({
+                  importType: importTypeRef.current,
+                  csvData: null,
+                });
+              handleUrl(e.target.value);
+            }}
+            helperText={loading ? "Fetching…" : error}
+            error={!!error}
+          />
+        </TabPanel>
+        <Button
+          variant="contained"
+          color="primary"
+          disabled={!validCsv}
+          sx={{
+            mb: 2,
+            mx: "auto",
+            display: "flex",
+            minWidth: 100,
+          }}
+          onClick={() => {
+            openTableModal("importCsv");
+            logEvent(analytics, `import_${importMethodRef.current}`, {
+              type: importTypeRef.current,
+            });
+          }}
+        >
+          Continue
+        </Button>
+      </TabContext>
+    </>
+  );
+}
diff --git a/src/components/TableToolbar/TableToolbar.tsx b/src/components/TableToolbar/TableToolbar.tsx
index b7858176..374f7aa9 100644
--- a/src/components/TableToolbar/TableToolbar.tsx
+++ b/src/components/TableToolbar/TableToolbar.tsx
@@ -35,7 +35,7 @@ import { FieldType } from "@src/constants/fields";
 // prettier-ignore
 const Filters = lazy(() => import("./Filters" /* webpackChunkName: "Filters" */));
 // prettier-ignore
-const ImportCsv = lazy(() => import("./ImportCsv" /* webpackChunkName: "ImportCsv" */));
+const ImportData = lazy(() => import("./ImportData/ImportData" /* webpackChunkName: "ImportData" */));
 // prettier-ignore
 const ReExecute = lazy(() => import("./ReExecute" /* webpackChunkName: "ReExecute" */));
 
@@ -96,7 +96,7 @@ export default function TableToolbar() {
       <div /> {/* Spacer */}
       {tableSettings.tableType !== "collectionGroup" && (
         <Suspense fallback={<ButtonSkeleton />}>
-          <ImportCsv />
+          <ImportData />
         </Suspense>
       )}
       <Suspense fallback={<ButtonSkeleton />}>

From 7511027612c57f0243f0168c705c8f6861ad72e2 Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Thu, 11 Aug 2022 10:08:00 +0300
Subject: [PATCH 070/309] feat(airtable-migration): fix id - used __rowy_ref
 object to set document id - add document id validation

---
 src/atoms/tableScope/rowActions.ts            |  4 +-
 .../ImportAirtableWizard.tsx                  |  2 +-
 .../ImportCsvWizard/ImportCsvWizard.tsx       | 39 ++++++++++++++++---
 .../ImportCsvWizard/Step1Columns.tsx          | 38 ++++++++++++++++++
 .../TableModals/ImportCsvWizard/utils.ts      |  4 ++
 5 files changed, 78 insertions(+), 9 deletions(-)
 create mode 100644 src/components/TableModals/ImportCsvWizard/utils.ts

diff --git a/src/atoms/tableScope/rowActions.ts b/src/atoms/tableScope/rowActions.ts
index cbb9cb3d..1b91bd36 100644
--- a/src/atoms/tableScope/rowActions.ts
+++ b/src/atoms/tableScope/rowActions.ts
@@ -265,8 +265,8 @@ export const bulkAddRowsAtom = atom(
 
     // Assign a random ID to each row
     const operations = rows.map((row) => ({
-      type: row?.id ? ("update" as "update") : ("add" as "add"),
-      path: `${collection}/${row?.id ?? generateId()}`,
+      type: row?._rowy_ref?.id ? ("update" as "update") : ("add" as "add"),
+      path: `${collection}/${row?._rowy_ref?.id ?? generateId()}`,
       data: { ...initialValues, ...omitRowyFields(row) },
     }));
 
diff --git a/src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx b/src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx
index 2de2bc7a..35e9f334 100644
--- a/src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx
+++ b/src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx
@@ -104,7 +104,7 @@ export default function ImportAirtableWizard({ onClose }: ITableModalProps) {
           ? parser(record.fields[pair.fieldKey])
           : record.fields[pair.fieldKey];
         return config.documentId === "recordId"
-          ? { ...a, [pair.columnKey]: value, id: record.id }
+          ? { ...a, [pair.columnKey]: value, _rowy_ref: { id: record.id } }
           : { ...a, [pair.columnKey]: value };
       }, {})
     );
diff --git a/src/components/TableModals/ImportCsvWizard/ImportCsvWizard.tsx b/src/components/TableModals/ImportCsvWizard/ImportCsvWizard.tsx
index c09ea77b..b35d7d24 100644
--- a/src/components/TableModals/ImportCsvWizard/ImportCsvWizard.tsx
+++ b/src/components/TableModals/ImportCsvWizard/ImportCsvWizard.tsx
@@ -37,10 +37,13 @@ import {
 import { ColumnConfig } from "@src/types/table";
 import { getFieldProp } from "@src/components/fields";
 import { analytics, logEvent } from "@src/analytics";
+import { isValidDocId } from "./utils";
 
 export type CsvConfig = {
   pairs: { csvKey: string; columnKey: string }[];
   newColumns: ColumnConfig[];
+  documentId: "auto" | "column";
+  documentIdCsvKey?: string;
 };
 
 export interface IStepProps {
@@ -68,6 +71,7 @@ export default function ImportCsvWizard({ onClose }: ITableModalProps) {
   const [config, setConfig] = useState<CsvConfig>({
     pairs: [],
     newColumns: [],
+    documentId: "auto",
   });
   const updateConfig: IStepProps["updateConfig"] = useCallback((value) => {
     setConfig((prev) => {
@@ -77,7 +81,7 @@ export default function ImportCsvWizard({ onClose }: ITableModalProps) {
         "key"
       ).filter((col) => pairs.some((pair) => pair.columnKey === col.key));
 
-      return { pairs, newColumns };
+      return { ...prev, pairs, newColumns };
     });
   }, []);
 
@@ -95,7 +99,18 @@ export default function ImportCsvWizard({ onClose }: ITableModalProps) {
         const value = csvFieldParser
           ? csvFieldParser(row[pair.csvKey], matchingColumn.config)
           : row[pair.csvKey];
-        return { ...a, [pair.columnKey]: value };
+
+        return config.documentId === "column"
+          ? {
+              ...a,
+              [pair.columnKey]: value,
+              _rowy_ref: {
+                id: config.documentIdCsvKey
+                  ? row[config.documentIdCsvKey]
+                  : null,
+              },
+            }
+          : { ...a, [pair.columnKey]: value };
       }, {})
     );
   }, [csvData, columns, config]);
@@ -103,17 +118,21 @@ export default function ImportCsvWizard({ onClose }: ITableModalProps) {
   const handleFinish = async () => {
     if (!parsedRows) return;
     console.time("importCsv");
+    const validRows =
+      config.documentId === "column"
+        ? parsedRows.filter((row) => isValidDocId(row._rowy_ref.id))
+        : parsedRows;
     snackbarProgressRef.current?.setProgress(0);
     const loadingSnackbar = enqueueSnackbar(
       `Importing ${Number(
-        parsedRows.length
+        validRows.length
       ).toLocaleString()} rows. This might take a while.`,
       {
         persist: true,
         action: (
           <SnackbarProgress
             stateRef={snackbarProgressRef}
-            target={Math.ceil(parsedRows.length / 500)}
+            target={Math.ceil(validRows.length / 500)}
             label=" batches"
           />
         ),
@@ -145,9 +164,17 @@ export default function ImportCsvWizard({ onClose }: ITableModalProps) {
       for (const col of config.newColumns)
         promises.push(addColumn({ config: col }));
 
+      if (validRows.length < parsedRows.length) {
+        enqueueSnackbar(
+          `${Number(
+            parsedRows.length - validRows.length
+          ).toLocaleString()} invalid rows skipped!`,
+          { variant: "warning" }
+        );
+      }
       promises.push(
         bulkAddRows({
-          rows: parsedRows,
+          rows: validRows,
           collection: tableSettings.collection,
           onBatchCommit: (batchNumber: number) =>
             snackbarProgressRef.current?.setProgress(batchNumber),
@@ -158,7 +185,7 @@ export default function ImportCsvWizard({ onClose }: ITableModalProps) {
       await Promise.all(promises);
       logEvent(analytics, "import_success", { type: importType });
       enqueueSnackbar(
-        `Imported ${Number(parsedRows.length).toLocaleString()} rows`,
+        `Imported ${Number(validRows.length).toLocaleString()} rows`,
         { variant: "success" }
       );
     } catch (e) {
diff --git a/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx b/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx
index 8643c2c2..fecb82ec 100644
--- a/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx
+++ b/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx
@@ -10,10 +10,14 @@ import {
   FormControlLabel,
   Checkbox,
   Chip,
+  FormControl,
+  RadioGroup,
+  Radio,
 } from "@mui/material";
 import ArrowIcon from "@mui/icons-material/ArrowForward";
 
 import { IStepProps } from ".";
+import { CsvConfig } from "@src/components/TableModals/ImportCsvWizard";
 import FadeList from "@src/components/TableModals/ScrollableList";
 import Column, { COLUMN_HEADER_HEIGHT } from "@src/components/Table/Column";
 import MultiSelect from "@rowy/multiselect";
@@ -268,6 +272,40 @@ export default function Step1Columns({
           );
         })}
       </FadeList>
+      <Grid container marginTop={2}>
+        <Typography variant="subtitle2" gutterBottom component="h2">
+          Document Ids (Optional)
+        </Typography>
+        <Divider />
+        <Grid item xs={12}>
+          <FormControl>
+            <RadioGroup
+              defaultValue="auto"
+              name="radio-buttons-group"
+              sx={{ flexDirection: "row" }}
+              onChange={(e) => {
+                const documentId = e.currentTarget.value as "auto" | "column";
+                setConfig((prev: CsvConfig) => ({
+                  ...prev,
+                  documentId,
+                  documentIdCsvKey: "number",
+                }));
+              }}
+            >
+              <FormControlLabel
+                value="auto"
+                control={<Radio />}
+                label="Auto-Generated"
+              />
+              <FormControlLabel
+                value="column"
+                control={<Radio />}
+                label="Pick Column"
+              />
+            </RadioGroup>
+          </FormControl>
+        </Grid>
+      </Grid>
     </div>
   );
 }
diff --git a/src/components/TableModals/ImportCsvWizard/utils.ts b/src/components/TableModals/ImportCsvWizard/utils.ts
new file mode 100644
index 00000000..0ad40df8
--- /dev/null
+++ b/src/components/TableModals/ImportCsvWizard/utils.ts
@@ -0,0 +1,4 @@
+export const REGEX_DOCUMENT_ID = /^(?!\.\.?$)(?!.*__.*__)([^/]{1,1500})$/;
+
+export const isValidDocId = (documentId: string) =>
+  REGEX_DOCUMENT_ID.test(documentId);

From 076a1a0fbd9645519ec3bb86ca26a4d6a6f44566 Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Thu, 11 Aug 2022 10:46:28 +0300
Subject: [PATCH 071/309] feat(airtable-migration): add id column select

---
 .../ImportCsvWizard/Step1Columns.tsx          | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx b/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx
index fecb82ec..05b05512 100644
--- a/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx
+++ b/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx
@@ -13,6 +13,8 @@ import {
   FormControl,
   RadioGroup,
   Radio,
+  TextField,
+  MenuItem,
 } from "@mui/material";
 import ArrowIcon from "@mui/icons-material/ArrowForward";
 
@@ -288,7 +290,6 @@ export default function Step1Columns({
                 setConfig((prev: CsvConfig) => ({
                   ...prev,
                   documentId,
-                  documentIdCsvKey: "number",
                 }));
               }}
             >
@@ -302,6 +303,30 @@ export default function Step1Columns({
                 control={<Radio />}
                 label="Pick Column"
               />
+              <TextField
+                select
+                value={config.documentIdCsvKey}
+                onChange={(e) =>
+                  setConfig((prev) => ({
+                    ...prev,
+                    documentIdCsvKey: e.target.value,
+                  }))
+                }
+                sx={{ width: 200 }}
+                SelectProps={{
+                  MenuProps: {
+                    sx: { height: 200 },
+                    anchorOrigin: { vertical: "bottom", horizontal: "right" },
+                    transformOrigin: { vertical: "top", horizontal: "right" },
+                  },
+                }}
+              >
+                {csvData.columns.map((column) => (
+                  <MenuItem key={column} value={column}>
+                    {column}
+                  </MenuItem>
+                ))}
+              </TextField>
             </RadioGroup>
           </FormControl>
         </Grid>

From 3c020b23eb46f7c043f513a2ff12fe695cfbc932 Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Fri, 12 Aug 2022 05:29:46 +0300
Subject: [PATCH 072/309] feat(airtable-migration): add ui improvements - add
 step error messages - add invalid rows information

---
 .../ImportCsvWizard/ImportCsvWizard.tsx       | 27 ++++++++-----
 .../ImportCsvWizard/Step1Columns.tsx          | 40 ++++++++++++++++++-
 .../TableModals/ImportCsvWizard/utils.ts      |  1 +
 3 files changed, 56 insertions(+), 12 deletions(-)

diff --git a/src/components/TableModals/ImportCsvWizard/ImportCsvWizard.tsx b/src/components/TableModals/ImportCsvWizard/ImportCsvWizard.tsx
index b35d7d24..b046f9fb 100644
--- a/src/components/TableModals/ImportCsvWizard/ImportCsvWizard.tsx
+++ b/src/components/TableModals/ImportCsvWizard/ImportCsvWizard.tsx
@@ -3,7 +3,7 @@ import useMemoValue from "use-memo-value";
 import { useAtom, useSetAtom } from "jotai";
 import { RESET } from "jotai/utils";
 import { useSnackbar } from "notistack";
-import { uniqBy, find, isEqual } from "lodash-es";
+import { uniqBy, find, isEqual, groupBy } from "lodash-es";
 import { ITableModalProps } from "@src/components/TableModals";
 
 import {
@@ -43,7 +43,7 @@ export type CsvConfig = {
   pairs: { csvKey: string; columnKey: string }[];
   newColumns: ColumnConfig[];
   documentId: "auto" | "column";
-  documentIdCsvKey?: string;
+  documentIdCsvKey: string | null;
 };
 
 export interface IStepProps {
@@ -72,6 +72,7 @@ export default function ImportCsvWizard({ onClose }: ITableModalProps) {
     pairs: [],
     newColumns: [],
     documentId: "auto",
+    documentIdCsvKey: null,
   });
   const updateConfig: IStepProps["updateConfig"] = useCallback((value) => {
     setConfig((prev) => {
@@ -115,13 +116,17 @@ export default function ImportCsvWizard({ onClose }: ITableModalProps) {
     );
   }, [csvData, columns, config]);
 
+  const { validRows, invalidRows } =
+    config.documentId === "column"
+      ? groupBy(parsedRows, (row) =>
+          isValidDocId(row._rowy_ref?.id) ? "validRows" : "invalidRows"
+        )
+      : { validRows: parsedRows, invalidRows: [] };
+  console.log({ validRows, invalidRows });
+
   const handleFinish = async () => {
     if (!parsedRows) return;
     console.time("importCsv");
-    const validRows =
-      config.documentId === "column"
-        ? parsedRows.filter((row) => isValidDocId(row._rowy_ref.id))
-        : parsedRows;
     snackbarProgressRef.current?.setProgress(0);
     const loadingSnackbar = enqueueSnackbar(
       `Importing ${Number(
@@ -166,7 +171,7 @@ export default function ImportCsvWizard({ onClose }: ITableModalProps) {
 
       if (validRows.length < parsedRows.length) {
         enqueueSnackbar(
-          `${Number(
+          `Invalid document ID! ${Number(
             parsedRows.length - validRows.length
           ).toLocaleString()} invalid rows skipped!`,
           { variant: "warning" }
@@ -234,14 +239,16 @@ export default function ImportCsvWizard({ onClose }: ITableModalProps) {
             ),
             content: (
               <Step1Columns
-                csvData={csvData}
+                csvData={{ ...csvData, invalidRows }}
                 config={config}
                 setConfig={setConfig}
                 updateConfig={updateConfig}
                 isXs={isXs}
               />
             ),
-            disableNext: config.pairs.length === 0,
+            disableNext:
+              config.pairs.length === 0 ||
+              (config.documentId === "column" && !config.documentIdCsvKey),
           },
           config.newColumns.length > 0 && {
             title: "Set column types",
@@ -267,7 +274,7 @@ export default function ImportCsvWizard({ onClose }: ITableModalProps) {
               "Preview your data with your configured columns. You can change column types by clicking “Edit type” from the column menu at any time.",
             content: (
               <Step3Preview
-                csvData={{ ...csvData, rows: parsedRows }}
+                csvData={{ ...csvData, rows: validRows }}
                 config={config}
                 setConfig={setConfig}
                 updateConfig={updateConfig}
diff --git a/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx b/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx
index 05b05512..1dd0ce76 100644
--- a/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx
+++ b/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx
@@ -15,6 +15,8 @@ import {
   Radio,
   TextField,
   MenuItem,
+  Alert,
+  AlertTitle,
 } from "@mui/material";
 import ArrowIcon from "@mui/icons-material/ArrowForward";
 
@@ -28,6 +30,7 @@ import {
   tableScope,
   tableSchemaAtom,
   tableColumnsOrderedAtom,
+  ImportCsvData,
 } from "@src/atoms/tableScope";
 import { FieldType } from "@src/constants/fields";
 import { suggestType } from "@src/components/TableModals/ImportExistingWizard/utils";
@@ -38,7 +41,9 @@ export default function Step1Columns({
   updateConfig,
   setConfig,
   isXs,
-}: IStepProps) {
+}: IStepProps & {
+  csvData: NonNullable<ImportCsvData & { invalidRows: Record<string, any> }>;
+}) {
   const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
   const [tableColumnsOrdered] = useAtom(tableColumnsOrderedAtom, tableScope);
 
@@ -132,6 +137,19 @@ export default function Step1Columns({
     }
   };
 
+  const stepErrors = () => {
+    const errors = [];
+    if (config.pairs.length < 1) {
+      errors.push("You must select at least one column to import!");
+    }
+    console.log(config.documentId);
+    console.log(config.documentIdCsvKey);
+    if (config.documentId === "column" && !config.documentIdCsvKey) {
+      errors.push("You must select a column for document ID!");
+    }
+    return errors;
+  };
+
   return (
     <div>
       <Grid container spacing={7}>
@@ -290,6 +308,7 @@ export default function Step1Columns({
                 setConfig((prev: CsvConfig) => ({
                   ...prev,
                   documentId,
+                  documentIdCsvKey: null,
                 }));
               }}
             >
@@ -304,6 +323,7 @@ export default function Step1Columns({
                 label="Pick Column"
               />
               <TextField
+                disabled={config.documentId !== "column"}
                 select
                 value={config.documentIdCsvKey}
                 onChange={(e) =>
@@ -312,14 +332,23 @@ export default function Step1Columns({
                     documentIdCsvKey: e.target.value,
                   }))
                 }
-                sx={{ width: 200 }}
+                sx={{ width: isXs ? "100%" : 200, margin: "auto" }}
                 SelectProps={{
+                  displayEmpty: true,
+                  renderValue: (value) => (
+                    <>{value ? value : "Select ID Column"}</>
+                  ),
                   MenuProps: {
                     sx: { height: 200 },
                     anchorOrigin: { vertical: "bottom", horizontal: "right" },
                     transformOrigin: { vertical: "top", horizontal: "right" },
                   },
                 }}
+                helperText={
+                  config.documentId === "column" &&
+                  csvData.invalidRows &&
+                  `Invalid Rows: ${csvData.invalidRows.length}/${csvData.rows.length}`
+                }
               >
                 {csvData.columns.map((column) => (
                   <MenuItem key={column} value={column}>
@@ -330,6 +359,13 @@ export default function Step1Columns({
             </RadioGroup>
           </FormControl>
         </Grid>
+        <Grid item xs={12}>
+          {stepErrors().map((error) => (
+            <Alert severity="error" sx={{ my: 1 }}>
+              <AlertTitle>{error}</AlertTitle>
+            </Alert>
+          ))}
+        </Grid>
       </Grid>
     </div>
   );
diff --git a/src/components/TableModals/ImportCsvWizard/utils.ts b/src/components/TableModals/ImportCsvWizard/utils.ts
index 0ad40df8..f6a0992d 100644
--- a/src/components/TableModals/ImportCsvWizard/utils.ts
+++ b/src/components/TableModals/ImportCsvWizard/utils.ts
@@ -1,3 +1,4 @@
+// https://firebase.google.com/docs/firestore/quotas
 export const REGEX_DOCUMENT_ID = /^(?!\.\.?$)(?!.*__.*__)([^/]{1,1500})$/;
 
 export const isValidDocId = (documentId: string) =>

From 32bc5b4b30c2723f5396b2b741a78c4cfbe005b9 Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Fri, 12 Aug 2022 05:54:19 +0300
Subject: [PATCH 073/309] chore(airtable-migration): remove console logs

---
 .../TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx   | 1 -
 src/components/TableModals/ImportAirtableWizard/utils.ts        | 1 -
 src/components/TableModals/ImportCsvWizard/ImportCsvWizard.tsx  | 1 -
 src/components/TableModals/ImportCsvWizard/Step1Columns.tsx     | 2 --
 4 files changed, 5 deletions(-)

diff --git a/src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx b/src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx
index 35e9f334..e334077c 100644
--- a/src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx
+++ b/src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx
@@ -152,7 +152,6 @@ export default function ImportAirtableWizard({ onClose }: ITableModalProps) {
       // Airtable Rate Limits: 5 req/sec
       const RATE_LIMIT = { REQ_PER_SECOND: 5 };
       const fetcher = async (i: number = 0, offset?: string): Promise<void> => {
-        console.log(i, offset, promises);
         const { records, offset: nextPage } = await fetchRecords(offset);
         snackbarProgressRef.current?.setTarget((prev) => prev + records.length);
         promises.push(
diff --git a/src/components/TableModals/ImportAirtableWizard/utils.ts b/src/components/TableModals/ImportAirtableWizard/utils.ts
index ab8d4490..bc7ff765 100644
--- a/src/components/TableModals/ImportAirtableWizard/utils.ts
+++ b/src/components/TableModals/ImportAirtableWizard/utils.ts
@@ -48,7 +48,6 @@ export const suggestType = (data: { [key: string]: any }[], field: string) => {
     else results[result] += 1;
   });
 
-  console.log(results);
   const sortedResults = sortBy(Object.entries(results), 1).reverse();
   if (!sortedResults || !sortedResults[0]) return FieldType.json;
   const bestMatch = sortedResults[0][0];
diff --git a/src/components/TableModals/ImportCsvWizard/ImportCsvWizard.tsx b/src/components/TableModals/ImportCsvWizard/ImportCsvWizard.tsx
index b046f9fb..f8929d31 100644
--- a/src/components/TableModals/ImportCsvWizard/ImportCsvWizard.tsx
+++ b/src/components/TableModals/ImportCsvWizard/ImportCsvWizard.tsx
@@ -122,7 +122,6 @@ export default function ImportCsvWizard({ onClose }: ITableModalProps) {
           isValidDocId(row._rowy_ref?.id) ? "validRows" : "invalidRows"
         )
       : { validRows: parsedRows, invalidRows: [] };
-  console.log({ validRows, invalidRows });
 
   const handleFinish = async () => {
     if (!parsedRows) return;
diff --git a/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx b/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx
index 1dd0ce76..e90159bd 100644
--- a/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx
+++ b/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx
@@ -142,8 +142,6 @@ export default function Step1Columns({
     if (config.pairs.length < 1) {
       errors.push("You must select at least one column to import!");
     }
-    console.log(config.documentId);
-    console.log(config.documentIdCsvKey);
     if (config.documentId === "column" && !config.documentIdCsvKey) {
       errors.push("You must select a column for document ID!");
     }

From b26f57ceb5e2da9b44def9d87c28129ffe651569 Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Mon, 15 Aug 2022 08:57:20 +0300
Subject: [PATCH 074/309] feat(airtable-migration): improve form errors

---
 .../ImportData/ImportFromAirtable.tsx         | 28 +++++++++++++++----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/components/TableToolbar/ImportData/ImportFromAirtable.tsx b/src/components/TableToolbar/ImportData/ImportFromAirtable.tsx
index e7988b6b..53b226e0 100644
--- a/src/components/TableToolbar/ImportData/ImportFromAirtable.tsx
+++ b/src/components/TableToolbar/ImportData/ImportFromAirtable.tsx
@@ -27,20 +27,26 @@ export default function ImportFromAirtable() {
         baseId: "",
         tableId: "",
       });
+      setError(null);
+      setLoading(false);
     };
   }, [setImportAirtable]);
 
   const handleAirtableConnection = () => {
+    const errors = [];
     if (!apiKey) {
-      setError({ apiKey: { message: "API Key is missing!" } });
-      return;
+      errors.push({ apiKey: { message: "API Key is missing!" } });
     }
     if (!baseId) {
-      setError({ baseId: { message: "Base ID is missing!" } });
-      return;
+      errors.push({ baseId: { message: "Base ID is missing!" } });
     }
     if (!tableId) {
-      setError({ tableId: { message: "Table ID is missing!" } });
+      errors.push({ tableId: { message: "Table ID is missing!" } });
+    }
+    if (errors.length > 0) {
+      setError(
+        errors.reduce((obj, error) => ({ ...obj, ...error }), {} as any)
+      );
       return;
     }
     setLoading(true);
@@ -54,6 +60,18 @@ export default function ImportFromAirtable() {
       .then((body) => {
         const { error } = body;
         if (error) {
+          if (error.type === "AUTHENTICATION_REQUIRED") {
+            setError({ apiKey: { message: "Invalid API Key!" } });
+          }
+          if (error === "NOT_FOUND") {
+            setError({ baseId: { message: "Could not find base!" } });
+          }
+          if (
+            error.type === "TABLE_NOT_FOUND" ||
+            error.type === "MODEL_ID_NOT_FOUND"
+          ) {
+            setError({ tableId: { message: "Could not find table!" } });
+          }
           throw new Error(error);
         }
 

From 6afb1c023869ab9388774d43b0bcb5d9eaacc2a0 Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Mon, 15 Aug 2022 08:57:47 +0300
Subject: [PATCH 075/309] feat(airtable-migration): add next step disabler

---
 .../TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx b/src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx
index e334077c..afe95479 100644
--- a/src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx
+++ b/src/components/TableModals/ImportAirtableWizard/ImportAirtableWizard.tsx
@@ -237,6 +237,7 @@ export default function ImportAirtableWizard({ onClose }: ITableModalProps) {
                 isXs={isXs}
               />
             ),
+            disableNext: config.pairs.length === 0,
           },
           config.newColumns.length > 0 && {
             title: "Set column types",

From 796067af40f6ff3e03fc24f5ddfbd30e5230ba6b Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 15 Aug 2022 12:05:54 +0200
Subject: [PATCH 076/309] fix TableTutorial positioning when nav open

---
 src/components/TableTutorial/TableTutorial.tsx | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/components/TableTutorial/TableTutorial.tsx b/src/components/TableTutorial/TableTutorial.tsx
index 0df79ef7..e0190d7f 100644
--- a/src/components/TableTutorial/TableTutorial.tsx
+++ b/src/components/TableTutorial/TableTutorial.tsx
@@ -1,5 +1,5 @@
 import { useState, Fragment } from "react";
-import { useSetAtom } from "jotai";
+import { useAtom, useSetAtom } from "jotai";
 import { useNavigate } from "react-router-dom";
 
 import {
@@ -17,11 +17,19 @@ import ArrowForwardIcon from "@mui/icons-material/ArrowForward";
 import StepsProgress from "@src/components/StepsProgress";
 import { TUTORIAL_STEPS } from "./Steps";
 
-import { projectScope, confirmDialogAtom } from "@src/atoms/projectScope";
+import {
+  projectScope,
+  confirmDialogAtom,
+  navOpenAtom,
+} from "@src/atoms/projectScope";
 import { ROUTES } from "@src/constants/routes";
-import { NAV_DRAWER_COLLAPSED_WIDTH } from "@src/layouts/Navigation/NavDrawer";
+import {
+  NAV_DRAWER_COLLAPSED_WIDTH,
+  NAV_DRAWER_WIDTH,
+} from "@src/layouts/Navigation/NavDrawer";
 
 export default function TableTutorial() {
+  const [navOpen] = useAtom(navOpenAtom, projectScope);
   const confirm = useSetAtom(confirmDialogAtom, projectScope);
   const navigate = useNavigate();
 
@@ -56,7 +64,7 @@ export default function TableTutorial() {
           bottom: `env(safe-area-inset-bottom)`,
           left: {
             xs: `env(safe-area-inset-left)`,
-            md: NAV_DRAWER_COLLAPSED_WIDTH + 2,
+            md: (navOpen ? NAV_DRAWER_WIDTH : NAV_DRAWER_COLLAPSED_WIDTH) + 2,
           },
           right: `env(safe-area-inset-right)`,
           height: "min(50vh, 440px)",

From 50c26c16287fbafe9f91db97fe2611f8403a1d70 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 15 Aug 2022 12:06:01 +0200
Subject: [PATCH 077/309] bump version number

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b224e159..f6e3055d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rowy",
-  "version": "3.0.0-alpha",
+  "version": "3.0.0",
   "homepage": "https://rowy.io",
   "repository": {
     "type": "git",

From a39b7357967a8691969e98211b3747cf77e5a06d Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 15 Aug 2022 12:45:45 +0200
Subject: [PATCH 078/309] finish get started & tutorial logic

---
 src/App.tsx                                   |  4 +
 src/atoms/projectScope/user.ts                |  3 +
 .../GetStartedChecklist.tsx                   | 71 +++++++--------
 .../GetStartedProgress.tsx                    | 18 ++++
 .../useGetStartedCompletion.ts                | 25 ++++++
 .../TableTutorial/Steps/Step5Finish.tsx       | 66 ++++++++++++++
 src/components/TableTutorial/Steps/index.ts   |  2 +
 .../TableTutorial/TableTutorial.tsx           | 22 +++--
 src/constants/externalLinks.ts                |  3 +
 .../Navigation/NavDrawer/NavDrawer.tsx        | 87 ++++++++++---------
 src/pages/Settings/MembersPage.tsx            |  3 -
 11 files changed, 220 insertions(+), 84 deletions(-)
 create mode 100644 src/components/GetStartedChecklist/GetStartedProgress.tsx
 create mode 100644 src/components/GetStartedChecklist/useGetStartedCompletion.ts
 create mode 100644 src/components/TableTutorial/Steps/Step5Finish.tsx

diff --git a/src/App.tsx b/src/App.tsx
index 4ce92835..97209c9e 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -4,6 +4,7 @@ import { useAtom } from "jotai";
 
 import Loading from "@src/components/Loading";
 import ProjectSourceFirebase from "@src/sources/ProjectSourceFirebase";
+import MembersSourceFirebase from "@src/sources/MembersSourceFirebase";
 import ConfirmDialog from "@src/components/ConfirmDialog";
 import RowyRunModal from "@src/components/RowyRunModal";
 import NotFound from "@src/pages/NotFoundPage";
@@ -12,6 +13,7 @@ import RequireAuth from "@src/layouts/RequireAuth";
 import {
   projectScope,
   currentUserAtom,
+  userRolesAtom,
   altPressAtom,
 } from "@src/atoms/projectScope";
 import { ROUTES } from "@src/constants/routes";
@@ -64,11 +66,13 @@ const ThemeTestPage = lazy(() => import("@src/pages/Test/ThemeTestPage" /* webpa
 
 export default function App() {
   const [currentUser] = useAtom(currentUserAtom, projectScope);
+  const [userRoles] = useAtom(userRolesAtom, projectScope);
   useKeyPressWithAtom("Alt", altPressAtom, projectScope);
 
   return (
     <Suspense fallback={<Loading fullScreen />}>
       <ProjectSourceFirebase />
+      {userRoles.includes("ADMIN") && <MembersSourceFirebase />}
       <ConfirmDialog />
       <RowyRunModal />
 
diff --git a/src/atoms/projectScope/user.ts b/src/atoms/projectScope/user.ts
index ee111ed8..4f8aad75 100644
--- a/src/atoms/projectScope/user.ts
+++ b/src/atoms/projectScope/user.ts
@@ -36,6 +36,9 @@ export type UserSettings = Partial<{
       sorts: TableSort[];
     }>
   >;
+
+  /** Stores table tutorial completion */
+  tableTutorialComplete?: boolean;
 }>;
 /** User info and settings */
 export const userSettingsAtom = atom<UserSettings>({});
diff --git a/src/components/GetStartedChecklist/GetStartedChecklist.tsx b/src/components/GetStartedChecklist/GetStartedChecklist.tsx
index f68c60f0..259aee4a 100644
--- a/src/components/GetStartedChecklist/GetStartedChecklist.tsx
+++ b/src/components/GetStartedChecklist/GetStartedChecklist.tsx
@@ -5,11 +5,10 @@ import UncheckedIcon from "@mui/icons-material/RadioButtonUnchecked";
 import CheckedIcon from "@mui/icons-material/CheckCircleOutline";
 import AddIcon from "@mui/icons-material/Add";
 import MembersIcon from "@mui/icons-material/AccountCircleOutlined";
-import { Project as ProjectIcon } from "@src/assets/icons";
 
 import Modal, { IModalProps } from "@src/components/Modal";
 import SteppedAccordion from "@src/components/SteppedAccordion";
-import StepsProgress from "@src/components/StepsProgress";
+import GetStartedProgress from "./GetStartedProgress";
 
 import {
   projectScope,
@@ -20,6 +19,7 @@ import {
   NAV_DRAWER_WIDTH,
   NAV_DRAWER_COLLAPSED_WIDTH,
 } from "@src/layouts/Navigation/NavDrawer";
+import useGetStartedCompletion from "./useGetStartedCompletion";
 
 export interface IGetStartedChecklistProps extends Partial<IModalProps> {
   navOpen: boolean;
@@ -37,8 +37,15 @@ export default function GetStartedChecklist({
     projectScope
   );
 
+  const [completedSteps] = useGetStartedCompletion();
+
   if (!open) return null;
 
+  const incompleteIcon = <UncheckedIcon color="action" />;
+  const completeIcon = (
+    <CheckedIcon color="success" sx={{ color: "success.light" }} />
+  );
+
   return (
     <Modal
       {...props}
@@ -73,27 +80,34 @@ export default function GetStartedChecklist({
         },
       ]}
     >
-      <StepsProgress value={1} steps={5} sx={{ mb: 2 }} />
+      <GetStartedProgress sx={{ mb: 2 }} />
 
       <SteppedAccordion
         steps={[
           {
-            id: "workspace",
-            title: "Create a workspace",
+            id: "project",
+            title: "Create a project",
             labelButtonProps: {
-              icon: (
-                <CheckedIcon color="success" sx={{ color: "success.light" }} />
-              ),
+              icon: completedSteps.project ? completeIcon : incompleteIcon,
             },
-            content: null,
+            content: (
+              <Typography paragraph>
+                You’ve created a project and connected it to a data source.
+              </Typography>
+            ),
           },
           {
             id: "tutorial",
             title: "Complete the table tutorial",
-            labelButtonProps: { icon: <UncheckedIcon color="action" /> },
+            labelButtonProps: {
+              icon: completedSteps.tutorial ? completeIcon : incompleteIcon,
+            },
             content: (
               <>
-                <Typography>This is why you should</Typography>
+                <Typography>
+                  Learn the basic features and functions of Rowy before creating
+                  a table.
+                </Typography>
                 <Button variant="contained" color="primary">
                   Begin tutorial
                 </Button>
@@ -101,31 +115,17 @@ export default function GetStartedChecklist({
             ),
           },
           {
-            id: "project",
-            title: "Create a project",
-            labelButtonProps: { icon: <UncheckedIcon color="action" /> },
+            id: "table",
+            title: "Create a table",
+            labelButtonProps: {
+              icon: completedSteps.table ? completeIcon : incompleteIcon,
+            },
             content: (
               <>
                 <Typography>
-                  You’re ready to create a project and connect to a data source
+                  Use tables to manage the data from your database in a
+                  spreadsheet UI.
                 </Typography>
-                <Button
-                  variant="contained"
-                  color="primary"
-                  startIcon={<ProjectIcon />}
-                >
-                  Create project
-                </Button>
-              </>
-            ),
-          },
-          {
-            id: "table",
-            title: "Create a table",
-            labelButtonProps: { icon: <UncheckedIcon color="action" /> },
-            content: (
-              <>
-                <Typography>This is why you should</Typography>
                 <Button
                   variant="contained"
                   color="primary"
@@ -140,11 +140,14 @@ export default function GetStartedChecklist({
           {
             id: "members",
             title: "Invite team members",
-            labelButtonProps: { icon: <UncheckedIcon color="action" /> },
+            labelButtonProps: {
+              icon: completedSteps.members ? completeIcon : incompleteIcon,
+            },
             content: (
               <>
                 <Typography>
-                  Go to the members page to invite someone
+                  Collaborate on workspace projects by inviting your team
+                  members. You can control their roles and access.
                 </Typography>
                 <Button
                   variant="contained"
diff --git a/src/components/GetStartedChecklist/GetStartedProgress.tsx b/src/components/GetStartedChecklist/GetStartedProgress.tsx
new file mode 100644
index 00000000..8cf094e8
--- /dev/null
+++ b/src/components/GetStartedChecklist/GetStartedProgress.tsx
@@ -0,0 +1,18 @@
+import StepsProgress, {
+  IStepsProgressProps,
+} from "@src/components/StepsProgress";
+import useGetStartedCompletion from "./useGetStartedCompletion";
+
+export default function GetStartedProgress(
+  props: Omit<IStepsProgressProps, "value" | "steps">
+) {
+  const [completedSteps, count] = useGetStartedCompletion();
+
+  return (
+    <StepsProgress
+      {...props}
+      value={count}
+      steps={Object.keys(completedSteps).length}
+    />
+  );
+}
diff --git a/src/components/GetStartedChecklist/useGetStartedCompletion.ts b/src/components/GetStartedChecklist/useGetStartedCompletion.ts
new file mode 100644
index 00000000..e9bac12d
--- /dev/null
+++ b/src/components/GetStartedChecklist/useGetStartedCompletion.ts
@@ -0,0 +1,25 @@
+import { useAtom } from "jotai";
+import {
+  projectScope,
+  tablesAtom,
+  userSettingsAtom,
+  allUsersAtom,
+} from "@src/atoms/projectScope";
+
+export default function useGetStartedCompletion() {
+  const [tables] = useAtom(tablesAtom, projectScope);
+  const [userSettings] = useAtom(userSettingsAtom, projectScope);
+  const [allUsers] = useAtom(allUsersAtom, projectScope);
+
+  const completedSteps = {
+    project: true,
+    tutorial: Boolean(userSettings.tableTutorialComplete),
+    table: tables.length > 0,
+    members: allUsers.length > 0,
+  };
+
+  return [
+    completedSteps,
+    Object.values(completedSteps).reduce((a, c) => (c ? a + 1 : a), 0),
+  ] as const;
+}
diff --git a/src/components/TableTutorial/Steps/Step5Finish.tsx b/src/components/TableTutorial/Steps/Step5Finish.tsx
new file mode 100644
index 00000000..a851718c
--- /dev/null
+++ b/src/components/TableTutorial/Steps/Step5Finish.tsx
@@ -0,0 +1,66 @@
+import { ITableTutorialStepComponentProps } from ".";
+import { Typography, Link } from "@mui/material";
+import { EXTERNAL_LINKS } from "@src/constants/externalLinks";
+
+export const Step5Finish = {
+  id: "finish",
+  title: "Congrats, you’re ready to start building your own table! 🎉",
+  description: "",
+  StepComponent,
+};
+
+export default Step5Finish;
+
+function StepComponent({ setComplete }: ITableTutorialStepComponentProps) {
+  setComplete(true);
+
+  return (
+    <Typography
+      component="ul"
+      variant="body1"
+      sx={{ margin: 0, paddingLeft: "1em", "& > * + *": { mt: 1 } }}
+    >
+      <li>
+        Play around with the demo tables in our live community{" "}
+        <Link
+          href={EXTERNAL_LINKS.playground}
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          playground
+        </Link>{" "}
+        to learn what you can do with Rowy
+      </li>
+      <li>
+        Check out and deploy our{" "}
+        <Link
+          href={EXTERNAL_LINKS.templates}
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          templates
+        </Link>{" "}
+        to explore how Rowy can improve your project
+      </li>
+      <li>
+        Connect with us on{" "}
+        <Link
+          href={EXTERNAL_LINKS.discord}
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          Discord
+        </Link>{" "}
+        and{" "}
+        <Link
+          href={EXTERNAL_LINKS.gitHub}
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          GitHub
+        </Link>{" "}
+        and ask us how Rowy can help with your specific use case
+      </li>
+    </Typography>
+  );
+}
diff --git a/src/components/TableTutorial/Steps/index.ts b/src/components/TableTutorial/Steps/index.ts
index 556d3dce..b0dc1c67 100644
--- a/src/components/TableTutorial/Steps/index.ts
+++ b/src/components/TableTutorial/Steps/index.ts
@@ -2,12 +2,14 @@ import Step1Import from "./Step1Import";
 import Step2Add from "./Step2Add";
 import Step3Invite from "./Step3Invite";
 import Step4Code from "./Step4Code";
+import Step5Finish from "./Step5Finish";
 
 export const TUTORIAL_STEPS = [
   Step1Import,
   Step2Add,
   Step3Invite,
   Step4Code,
+  Step5Finish,
 ] as Array<ITableTutorialStepProps>;
 
 export interface ITableTutorialStepProps {
diff --git a/src/components/TableTutorial/TableTutorial.tsx b/src/components/TableTutorial/TableTutorial.tsx
index e0190d7f..2eb56f4c 100644
--- a/src/components/TableTutorial/TableTutorial.tsx
+++ b/src/components/TableTutorial/TableTutorial.tsx
@@ -21,6 +21,7 @@ import {
   projectScope,
   confirmDialogAtom,
   navOpenAtom,
+  updateUserSettingsAtom,
 } from "@src/atoms/projectScope";
 import { ROUTES } from "@src/constants/routes";
 import {
@@ -31,6 +32,7 @@ import {
 export default function TableTutorial() {
   const [navOpen] = useAtom(navOpenAtom, projectScope);
   const confirm = useSetAtom(confirmDialogAtom, projectScope);
+  const [updateUserSettings] = useAtom(updateUserSettingsAtom, projectScope);
   const navigate = useNavigate();
 
   const [completed, setCompleted] = useState(
@@ -38,6 +40,10 @@ export default function TableTutorial() {
   );
   const [currentStep, setCurrentStep] = useState(0);
 
+  const stepProps = TUTORIAL_STEPS[currentStep];
+  const StepComponent = stepProps.StepComponent;
+  const isFinal = currentStep === TUTORIAL_STEPS.length - 1;
+
   const handleComplete = (value: boolean) =>
     setCompleted((c) => {
       if (c[currentStep] === value) return c;
@@ -46,12 +52,16 @@ export default function TableTutorial() {
       return newCompleted;
     });
 
-  const handleNext = () =>
-    setCurrentStep((c) => Math.min(c + 1, TUTORIAL_STEPS.length - 1));
+  const handleNext = () => {
+    if (isFinal) {
+      if (updateUserSettings)
+        updateUserSettings({ tableTutorialComplete: true });
 
-  const stepProps = TUTORIAL_STEPS[currentStep];
-  const StepComponent = stepProps.StepComponent;
-  const isFinal = currentStep === TUTORIAL_STEPS.length - 1;
+      navigate(ROUTES.tables);
+    } else {
+      setCurrentStep((c) => Math.min(c + 1, TUTORIAL_STEPS.length - 1));
+    }
+  };
 
   return (
     <Slide in direction="up">
@@ -64,7 +74,7 @@ export default function TableTutorial() {
           bottom: `env(safe-area-inset-bottom)`,
           left: {
             xs: `env(safe-area-inset-left)`,
-            md: (navOpen ? NAV_DRAWER_WIDTH : NAV_DRAWER_COLLAPSED_WIDTH) + 2,
+            md: (navOpen ? NAV_DRAWER_WIDTH : NAV_DRAWER_COLLAPSED_WIDTH) + 8,
           },
           right: `env(safe-area-inset-right)`,
           height: "min(50vh, 440px)",
diff --git a/src/constants/externalLinks.ts b/src/constants/externalLinks.ts
index b0c73736..b75be8f4 100644
--- a/src/constants/externalLinks.ts
+++ b/src/constants/externalLinks.ts
@@ -5,7 +5,10 @@ export const EXTERNAL_LINKS = {
   homepage: meta.homepage,
   privacy: meta.homepage + "/privacy",
   terms: meta.homepage + "/terms",
+  templates: meta.homepage + "/templates",
   docs: meta.homepage.replace("//", "//docs."),
+  demo: meta.homepage.replace("//", "//demo."),
+  playground: meta.homepage.replace("//", "//demo."),
 
   gitHub: meta.repository.url.replace(".git", ""),
   discord: "https://discord.gg/B8yAD5PDX4",
diff --git a/src/layouts/Navigation/NavDrawer/NavDrawer.tsx b/src/layouts/Navigation/NavDrawer/NavDrawer.tsx
index 30c895d4..769a0667 100644
--- a/src/layouts/Navigation/NavDrawer/NavDrawer.tsx
+++ b/src/layouts/Navigation/NavDrawer/NavDrawer.tsx
@@ -29,7 +29,7 @@ import {
 
 import Logo from "@src/assets/Logo";
 import NavItem from "./NavItem";
-import StepsProgress from "@src/components/StepsProgress";
+import GetStartedProgress from "@src/components/GetStartedChecklist/GetStartedProgress";
 import CommunityMenu from "./CommunityMenu";
 import HelpMenu from "./HelpMenu";
 import { INavDrawerContentsProps } from "./NavDrawerContents";
@@ -37,6 +37,8 @@ import { INavDrawerContentsProps } from "./NavDrawerContents";
 import { projectScope, getStartedChecklistAtom } from "@src/atoms/projectScope";
 import { EXTERNAL_LINKS, WIKI_LINKS } from "@src/constants/externalLinks";
 import { TOP_BAR_HEIGHT } from "@src/layouts/Navigation/TopBar";
+import useGetStartedCompletion from "@src/components/GetStartedChecklist/useGetStartedCompletion";
+
 export const NAV_DRAWER_WIDTH = 256;
 export const NAV_DRAWER_COLLAPSED_WIDTH = 56;
 
@@ -68,6 +70,8 @@ export default function NavDrawer({
     getStartedChecklistAtom,
     projectScope
   );
+  const [getStartedCompleted, getStartedCompletionCount] =
+    useGetStartedCompletion();
 
   const [communityMenuAnchorEl, setCommunityMenuAnchorEl] =
     useState<HTMLButtonElement | null>(null);
@@ -239,50 +243,51 @@ export default function NavDrawer({
               <ol style={{ listStyle: "none", margin: 0, padding: 0 }}>
                 <Divider variant="middle" sx={{ mb: 1 }} />
 
-                <li>
-                  <NavItem
-                    onClick={() => {
-                      openGetStartedChecklist(true);
-                      setHover(false);
-                    }}
-                    sx={{
-                      mb: 1,
-                      py: 0.5,
-                      bgcolor: (theme) =>
-                        alpha(
-                          theme.palette.primary.main,
-                          theme.palette.action.selectedOpacity
-                        ),
-                      "&:hover": {
+                {getStartedCompletionCount <
+                  Object.keys(getStartedCompleted).length && (
+                  <li>
+                    <NavItem
+                      onClick={() => {
+                        openGetStartedChecklist(true);
+                        setHover(false);
+                      }}
+                      sx={{
+                        mb: 1,
+                        py: 0.5,
                         bgcolor: (theme) =>
                           alpha(
                             theme.palette.primary.main,
-                            theme.palette.action.selectedOpacity +
-                              theme.palette.action.hoverOpacity
+                            theme.palette.action.selectedOpacity
                           ),
-                      },
-                      "& *, &&:hover *": {
-                        color: (theme) =>
-                          theme.palette.primary[
-                            theme.palette.mode === "dark" ? "light" : "dark"
-                          ],
-                      },
-                    }}
-                  >
-                    <ListItemIcon>
-                      <ChecklistIcon />
-                    </ListItemIcon>
-                    <ListItemText
-                      primary="Get started"
-                      secondary={
-                        <StepsProgress value={1} steps={5} sx={{ mr: 3 }} />
-                      }
-                    />
-                    <ListItemSecondaryAction>
-                      <ChevronRightIcon />
-                    </ListItemSecondaryAction>
-                  </NavItem>
-                </li>
+                        "&:hover": {
+                          bgcolor: (theme) =>
+                            alpha(
+                              theme.palette.primary.main,
+                              theme.palette.action.selectedOpacity +
+                                theme.palette.action.hoverOpacity
+                            ),
+                        },
+                        "& *, &&:hover *": {
+                          color: (theme) =>
+                            theme.palette.primary[
+                              theme.palette.mode === "dark" ? "light" : "dark"
+                            ],
+                        },
+                      }}
+                    >
+                      <ListItemIcon>
+                        <ChecklistIcon />
+                      </ListItemIcon>
+                      <ListItemText
+                        primary="Get started"
+                        secondary={<GetStartedProgress sx={{ mr: 3 }} />}
+                      />
+                      <ListItemSecondaryAction>
+                        <ChevronRightIcon />
+                      </ListItemSecondaryAction>
+                    </NavItem>
+                  </li>
+                )}
 
                 <li>
                   <NavItem href={EXTERNAL_LINKS.docs}>
diff --git a/src/pages/Settings/MembersPage.tsx b/src/pages/Settings/MembersPage.tsx
index fdf276de..feb516ab 100644
--- a/src/pages/Settings/MembersPage.tsx
+++ b/src/pages/Settings/MembersPage.tsx
@@ -19,7 +19,6 @@ import UserSkeleton from "@src/components/Settings/UserManagement/UserSkeleton";
 import InviteUser from "@src/components/Settings/UserManagement/InviteUser";
 
 import { projectScope, allUsersAtom } from "@src/atoms/projectScope";
-import MembersSourceFirebase from "@src/sources/MembersSourceFirebase";
 import useBasicSearch from "@src/hooks/useBasicSearch";
 
 const SEARCH_KEYS = ["id", "user.displayName", "user.email"];
@@ -30,8 +29,6 @@ function MembersPage() {
 
   return (
     <Container maxWidth="sm" sx={{ px: 1, pt: 1, pb: 7 + 3 + 3 }}>
-      <MembersSourceFirebase />
-
       <FloatingSearch
         label="Search users"
         onChange={(e) => handleQuery(e.target.value)}

From 5a24aeb40bf890cc247c6f3ca238580a0bd2783a Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Mon, 15 Aug 2022 13:54:54 +0300
Subject: [PATCH 079/309] feat(airtable-migration): add next step disabler

---
 src/components/TableModals/ImportCsvWizard/ImportCsvWizard.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/TableModals/ImportCsvWizard/ImportCsvWizard.tsx b/src/components/TableModals/ImportCsvWizard/ImportCsvWizard.tsx
index f8929d31..ac67337e 100644
--- a/src/components/TableModals/ImportCsvWizard/ImportCsvWizard.tsx
+++ b/src/components/TableModals/ImportCsvWizard/ImportCsvWizard.tsx
@@ -247,6 +247,7 @@ export default function ImportCsvWizard({ onClose }: ITableModalProps) {
             ),
             disableNext:
               config.pairs.length === 0 ||
+              !validRows ||
               (config.documentId === "column" && !config.documentIdCsvKey),
           },
           config.newColumns.length > 0 && {

From 385f764e452d1eada9afe67996fd0cc0a531fd26 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 16 Aug 2022 12:06:36 +0200
Subject: [PATCH 080/309] GetStartedChecklist: close when user clicks an action

---
 .../GetStartedChecklist.tsx                    | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/components/GetStartedChecklist/GetStartedChecklist.tsx b/src/components/GetStartedChecklist/GetStartedChecklist.tsx
index 259aee4a..7a3a47e1 100644
--- a/src/components/GetStartedChecklist/GetStartedChecklist.tsx
+++ b/src/components/GetStartedChecklist/GetStartedChecklist.tsx
@@ -1,4 +1,5 @@
 import { useAtom, useSetAtom } from "jotai";
+import { Link } from "react-router-dom";
 
 import { Typography, Button } from "@mui/material";
 import UncheckedIcon from "@mui/icons-material/RadioButtonUnchecked";
@@ -20,6 +21,7 @@ import {
   NAV_DRAWER_COLLAPSED_WIDTH,
 } from "@src/layouts/Navigation/NavDrawer";
 import useGetStartedCompletion from "./useGetStartedCompletion";
+import { ROUTES } from "@src/constants/routes";
 
 export interface IGetStartedChecklistProps extends Partial<IModalProps> {
   navOpen: boolean;
@@ -108,7 +110,13 @@ export default function GetStartedChecklist({
                   Learn the basic features and functions of Rowy before creating
                   a table.
                 </Typography>
-                <Button variant="contained" color="primary">
+                <Button
+                  variant="contained"
+                  color="primary"
+                  component={Link}
+                  to={ROUTES.tableTutorial}
+                  onClick={() => setOpen(false)}
+                >
                   Begin tutorial
                 </Button>
               </>
@@ -130,7 +138,10 @@ export default function GetStartedChecklist({
                   variant="contained"
                   color="primary"
                   startIcon={<AddIcon />}
-                  onClick={() => openTableSettingsDialog({ open: true })}
+                  onClick={() => {
+                    openTableSettingsDialog({ open: true });
+                    setOpen(false);
+                  }}
                 >
                   Create table
                 </Button>
@@ -153,6 +164,9 @@ export default function GetStartedChecklist({
                   variant="contained"
                   color="primary"
                   startIcon={<MembersIcon />}
+                  component={Link}
+                  to={ROUTES.members}
+                  onClick={() => setOpen(false)}
                 >
                   Members
                 </Button>

From 9e1b53a9d5cd3038553bbea64dc19ee11f95fb4d Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 16 Aug 2022 15:45:22 +0200
Subject: [PATCH 081/309] add imagery to table tutorial

---
 src/assets/tutorial/community-dark.svg        |  37 +++++
 src/assets/tutorial/community-light.svg       |  37 +++++
 src/assets/tutorial/derivative-dark.gif       | Bin 0 -> 127069 bytes
 src/assets/tutorial/derivative-light.gif      | Bin 0 -> 113893 bytes
 src/assets/tutorial/invite-users-dark.gif     | Bin 0 -> 86394 bytes
 src/assets/tutorial/invite-users-light.gif    | Bin 0 -> 81996 bytes
 src/assets/tutorial/playground-dark.svg       |  12 ++
 src/assets/tutorial/playground-light.svg      |  12 ++
 src/assets/tutorial/templates-dark.svg        |  24 ++++
 src/assets/tutorial/templates-light.svg       |  24 ++++
 .../TableTutorial/Steps/Step1Import.tsx       |   2 +-
 .../TableTutorial/Steps/Step2Add.tsx          |   2 +-
 .../TableTutorial/Steps/Step3Invite.tsx       |  35 ++++-
 .../TableTutorial/Steps/Step4Code.tsx         |  35 ++++-
 .../TableTutorial/Steps/Step5Finish.tsx       | 132 +++++++++++-------
 .../TableTutorial/TableTutorial.tsx           |   2 +-
 16 files changed, 297 insertions(+), 57 deletions(-)
 create mode 100644 src/assets/tutorial/community-dark.svg
 create mode 100644 src/assets/tutorial/community-light.svg
 create mode 100644 src/assets/tutorial/derivative-dark.gif
 create mode 100644 src/assets/tutorial/derivative-light.gif
 create mode 100644 src/assets/tutorial/invite-users-dark.gif
 create mode 100644 src/assets/tutorial/invite-users-light.gif
 create mode 100644 src/assets/tutorial/playground-dark.svg
 create mode 100644 src/assets/tutorial/playground-light.svg
 create mode 100644 src/assets/tutorial/templates-dark.svg
 create mode 100644 src/assets/tutorial/templates-light.svg

diff --git a/src/assets/tutorial/community-dark.svg b/src/assets/tutorial/community-dark.svg
new file mode 100644
index 00000000..913fd0ae
--- /dev/null
+++ b/src/assets/tutorial/community-dark.svg
@@ -0,0 +1,37 @@
+<svg width="117" height="120" viewBox="0 0 117 120" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M104.634 68.6831C104.634 80.1972 100.53 90.6702 93.6709 98.8771C85.0353 109.228 72.0513 115.781 57.4749 115.781C43.511 115.781 31.0169 109.717 22.3813 100.102C14.9706 91.7726 10.4385 80.7484 10.4385 68.6831C10.4385 42.6538 31.5069 21.5854 57.5361 21.5854C83.5654 21.5854 104.634 42.6538 104.634 68.6831Z" stroke="#3E4450" stroke-width="2" stroke-miterlimit="10" stroke-dasharray="4 4"/>
+<path d="M74.8781 71.7725C74.5226 73.2834 73.9893 74.8833 73.3671 76.2164C71.6785 79.5049 69.0121 82.0824 65.7236 83.7711C62.3462 85.4598 58.3467 86.1708 54.3471 85.282C44.926 83.3267 38.8823 74.0833 40.8376 64.6622C42.7929 55.2411 51.9474 49.1085 61.3685 51.1527C64.7459 51.8637 67.6789 53.5524 70.1675 55.8632C74.3448 60.0405 76.1224 66.0843 74.8781 71.7725Z" fill="#3E4450" stroke="#949BAB" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M63.4127 66.7063H60.4132C59.8609 66.7063 59.4132 66.2586 59.4132 65.7063V62.7067C59.4132 61.9068 58.791 61.1958 57.9023 61.1958C57.1024 61.1958 56.3913 61.818 56.3913 62.7067V65.7063C56.3913 66.2586 55.9436 66.7063 55.3913 66.7063H52.3918C51.5919 66.7063 50.8809 67.3284 50.8809 68.2172C50.8809 69.106 51.503 69.7281 52.3918 69.7281H55.3913C55.9436 69.7281 56.3913 70.1759 56.3913 70.7281V73.7277C56.3913 74.5276 57.0135 75.2386 57.9023 75.2386C58.7022 75.2386 59.4132 74.6165 59.4132 73.7277V70.7281C59.4132 70.1759 59.8609 69.7281 60.4132 69.7281H63.4127C64.2126 69.7281 64.9237 69.106 64.9237 68.2172C64.9237 67.3284 64.2126 66.7063 63.4127 66.7063Z" fill="#C7CDDB"/>
+<path d="M78.3516 21.6057C78.3516 27.1603 76.1318 32.0976 72.6787 35.8007C72.4321 36.171 72.0621 36.4178 71.6921 36.6647C67.9924 40.1209 63.0594 42.2192 57.6332 42.2192C53.3169 42.2192 49.2472 40.8615 45.9174 38.5162C44.9308 37.899 44.0675 37.035 43.2043 36.2944C39.3812 32.5914 37.0381 27.4071 37.0381 21.6057C37.0381 10.2498 46.2874 0.992188 57.6332 0.992188C69.1023 0.992188 78.3516 10.2498 78.3516 21.6057Z" fill="black"/>
+<path d="M78.3516 21.6043C78.3516 27.6526 75.7618 32.9603 71.6921 36.7868C67.9924 40.2429 63.0594 42.3413 57.6332 42.3413C53.3169 42.3413 49.2472 40.9835 45.9174 38.6383C40.4912 34.9353 37.0381 28.7635 37.0381 21.7278C37.0381 10.3718 46.2874 1.11426 57.6332 1.11426C68.979 1.11426 78.3516 10.2484 78.3516 21.6043Z" fill="#1F2229" stroke="#3E4450" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M72.679 35.8005C72.4324 36.1708 72.0624 36.4176 71.6924 36.6645C67.9927 40.1207 63.0597 42.219 57.6335 42.219C53.3172 42.219 49.2475 40.8613 45.9177 38.516C44.9311 37.8988 44.0679 37.0348 43.2046 36.2942C43.6979 35.677 44.4378 35.3067 46.041 34.6895L46.6577 34.4427C47.8909 33.9489 49.6174 33.3318 51.8373 32.3443C52.2072 32.2209 52.4539 31.974 52.7005 31.7271C52.8239 31.6037 52.9472 31.4803 52.9472 31.2334C53.0705 30.9865 53.1938 30.6162 53.1938 30.3693V26.1726C53.0705 26.0492 53.0705 26.0492 52.9472 25.9257C52.5772 25.432 52.3306 24.8148 52.3306 24.0742L52.0839 23.9508C50.974 24.1976 51.0973 23.0867 50.8507 20.8649C50.7274 20.0009 50.8507 19.754 51.344 19.6306L51.7139 19.1368C50.974 17.4088 50.604 15.8041 50.604 14.5698C50.604 12.4714 51.4673 11.1136 52.7005 10.4964C51.9606 9.01522 51.9606 8.52148 51.9606 8.52148C51.9606 8.52148 56.2769 9.26209 57.7568 9.01522C59.6067 8.64492 62.5664 9.13866 63.6764 11.6073C65.5262 12.3479 66.1428 13.4589 66.3895 14.6932C66.6361 16.6681 65.5262 18.7665 65.2796 19.6306V19.754C65.5262 19.8774 65.6495 20.1243 65.5262 20.9883C65.2796 23.0867 65.2796 24.3211 64.293 24.0742L63.3064 25.8023C63.3064 26.0492 63.3064 26.0492 63.1831 26.1726C63.1831 26.5429 63.1831 27.1601 63.1831 30.4928C63.1831 30.8631 63.3064 31.3568 63.553 31.6037C63.6764 31.7271 63.6764 31.8506 63.7997 31.8506C64.0463 32.0974 64.293 32.3443 64.5396 32.3443C67.0061 33.3318 68.7326 34.0724 70.0892 34.5661C71.3224 35.0599 72.1857 35.4302 72.679 35.8005Z" fill="#2E333D"/>
+<path d="M72.679 35.8004C72.4324 36.1707 72.0624 36.4176 71.6924 36.6644C67.9927 40.1206 63.0597 42.219 57.6335 42.219C53.3172 42.219 49.2475 40.8612 45.9177 38.5159C44.9311 37.8988 44.0679 37.0347 43.2046 36.2941C43.6979 35.6769 44.4378 35.3066 46.041 34.6895L46.6577 34.4426C47.8909 33.9489 49.6174 33.3317 51.8373 32.3442C52.2072 32.2208 52.4539 31.9739 52.7005 31.7271C53.9338 33.4551 55.907 34.566 58.2501 34.566C60.4699 34.566 62.4431 33.4551 63.6764 31.8505C63.923 32.0974 64.1697 32.3442 64.4163 32.3442C66.8828 33.3317 68.6093 34.0723 69.9659 34.566C71.3224 35.0598 72.1857 35.4301 72.679 35.8004Z" fill="#3E4450"/>
+<path d="M65.1564 19.5071C65.2797 19.0134 65.0331 18.2728 64.7864 17.9025C64.7864 17.7791 64.6631 17.7791 64.6631 17.6556C63.7999 15.9275 61.95 15.3104 60.2235 15.1869C55.6605 14.9401 55.2905 15.8041 53.9339 14.5698C54.4272 15.1869 54.4272 16.2978 53.6873 17.5322C53.194 18.3962 52.3307 18.89 51.4675 19.1368C49.371 14.4463 50.4809 11.4839 52.454 10.4964C51.7141 9.01522 51.7141 8.52148 51.7141 8.52148C51.7141 8.52148 56.0304 9.26209 57.5103 9.01522C59.3602 8.64492 62.32 9.13866 63.4299 11.6073C65.2797 12.3479 65.8964 13.4589 66.143 14.6932C66.513 16.5447 65.4031 18.6431 65.1564 19.5071Z" fill="#949BAB"/>
+<path d="M53.317 30.3692V26.1724C53.1936 26.049 53.1936 26.049 53.0703 25.9256V25.6787C53.317 26.049 53.5636 26.4193 53.9336 26.6662L57.2633 29.0114C58.0033 29.6286 59.1132 29.6286 59.8531 29.0114L62.9362 26.2959C63.0595 26.1724 63.1829 26.1724 63.3062 26.049C63.3062 26.4193 63.3062 27.0365 63.3062 30.3692C63.3062 30.6161 63.3062 30.7395 63.4295 30.9864H53.317C53.1936 30.7395 53.317 30.6161 53.317 30.3692Z" fill="url(#paint0_linear)"/>
+<path d="M115.285 97.8074C115.285 103.362 113.065 108.299 109.612 112.002C109.365 112.373 108.995 112.619 108.625 112.866C104.925 116.323 99.9925 118.421 94.5663 118.421C90.25 118.421 86.1803 117.063 82.8505 114.718C81.8639 114.101 81.0007 113.237 80.1374 112.496C76.3143 108.793 73.9712 103.609 73.9712 97.8074C73.9712 86.4514 83.2205 77.1938 94.5663 77.1938C106.035 77.1938 115.285 86.4514 115.285 97.8074Z" fill="black"/>
+<path d="M115.285 97.8065C115.285 103.855 112.695 109.162 108.625 112.989C104.925 116.445 99.9925 118.543 94.5663 118.543C90.25 118.543 86.1803 117.186 82.8505 114.84C77.4243 111.137 73.9712 104.966 73.9712 97.9299C73.9712 86.574 83.2205 77.3164 94.5663 77.3164C105.912 77.3164 115.285 86.4505 115.285 97.8065Z" fill="#1F2229" stroke="#3E4450" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M109.613 112.003C109.366 112.373 108.996 112.62 108.626 112.867C104.927 116.323 99.9938 118.421 94.5676 118.421C90.2512 118.421 86.1815 117.063 82.8518 114.718C81.8652 114.101 81.0019 113.237 80.1387 112.496C80.632 111.879 81.3719 111.509 82.9751 110.892L83.5917 110.645C84.825 110.151 86.5515 109.534 88.7713 108.546C89.1413 108.423 89.388 108.176 89.6346 107.929C89.7579 107.806 89.8813 107.682 89.8813 107.436C90.0046 107.189 90.1279 106.818 90.1279 106.571V102.375C90.0046 102.251 90.0046 102.251 89.8813 102.128C89.5113 101.634 89.2646 101.017 89.2646 100.276L89.018 100.153C87.9081 100.4 88.0314 99.2889 87.7848 97.0671C87.6614 96.203 87.7848 95.9562 88.278 95.8327L88.648 95.339C87.9081 93.6109 87.5381 92.0063 87.5381 90.7719C87.5381 88.6735 88.4014 87.3158 89.6346 86.6986C88.8947 85.2174 88.8947 84.7236 88.8947 84.7236C88.8947 84.7236 93.211 85.4642 94.6909 85.2174C96.5408 84.8471 99.5005 85.3408 100.61 87.8095C102.46 88.5501 103.077 89.661 103.324 90.8953C103.57 92.8703 102.46 94.9687 102.214 95.8327V95.9562C102.46 96.0796 102.584 96.3265 102.46 97.1905C102.214 99.2889 102.214 100.523 101.227 100.276L100.24 102.004C100.24 102.251 100.24 102.251 100.117 102.375C100.117 102.745 100.117 103.362 100.117 106.695C100.117 107.065 100.24 107.559 100.487 107.806C100.61 107.929 100.61 108.053 100.734 108.053C100.98 108.3 101.227 108.546 101.474 108.546C103.94 109.534 105.667 110.275 107.023 110.768C108.257 111.262 109.12 111.632 109.613 112.003Z" fill="#2E333D"/>
+<path d="M109.612 112.003C109.365 112.373 108.995 112.62 108.626 112.867C104.926 116.323 99.9928 118.421 94.5666 118.421C90.2503 118.421 86.1806 117.063 82.8508 114.718C81.8642 114.101 81.001 113.237 80.1377 112.496C80.631 111.879 81.3709 111.509 82.9741 110.892L83.5908 110.645C84.824 110.151 86.5505 109.534 88.7704 108.546C89.1403 108.423 89.387 108.176 89.6336 107.929C90.8669 109.657 92.8401 110.768 95.1832 110.768C97.403 110.768 99.3762 109.657 100.609 108.053C100.856 108.3 101.103 108.546 101.349 108.546C103.816 109.534 105.542 110.274 106.899 110.768C108.256 111.262 109.119 111.632 109.612 112.003Z" fill="#3E4450"/>
+<path d="M102.09 95.7093C102.213 95.2155 101.966 94.4749 101.72 94.1046C101.72 93.9812 101.596 93.9812 101.596 93.8578C100.733 92.1297 98.8831 91.5125 97.1566 91.3891C92.5936 91.1422 92.2236 92.0063 90.867 90.7719C91.3603 91.3891 91.3603 92.5 90.6204 93.7343C90.1271 94.5984 89.2638 95.0921 88.4006 95.339C86.3041 90.6485 87.414 87.6861 89.3872 86.6986C88.6472 85.2174 88.6472 84.7236 88.6472 84.7236C88.6472 84.7236 92.9635 85.4642 94.4434 85.2174C96.2933 84.8471 99.2531 85.3408 100.363 87.8095C102.213 88.5501 102.829 89.661 103.076 90.8953C103.446 92.7469 102.336 94.8452 102.09 95.7093Z" fill="#949BAB"/>
+<path d="M90.2501 106.571V102.375C90.1267 102.251 90.1267 102.251 90.0034 102.128V101.881C90.2501 102.251 90.4967 102.621 90.8667 102.868L94.1964 105.214C94.9364 105.831 96.0463 105.831 96.7862 105.214L99.8693 102.498C99.9927 102.375 100.116 102.375 100.239 102.251C100.239 102.621 100.239 103.239 100.239 106.571C100.239 106.818 100.239 106.942 100.363 107.189H90.2501C90.1267 106.942 90.2501 106.818 90.2501 106.571Z" fill="url(#paint1_linear)"/>
+<path d="M41.2036 98.1168C41.2036 103.918 38.7371 109.102 34.7908 112.805C33.6808 113.793 32.5709 114.657 31.2144 115.398C28.2546 117.126 24.8015 118.113 21.1018 118.113C17.4021 118.113 13.949 117.126 10.9892 115.398C10.4959 115.151 10.126 114.904 9.63268 114.534C4.45307 110.954 1 104.906 1 98.1168C1 87.0077 10.0026 78.1204 20.9785 78.1204C32.201 77.997 41.2036 87.0077 41.2036 98.1168Z" fill="#1F2229" stroke="#3E4450" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M17.0323 102.56C17.279 102.806 17.5256 103.177 17.8956 103.424C18.1422 103.67 18.3889 103.794 18.6355 104.041C18.7589 104.164 19.0055 104.288 19.1288 104.411C19.1288 104.411 19.2522 104.411 19.2522 104.534L19.3755 104.658V106.386C19.3755 106.386 19.3755 106.386 19.2522 106.263C19.1288 106.139 18.8822 106.016 18.7589 105.892C18.5122 105.769 18.2656 105.522 18.0189 105.399C17.8956 105.399 17.8956 105.275 17.7723 105.275C16.909 104.781 16.1691 104.288 16.1691 103.67C16.2924 103.424 16.539 103.053 17.0323 102.56ZM34.1878 112.107C33.4478 110.502 32.4478 108.978 30.7213 108.114C29.858 107.744 28.8714 107.373 27.8848 107.373C27.6382 107.373 27.2682 107.373 27.0216 107.373C26.8982 107.373 26.7749 107.373 26.6516 107.373C25.295 107.25 25.1717 107.003 25.1717 107.003V104.164C26.035 103.424 26.8982 102.56 27.6382 101.695C28.2548 100.831 28.7481 99.844 28.9947 98.6096C30.1047 98.3628 30.8446 97.3753 30.7213 96.1409C30.7213 95.6472 30.3513 95.1535 30.3513 94.6597C30.3513 94.4129 30.3513 94.166 30.3513 93.9191C30.3513 93.7957 30.3513 93.5488 30.3513 93.4254C30.3513 93.3019 30.3513 93.0551 30.3513 92.9316C30.228 92.0676 29.9813 91.2036 29.488 90.2161C28.0082 87.5005 25.295 85.7725 22.0886 85.7725C21.472 85.7725 20.8554 85.8959 20.2387 86.0193C19.1288 86.2662 18.0189 86.7599 17.1556 87.5005C17.0323 87.624 16.7857 87.7474 16.6624 87.9943L16.539 88.1177C15.5524 89.1052 14.6892 90.2161 14.3192 91.5739C13.8259 92.9316 13.8259 94.2894 13.9492 95.6472C13.9492 95.6472 13.9492 95.6472 13.9492 95.7706V95.8941C13.9492 96.1409 14.0726 96.1409 13.9492 96.2644C13.9492 96.3878 13.8259 96.3878 13.8259 96.5112C13.5793 96.8815 13.4559 97.3753 13.7026 98.1159C14.1959 99.3502 14.9358 99.2268 15.7991 99.844C15.7991 99.844 15.6758 99.844 15.6758 99.9674L14.8125 100.214C10.8661 101.449 9.50957 104.781 11.2361 106.88C11.8527 107.62 12.8393 108.238 14.3192 108.608C13.9492 108.608 13.5793 108.855 13.3326 109.102C11.6061 110.459 10.4962 112.558 10.2495 114.533C10.2495 114.656 10.2495 114.78 10.2495 114.903C10.7428 115.15 11.1128 115.52 11.6061 115.767L30.9175 115.315C32.1507 114.575 32.6963 114.003 33.8062 113.016C33.6829 112.399 34.3111 112.23 34.1878 112.107Z" fill="#2E333D"/>
+<path d="M34.7909 112.805C33.681 113.792 32.5711 114.656 31.2145 115.397C28.2547 117.125 24.8017 118.113 21.1019 118.113C17.4022 118.113 13.9491 117.125 10.9894 115.397C10.4961 115.15 10.1261 114.903 9.63281 114.533C9.63281 114.41 9.63281 114.286 9.63281 114.163C9.87946 112.188 10.9894 110.089 12.7159 108.732C12.9626 108.485 13.3325 108.361 13.7025 108.238C12.2226 107.991 11.236 107.374 10.6194 106.51H15.3057C16.6623 108.361 18.7588 109.472 21.2253 109.472C23.3218 109.472 25.1716 108.608 26.5282 107.25C26.6515 107.25 26.7748 107.25 26.8982 107.25C27.1448 107.25 27.3915 107.25 27.7614 107.25C28.748 107.25 29.7346 107.497 30.5979 107.991C32.3244 108.855 33.5577 110.336 34.4209 112.064C34.6676 112.311 34.6676 112.558 34.7909 112.805Z" fill="#3E4450"/>
+<path d="M25.2953 104.165V106.757L17.5259 107.004L17.8958 105.275C18.0192 105.275 18.0192 105.399 18.1425 105.399C18.3891 105.522 18.6358 105.769 18.8824 105.893C19.0058 106.016 19.1291 106.139 19.3757 106.263C19.3757 106.263 19.4991 106.263 19.4991 106.386V104.658L19.3757 104.535C20.7323 105.275 22.5822 105.769 25.2953 104.165Z" fill="url(#paint2_linear)"/>
+<path d="M30.351 93.4261C28.8711 93.9198 27.1446 94.1667 25.5414 94.0432C22.9516 93.7964 20.4851 92.8089 18.5119 91.0808C17.8953 92.9323 16.2921 94.2901 14.4422 95.1541C14.1956 95.2776 13.949 95.401 13.7023 95.401C13.7023 95.401 13.7023 95.401 13.7023 95.2776C13.579 93.9198 13.579 92.562 14.0723 91.2042C14.4422 89.8465 15.3055 88.7356 16.2921 87.7481L16.4154 87.6247C16.5388 87.5012 16.7854 87.3778 16.9087 87.1309C17.772 86.3903 18.8819 85.8966 19.9918 85.6497C20.6084 85.5263 21.2251 85.4028 21.8417 85.4028C25.0481 85.4028 27.8846 87.1309 29.2411 89.8465C29.7344 90.8339 29.9811 91.8214 30.1044 92.562C30.351 93.0558 30.351 93.3026 30.351 93.4261Z" fill="#949BAB"/>
+<path d="M20.4853 111.694C19.7453 112.558 18.5121 112.558 17.4022 112.558C18.5121 111.447 17.8955 107.868 13.9491 108.238C8.52286 107.251 9.01616 101.573 14.4424 99.8445L15.3057 99.5977L15.429 99.7211C15.799 100.832 16.4156 101.819 17.0322 102.56C14.8124 104.412 17.8955 104.905 19.3754 106.387C20.6086 107.127 21.7185 110.213 20.4853 111.694Z" fill="#949BAB"/>
+<defs>
+<linearGradient id="paint0_linear" x1="58.2299" y1="30.8211" x2="58.2299" y2="28.0409" gradientUnits="userSpaceOnUse">
+<stop stop-color="#2E333D"/>
+<stop offset="0.9913" stop-color="#222427"/>
+</linearGradient>
+<linearGradient id="paint1_linear" x1="95.163" y1="107.023" x2="95.163" y2="104.243" gradientUnits="userSpaceOnUse">
+<stop stop-color="#2E333D"/>
+<stop offset="0.9913" stop-color="#222427"/>
+</linearGradient>
+<linearGradient id="paint2_linear" x1="21.3956" y1="106.915" x2="21.3956" y2="105.428" gradientUnits="userSpaceOnUse">
+<stop stop-color="#2E333D"/>
+<stop offset="0.9913" stop-color="#222427"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/src/assets/tutorial/community-light.svg b/src/assets/tutorial/community-light.svg
new file mode 100644
index 00000000..9e04b049
--- /dev/null
+++ b/src/assets/tutorial/community-light.svg
@@ -0,0 +1,37 @@
+<svg width="117" height="120" viewBox="0 0 117 120" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M104.634 68.6908C104.634 80.2049 100.53 90.6778 93.6709 98.8847C85.0353 109.235 72.0513 115.788 57.4749 115.788C43.511 115.788 31.0169 109.725 22.3813 100.11C14.9706 91.7803 10.4385 80.7561 10.4385 68.6908C10.4385 42.6615 31.5069 21.5931 57.5361 21.5931C83.5654 21.5931 104.634 42.6615 104.634 68.6908Z" fill="white" stroke="#D6DCE8" stroke-width="2" stroke-miterlimit="10" stroke-dasharray="4 4"/>
+<path d="M74.8781 71.7799C74.5226 73.2909 73.9893 74.8907 73.3671 76.2239C71.6785 79.5124 69.0121 82.0898 65.7236 83.7785C62.3462 85.4672 58.3467 86.1783 54.3471 85.2895C44.926 83.3341 38.8823 74.0908 40.8376 64.6697C42.7929 55.2485 51.9474 49.1159 61.3685 51.1601C64.7459 51.8712 67.6789 53.5598 70.1675 55.8707C74.3448 60.048 76.1224 66.0917 74.8781 71.7799Z" fill="#D6DCE8" stroke="#AAB2C5" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M63.4127 65.7137H60.4132V62.7142C60.4132 61.4008 59.3814 60.2032 57.9023 60.2032C56.5889 60.2032 55.3913 61.235 55.3913 62.7142V65.7137H52.3918C51.0785 65.7137 49.8809 66.7455 49.8809 68.2246C49.8809 68.9086 50.1243 69.5489 50.5959 70.0205C51.0675 70.4921 51.7079 70.7356 52.3918 70.7356H55.3913V73.7351C55.3913 75.0484 56.4231 76.246 57.9023 76.246C59.2156 76.246 60.4132 75.2142 60.4132 73.7351V70.7356H63.4127C64.726 70.7356 65.9237 69.7038 65.9237 68.2246C65.9237 66.7455 64.726 65.7137 63.4127 65.7137Z" fill="white" stroke="#AAB2C5" stroke-width="2"/>
+<path d="M78.3516 21.6135C78.3516 27.1681 76.1318 32.1054 72.6787 35.8085C72.4321 36.1788 72.0621 36.4256 71.6921 36.6725C67.9924 40.1287 63.0594 42.2271 57.6332 42.2271C53.3169 42.2271 49.2472 40.8693 45.9174 38.524C44.9308 37.9069 44.0675 37.0428 43.2043 36.3022C39.3812 32.5992 37.0381 27.4149 37.0381 21.6135C37.0381 10.2576 46.2874 1 57.6332 1C69.1023 1 78.3516 10.2576 78.3516 21.6135Z" fill="#E9F0F8"/>
+<path d="M78.3516 21.6124C78.3516 27.6607 75.7618 32.9684 71.6921 36.7948C67.9924 40.251 63.0594 42.3494 57.6332 42.3494C53.3169 42.3494 49.2472 40.9916 45.9174 38.6463C40.4912 34.9433 37.0381 28.7716 37.0381 21.7358C37.0381 10.3799 46.2874 1.12231 57.6332 1.12231C68.979 1.12231 78.3516 10.2564 78.3516 21.6124Z" fill="#F1F3F9" stroke="#D6DCE8" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M72.679 35.8085C72.4324 36.1788 72.0624 36.4257 71.6924 36.6726C67.9927 40.1287 63.0597 42.2271 57.6335 42.2271C53.3172 42.2271 49.2475 40.8693 45.9177 38.5241C44.9311 37.9069 44.0679 37.0429 43.2046 36.3023C43.6979 35.6851 44.4378 35.3148 46.041 34.6976L46.6577 34.4507C47.8909 33.957 49.6174 33.3398 51.8373 32.3524C52.2072 32.2289 52.4539 31.9821 52.7005 31.7352C52.8239 31.6118 52.9472 31.4883 52.9472 31.2415C53.0705 30.9946 53.1938 30.6243 53.1938 30.3774V26.1806C53.0705 26.0572 53.0705 26.0572 52.9472 25.9338C52.5772 25.44 52.3306 24.8229 52.3306 24.0823L52.0839 23.9588C50.974 24.2057 51.0973 23.0948 50.8507 20.873C50.7274 20.0089 50.8507 19.7621 51.344 19.6386L51.7139 19.1449C50.974 17.4168 50.604 15.8122 50.604 14.5778C50.604 12.4794 51.4673 11.1217 52.7005 10.5045C51.9606 9.02328 51.9606 8.52954 51.9606 8.52954C51.9606 8.52954 56.2769 9.27015 57.7568 9.02328C59.6067 8.65298 62.5664 9.14671 63.6764 11.6154C65.5262 12.356 66.1428 13.4669 66.3895 14.7013C66.6361 16.6762 65.5262 18.7746 65.2796 19.6386V19.7621C65.5262 19.8855 65.6495 20.1324 65.5262 20.9964C65.2796 23.0948 65.2796 24.3291 64.293 24.0823L63.3064 25.8103C63.3064 26.0572 63.3064 26.0572 63.1831 26.1806C63.1831 26.5509 63.1831 27.1681 63.1831 30.5008C63.1831 30.8711 63.3064 31.3649 63.553 31.6117C63.6764 31.7352 63.6764 31.8586 63.7997 31.8586C64.0463 32.1055 64.293 32.3524 64.5396 32.3524C67.0061 33.3398 68.7326 34.0804 70.0892 34.5742C71.3224 35.0679 72.1857 35.4382 72.679 35.8085Z" fill="white"/>
+<path d="M72.679 35.8084C72.4324 36.1787 72.0624 36.4256 71.6924 36.6725C67.9927 40.1286 63.0597 42.227 57.6335 42.227C53.3172 42.227 49.2475 40.8692 45.9177 38.524C44.9311 37.9068 44.0679 37.0428 43.2046 36.3022C43.6979 35.685 44.4378 35.3147 46.041 34.6975L46.6577 34.4507C47.8909 33.9569 49.6174 33.3398 51.8373 32.3523C52.2072 32.2288 52.4539 31.982 52.7005 31.7351C53.9338 33.4632 55.907 34.5741 58.2501 34.5741C60.4699 34.5741 62.4431 33.4632 63.6764 31.8585C63.923 32.1054 64.1697 32.3523 64.4163 32.3523C66.8828 33.3398 68.6093 34.0804 69.9659 34.5741C71.3224 35.0678 72.1857 35.4381 72.679 35.8084Z" fill="#D6DCE8"/>
+<path d="M65.1564 19.5152C65.2797 19.0215 65.0331 18.2808 64.7864 17.9105C64.7864 17.7871 64.6631 17.7871 64.6631 17.6637C63.7999 15.9356 61.95 15.3184 60.2235 15.195C55.6605 14.9481 55.2905 15.8122 53.9339 14.5778C54.4272 15.195 54.4272 16.3059 53.6873 17.5402C53.194 18.4043 52.3307 18.898 51.4675 19.1449C49.371 14.4544 50.4809 11.492 52.454 10.5045C51.7141 9.02328 51.7141 8.52954 51.7141 8.52954C51.7141 8.52954 56.0304 9.27015 57.5103 9.02328C59.3602 8.65298 62.32 9.14671 63.4299 11.6154C65.2797 12.356 65.8964 13.4669 66.143 14.7013C66.513 16.5528 65.4031 18.6512 65.1564 19.5152Z" fill="#AAB2C5"/>
+<path d="M53.317 30.3773V26.1805C53.1936 26.0571 53.1936 26.0571 53.0703 25.9336V25.6868C53.317 26.0571 53.5636 26.4274 53.9336 26.6742L57.2633 29.0195C58.0033 29.6367 59.1132 29.6367 59.8531 29.0195L62.9362 26.3039C63.0595 26.1805 63.1829 26.1805 63.3062 26.0571C63.3062 26.4274 63.3062 27.0445 63.3062 30.3773C63.3062 30.6241 63.3062 30.7476 63.4295 30.9944H53.317C53.1936 30.7476 53.317 30.6241 53.317 30.3773Z" fill="url(#paint0_linear)"/>
+<path d="M115.285 97.8154C115.285 103.37 113.065 108.307 109.612 112.01C109.365 112.381 108.995 112.628 108.625 112.874C104.925 116.331 99.9925 118.429 94.5663 118.429C90.25 118.429 86.1803 117.071 82.8505 114.726C81.8639 114.109 81.0007 113.245 80.1374 112.504C76.3143 108.801 73.9712 103.617 73.9712 97.8154C73.9712 86.4595 83.2205 77.2019 94.5663 77.2019C106.035 77.2019 115.285 86.4595 115.285 97.8154Z" fill="#E9F0F8"/>
+<path d="M115.285 97.8143C115.285 103.863 112.695 109.17 108.625 112.997C104.925 116.453 99.9925 118.551 94.5663 118.551C90.25 118.551 86.1803 117.194 82.8505 114.848C77.4243 111.145 73.9712 104.974 73.9712 97.9378C73.9712 86.5818 83.2205 77.3242 94.5663 77.3242C105.912 77.3242 115.285 86.4584 115.285 97.8143Z" fill="#F1F3F9" stroke="#D6DCE8" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M109.613 112.01C109.366 112.381 108.996 112.628 108.626 112.874C104.927 116.331 99.9938 118.429 94.5676 118.429C90.2512 118.429 86.1815 117.071 82.8518 114.726C81.8652 114.109 81.0019 113.245 80.1387 112.504C80.632 111.887 81.3719 111.517 82.9751 110.9L83.5917 110.653C84.825 110.159 86.5515 109.542 88.7713 108.554C89.1413 108.431 89.388 108.184 89.6346 107.937C89.7579 107.814 89.8813 107.69 89.8813 107.443C90.0046 107.197 90.1279 106.826 90.1279 106.579V102.383C90.0046 102.259 90.0046 102.259 89.8813 102.136C89.5113 101.642 89.2646 101.025 89.2646 100.284L89.018 100.161C87.9081 100.408 88.0314 99.2967 87.7848 97.0749C87.6614 96.2108 87.7848 95.964 88.278 95.8405L88.648 95.3468C87.9081 93.6187 87.5381 92.0141 87.5381 90.7797C87.5381 88.6814 88.4014 87.3236 89.6346 86.7064C88.8947 85.2252 88.8947 84.7315 88.8947 84.7315C88.8947 84.7315 93.211 85.4721 94.6909 85.2252C96.5408 84.8549 99.5005 85.3486 100.61 87.8173C102.46 88.5579 103.077 89.6688 103.324 90.9032C103.57 92.8781 102.46 94.9765 102.214 95.8405V95.964C102.46 96.0874 102.584 96.3343 102.46 97.1983C102.214 99.2967 102.214 100.531 101.227 100.284L100.24 102.012C100.24 102.259 100.24 102.259 100.117 102.383C100.117 102.753 100.117 103.37 100.117 106.703C100.117 107.073 100.24 107.567 100.487 107.814C100.61 107.937 100.61 108.061 100.734 108.061C100.98 108.307 101.227 108.554 101.474 108.554C103.94 109.542 105.667 110.282 107.023 110.776C108.257 111.27 109.12 111.64 109.613 112.01Z" fill="white"/>
+<path d="M109.612 112.01C109.365 112.381 108.995 112.628 108.626 112.874C104.926 116.331 99.9928 118.429 94.5666 118.429C90.2503 118.429 86.1806 117.071 82.8508 114.726C81.8642 114.109 81.001 113.245 80.1377 112.504C80.631 111.887 81.3709 111.517 82.9741 110.899L83.5908 110.653C84.824 110.159 86.5505 109.542 88.7704 108.554C89.1403 108.431 89.387 108.184 89.6336 107.937C90.8669 109.665 92.8401 110.776 95.1832 110.776C97.403 110.776 99.3762 109.665 100.609 108.06C100.856 108.307 101.103 108.554 101.349 108.554C103.816 109.542 105.542 110.282 106.899 110.776C108.256 111.27 109.119 111.64 109.612 112.01Z" fill="#D6DCE8"/>
+<path d="M102.09 95.7171C102.213 95.2234 101.966 94.4828 101.72 94.1125C101.72 93.989 101.596 93.989 101.596 93.8656C100.733 92.1375 98.8831 91.5203 97.1566 91.3969C92.5936 91.15 92.2236 92.0141 90.867 90.7797C91.3603 91.3969 91.3603 92.5078 90.6204 93.7422C90.1271 94.6062 89.2638 95.0999 88.4006 95.3468C86.3041 90.6563 87.414 87.6939 89.3872 86.7064C88.6472 85.2252 88.6472 84.7315 88.6472 84.7315C88.6472 84.7315 92.9635 85.4721 94.4434 85.2252C96.2933 84.8549 99.2531 85.3486 100.363 87.8173C102.213 88.5579 102.829 89.6688 103.076 90.9032C103.446 92.7547 102.336 94.8531 102.09 95.7171Z" fill="#AAB2C5"/>
+<path d="M90.2501 106.579V102.382C90.1267 102.259 90.1267 102.259 90.0034 102.136V101.889C90.2501 102.259 90.4967 102.629 90.8667 102.876L94.1964 105.221C94.9364 105.839 96.0463 105.839 96.7862 105.221L99.8693 102.506C99.9927 102.382 100.116 102.382 100.239 102.259C100.239 102.629 100.239 103.246 100.239 106.579C100.239 106.826 100.239 106.949 100.363 107.196H90.2501C90.1267 106.949 90.2501 106.826 90.2501 106.579Z" fill="url(#paint1_linear)"/>
+<path d="M41.2036 98.1248C41.2036 103.926 38.7371 109.11 34.7908 112.813C33.6808 113.801 32.5709 114.665 31.2144 115.406C28.2546 117.134 24.8015 118.121 21.1018 118.121C17.4021 118.121 13.949 117.134 10.9892 115.406C10.4959 115.159 10.126 114.912 9.63268 114.542C4.45307 110.962 1 104.914 1 98.1248C1 87.0157 10.0026 78.1284 20.9785 78.1284C32.201 78.005 41.2036 87.0157 41.2036 98.1248Z" fill="#F1F3F9" stroke="#D6DCE8" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M17.0323 102.568C17.279 102.815 17.5256 103.185 17.8956 103.432C18.1422 103.679 18.3889 103.802 18.6355 104.049C18.7589 104.172 19.0055 104.296 19.1288 104.419C19.1288 104.419 19.2522 104.419 19.2522 104.543L19.3755 104.666V106.394C19.3755 106.394 19.3755 106.394 19.2522 106.271C19.1288 106.147 18.8822 106.024 18.7589 105.901C18.5122 105.777 18.2656 105.53 18.0189 105.407C17.8956 105.407 17.8956 105.283 17.7723 105.283C16.909 104.79 16.1691 104.296 16.1691 103.679C16.2924 103.432 16.539 103.062 17.0323 102.568ZM34.1878 112.115C33.4478 110.511 32.4478 108.986 30.7213 108.122C29.858 107.752 28.8714 107.382 27.8848 107.382C27.6382 107.382 27.2682 107.382 27.0216 107.382C26.8982 107.382 26.7749 107.382 26.6516 107.382C25.295 107.258 25.1717 107.011 25.1717 107.011V104.172C26.035 103.432 26.8982 102.568 27.6382 101.704C28.2548 100.84 28.7481 99.8523 28.9947 98.6179C30.1047 98.371 30.8446 97.3836 30.7213 96.1492C30.7213 95.6555 30.3513 95.1617 30.3513 94.668C30.3513 94.4211 30.3513 94.1743 30.3513 93.9274C30.3513 93.804 30.3513 93.5571 30.3513 93.4337C30.3513 93.3102 30.3513 93.0634 30.3513 92.9399C30.228 92.0759 29.9813 91.2119 29.488 90.2244C28.0082 87.5088 25.295 85.7807 22.0886 85.7807C21.472 85.7807 20.8554 85.9042 20.2387 86.0276C19.1288 86.2745 18.0189 86.7682 17.1556 87.5088C17.0323 87.6323 16.7857 87.7557 16.6624 88.0026L16.539 88.126C15.5524 89.1135 14.6892 90.2244 14.3192 91.5822C13.8259 92.9399 13.8259 94.2977 13.9492 95.6555C13.9492 95.6555 13.9492 95.6555 13.9492 95.7789V95.9024C13.9492 96.1492 14.0726 96.1492 13.9492 96.2727C13.9492 96.3961 13.8259 96.3961 13.8259 96.5195C13.5793 96.8898 13.4559 97.3836 13.7026 98.1242C14.1959 99.3585 14.9358 99.2351 15.7991 99.8523C15.7991 99.8523 15.6758 99.8523 15.6758 99.9757L14.8125 100.223C10.8661 101.457 9.50957 104.79 11.2361 106.888C11.8527 107.629 12.8393 108.246 14.3192 108.616C13.9492 108.616 13.5793 108.863 13.3326 109.11C11.6061 110.468 10.4962 112.566 10.2495 114.541C10.2495 114.664 10.2495 114.788 10.2495 114.911C10.7428 115.158 11.1128 115.528 11.6061 115.775L30.9175 115.324C32.1507 114.583 32.6963 114.011 33.8062 113.024C33.6829 112.407 34.3111 112.239 34.1878 112.115Z" fill="white"/>
+<path d="M34.7909 112.813C33.681 113.801 32.5711 114.665 31.2145 115.405C28.2547 117.133 24.8017 118.121 21.1019 118.121C17.4022 118.121 13.9491 117.133 10.9894 115.405C10.4961 115.158 10.1261 114.912 9.63281 114.541C9.63281 114.418 9.63281 114.294 9.63281 114.171C9.87946 112.196 10.9894 110.098 12.7159 108.74C12.9626 108.493 13.3325 108.37 13.7025 108.246C12.2226 107.999 11.236 107.382 10.6194 106.518H15.3057C16.6623 108.37 18.7588 109.48 21.2253 109.48C23.3218 109.48 25.1716 108.616 26.5282 107.259C26.6515 107.259 26.7748 107.259 26.8982 107.259C27.1448 107.259 27.3915 107.259 27.7614 107.259C28.748 107.259 29.7346 107.506 30.5979 107.999C32.3244 108.863 33.5577 110.345 34.4209 112.073C34.6676 112.319 34.6676 112.566 34.7909 112.813Z" fill="#D6DCE8"/>
+<path d="M25.2953 104.173V106.765L17.5259 107.012L17.8958 105.284C18.0192 105.284 18.0192 105.407 18.1425 105.407C18.3891 105.531 18.6358 105.777 18.8824 105.901C19.0058 106.024 19.1291 106.148 19.3757 106.271C19.3757 106.271 19.4991 106.271 19.4991 106.395V104.667L19.3757 104.543C20.7323 105.284 22.5822 105.777 25.2953 104.173Z" fill="url(#paint2_linear)"/>
+<path d="M30.351 93.4341C28.8711 93.9278 27.1446 94.1747 25.5414 94.0513C22.9516 93.8044 20.4851 92.8169 18.5119 91.0888C17.8953 92.9404 16.2921 94.2981 14.4422 95.1622C14.1956 95.2856 13.949 95.409 13.7023 95.409C13.7023 95.409 13.7023 95.4091 13.7023 95.2856C13.579 93.9278 13.579 92.5701 14.0723 91.2123C14.4422 89.8545 15.3055 88.7436 16.2921 87.7561L16.4154 87.6327C16.5388 87.5093 16.7854 87.3858 16.9087 87.139C17.772 86.3983 18.8819 85.9046 19.9918 85.6577C20.6084 85.5343 21.2251 85.4109 21.8417 85.4109C25.0481 85.4109 27.8846 87.139 29.2411 89.8545C29.7344 90.842 29.9811 91.8295 30.1044 92.5701C30.351 93.0638 30.351 93.3107 30.351 93.4341Z" fill="#AAB2C5"/>
+<path d="M20.4853 111.703C19.7453 112.567 18.5121 112.567 17.4022 112.567C18.5121 111.456 17.8955 107.876 13.9491 108.246C8.52286 107.259 9.01616 101.581 14.4424 99.8528L15.3057 99.6059L15.429 99.7294C15.799 100.84 16.4156 101.828 17.0322 102.568C14.8124 104.42 17.8955 104.914 19.3754 106.395C20.6086 107.135 21.7185 110.221 20.4853 111.703Z" fill="#AAB2C5"/>
+<defs>
+<linearGradient id="paint0_linear" x1="58.2299" y1="30.8292" x2="58.2299" y2="28.049" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="0.9913" stop-color="#D6DEEA"/>
+</linearGradient>
+<linearGradient id="paint1_linear" x1="95.163" y1="107.031" x2="95.163" y2="104.251" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="0.9913" stop-color="#D6DEEA"/>
+</linearGradient>
+<linearGradient id="paint2_linear" x1="21.3956" y1="106.923" x2="21.3956" y2="105.436" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="0.9913" stop-color="#D6DEEA"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/src/assets/tutorial/derivative-dark.gif b/src/assets/tutorial/derivative-dark.gif
new file mode 100644
index 0000000000000000000000000000000000000000..556ae882b47b79180033405f1caa1c8a5ffd8c8b
GIT binary patch
literal 127069
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

literal 0
HcmV?d00001

diff --git a/src/assets/tutorial/derivative-light.gif b/src/assets/tutorial/derivative-light.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7713447a2cb94513778f09d31502d7ab3517097c
GIT binary patch
literal 113893
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

literal 0
HcmV?d00001

diff --git a/src/assets/tutorial/invite-users-dark.gif b/src/assets/tutorial/invite-users-dark.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b5efb7de6b9d3d726aa4b7f20eb0240f04a9b71f
GIT binary patch
literal 86394
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
PA`>RHT&BfB5D)-6aheh*

literal 0
HcmV?d00001

diff --git a/src/assets/tutorial/invite-users-light.gif b/src/assets/tutorial/invite-users-light.gif
new file mode 100644
index 0000000000000000000000000000000000000000..8127ff38c364cc72ff0b3aadb00736fc8b6141e9
GIT binary patch
literal 81996
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
N-sk=uSt1|+06TPq3CsWh

literal 0
HcmV?d00001

diff --git a/src/assets/tutorial/playground-dark.svg b/src/assets/tutorial/playground-dark.svg
new file mode 100644
index 00000000..d87a587b
--- /dev/null
+++ b/src/assets/tutorial/playground-dark.svg
@@ -0,0 +1,12 @@
+<svg width="119" height="117" viewBox="0 0 119 117" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M52.0114 115.804C80.1842 115.804 103.023 92.8871 103.023 64.6183C103.023 36.3495 80.1842 13.4331 52.0114 13.4331C23.8386 13.4331 1 36.3495 1 64.6183C1 92.8871 23.8386 115.804 52.0114 115.804Z" fill="#1F2229" stroke="#484E59" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M110.666 21.9438C111.335 21.3298 111.382 20.2875 110.77 19.6157C110.158 18.9439 109.12 18.897 108.45 19.5109C107.781 20.1249 107.734 21.1672 108.346 21.839C108.957 22.5108 109.996 22.5577 110.666 21.9438Z" fill="#3B414E"/>
+<path opacity="0.3" d="M83.4192 41.2397C85.2331 41.2397 86.7036 39.7642 86.7036 37.9441C86.7036 36.1239 85.2331 34.6484 83.4192 34.6484C81.6053 34.6484 80.1348 36.1239 80.1348 37.9441C80.1348 39.7642 81.6053 41.2397 83.4192 41.2397Z" fill="#3E4450"/>
+<path d="M61.2816 45.569C60.8718 47.7548 59.0958 49.804 56.7733 50.3505C54.9973 50.7604 53.2213 50.3505 51.9918 49.3942V65.2415H37.2374C37.7839 64.1486 37.9205 63.0557 37.7839 61.8261C37.5106 59.0939 35.1882 56.908 32.5925 56.6348C29.0405 56.2249 25.8984 58.9572 25.8984 62.5092C25.8984 63.4655 26.035 64.4218 26.4448 65.1049H9.77783V34.6398C9.77783 28.3555 14.8326 23.3008 21.2535 23.3008H51.8552V39.1481C52.9481 38.465 54.041 38.0552 55.2706 38.0552C58.9592 38.6016 61.9647 41.7438 61.2816 45.569Z" fill="#2E333D" stroke="#3E4450" stroke-width="1.5905" stroke-miterlimit="10" stroke-linejoin="round"/>
+<path d="M42.019 85.187C41.4726 88.8756 44.3415 92.0177 48.0301 92.0177C49.5328 92.0177 50.899 91.4713 51.9919 90.6516V107.045H21.3902C15.1059 107.045 9.91455 101.854 9.91455 95.7063V65.1046H26.4449C26.0351 64.2849 25.8985 63.4653 25.8985 62.3723C26.0351 59.5034 28.2209 57.0444 30.9532 56.6345C34.6418 56.2247 37.784 58.957 37.784 62.5089C37.784 63.4652 37.6474 64.2849 37.2375 65.1046H51.7187V81.4984C50.4891 80.4055 48.8498 79.859 47.0738 80.1323C44.4781 80.4055 42.4289 82.5913 42.019 85.187Z" fill="#1F2229" stroke="#3E4450" stroke-width="1.5905" stroke-miterlimit="10" stroke-linejoin="round"/>
+<path d="M94.0691 65.1047V95.4331C94.0691 101.717 88.8777 106.772 82.5934 106.772H51.9917V90.3784C50.8988 91.3347 49.5327 91.7446 48.0299 91.7446C44.4779 91.7446 41.7456 88.6024 42.0188 84.9138C42.4287 82.1815 44.6145 80.1323 47.0736 79.7224C48.8496 79.5858 50.6256 80.1323 51.7185 81.0886V64.6948H69.3418C68.7953 65.5145 68.6587 66.4708 68.6587 67.4271C68.6587 70.8425 71.6642 73.7114 75.3528 73.3016C78.0851 73.0283 80.4076 70.7059 80.6808 68.1102C80.8174 66.8807 80.5442 65.7877 80.1344 64.6948L94.0691 65.1047Z" fill="#2E333D" stroke="#3E4450" stroke-width="1.5905" stroke-miterlimit="10" stroke-linejoin="round"/>
+<path d="M106.911 52.6728L93.3859 50.3503C93.6591 51.4432 93.7958 52.5362 93.3859 53.6291C92.5662 56.2247 90.1072 58.0007 87.3749 57.8641C83.8229 57.5909 81.2272 54.4488 81.7737 51.0334C81.9103 50.0771 82.3201 49.2574 82.8666 48.5743L65.3799 45.4322L68.1122 29.7215C69.2051 30.8144 70.8445 31.4975 72.7571 31.4975C75.2161 31.3609 77.2654 29.8581 77.9484 27.6723C79.3146 24.1203 76.9921 20.2951 73.3035 19.7486C72.074 19.4754 70.8445 19.7486 69.7516 20.1585L72.4839 4.44775L102.539 9.63912C108.823 10.732 112.922 16.6065 111.829 22.7541L106.911 52.6728Z" fill="#6D7381" stroke="#949BAB" stroke-width="2" stroke-miterlimit="10" stroke-linejoin="round"/>
+<path d="M113.473 64.1927L118.015 62.8237C118.344 62.7282 118.344 62.2506 118.015 62.1551L113.473 60.7861C113.356 60.7543 113.271 60.6694 113.24 60.5526L111.871 56.0212C111.775 55.6922 111.297 55.6922 111.202 56.0212L109.833 60.5526C109.801 60.6694 109.716 60.7543 109.6 60.7861L105.068 62.1551C104.739 62.2506 104.739 62.7282 105.068 62.8237L109.61 64.1927C109.727 64.2245 109.812 64.3094 109.844 64.4261L111.213 68.9682C111.308 69.2972 111.786 69.2972 111.881 68.9682L113.25 64.4261C113.271 64.3094 113.356 64.2245 113.473 64.1927Z" fill="#3E4450"/>
+<path d="M103.424 24.4523L109.073 22.7496C109.482 22.6308 109.482 22.0369 109.073 21.9181L103.424 20.2153C103.279 20.1757 103.173 20.0701 103.133 19.925L101.431 14.2888C101.312 13.8796 100.718 13.8796 100.599 14.2888L98.8965 19.925C98.8569 20.0701 98.7513 20.1757 98.6061 20.2153L92.97 21.9181C92.5608 22.0369 92.5608 22.6308 92.97 22.7496L98.6193 24.4523C98.7645 24.4919 98.8701 24.5975 98.9097 24.7427L100.612 30.3921C100.731 30.8012 101.325 30.8012 101.444 30.3921L103.147 24.7427C103.173 24.5975 103.279 24.4919 103.424 24.4523Z" fill="#C7CDDB"/>
+<path d="M62.357 5.26099L65.1958 4.40543C65.4015 4.34575 65.4015 4.0473 65.1958 3.98761L62.357 3.13205C62.2841 3.11216 62.231 3.0591 62.2111 2.98615L61.3555 0.154199C61.2958 -0.0513995 60.9973 -0.0513995 60.9376 0.154199L60.082 2.98615C60.0621 3.0591 60.009 3.11216 59.9361 3.13205L57.1039 3.98761C56.8983 4.0473 56.8983 4.34575 57.1039 4.40543L59.9427 5.26099C60.0157 5.28088 60.0687 5.33394 60.0886 5.4069L60.9443 8.24548C61.004 8.45107 61.3024 8.45107 61.3621 8.24548L62.2177 5.4069C62.231 5.33394 62.2841 5.28088 62.357 5.26099Z" fill="#3E4450"/>
+</svg>
diff --git a/src/assets/tutorial/playground-light.svg b/src/assets/tutorial/playground-light.svg
new file mode 100644
index 00000000..cc882c4d
--- /dev/null
+++ b/src/assets/tutorial/playground-light.svg
@@ -0,0 +1,12 @@
+<svg width="119" height="117" viewBox="0 0 119 117" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M52.0114 115.804C80.1842 115.804 103.023 92.8871 103.023 64.6183C103.023 36.3495 80.1842 13.4331 52.0114 13.4331C23.8386 13.4331 1 36.3495 1 64.6183C1 92.8871 23.8386 115.804 52.0114 115.804Z" fill="#F1F3F9" stroke="#D6DCE8" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M110.666 21.9437C111.335 21.3297 111.382 20.2874 110.77 19.6156C110.158 18.9438 109.12 18.8969 108.45 19.5108C107.781 20.1247 107.734 21.167 108.346 21.8389C108.957 22.5107 109.996 22.5576 110.666 21.9437Z" fill="#EAEEF9"/>
+<path opacity="0.3" d="M83.4192 41.2399C85.2331 41.2399 86.7036 39.7644 86.7036 37.9443C86.7036 36.1242 85.2331 34.6487 83.4192 34.6487C81.6053 34.6487 80.1348 36.1242 80.1348 37.9443C80.1348 39.7644 81.6053 41.2399 83.4192 41.2399Z" fill="#AAB2C5"/>
+<path d="M61.2816 45.5689C60.8718 47.7547 59.0958 49.8039 56.7733 50.3504C54.9973 50.7602 53.2213 50.3504 51.9918 49.3941V65.2414H37.2374C37.7839 64.1485 37.9205 63.0556 37.7839 61.826C37.5106 59.0937 35.1882 56.9079 32.5925 56.6347C29.0405 56.2248 25.8984 58.9571 25.8984 62.5091C25.8984 63.4654 26.035 64.4217 26.4448 65.1048H9.77783V34.6397C9.77783 28.3554 14.8326 23.3007 21.2535 23.3007H51.8552V39.148C52.9481 38.4649 54.041 38.0551 55.2706 38.0551C58.9592 38.6015 61.9647 41.7437 61.2816 45.5689Z" fill="white" stroke="#C5CCDA" stroke-width="1.5905" stroke-miterlimit="10" stroke-linejoin="round"/>
+<path d="M42.019 85.1871C41.4726 88.8757 44.3415 92.0178 48.0301 92.0178C49.5328 92.0178 50.899 91.4713 51.9919 90.6516V107.045H21.3902C15.1059 107.045 9.91455 101.854 9.91455 95.7064V65.1047H26.4449C26.0351 64.285 25.8985 63.4653 25.8985 62.3724C26.0351 59.5035 28.2209 57.0444 30.9532 56.6346C34.6418 56.2247 37.784 58.957 37.784 62.509C37.784 63.4653 37.6474 64.285 37.2375 65.1047H51.7187V81.4985C50.4891 80.4055 48.8498 79.8591 47.0738 80.1323C44.4781 80.4055 42.4289 82.5914 42.019 85.1871Z" fill="white" stroke="#C5CCDA" stroke-width="1.5905" stroke-miterlimit="10" stroke-linejoin="round"/>
+<path d="M94.0691 65.1049V95.4333C94.0691 101.718 88.8777 106.772 82.5934 106.772H51.9917V90.3786C50.8988 91.3349 49.5327 91.7447 48.0299 91.7447C44.4779 91.7447 41.7456 88.6026 42.0188 84.914C42.4287 82.1817 44.6145 80.1325 47.0736 79.7226C48.8496 79.586 50.6256 80.1325 51.7185 81.0888V64.695H69.3418C68.7953 65.5147 68.6587 66.471 68.6587 67.4273C68.6587 70.8427 71.6642 73.7116 75.3528 73.3017C78.0851 73.0285 80.4076 70.7061 80.6808 68.1104C80.8174 66.8808 80.5442 65.7879 80.1344 64.695L94.0691 65.1049Z" fill="white" stroke="#C5CCDA" stroke-width="1.5905" stroke-miterlimit="10" stroke-linejoin="round"/>
+<path d="M106.911 52.6728L93.3859 50.3503C93.6591 51.4432 93.7958 52.5362 93.3859 53.6291C92.5662 56.2247 90.1072 58.0007 87.3749 57.8641C83.8229 57.5909 81.2272 54.4488 81.7737 51.0334C81.9103 50.0771 82.3201 49.2574 82.8666 48.5743L65.3799 45.4322L68.1122 29.7215C69.2051 30.8144 70.8445 31.4975 72.7571 31.4975C75.2161 31.3609 77.2654 29.8581 77.9484 27.6723C79.3146 24.1203 76.9921 20.2951 73.3035 19.7486C72.074 19.4754 70.8445 19.7486 69.7516 20.1585L72.4839 4.44775L102.539 9.63912C108.823 10.732 112.922 16.6065 111.829 22.7541L106.911 52.6728Z" fill="#D6DCE8" stroke="#AAB2C5" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M113.473 64.1926L118.015 62.8236C118.344 62.7281 118.344 62.2505 118.015 62.155L113.473 60.786C113.356 60.7542 113.271 60.6693 113.24 60.5526L111.871 56.0211C111.775 55.6921 111.297 55.6921 111.202 56.0211L109.833 60.5526C109.801 60.6693 109.716 60.7542 109.6 60.786L105.068 62.155C104.739 62.2505 104.739 62.7281 105.068 62.8236L109.61 64.1926C109.727 64.2244 109.812 64.3093 109.844 64.4261L111.213 68.9682C111.308 69.2971 111.786 69.2971 111.881 68.9682L113.25 64.4261C113.271 64.3093 113.356 64.2244 113.473 64.1926Z" fill="#AAB2C5"/>
+<path d="M103.424 24.4522L109.073 22.7495C109.482 22.6307 109.482 22.0367 109.073 21.9179L103.424 20.2152C103.279 20.1756 103.173 20.07 103.133 19.9248L101.431 14.2887C101.312 13.8795 100.718 13.8795 100.599 14.2887L98.8965 19.9248C98.8569 20.07 98.7513 20.1756 98.6061 20.2152L92.97 21.9179C92.5608 22.0367 92.5608 22.6307 92.97 22.7495L98.6193 24.4522C98.7645 24.4918 98.8701 24.5974 98.9097 24.7426L100.612 30.3919C100.731 30.8011 101.325 30.8011 101.444 30.3919L103.147 24.7426C103.173 24.5974 103.279 24.4918 103.424 24.4522Z" fill="#AAB2C5"/>
+<path d="M62.357 5.26099L65.1958 4.40543C65.4015 4.34575 65.4015 4.0473 65.1958 3.98761L62.357 3.13205C62.2841 3.11216 62.231 3.0591 62.2111 2.98615L61.3555 0.154199C61.2958 -0.0513995 60.9973 -0.0513995 60.9376 0.154199L60.082 2.98615C60.0621 3.0591 60.009 3.11216 59.9361 3.13205L57.1039 3.98761C56.8983 4.0473 56.8983 4.34575 57.1039 4.40543L59.9427 5.26099C60.0157 5.28088 60.0687 5.33394 60.0886 5.4069L60.9443 8.24548C61.004 8.45107 61.3024 8.45107 61.3621 8.24548L62.2177 5.4069C62.231 5.33394 62.2841 5.28088 62.357 5.26099Z" fill="#AAB2C5"/>
+</svg>
diff --git a/src/assets/tutorial/templates-dark.svg b/src/assets/tutorial/templates-dark.svg
new file mode 100644
index 00000000..5930cacb
--- /dev/null
+++ b/src/assets/tutorial/templates-dark.svg
@@ -0,0 +1,24 @@
+<svg width="145" height="110" viewBox="0 0 145 110" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M74.6528 108.28C104.218 108.28 128.187 84.3113 128.187 54.6402C128.187 24.9692 104.113 1 74.6528 1C45.0873 1 21.1182 24.9692 21.1182 54.6402C21.1182 84.3113 45.0873 108.28 74.6528 108.28Z" fill="#1F2229" stroke="#3B414E" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M134.984 37.645C137.374 37.645 139.313 35.7068 139.313 33.3158C139.313 30.9248 137.374 28.9866 134.984 28.9866C132.593 28.9866 130.654 30.9248 130.654 33.3158C130.654 35.7068 132.593 37.645 134.984 37.645Z" fill="#3B414E"/>
+<path d="M141.319 20.7505C142.952 20.7505 144.275 19.4268 144.275 17.7939C144.275 16.1611 142.952 14.8374 141.319 14.8374C139.686 14.8374 138.362 16.1611 138.362 17.7939C138.362 19.4268 139.686 20.7505 141.319 20.7505Z" fill="#3B414E"/>
+<path d="M23.5469 19.4783C25.1797 19.4783 26.5034 18.1546 26.5034 16.5217C26.5034 14.8889 25.1797 13.5652 23.5469 13.5652C21.914 13.5652 20.5903 14.8889 20.5903 16.5217C20.5903 18.1546 21.914 19.4783 23.5469 19.4783Z" fill="#1F2229"/>
+<path d="M5.49073 76.4976C8.52318 76.4976 10.9815 74.0393 10.9815 71.0068C10.9815 67.9744 8.52318 65.5161 5.49073 65.5161C2.45828 65.5161 0 67.9744 0 71.0068C0 74.0393 2.45828 76.4976 5.49073 76.4976Z" fill="#1F2229"/>
+<path d="M85.5262 69.1928V89.5045C85.5262 91.2707 84.4985 93.037 83.0304 93.9201L67.4679 102.898C66.587 103.487 65.4125 103.782 64.3848 103.782V78.4656L84.7921 66.6907C85.2326 67.4266 85.5262 68.3097 85.5262 69.1928Z" fill="#2E333D" stroke="#494E59" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M64.3846 78.4656V103.782C63.3569 103.782 62.3292 103.487 61.3015 102.898L45.739 93.9201C44.1241 93.037 43.2432 91.4179 43.2432 89.5045V69.1928C43.2432 68.3097 43.5368 67.4266 43.9772 66.6907L64.3846 78.4656Z" fill="#1F2229" stroke="#494E59" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M84.7921 66.6908L64.3848 78.4657L43.8306 66.5437C44.271 65.8077 44.8583 65.0718 45.7392 64.6302L61.7421 55.3575C63.2102 54.4744 65.1188 54.4744 66.7338 55.2103L83.1772 64.7774C83.1772 64.7774 83.1772 64.7774 83.324 64.7774C83.9112 65.3662 84.4985 65.9549 84.7921 66.6908Z" fill="#2E333D" stroke="#494E59" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M127.809 69.1928V89.5045C127.809 91.2707 126.782 93.037 125.314 93.9201L109.751 102.898C108.87 103.487 107.696 103.782 106.668 103.782V78.4656L127.075 66.6907C127.516 67.4266 127.809 68.3097 127.809 69.1928Z" fill="#2E333D" stroke="#494E59" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M106.668 78.4656V103.782C105.64 103.782 104.612 103.487 103.585 102.898L88.0222 93.9201C86.4073 93.037 85.5264 91.4179 85.5264 89.5045V69.1928C85.5264 68.3097 85.82 67.4266 86.2604 66.6907L106.668 78.4656Z" fill="#1F2229" stroke="#494E59" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M127.075 66.6908L106.668 78.4657L86.1138 66.5437C86.5542 65.8077 87.1415 65.0718 88.0224 64.6302L104.025 55.3575C105.493 54.4744 107.402 54.4744 109.017 55.2103L125.46 64.7774C125.46 64.7774 125.46 64.7774 125.607 64.7774C126.194 65.3662 126.782 65.9549 127.075 66.6908Z" fill="#2E333D" stroke="#494E59" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M64.2381 30.7776V51.0892C64.2381 52.8554 63.2104 54.6217 61.7423 55.5048L46.1798 64.4831C45.2989 65.0719 44.1244 65.3662 43.0967 65.3662V40.0503L63.5041 28.2754C64.0913 29.0113 64.2381 29.8944 64.2381 30.7776Z" fill="#2E333D" stroke="#494E59" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M43.0965 40.0503V65.3662C42.0688 65.3662 41.0411 65.0719 40.0134 64.4831L24.4509 55.5048C22.836 54.6217 21.9551 53.0026 21.9551 51.0892V30.7776C21.9551 29.8944 22.2487 29.0113 22.6892 28.2754L43.0965 40.0503Z" fill="#1F2229" stroke="#494E59" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M63.6505 28.2751L43.2432 40.0499L22.689 28.1279C23.1294 27.392 23.7167 26.656 24.5976 26.2145L40.6005 16.9418C42.0686 16.0586 43.9772 16.0586 45.5922 16.7946L61.8887 26.5088C61.8887 26.5088 61.8887 26.5088 62.0356 26.5088C62.6228 26.9504 63.2101 27.5391 63.6505 28.2751Z" fill="#2E333D" stroke="#494E59" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M109.311 30.3358V53.0024C109.311 55.063 108.283 56.9765 106.374 58.0068L88.9031 68.1626C87.8754 68.7513 86.7009 69.0457 85.5264 69.0457V40.6388L108.576 27.3921C109.017 28.2752 109.311 29.3055 109.311 30.3358Z" fill="#2E333D" stroke="#494E59" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M85.5262 40.6388V58.5955V69.0457C84.3516 69.0457 83.1771 68.7513 82.1494 68.1626L74.515 63.747L64.5315 58.0067C62.7697 56.9764 61.742 55.063 61.5952 53.1496V30.1886C61.5952 29.1583 61.8888 28.128 62.3293 27.2449L85.5262 40.6388Z" fill="#1F2229" stroke="#494E59" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M108.429 27.3921L85.3792 40.6388L62.3291 27.2449C62.7695 26.3618 63.5036 25.6258 64.3845 25.1843L82.296 14.7341C84.0578 13.7038 86.1132 13.7038 87.875 14.5869L106.374 25.3315C106.374 25.3315 106.521 25.3315 106.521 25.4787C107.402 26.0674 107.989 26.6561 108.429 27.3921Z" fill="#2E333D" stroke="#494E59" stroke-width="2" stroke-miterlimit="10"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M108.206 12.7656C108.856 12.7656 109.383 13.2922 109.383 13.9418V20.9987C109.383 21.6483 108.856 22.1749 108.206 22.1749C107.557 22.1749 107.03 21.6483 107.03 20.9987V13.9418C107.03 13.2922 107.557 12.7656 108.206 12.7656Z" fill="#949BAB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M123.936 13.1101C124.396 13.5694 124.396 14.3141 123.936 14.7735L115.311 23.3986C114.852 23.8579 114.107 23.8579 113.648 23.3986C113.188 22.9393 113.188 22.1946 113.648 21.7353L122.273 13.1101C122.732 12.6508 123.477 12.6508 123.936 13.1101Z" fill="#949BAB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M114.087 29.6239C114.087 28.9743 114.614 28.4478 115.264 28.4478H123.105C123.754 28.4478 124.281 28.9743 124.281 29.6239C124.281 30.2735 123.754 30.8001 123.105 30.8001H115.264C114.614 30.8001 114.087 30.2735 114.087 29.6239Z" fill="#949BAB"/>
+<path d="M96.9656 43.7842C96.7253 44.8023 96.3648 45.8804 95.9443 46.7788C94.8027 48.9948 93.0003 50.7317 90.7772 51.8696C88.4942 53.0076 85.7905 53.4867 83.0868 52.8878C76.7182 51.5702 72.6326 45.3414 73.9544 38.9928C75.2762 32.6442 81.4646 28.5116 87.8333 29.8891C90.1164 30.3683 92.099 31.5062 93.7813 33.0634C96.6052 35.8784 97.8068 39.9511 96.9656 43.7842Z" fill="#6D7381" stroke="#949BAB" stroke-width="2" stroke-miterlimit="10" stroke-linejoin="round"/>
+<path d="M89.1596 40.3732H86.4797V37.6933C86.4797 37.1573 86.0628 36.6809 85.4673 36.6809C84.9314 36.6809 84.4549 37.0978 84.4549 37.6933V40.3732H81.7751C81.2391 40.3732 80.7627 40.79 80.7627 41.3855C80.7627 41.9811 81.1796 42.3979 81.7751 42.3979H84.4549V45.0778C84.4549 45.6137 84.8718 46.0902 85.4673 46.0902C86.0033 46.0902 86.4797 45.6733 86.4797 45.0778V42.3979H89.1596C89.6955 42.3979 90.172 41.9811 90.172 41.3855C90.172 40.79 89.6955 40.3732 89.1596 40.3732Z" fill="#C7CDDB"/>
+</svg>
diff --git a/src/assets/tutorial/templates-light.svg b/src/assets/tutorial/templates-light.svg
new file mode 100644
index 00000000..b7ce3848
--- /dev/null
+++ b/src/assets/tutorial/templates-light.svg
@@ -0,0 +1,24 @@
+<svg width="145" height="110" viewBox="0 0 145 110" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M74.6528 108.28C104.218 108.28 128.187 84.3113 128.187 54.6402C128.187 24.9692 104.113 1 74.6528 1C45.0873 1 21.1182 24.9692 21.1182 54.6402C21.1182 84.3113 45.0873 108.28 74.6528 108.28Z" fill="#F1F3F9" stroke="#D6DCE8" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M134.984 37.645C137.374 37.645 139.313 35.7068 139.313 33.3158C139.313 30.9248 137.374 28.9866 134.984 28.9866C132.593 28.9866 130.654 30.9248 130.654 33.3158C130.654 35.7068 132.593 37.645 134.984 37.645Z" fill="#F1F3F9"/>
+<path d="M141.319 20.7505C142.952 20.7505 144.275 19.4268 144.275 17.7939C144.275 16.1611 142.952 14.8374 141.319 14.8374C139.686 14.8374 138.362 16.1611 138.362 17.7939C138.362 19.4268 139.686 20.7505 141.319 20.7505Z" fill="#F1F3F9"/>
+<path d="M23.5469 19.4783C25.1797 19.4783 26.5034 18.1546 26.5034 16.5217C26.5034 14.8889 25.1797 13.5652 23.5469 13.5652C21.914 13.5652 20.5903 14.8889 20.5903 16.5217C20.5903 18.1546 21.914 19.4783 23.5469 19.4783Z" fill="#F1F3F9"/>
+<path d="M5.49073 76.4977C8.52318 76.4977 10.9815 74.0394 10.9815 71.007C10.9815 67.9745 8.52318 65.5162 5.49073 65.5162C2.45828 65.5162 0 67.9745 0 71.007C0 74.0394 2.45828 76.4977 5.49073 76.4977Z" fill="#F1F3F9"/>
+<path d="M85.5262 69.1928V89.5045C85.5262 91.2707 84.4985 93.037 83.0304 93.9201L67.4679 102.898C66.587 103.487 65.4125 103.782 64.3848 103.782V78.4656L84.7921 66.6907C85.2326 67.4266 85.5262 68.3097 85.5262 69.1928Z" fill="white" stroke="#D6DCE8" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M64.3846 78.4656V103.782C63.3569 103.782 62.3292 103.487 61.3015 102.898L45.739 93.9201C44.1241 93.037 43.2432 91.4179 43.2432 89.5045V69.1928C43.2432 68.3097 43.5368 67.4266 43.9772 66.6907L64.3846 78.4656Z" fill="#F1F3F9" stroke="#D6DCE8" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M84.7921 66.6908L64.3848 78.4657L43.8306 66.5437C44.271 65.8077 44.8583 65.0718 45.7392 64.6302L61.7421 55.3575C63.2102 54.4744 65.1188 54.4744 66.7338 55.2103L83.1772 64.7774C83.1772 64.7774 83.1772 64.7774 83.324 64.7774C83.9112 65.3662 84.4985 65.9549 84.7921 66.6908Z" fill="white" stroke="#D6DCE8" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M127.809 69.1928V89.5045C127.809 91.2707 126.782 93.037 125.314 93.9201L109.751 102.898C108.87 103.487 107.696 103.782 106.668 103.782V78.4656L127.075 66.6907C127.516 67.4266 127.809 68.3097 127.809 69.1928Z" fill="white" stroke="#D6DCE8" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M106.668 78.4656V103.782C105.64 103.782 104.612 103.487 103.585 102.898L88.0222 93.9201C86.4073 93.037 85.5264 91.4179 85.5264 89.5045V69.1928C85.5264 68.3097 85.82 67.4266 86.2604 66.6907L106.668 78.4656Z" fill="#F1F3F9" stroke="#D6DCE8" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M127.075 66.6908L106.668 78.4657L86.1138 66.5437C86.5542 65.8077 87.1415 65.0718 88.0224 64.6302L104.025 55.3575C105.493 54.4744 107.402 54.4744 109.017 55.2103L125.46 64.7774C125.46 64.7774 125.46 64.7774 125.607 64.7774C126.194 65.3662 126.782 65.9549 127.075 66.6908Z" fill="white" stroke="#D6DCE8" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M64.2381 30.7773V51.089C64.2381 52.8552 63.2104 54.6214 61.7423 55.5045L46.1798 64.4829C45.2989 65.0716 44.1244 65.366 43.0967 65.366V40.05L63.5041 28.2751C64.0913 29.0111 64.2381 29.8942 64.2381 30.7773Z" fill="white" stroke="#D6DCE8" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M43.0965 40.05V65.366C42.0688 65.366 41.0411 65.0716 40.0134 64.4829L24.4509 55.5045C22.836 54.6214 21.9551 53.0024 21.9551 51.089V30.7773C21.9551 29.8942 22.2487 29.0111 22.6892 28.2751L43.0965 40.05Z" fill="#F1F3F9" stroke="#D6DCE8" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M63.6505 28.275L43.2432 40.0498L22.689 28.1278C23.1294 27.3918 23.7167 26.6559 24.5976 26.2143L40.6005 16.9416C42.0686 16.0585 43.9772 16.0585 45.5922 16.7944L61.8887 26.5087C61.8887 26.5087 61.8887 26.5087 62.0356 26.5087C62.6228 26.9503 63.2101 27.539 63.6505 28.275Z" fill="white" stroke="#D6DCE8" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M109.311 30.3358V53.0024C109.311 55.063 108.283 56.9765 106.374 58.0068L88.9031 68.1626C87.8754 68.7513 86.7009 69.0457 85.5264 69.0457V40.6388L108.576 27.3921C109.017 28.2752 109.311 29.3055 109.311 30.3358Z" fill="white" stroke="#AAB2C5" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M85.5262 40.6388V58.5955V69.0457C84.3516 69.0457 83.1771 68.7513 82.1494 68.1626L74.515 63.747L64.5315 58.0067C62.7697 56.9764 61.742 55.063 61.5952 53.1496V30.1886C61.5952 29.1583 61.8888 28.128 62.3293 27.2449L85.5262 40.6388Z" fill="#F1F3F9" stroke="#AAB2C5" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M108.429 27.3921L85.3792 40.6388L62.3291 27.2449C62.7695 26.3618 63.5036 25.6258 64.3845 25.1843L82.296 14.7341C84.0578 13.7038 86.1132 13.7038 87.875 14.5869L106.374 25.3315C106.374 25.3315 106.521 25.3315 106.521 25.4787C107.402 26.0674 107.989 26.6561 108.429 27.3921Z" fill="white" stroke="#AAB2C5" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M108.206 12.7656C108.856 12.7656 109.383 13.2922 109.383 13.9418V20.9987C109.383 21.6483 108.856 22.1749 108.206 22.1749C107.557 22.1749 107.03 21.6483 107.03 20.9987V13.9418C107.03 13.2922 107.557 12.7656 108.206 12.7656Z" fill="#AAB2C5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M123.936 13.1101C124.396 13.5694 124.396 14.3141 123.936 14.7735L115.311 23.3986C114.852 23.8579 114.107 23.8579 113.648 23.3986C113.188 22.9393 113.188 22.1946 113.648 21.7353L122.273 13.1101C122.732 12.6508 123.477 12.6508 123.936 13.1101Z" fill="#AAB2C5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M114.087 29.624C114.087 28.9745 114.614 28.4479 115.264 28.4479H123.105C123.754 28.4479 124.281 28.9745 124.281 29.624C124.281 30.2736 123.754 30.8002 123.105 30.8002H115.264C114.614 30.8002 114.087 30.2736 114.087 29.624Z" fill="#AAB2C5"/>
+<path d="M96.9656 43.7842C96.7253 44.8023 96.3648 45.8804 95.9443 46.7788C94.8027 48.9948 93.0003 50.7317 90.7772 51.8696C88.4942 53.0076 85.7905 53.4867 83.0868 52.8878C76.7182 51.5702 72.6326 45.3414 73.9544 38.9928C75.2762 32.6442 81.4646 28.5116 87.8333 29.8891C90.1164 30.3683 92.099 31.5062 93.7813 33.0634C96.6052 35.8784 97.8068 39.9511 96.9656 43.7842Z" fill="#D6DCE8" stroke="#AAB2C5" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M89.1596 39.3733H87.4797V37.6934C87.4797 36.644 86.6532 35.681 85.4673 35.681C84.4179 35.681 83.4549 36.5075 83.4549 37.6934V39.3733H81.7751C80.7257 39.3733 79.7627 40.1998 79.7627 41.3857C79.7627 41.923 79.9549 42.4387 80.3385 42.8223C80.7221 43.2059 81.2378 43.398 81.7751 43.398H83.4549V45.0779C83.4549 46.1273 84.2814 47.0903 85.4673 47.0903C86.5167 47.0903 87.4797 46.2638 87.4797 45.0779V43.398H89.1596C90.2089 43.398 91.172 42.5716 91.172 41.3857C91.172 40.1998 90.2089 39.3733 89.1596 39.3733Z" fill="white" stroke="#AAB2C5" stroke-width="2"/>
+</svg>
diff --git a/src/components/TableTutorial/Steps/Step1Import.tsx b/src/components/TableTutorial/Steps/Step1Import.tsx
index 005fcaab..682572fa 100644
--- a/src/components/TableTutorial/Steps/Step1Import.tsx
+++ b/src/components/TableTutorial/Steps/Step1Import.tsx
@@ -9,7 +9,7 @@ import { tableScope, tableRowsAtom } from "@src/atoms/tableScope";
 
 export const Step1Import = {
   id: "import",
-  title: "Let’s create a simple product pricing table",
+  title: "Let’s create a simple product pricing table.",
   description:
     "Rowy connects to your database and displays it in a spreadsheet UI, making it easy to manage your data.",
   StepComponent,
diff --git a/src/components/TableTutorial/Steps/Step2Add.tsx b/src/components/TableTutorial/Steps/Step2Add.tsx
index 2c7f2e8f..5e6d9dbe 100644
--- a/src/components/TableTutorial/Steps/Step2Add.tsx
+++ b/src/components/TableTutorial/Steps/Step2Add.tsx
@@ -15,7 +15,7 @@ import { FieldType } from "@src/constants/fields";
 
 export const Step2Add = {
   id: "add",
-  title: "Let’s add some columns and rows to your table",
+  title: "Let’s add some columns and rows to your table.",
   description:
     "When you make changes made to your data in Rowy, they’re reflected in your Firestore database in realtime.",
   StepComponent,
diff --git a/src/components/TableTutorial/Steps/Step3Invite.tsx b/src/components/TableTutorial/Steps/Step3Invite.tsx
index 139935cb..395def54 100644
--- a/src/components/TableTutorial/Steps/Step3Invite.tsx
+++ b/src/components/TableTutorial/Steps/Step3Invite.tsx
@@ -1,10 +1,29 @@
 import { ITableTutorialStepComponentProps } from ".";
 
+import { useTheme, Link } from "@mui/material";
+import InlineOpenInNewIcon from "@src/components/InlineOpenInNewIcon";
+
+import { WIKI_LINKS } from "@src/constants/externalLinks";
+import inviteUsersLight from "@src/assets/tutorial/invite-users-light.gif";
+import inviteUsersDark from "@src/assets/tutorial/invite-users-dark.gif";
+
 export const Step3Invite = {
   id: "invite",
-  title: "Let’s create a simple product pricing table",
-  description:
-    "Rowy allows you to invite your team members with granular, role-based access controls.",
+  title: "Collaborate with your team to manage your data in realtime.",
+  description: (
+    <>
+      Rowy allows you to invite your team members with granular, role-based
+      access controls.{" "}
+      <Link
+        href={WIKI_LINKS.setupRoles}
+        target="_blank"
+        rel="noopener noreferrer"
+      >
+        Read the docs
+        <InlineOpenInNewIcon />
+      </Link>
+    </>
+  ),
   StepComponent,
 };
 
@@ -12,6 +31,14 @@ export default Step3Invite;
 
 function StepComponent({ setComplete }: ITableTutorialStepComponentProps) {
   setComplete(true);
+  const theme = useTheme();
 
-  return <>TODO:</>;
+  return (
+    <img
+      src={theme.palette.mode === "dark" ? inviteUsersDark : inviteUsersLight}
+      alt="Animation of a Rowy table with three cursors: admin, editor, and viewer."
+      width={600}
+      height={200}
+    />
+  );
 }
diff --git a/src/components/TableTutorial/Steps/Step4Code.tsx b/src/components/TableTutorial/Steps/Step4Code.tsx
index f462fd64..d7fde464 100644
--- a/src/components/TableTutorial/Steps/Step4Code.tsx
+++ b/src/components/TableTutorial/Steps/Step4Code.tsx
@@ -1,9 +1,30 @@
 import { ITableTutorialStepComponentProps } from ".";
 
+import { useTheme, Link } from "@mui/material";
+import InlineOpenInNewIcon from "@src/components/InlineOpenInNewIcon";
+
+import { WIKI_LINKS } from "@src/constants/externalLinks";
+import derivativeLight from "@src/assets/tutorial/derivative-light.gif";
+import derivativeDark from "@src/assets/tutorial/derivative-dark.gif";
+
 export const Step4Code = {
   id: "code",
-  title: "Let’s learn how to unlock the true powers of Rowy",
-  description: "TODO:",
+  title: "Let’s learn how to unlock the true powers of Rowy.",
+  description: (
+    <>
+      You can write code in JavaScript to build any data logic with Derivative
+      columns, or build CRUD tasks with Extensions. And you can use any API or
+      NPM package.{" "}
+      <Link
+        href={WIKI_LINKS.fieldTypesDerivative}
+        target="_blank"
+        rel="noopener noreferrer"
+      >
+        Learn more
+        <InlineOpenInNewIcon />
+      </Link>
+    </>
+  ),
   StepComponent,
 };
 
@@ -11,6 +32,14 @@ export default Step4Code;
 
 function StepComponent({ setComplete }: ITableTutorialStepComponentProps) {
   setComplete(true);
+  const theme = useTheme();
 
-  return <>TODO:</>;
+  return (
+    <img
+      src={theme.palette.mode === "dark" ? derivativeDark : derivativeLight}
+      alt="Animation of a user entering two values, and the result of the executed Derivative code being displayed."
+      width={600}
+      height={200}
+    />
+  );
 }
diff --git a/src/components/TableTutorial/Steps/Step5Finish.tsx b/src/components/TableTutorial/Steps/Step5Finish.tsx
index a851718c..ffa00abe 100644
--- a/src/components/TableTutorial/Steps/Step5Finish.tsx
+++ b/src/components/TableTutorial/Steps/Step5Finish.tsx
@@ -1,7 +1,14 @@
 import { ITableTutorialStepComponentProps } from ".";
-import { Typography, Link } from "@mui/material";
+import { useTheme, Grid, Typography, Link } from "@mui/material";
 import { EXTERNAL_LINKS } from "@src/constants/externalLinks";
 
+import playgroundLight from "@src/assets/tutorial/playground-light.svg";
+import playgroundDark from "@src/assets/tutorial/playground-dark.svg";
+import templatesLight from "@src/assets/tutorial/templates-light.svg";
+import templatesDark from "@src/assets/tutorial/templates-dark.svg";
+import communityLight from "@src/assets/tutorial/community-light.svg";
+import communityDark from "@src/assets/tutorial/community-dark.svg";
+
 export const Step5Finish = {
   id: "finish",
   title: "Congrats, you’re ready to start building your own table! 🎉",
@@ -13,54 +20,85 @@ export default Step5Finish;
 
 function StepComponent({ setComplete }: ITableTutorialStepComponentProps) {
   setComplete(true);
+  const theme = useTheme();
 
   return (
-    <Typography
-      component="ul"
-      variant="body1"
-      sx={{ margin: 0, paddingLeft: "1em", "& > * + *": { mt: 1 } }}
+    <Grid
+      container
+      spacing={4}
+      sx={{
+        textAlign: "center",
+        "& img": { mb: 1 },
+        maxWidth: 840,
+      }}
     >
-      <li>
-        Play around with the demo tables in our live community{" "}
-        <Link
-          href={EXTERNAL_LINKS.playground}
-          target="_blank"
-          rel="noopener noreferrer"
-        >
-          playground
-        </Link>{" "}
-        to learn what you can do with Rowy
-      </li>
-      <li>
-        Check out and deploy our{" "}
-        <Link
-          href={EXTERNAL_LINKS.templates}
-          target="_blank"
-          rel="noopener noreferrer"
-        >
-          templates
-        </Link>{" "}
-        to explore how Rowy can improve your project
-      </li>
-      <li>
-        Connect with us on{" "}
-        <Link
-          href={EXTERNAL_LINKS.discord}
-          target="_blank"
-          rel="noopener noreferrer"
-        >
-          Discord
-        </Link>{" "}
-        and{" "}
-        <Link
-          href={EXTERNAL_LINKS.gitHub}
-          target="_blank"
-          rel="noopener noreferrer"
-        >
-          GitHub
-        </Link>{" "}
-        and ask us how Rowy can help with your specific use case
-      </li>
-    </Typography>
+      <Grid item xs={12} sm={6} md={4}>
+        <img
+          src={theme.palette.mode === "dark" ? playgroundDark : playgroundLight}
+          alt="Puzzle pieces coming together"
+          height={100}
+        />
+
+        <Typography>
+          Play around with the demo tables in our live community{" "}
+          <Link
+            href={EXTERNAL_LINKS.playground}
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+            playground
+          </Link>{" "}
+          to learn what you can do with Rowy.
+        </Typography>
+      </Grid>
+
+      <Grid item xs={12} sm={6} md={4}>
+        <img
+          src={theme.palette.mode === "dark" ? templatesDark : templatesLight}
+          alt="Blocks coming together"
+          height={100}
+        />
+
+        <Typography>
+          Check out and deploy our{" "}
+          <Link
+            href={EXTERNAL_LINKS.templates}
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+            templates
+          </Link>{" "}
+          to explore how Rowy can improve your project.
+        </Typography>
+      </Grid>
+
+      <Grid item xs={12} sm={6} md={4}>
+        <img
+          src={theme.palette.mode === "dark" ? communityDark : communityLight}
+          alt="People coming together"
+          height={100}
+        />
+
+        <Typography>
+          Connect with us on{" "}
+          <Link
+            href={EXTERNAL_LINKS.discord}
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+            Discord
+          </Link>{" "}
+          and{" "}
+          <Link
+            href={EXTERNAL_LINKS.gitHub}
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+            GitHub
+          </Link>{" "}
+          and ask us how Rowy can help with your specific use case.
+        </Typography>
+      </Grid>
+    </Grid>
   );
 }
diff --git a/src/components/TableTutorial/TableTutorial.tsx b/src/components/TableTutorial/TableTutorial.tsx
index 2eb56f4c..a3d4cc3c 100644
--- a/src/components/TableTutorial/TableTutorial.tsx
+++ b/src/components/TableTutorial/TableTutorial.tsx
@@ -83,7 +83,7 @@ export default function TableTutorial() {
             position: "static",
             height: "100%",
 
-            borderRadius: 2,
+            borderRadius: 3,
             borderBottomLeftRadius: 0,
             borderBottomRightRadius: 0,
             border: "none",

From 9ebd5b3aafbce1f887ad10c11669cbcc1c153d86 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 17 Aug 2022 10:49:52 +0200
Subject: [PATCH 082/309] update discord link

---
 src/constants/externalLinks.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/constants/externalLinks.ts b/src/constants/externalLinks.ts
index b75be8f4..a8dae59d 100644
--- a/src/constants/externalLinks.ts
+++ b/src/constants/externalLinks.ts
@@ -11,7 +11,7 @@ export const EXTERNAL_LINKS = {
   playground: meta.homepage.replace("//", "//demo."),
 
   gitHub: meta.repository.url.replace(".git", ""),
-  discord: "https://discord.gg/B8yAD5PDX4",
+  discord: "https://rowy.io/discord",
   twitter: "https://twitter.com/rowyio",
   productHunt: "https://www.producthunt.com/products/rowy-2",
 

From c665495be9f4a155c79074321305645abc99bef6 Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Wed, 17 Aug 2022 15:00:33 +0300
Subject: [PATCH 083/309] feat(airtable-migration): add checked value to radio
 inputs

---
 src/components/TableModals/ImportCsvWizard/Step1Columns.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx b/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx
index e90159bd..54060430 100644
--- a/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx
+++ b/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx
@@ -312,12 +312,12 @@ export default function Step1Columns({
             >
               <FormControlLabel
                 value="auto"
-                control={<Radio />}
+                control={<Radio checked={config.documentId === "auto"} />}
                 label="Auto-Generated"
               />
               <FormControlLabel
                 value="column"
-                control={<Radio />}
+                control={<Radio checked={config.documentId === "column"} />}
                 label="Pick Column"
               />
               <TextField

From 576de947954772ab50fc6619e73293a872ae94b4 Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Wed, 17 Aug 2022 15:53:25 +0300
Subject: [PATCH 084/309] feat(airtable-migration): create new column as
 default

---
 .../ImportCsvWizard/Step1Columns.tsx          | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx b/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx
index 54060430..c0764a10 100644
--- a/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx
+++ b/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx
@@ -70,12 +70,23 @@ export default function Step1Columns({
           find(tableColumns, (column) =>
             column.label.toLowerCase().includes(field.toLowerCase())
           )?.value ?? null;
-        if (match) {
-          setConfig((config) => ({
-            ...config,
-            pairs: [...config.pairs, { csvKey: field, columnKey: match }],
-          }));
+
+        const columnKey = camelCase(field);
+        const columnConfig: Partial<CsvConfig> = { pairs: [], newColumns: [] };
+        columnConfig.pairs = [{ csvKey: field, columnKey: match ?? columnKey }];
+        if (!match) {
+          columnConfig.newColumns = [
+            {
+              name: field,
+              fieldName: columnKey,
+              key: columnKey,
+              type: suggestType(csvData.rows, field) || FieldType.shortText,
+              index: -1,
+              config: {},
+            },
+          ];
         }
+        updateConfig(columnConfig);
       } else {
         const newValue = [...selectedFields];
         newValue.splice(newValue.indexOf(field), 1);

From 1c27b26c595d005ed8e7f4f42d3b54376c9c6ad0 Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Wed, 17 Aug 2022 16:17:16 +0300
Subject: [PATCH 085/309] feat(airtable-migration): add color csv import parser

---
 src/components/fields/Color/index.tsx | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/components/fields/Color/index.tsx b/src/components/fields/Color/index.tsx
index c927e908..392094eb 100644
--- a/src/components/fields/Color/index.tsx
+++ b/src/components/fields/Color/index.tsx
@@ -1,6 +1,7 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
 import withPopoverCell from "@src/components/fields/_withTableCell/withPopoverCell";
+import { toColor } from "react-color-palette";
 
 import ColorIcon from "@mui/icons-material/Colorize";
 import BasicCell from "@src/components/fields/_BasicCell/BasicCellNull";
@@ -30,5 +31,17 @@ export const config: IFieldConfig = {
   }),
   TableEditor: NullEditor as any,
   SideDrawerField,
+  csvImportParser: (value: string) => {
+    try {
+      const obj = JSON.parse(value);
+      if ("hex" in obj) {
+        return toColor("hex", obj.hex);
+      }
+      throw Error("Invalid color value");
+    } catch (error) {
+      console.error(error);
+      return null;
+    }
+  },
 };
 export default config;

From c56fdc0567ed955956c3b22bce19f8e3bb44e088 Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Wed, 17 Aug 2022 16:28:41 +0300
Subject: [PATCH 086/309] feat(csv-import): add import parsers to rating,
 slider

---
 src/components/fields/Color/index.tsx  |  4 ++--
 src/components/fields/Rating/index.tsx | 12 ++++++++++++
 src/components/fields/Slider/index.tsx | 12 ++++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/components/fields/Color/index.tsx b/src/components/fields/Color/index.tsx
index 392094eb..13cb9843 100644
--- a/src/components/fields/Color/index.tsx
+++ b/src/components/fields/Color/index.tsx
@@ -37,9 +37,9 @@ export const config: IFieldConfig = {
       if ("hex" in obj) {
         return toColor("hex", obj.hex);
       }
-      throw Error("Invalid color value");
+      throw new Error();
     } catch (error) {
-      console.error(error);
+      console.error("Invalid color value");
       return null;
     }
   },
diff --git a/src/components/fields/Rating/index.tsx b/src/components/fields/Rating/index.tsx
index 1492a4b4..3cbc5108 100644
--- a/src/components/fields/Rating/index.tsx
+++ b/src/components/fields/Rating/index.tsx
@@ -36,5 +36,17 @@ export const config: IFieldConfig = {
   filter: {
     operators: filterOperators,
   },
+  csvImportParser: (value: string) => {
+    try {
+      const parsed = parseInt(value);
+      if (isNaN(parsed)) {
+        throw new Error("Invalid rating value!");
+      }
+      return parsed;
+    } catch (error) {
+      console.error(error);
+      return null;
+    }
+  },
 };
 export default config;
diff --git a/src/components/fields/Slider/index.tsx b/src/components/fields/Slider/index.tsx
index 69363caa..80816fdf 100644
--- a/src/components/fields/Slider/index.tsx
+++ b/src/components/fields/Slider/index.tsx
@@ -35,5 +35,17 @@ export const config: IFieldConfig = {
     operators: filterOperators,
   },
   SideDrawerField,
+  csvImportParser: (value: string) => {
+    try {
+      const parsed = parseInt(value);
+      if (isNaN(parsed)) {
+        throw new Error("Invalid slider value!");
+      }
+      return parsed;
+    } catch (error) {
+      console.error(error);
+      return null;
+    }
+  },
 };
 export default config;

From 67e6fc5e710a8084872e29deac54ea8737a6d732 Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Wed, 17 Aug 2022 16:53:10 +0300
Subject: [PATCH 087/309] feat(csv-import): add geopoint parser

---
 .../TableModals/ImportExistingWizard/utils.ts       |  1 +
 src/components/fields/GeoPoint/TableCell.tsx        |  2 +-
 src/components/fields/GeoPoint/index.tsx            | 13 +++++++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/components/TableModals/ImportExistingWizard/utils.ts b/src/components/TableModals/ImportExistingWizard/utils.ts
index 7b6d36e0..98ec10e0 100644
--- a/src/components/TableModals/ImportExistingWizard/utils.ts
+++ b/src/components/TableModals/ImportExistingWizard/utils.ts
@@ -46,6 +46,7 @@ const inferTypeFromValue = (value: any) => {
 
   if (typeof value === "object") {
     if ("hex" in value && "rgb" in value) return FieldType.color;
+    if ("latitude" in value && "longitude" in value) return FieldType.geoPoint;
     if ("toDate" in value) return FieldType.dateTime;
     return FieldType.json;
   }
diff --git a/src/components/fields/GeoPoint/TableCell.tsx b/src/components/fields/GeoPoint/TableCell.tsx
index de271abd..2e57a835 100644
--- a/src/components/fields/GeoPoint/TableCell.tsx
+++ b/src/components/fields/GeoPoint/TableCell.tsx
@@ -2,7 +2,7 @@ import { IBasicCellProps } from "@src/components/fields/types";
 import { Typography } from "@mui/material";
 
 export default function GeoPoint({ value }: IBasicCellProps) {
-  if (value === undefined) return null;
+  if (!value) return null;
   const { latitude, longitude } = value;
 
   if (latitude === undefined || longitude === undefined)
diff --git a/src/components/fields/GeoPoint/index.tsx b/src/components/fields/GeoPoint/index.tsx
index 3b3168ec..21b898b1 100644
--- a/src/components/fields/GeoPoint/index.tsx
+++ b/src/components/fields/GeoPoint/index.tsx
@@ -1,4 +1,5 @@
 import { lazy } from "react";
+import { GeoPoint } from "firebase/firestore";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
 import withBasicCell from "@src/components/fields/_withTableCell/withBasicCell";
 
@@ -26,5 +27,17 @@ export const config: IFieldConfig = {
   TableCell: withBasicCell(TableCell),
   TableEditor: withSideDrawerEditor(TableCell),
   SideDrawerField,
+  csvImportParser: (value: string) => {
+    try {
+      const { latitude, longitude } = JSON.parse(value);
+      if (latitude && longitude) {
+        return new GeoPoint(latitude, longitude);
+      }
+      throw new Error();
+    } catch (e) {
+      console.error("Invalid Geopoint value");
+      return null;
+    }
+  },
 };
 export default config;

From 086fd66dad3f4a492e99f5bbf015ad1a5cf36bf1 Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Thu, 18 Aug 2022 09:55:09 +0300
Subject: [PATCH 088/309] feat(csv-import): fix invalid columnKey select

---
 .../TableModals/ImportCsvWizard/Step1Columns.tsx          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx b/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx
index c0764a10..24ef65bd 100644
--- a/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx
+++ b/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx
@@ -119,7 +119,7 @@ export default function Step1Columns({
 
   const handleChange = (csvKey: string) => (value: string) => {
     const columnKey = !!tableSchema.columns?.[value] ? value : camelCase(value);
-
+    if (columnKey === "") return;
     // Check if this pair already exists in config
     const configIndex = findIndex(config.pairs, { csvKey });
     if (configIndex > -1) {
@@ -334,7 +334,7 @@ export default function Step1Columns({
               <TextField
                 disabled={config.documentId !== "column"}
                 select
-                value={config.documentIdCsvKey}
+                value={config.documentIdCsvKey ?? ""}
                 onChange={(e) =>
                   setConfig((prev) => ({
                     ...prev,
@@ -369,8 +369,8 @@ export default function Step1Columns({
           </FormControl>
         </Grid>
         <Grid item xs={12}>
-          {stepErrors().map((error) => (
-            <Alert severity="error" sx={{ my: 1 }}>
+          {stepErrors().map((error, index) => (
+            <Alert key={index} severity="error" sx={{ my: 1 }}>
               <AlertTitle>{error}</AlertTitle>
             </Alert>
           ))}

From 2034efaf3ba56d6f916a762833b1a2c40420d245 Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Thu, 18 Aug 2022 09:56:03 +0300
Subject: [PATCH 089/309] feat(airtable-import): remove redundant condition

---
 src/components/TableModals/ImportAirtableWizard/utils.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/TableModals/ImportAirtableWizard/utils.ts b/src/components/TableModals/ImportAirtableWizard/utils.ts
index bc7ff765..89130dcb 100644
--- a/src/components/TableModals/ImportAirtableWizard/utils.ts
+++ b/src/components/TableModals/ImportAirtableWizard/utils.ts
@@ -9,8 +9,6 @@ import {
 import { isValid as isValidDate, parseISO } from "date-fns";
 
 export const inferTypeFromValue = (value: any) => {
-  if (!value || typeof value === "function") return;
-
   if (Array.isArray(value) && typeof value[0] === "string")
     return FieldType.multiSelect;
   if (typeof value === "boolean") return FieldType.checkbox;

From f775fe611f0100da570cdd733995cad7c8a9dae6 Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Thu, 18 Aug 2022 11:18:11 +0300
Subject: [PATCH 090/309] feat(airtable-import): add new column as default

---
 .../ImportAirtableWizard/Step1Columns.tsx     | 27 +++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/components/TableModals/ImportAirtableWizard/Step1Columns.tsx b/src/components/TableModals/ImportAirtableWizard/Step1Columns.tsx
index 12cde08a..d3500605 100644
--- a/src/components/TableModals/ImportAirtableWizard/Step1Columns.tsx
+++ b/src/components/TableModals/ImportAirtableWizard/Step1Columns.tsx
@@ -63,12 +63,29 @@ export default function Step1Columns({
           find(tableColumns, (column) =>
             column.label.toLowerCase().includes(field.toLowerCase())
           )?.value ?? null;
-        if (match) {
-          setConfig((config) => ({
-            ...config,
-            pairs: [...config.pairs, { fieldKey: field, columnKey: match }],
-          }));
+
+        const columnKey = camelCase(field);
+        const columnConfig: Partial<AirtableConfig> = {
+          pairs: [],
+          newColumns: [],
+        };
+        columnConfig.pairs = [
+          { fieldKey: field, columnKey: match ?? columnKey },
+        ];
+        if (!match) {
+          columnConfig.newColumns = [
+            {
+              name: field,
+              fieldName: columnKey,
+              key: columnKey,
+              type:
+                suggestType(airtableData.records, field) || FieldType.shortText,
+              index: -1,
+              config: {},
+            },
+          ];
         }
+        updateConfig(columnConfig);
       } else {
         const newValue = [...selectedFields];
         newValue.splice(newValue.indexOf(field), 1);

From d1fc7a009f4f46dbe9f17036edf418862a064e55 Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Thu, 18 Aug 2022 11:18:39 +0300
Subject: [PATCH 091/309] feat(data-import): disable audit logs

---
 src/atoms/tableScope/rowActions.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/atoms/tableScope/rowActions.ts b/src/atoms/tableScope/rowActions.ts
index db94185d..75ec06c1 100644
--- a/src/atoms/tableScope/rowActions.ts
+++ b/src/atoms/tableScope/rowActions.ts
@@ -273,13 +273,13 @@ export const bulkAddRowsAtom = atom(
     // Write to db
     await bulkWriteDb(operations, onBatchCommit);
 
-    if (auditChange) {
-      const auditChangePromises: Promise<void>[] = [];
-      for (const operation of operations) {
-        auditChangePromises.push(auditChange("ADD_ROW", operation.path));
-      }
-      await Promise.all(auditChangePromises);
-    }
+    // if (auditChange) {
+    //   const auditChangePromises: Promise<void>[] = [];
+    //   for (const operation of operations) {
+    //     auditChangePromises.push(auditChange("ADD_ROW", operation.path));
+    //   }
+    //   await Promise.all(auditChangePromises);
+    // }
   }
 );
 

From e4c49b11ecdcfd31ae6f40d3ee92dfa512d0bb34 Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Thu, 18 Aug 2022 11:40:34 +0300
Subject: [PATCH 092/309] feat(airtable-import): add url input instead
 base/table id

---
 .../ImportData/ImportFromAirtable.tsx         | 43 ++++++++-----------
 1 file changed, 18 insertions(+), 25 deletions(-)

diff --git a/src/components/TableToolbar/ImportData/ImportFromAirtable.tsx b/src/components/TableToolbar/ImportData/ImportFromAirtable.tsx
index 53b226e0..494ec5a9 100644
--- a/src/components/TableToolbar/ImportData/ImportFromAirtable.tsx
+++ b/src/components/TableToolbar/ImportData/ImportFromAirtable.tsx
@@ -9,6 +9,7 @@ import {
   tableScope,
 } from "@src/atoms/tableScope";
 import { analytics, logEvent } from "@src/analytics";
+import { find } from "lodash-es";
 
 export default function ImportFromAirtable() {
   const [{ baseId, tableId, apiKey }, setImportAirtable] = useAtom(
@@ -18,6 +19,7 @@ export default function ImportFromAirtable() {
   const openTableModal = useSetAtom(tableModalAtom, tableScope);
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState<any>({});
+  const [tableUrl, setTableUrl] = useState("");
 
   useEffect(() => {
     return () => {
@@ -32,6 +34,16 @@ export default function ImportFromAirtable() {
     };
   }, [setImportAirtable]);
 
+  useEffect(() => {
+    try {
+      const url = new URL(tableUrl);
+      const pathNames = url.pathname.split("/");
+      const baseId = find(pathNames, (path) => /^app[\w]+$/.test(path)) ?? "";
+      const tableId = find(pathNames, (path) => /^tbl[\w]+$/.test(path)) ?? "";
+      setImportAirtable((prev) => ({ ...prev, baseId, tableId }));
+    } catch (error) {}
+  }, [tableUrl, setImportAirtable]);
+
   const handleAirtableConnection = () => {
     const errors = [];
     if (!apiKey) {
@@ -115,33 +127,14 @@ export default function ImportFromAirtable() {
         variant="filled"
         autoFocus
         fullWidth
-        label="Airtable Base ID"
-        placeholder="Insert your Base ID here"
-        value={baseId}
+        label="Airtable Table URL"
+        placeholder="Insert your Table URL here"
+        value={tableUrl}
         onChange={(e) => {
-          setImportAirtable((prev) => ({
-            ...prev,
-            baseId: e.currentTarget.value,
-          }));
+          setTableUrl(e.currentTarget.value);
         }}
-        helperText={error?.baseId?.message}
-        error={!!error?.baseId?.message}
-      />
-      <TextField
-        variant="filled"
-        autoFocus
-        fullWidth
-        label="Airtable Table Name or ID"
-        placeholder="Insert your Table Name or ID here"
-        value={tableId}
-        onChange={(e) => {
-          setImportAirtable((prev) => ({
-            ...prev,
-            tableId: e.currentTarget.value,
-          }));
-        }}
-        helperText={error?.tableId?.message}
-        error={!!error?.tableId?.message}
+        helperText={error?.baseId?.message || error?.tableId?.message}
+        error={!!error?.baseId?.message || error?.tableId?.message}
       />
       <Button
         variant="contained"

From a48e21bad8903a86b35d29027ab914caf8d2f73e Mon Sep 17 00:00:00 2001
From: shamsmosowi <shams.mosowi@gmail.com>
Date: Fri, 2 Sep 2022 06:55:54 +0200
Subject: [PATCH 093/309] fix user roles update

---
 src/components/Settings/UserManagement/UserItem.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Settings/UserManagement/UserItem.tsx b/src/components/Settings/UserManagement/UserItem.tsx
index 2c87108b..2f1cbcb7 100644
--- a/src/components/Settings/UserManagement/UserItem.tsx
+++ b/src/components/Settings/UserManagement/UserItem.tsx
@@ -59,7 +59,7 @@ export default function UserItem({
       });
       if (res.success) {
         if (!updateUser) throw new Error("Could not update user document");
-        await updateUser(_rowy_ref!.id, { roles: value });
+        await updateUser(_rowy_ref!.path, { roles: value });
         closeSnackbar(loadingSnackbarId);
         enqueueSnackbar(`Set roles for ${user!.email}: ${value.join(", ")}`);
       }

From 3bc74e284b6959ec90e8e61d447e3956c617ad32 Mon Sep 17 00:00:00 2001
From: Bobby Wang <bofei@mail.com>
Date: Thu, 15 Sep 2022 01:46:10 +0700
Subject: [PATCH 094/309] Fix: monoco editor randomly not initialise theme
 correctly in dark mode

---
 src/components/CodeEditor/CodeEditor.tsx      |  7 +++++++
 .../CodeEditor/useMonacoCustomizations.ts     | 19 -------------------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/src/components/CodeEditor/CodeEditor.tsx b/src/components/CodeEditor/CodeEditor.tsx
index 6c969203..20d835d9 100644
--- a/src/components/CodeEditor/CodeEditor.tsx
+++ b/src/components/CodeEditor/CodeEditor.tsx
@@ -12,6 +12,8 @@ import useMonacoCustomizations, {
 } from "./useMonacoCustomizations";
 import FullScreenButton from "@src/components/FullScreenButton";
 import { spreadSx } from "@src/utils/ui";
+import githubLightTheme from "@src/components/CodeEditor/github-light-default.json";
+import githubDarkTheme from "@src/components/CodeEditor/github-dark-default.json";
 
 export interface ICodeEditorProps
   extends Partial<EditorProps>,
@@ -89,6 +91,10 @@ export default function CodeEditor({
           value={initialEditorValue}
           loading={<CircularProgressOptical size={20} sx={{ m: 2 }} />}
           className="editor"
+          beforeMount={(monaco) => {
+            monaco.editor.defineTheme("github-light", githubLightTheme as any);
+            monaco.editor.defineTheme("github-dark", githubDarkTheme as any);
+          }}
           onMount={(editor) => {
             if (onFocus) editor.onDidFocusEditorWidget(onFocus);
             if (onBlur) editor.onDidBlurEditorWidget(onBlur);
@@ -105,6 +111,7 @@ export default function CodeEditor({
             automaticLayout: true,
             fixedOverflowWidgets: true,
             tabSize: 2,
+            theme: `github-${theme.palette.mode}`,
             ...props.options,
           }}
         />
diff --git a/src/components/CodeEditor/useMonacoCustomizations.ts b/src/components/CodeEditor/useMonacoCustomizations.ts
index 73b2bd53..13c05a20 100644
--- a/src/components/CodeEditor/useMonacoCustomizations.ts
+++ b/src/components/CodeEditor/useMonacoCustomizations.ts
@@ -71,25 +71,6 @@ export default function useMonacoCustomizations({
     };
   }, []);
 
-  // Initialize theme
-  useEffect(() => {
-    if (!monaco) {
-      // useMonaco returns a monaco instance but initialisation is done asynchronously
-      // dont execute the logic until the instance is initialised
-      return;
-    }
-
-    setTimeout(() => {
-      try {
-        monaco.editor.defineTheme("github-light", githubLightTheme as any);
-        monaco.editor.defineTheme("github-dark", githubDarkTheme as any);
-        monaco.editor.setTheme("github-" + theme.palette.mode);
-      } catch (error) {
-        console.error("Could not set Monaco theme: ", error);
-      }
-    });
-  }, [monaco, theme.palette.mode]);
-
   // Initialize external libs & TypeScript compiler options
   useEffect(() => {
     if (!monaco) return;

From c1a903d22fdd0e67beaf30d41d74332542205a92 Mon Sep 17 00:00:00 2001
From: Harini Janakiraman <harinijanakiraman@gmail.com>
Date: Thu, 15 Sep 2022 17:17:50 +1000
Subject: [PATCH 095/309] fix docs link

---
 src/constants/externalLinks.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/constants/externalLinks.ts b/src/constants/externalLinks.ts
index a8dae59d..10538e14 100644
--- a/src/constants/externalLinks.ts
+++ b/src/constants/externalLinks.ts
@@ -28,7 +28,7 @@ export const EXTERNAL_LINKS = {
 const WIKI_PATHS = {
   setup: "/setup/install",
   setupFirebaseProject: "/setup/firebase-project",
-  setupRoles: "/setup/roles",
+  setupRoles: "/how-to/roles",
   setupUpdate: "/setup/update",
 
   howTo: "/category/quickstart-guide",

From 829153f256ed7c952e3254fb9143b2ea7c57e315 Mon Sep 17 00:00:00 2001
From: shamsmosowi <shams.mosowi@gmail.com>
Date: Thu, 15 Sep 2022 11:57:57 +0200
Subject: [PATCH 096/309] add support for evaluate derivative with deps

---
 .../fields/Derivative/ContextMenuActions.tsx     | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/components/fields/Derivative/ContextMenuActions.tsx b/src/components/fields/Derivative/ContextMenuActions.tsx
index f877301f..015e3f7a 100644
--- a/src/components/fields/Derivative/ContextMenuActions.tsx
+++ b/src/components/fields/Derivative/ContextMenuActions.tsx
@@ -5,7 +5,11 @@ import { useSnackbar } from "notistack";
 import ReEvalIcon from "@mui/icons-material/ReplayOutlined";
 import EvalIcon from "@mui/icons-material/PlayCircleOutline";
 
-import { projectScope, rowyRunAtom } from "@src/atoms/projectScope";
+import {
+  projectScope,
+  compatibleRowyRunVersionAtom,
+  rowyRunAtom,
+} from "@src/atoms/projectScope";
 import {
   tableScope,
   tableSettingsAtom,
@@ -31,6 +35,10 @@ export const ContextMenuActions: IFieldConfig["contextMenuActions"] = (
   const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
   const [tableRows] = useAtom(tableRowsAtom, tableScope);
   const { enqueueSnackbar, closeSnackbar } = useSnackbar();
+  const [compatibleRowyRunVersion] = useAtom(
+    compatibleRowyRunVersionAtom,
+    projectScope
+  );
 
   const selectedCol = tableSchema.columns?.[selectedCell.columnKey];
   if (!selectedCol) return [];
@@ -43,7 +51,11 @@ export const ContextMenuActions: IFieldConfig["contextMenuActions"] = (
   // don't show evaluate button if function has external dependency
   const code =
     selectedCol.config?.derivativeFn ?? selectedCol.config?.script ?? "";
-  if (code.includes("require(")) return [];
+  if (
+    code.includes("require(") &&
+    compatibleRowyRunVersion({ maxVersion: "1.6.2" })
+  )
+    return [];
 
   const handleEvaluate = async () => {
     try {

From 22b11c7ef21975c9022452424043af3ab6901dca Mon Sep 17 00:00:00 2001
From: shamsmosowi <shams.mosowi@gmail.com>
Date: Thu, 15 Sep 2022 12:01:19 +0200
Subject: [PATCH 097/309] remove autofocus

---
 src/components/TableToolbar/ImportData/ImportFromAirtable.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/TableToolbar/ImportData/ImportFromAirtable.tsx b/src/components/TableToolbar/ImportData/ImportFromAirtable.tsx
index 494ec5a9..21bdb405 100644
--- a/src/components/TableToolbar/ImportData/ImportFromAirtable.tsx
+++ b/src/components/TableToolbar/ImportData/ImportFromAirtable.tsx
@@ -125,7 +125,6 @@ export default function ImportFromAirtable() {
       />
       <TextField
         variant="filled"
-        autoFocus
         fullWidth
         label="Airtable Table URL"
         placeholder="Insert your Table URL here"

From f5ed824dc72fa4a1973260bf61f84c3e5cdb8b42 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Fri, 16 Sep 2022 14:16:12 +1000
Subject: [PATCH 098/309] fix ROWY-645

---
 src/atoms/tableScope/table.ts | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/atoms/tableScope/table.ts b/src/atoms/tableScope/table.ts
index 29a45c58..29bc400e 100644
--- a/src/atoms/tableScope/table.ts
+++ b/src/atoms/tableScope/table.ts
@@ -157,13 +157,34 @@ export const tableRowsLocalAtom = atomWithReducer(
 
 /** Store rows from the db listener */
 export const tableRowsDbAtom = atom<TableRow[]>([]);
+
 /** Combine tableRowsLocal and tableRowsDb */
-export const tableRowsAtom = atom<TableRow[]>((get) =>
-  uniqBy(
-    [...get(tableRowsLocalAtom), ...get(tableRowsDbAtom)],
-    "_rowy_ref.path"
-  )
-);
+export const tableRowsAtom = atom<TableRow[]>((get) => {
+  const rowsDb = [...get(tableRowsDbAtom)];
+  const rowsLocal = get(tableRowsLocalAtom);
+
+  // Optimization: create Map of rowsDb by path to index for faster lookup
+  const rowsDbMap = new Map<string, number>();
+  rowsDb.forEach((row, i) => rowsDbMap.set(row._rowy_ref.path, i));
+
+  // Loop through rowsLocal, which is usually the smaller of the two arrays
+  const rowsLocalToMerge = rowsLocal.map((row, i) => {
+    // If row is in rowsDb, merge the two
+    // and remove from rowsDb to prevent duplication
+    if (rowsDbMap.has(row._rowy_ref.path)) {
+      const index = rowsDbMap.get(row._rowy_ref.path)!;
+      const merged = updateRowData({ ...rowsDb[index] }, row);
+      rowsDb.splice(index, 1);
+      return merged;
+    }
+
+    return row;
+  });
+
+  // Merge the two arrays
+  return [...rowsLocalToMerge, ...rowsDb];
+});
+
 /** Store next page state for infinite scroll */
 export const tableNextPageAtom = atom({
   loading: false,

From 7f646f02c9b8a4106103115b063b2a4390c6795b Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Fri, 16 Sep 2022 15:12:05 +1000
Subject: [PATCH 099/309] NavItem: fix undefined props causing issues

---
 src/layouts/Navigation/NavDrawer/NavItem.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/layouts/Navigation/NavDrawer/NavItem.tsx b/src/layouts/Navigation/NavDrawer/NavItem.tsx
index 5174f11c..0211aedc 100644
--- a/src/layouts/Navigation/NavDrawer/NavItem.tsx
+++ b/src/layouts/Navigation/NavDrawer/NavItem.tsx
@@ -12,14 +12,14 @@ export default function NavItem(props: MenuItemProps<NavItemComponent>) {
   const { pathname } = useLocation();
 
   let component: NavItemComponent = "button";
-  if ("to" in props) {
+  if ("to" in props && props.to !== undefined) {
     component = Link;
     if (
       typeof props.to === "string" ? props.to.includes("#") : !!props.to.hash
     ) {
       component = HashLink;
     }
-  } else if ("href" in props) {
+  } else if ("href" in props && props.href !== undefined) {
     component = "a";
   }
 

From 68f081f8de0e79b4a4cfca6325aa099975db383e Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Fri, 16 Sep 2022 15:58:48 +1000
Subject: [PATCH 100/309] NavDrawer: hide create table button for non-ADMINs

---
 .../NavDrawer/NavDrawerContents.tsx           | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/layouts/Navigation/NavDrawer/NavDrawerContents.tsx b/src/layouts/Navigation/NavDrawer/NavDrawerContents.tsx
index 04f1062c..b32cfea0 100644
--- a/src/layouts/Navigation/NavDrawer/NavDrawerContents.tsx
+++ b/src/layouts/Navigation/NavDrawer/NavDrawerContents.tsx
@@ -11,6 +11,7 @@ import NavTableSection from "./NavTableSection";
 
 import {
   projectScope,
+  userRolesAtom,
   userSettingsAtom,
   tablesAtom,
   tableSettingsDialogAtom,
@@ -33,6 +34,7 @@ export default function NavDrawerContents({
   tempExpanded,
 }: INavDrawerContentsProps) {
   const [tables] = useAtom(tablesAtom, projectScope);
+  const [userRoles] = useAtom(userRolesAtom, projectScope);
   const [userSettings] = useAtom(userSettingsAtom, projectScope);
   const openTableSettingsDialog = useSetAtom(
     tableSettingsDialogAtom,
@@ -80,21 +82,23 @@ export default function NavDrawerContents({
             />
           ))}
 
-      <li>
-        <NavItem
-          {...({ component: "button" } as any)}
-          onClick={(e: any) => {
-            if (closeDrawer) closeDrawer(e);
-            openTableSettingsDialog({});
-          }}
-          sx={{ mb: 1 }}
-        >
-          <ListItemIcon>
-            <AddIcon />
-          </ListItemIcon>
-          <ListItemText primary="Create table…" />
-        </NavItem>
-      </li>
+      {userRoles.includes("ADMIN") && (
+        <li>
+          <NavItem
+            {...({ component: "button" } as any)}
+            onClick={(e: any) => {
+              if (closeDrawer) closeDrawer(e);
+              openTableSettingsDialog({});
+            }}
+            sx={{ mb: 1 }}
+          >
+            <ListItemIcon>
+              <AddIcon />
+            </ListItemIcon>
+            <ListItemText primary="Create table…" />
+          </NavItem>
+        </li>
+      )}
     </>
   );
 }

From 6711c227f3e66605058e2b89f35e3438b8a1d3ab Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Fri, 16 Sep 2022 16:03:16 +1000
Subject: [PATCH 101/309] redo tutorial from get started checklist

---
 src/components/GetStartedChecklist/GetStartedChecklist.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/GetStartedChecklist/GetStartedChecklist.tsx b/src/components/GetStartedChecklist/GetStartedChecklist.tsx
index 7a3a47e1..21ae6bbe 100644
--- a/src/components/GetStartedChecklist/GetStartedChecklist.tsx
+++ b/src/components/GetStartedChecklist/GetStartedChecklist.tsx
@@ -110,14 +110,15 @@ export default function GetStartedChecklist({
                   Learn the basic features and functions of Rowy before creating
                   a table.
                 </Typography>
+
                 <Button
-                  variant="contained"
+                  variant={completedSteps.tutorial ? "outlined" : "contained"}
                   color="primary"
                   component={Link}
                   to={ROUTES.tableTutorial}
                   onClick={() => setOpen(false)}
                 >
-                  Begin tutorial
+                  {completedSteps.tutorial ? "Redo" : "Begin"} tutorial
                 </Button>
               </>
             ),

From bafc415a16a1c6f7dd50f89450ffb37f53fcddc5 Mon Sep 17 00:00:00 2001
From: Bhavya Verma <vbhavya269@gmail.com>
Date: Fri, 16 Sep 2022 13:35:10 +0530
Subject: [PATCH 102/309] Added confirmation for Duplicate Row button

---
 .../Table/ContextMenu/MenuContents.tsx        | 35 +++++++++++++++----
 .../Table/formatters/FinalColumn.tsx          | 33 ++++++++++++++---
 2 files changed, 56 insertions(+), 12 deletions(-)

diff --git a/src/components/Table/ContextMenu/MenuContents.tsx b/src/components/Table/ContextMenu/MenuContents.tsx
index ae53a4a0..52b2d3d3 100644
--- a/src/components/Table/ContextMenu/MenuContents.tsx
+++ b/src/components/Table/ContextMenu/MenuContents.tsx
@@ -137,6 +137,12 @@ export default function MenuContents({ onClose }: IMenuContentsProps) {
 
   // Row actions
   if (row) {
+    const handleDuplicate = () => {
+      addRow({
+        row,
+        setId: addRowIdType === "custom" ? "decrement" : addRowIdType,
+      });
+    };
     const handleDelete = () => deleteRow(row._rowy_ref.path);
     const rowActions = [
       {
@@ -179,13 +185,28 @@ export default function MenuContents({ onClose }: IMenuContentsProps) {
             disabled:
               tableSettings.tableType === "collectionGroup" ||
               (!userRoles.includes("ADMIN") && tableSettings.readOnly),
-            onClick: () => {
-              addRow({
-                row,
-                setId: addRowIdType === "custom" ? "decrement" : addRowIdType,
-              });
-              onClose();
-            },
+            onClick: altPress
+              ? handleDuplicate
+              : () => {
+                  confirm({
+                    title: "Duplicate row?",
+                    body: (
+                      <>
+                        Row path:
+                        <br />
+                        <code
+                          style={{ userSelect: "all", wordBreak: "break-all" }}
+                        >
+                          {row._rowy_ref.path}
+                        </code>
+                      </>
+                    ),
+                    confirm: "Duplicate",
+                    confirmColor: "success",
+                    handleConfirm: handleDuplicate,
+                  });
+                  onClose();
+                },
           },
           {
             label: altPress ? "Delete" : "Delete…",
diff --git a/src/components/Table/formatters/FinalColumn.tsx b/src/components/Table/formatters/FinalColumn.tsx
index d5d57934..73f1c7b1 100644
--- a/src/components/Table/formatters/FinalColumn.tsx
+++ b/src/components/Table/formatters/FinalColumn.tsx
@@ -31,6 +31,12 @@ export default function FinalColumn({ row }: FormatterProps<TableRow, any>) {
 
   const [altPress] = useAtom(altPressAtom, projectScope);
   const handleDelete = () => deleteRow(row._rowy_ref.path);
+  const handleDuplicate = () => {
+    addRow({
+      row,
+      setId: addRowIdType === "custom" ? "decrement" : addRowIdType,
+    });
+  };
 
   if (!userRoles.includes("ADMIN") && tableSettings.readOnly === true)
     return null;
@@ -42,11 +48,28 @@ export default function FinalColumn({ row }: FormatterProps<TableRow, any>) {
           size="small"
           color="inherit"
           disabled={tableSettings.tableType === "collectionGroup"}
-          onClick={() =>
-            addRow({
-              row,
-              setId: addRowIdType === "custom" ? "decrement" : addRowIdType,
-            })
+          onClick={
+            altPress
+              ? handleDuplicate
+              : () => {
+                  confirm({
+                    title: "Duplicate row?",
+                    body: (
+                      <>
+                        Row path:
+                        <br />
+                        <code
+                          style={{ userSelect: "all", wordBreak: "break-all" }}
+                        >
+                          {row._rowy_ref.path}
+                        </code>
+                      </>
+                    ),
+                    confirm: "Duplicate",
+                    confirmColor: "success",
+                    handleConfirm: handleDuplicate,
+                  });
+                }
           }
           aria-label="Duplicate row"
           className="row-hover-iconButton"

From 40a3960916010cdae0fa131a7c31453be727e981 Mon Sep 17 00:00:00 2001
From: Bobby Wang <bofei@mail.com>
Date: Fri, 16 Sep 2022 15:18:49 +0700
Subject: [PATCH 103/309] Fix: monoco editor dark theme issue

---
 src/components/CodeEditor/CodeEditor.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/CodeEditor/CodeEditor.tsx b/src/components/CodeEditor/CodeEditor.tsx
index 20d835d9..2abfd45b 100644
--- a/src/components/CodeEditor/CodeEditor.tsx
+++ b/src/components/CodeEditor/CodeEditor.tsx
@@ -101,6 +101,7 @@ export default function CodeEditor({
           }}
           {...props}
           onValidate={onValidate_}
+          theme={`github-${theme.palette.mode}`}
           options={{
             readOnly: disabled,
             fontFamily: theme.typography.fontFamilyMono,
@@ -111,7 +112,6 @@ export default function CodeEditor({
             automaticLayout: true,
             fixedOverflowWidgets: true,
             tabSize: 2,
-            theme: `github-${theme.palette.mode}`,
             ...props.options,
           }}
         />

From 2fbd89a581964ece7943c6c943e523ab8d4d3fde Mon Sep 17 00:00:00 2001
From: Bobby Wang <bofei@mail.com>
Date: Fri, 16 Sep 2022 16:05:24 +0700
Subject: [PATCH 104/309] Fix: monoco editor dynamic import editor error

---
 .../CodeEditor/useMonacoCustomizations.ts     | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/components/CodeEditor/useMonacoCustomizations.ts b/src/components/CodeEditor/useMonacoCustomizations.ts
index 13c05a20..f16f621b 100644
--- a/src/components/CodeEditor/useMonacoCustomizations.ts
+++ b/src/components/CodeEditor/useMonacoCustomizations.ts
@@ -65,6 +65,7 @@ export default function useMonacoCustomizations({
   const [tableRows] = useAtom(tableRowsAtom, tableScope);
   const [rowyRun] = useAtom(rowyRunAtom, projectScope);
   const [tableColumnsOrdered] = useAtom(tableColumnsOrderedAtom, tableScope);
+
   useEffect(() => {
     return () => {
       onUnmount?.();
@@ -76,6 +77,10 @@ export default function useMonacoCustomizations({
     if (!monaco) return;
 
     try {
+      monaco.languages.typescript.javascriptDefaults.setCompilerOptions({
+        target: monaco.languages.typescript.ScriptTarget.ES2020,
+        allowNonTsExtensions: true,
+      });
       monaco.languages.typescript.javascriptDefaults.addExtraLib(firestoreDefs);
       monaco.languages.typescript.javascriptDefaults.addExtraLib(
         firebaseAuthDefs
@@ -83,11 +88,6 @@ export default function useMonacoCustomizations({
       monaco.languages.typescript.javascriptDefaults.addExtraLib(
         firebaseStorageDefs
       );
-      // Compiler options
-      monaco.languages.typescript.javascriptDefaults.setCompilerOptions({
-        target: monaco.languages.typescript.ScriptTarget.ES2020,
-        allowNonTsExtensions: true,
-      });
       monaco.languages.typescript.javascriptDefaults.addExtraLib(
         utilsDefs,
         "ts:filename/utils.d.ts"
@@ -121,9 +121,12 @@ export default function useMonacoCustomizations({
     if (!monaco) return;
 
     try {
-      monaco.languages.typescript.javascriptDefaults.setDiagnosticsOptions(
-        JSON.parse(stringifiedDiagnosticsOptions)
-      );
+      monaco.languages.typescript.javascriptDefaults.setDiagnosticsOptions({
+        ...JSON.parse(stringifiedDiagnosticsOptions),
+        diagnosticCodesToIgnore: [
+          1323, // remove dynamic import error
+        ],
+      });
     } catch (error) {
       console.error("Could not set diagnostics options: ", error);
     }

From fccad0bc1be7cef60a1786a2f75b89b6eae043df Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Fri, 16 Sep 2022 18:17:43 +0300
Subject: [PATCH 105/309] fix(airtable-import): fix columns step issues, ui
 improvements exact same as csv import

---
 .../ImportAirtableWizard/Step1Columns.tsx     | 52 +++++++++++++------
 1 file changed, 36 insertions(+), 16 deletions(-)

diff --git a/src/components/TableModals/ImportAirtableWizard/Step1Columns.tsx b/src/components/TableModals/ImportAirtableWizard/Step1Columns.tsx
index d3500605..ea86e2c4 100644
--- a/src/components/TableModals/ImportAirtableWizard/Step1Columns.tsx
+++ b/src/components/TableModals/ImportAirtableWizard/Step1Columns.tsx
@@ -13,14 +13,17 @@ import {
   FormControl,
   RadioGroup,
   Radio,
+  Stack,
+  Box,
 } from "@mui/material";
 import ArrowIcon from "@mui/icons-material/ArrowForward";
+import { TableColumn as TableColumnIcon } from "@src/assets/icons";
 
 import { IStepProps } from ".";
-import { AirtableConfig } from "./ImportAirtableWizard";
+import { AirtableConfig } from "@src/components/TableModals/ImportAirtableWizard";
 import FadeList from "@src/components/TableModals/ScrollableList";
 import Column, { COLUMN_HEADER_HEIGHT } from "@src/components/Table/Column";
-import MultiSelect from "@rowy/multiselect";
+import ColumnSelect from "@src/components/Table/ColumnSelect";
 
 import {
   tableScope,
@@ -28,7 +31,8 @@ import {
   tableColumnsOrderedAtom,
 } from "@src/atoms/tableScope";
 import { FieldType } from "@src/constants/fields";
-import { suggestType } from "./utils";
+import { getFieldProp } from "@src/components/fields";
+import { suggestType } from "@src/components/TableModals/ImportAirtableWizard/utils";
 
 export default function Step1Columns({
   airtableData,
@@ -51,6 +55,7 @@ export default function Step1Columns({
     config.pairs.map((pair) => pair.fieldKey)
   );
 
+  // When a field is selected to be imported
   const handleSelect =
     (field: string) => (e: React.ChangeEvent<HTMLInputElement>) => {
       const checked = e.target.checked;
@@ -98,7 +103,7 @@ export default function Step1Columns({
         // Delete matching newColumn if it was created
         if (configPair) {
           const newColumnIndex = findIndex(config.newColumns, {
-            key: configPair.fieldKey,
+            key: configPair.columnKey,
           });
           if (newColumnIndex > -1) {
             const newColumns = [...config.newColumns];
@@ -116,14 +121,17 @@ export default function Step1Columns({
       }
     };
 
+  // When a field is mapped to a new column
   const handleChange = (fieldKey: string) => (value: string) => {
     if (!value) return;
     const columnKey = !!tableSchema.columns?.[value] ? value : camelCase(value);
+    if (columnKey === "") return;
     // Check if this pair already exists in config
     const configIndex = findIndex(config.pairs, { fieldKey });
+    console.log(columnKey, configIndex);
     if (configIndex > -1) {
       const pairs = [...config.pairs];
-      pairs[configIndex].fieldKey = columnKey;
+      pairs[configIndex].columnKey = columnKey;
       setConfig((config) => ({ ...config, pairs }));
     } else {
       updateConfig({
@@ -217,9 +225,8 @@ export default function Step1Columns({
 
               <Grid item xs>
                 {selected && (
-                  <MultiSelect
+                  <ColumnSelect
                     multiple={false}
-                    options={tableColumns}
                     value={columnKey}
                     onChange={handleChange(field) as any}
                     TextFieldProps={{
@@ -229,21 +236,34 @@ export default function Step1Columns({
                           if (!columnKey) return "Select or add column";
                           else
                             return (
-                              <>
+                              <Stack
+                                direction="row"
+                                gap={1}
+                                alignItems="center"
+                              >
+                                <Box sx={{ width: 24, height: 24 }}>
+                                  {!isNewColumn ? (
+                                    getFieldProp("icon", matchingColumn?.type)
+                                  ) : (
+                                    <TableColumnIcon color="disabled" />
+                                  )}
+                                </Box>
                                 {matchingColumn?.name}
                                 {isNewColumn && (
                                   <Chip
                                     label="New"
+                                    color="primary"
                                     size="small"
-                                    sx={{
-                                      marginLeft: (theme) =>
-                                        theme.spacing(1) + " !important",
-                                      backgroundColor: "action.focus",
+                                    variant="outlined"
+                                    style={{
+                                      marginLeft: "auto",
                                       pointerEvents: "none",
+                                      height: 24,
+                                      fontWeight: "normal",
                                     }}
                                   />
                                 )}
-                              </>
+                              </Stack>
                             );
                         },
                         sx: [
@@ -274,14 +294,14 @@ export default function Step1Columns({
                           !columnKey && { color: "text.disabled" },
                         ],
                       },
+                      sx: { "& .MuiInputLabel-root": { display: "none" } },
                     }}
                     clearable={false}
                     displayEmpty
-                    labelPlural="columns"
                     freeText
-                    AddButtonProps={{ children: "Add new column…" }}
+                    AddButtonProps={{ children: "Create column…" }}
                     AddDialogProps={{
-                      title: "Add new column",
+                      title: "Create column",
                       textFieldLabel: "Column name",
                     }}
                   />

From 4deae4866d9e8f2a9db53e1d050abb1916db07d7 Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Fri, 16 Sep 2022 19:22:03 +0300
Subject: [PATCH 106/309] feat(airtable-import): add doc links

---
 .../ImportData/ImportFromAirtable.tsx         | 51 +++++++++++++++++--
 src/constants/externalLinks.ts                |  4 ++
 2 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/src/components/TableToolbar/ImportData/ImportFromAirtable.tsx b/src/components/TableToolbar/ImportData/ImportFromAirtable.tsx
index 21bdb405..f5ed3aa9 100644
--- a/src/components/TableToolbar/ImportData/ImportFromAirtable.tsx
+++ b/src/components/TableToolbar/ImportData/ImportFromAirtable.tsx
@@ -1,7 +1,14 @@
 import { useState, useEffect } from "react";
 import { useAtom, useSetAtom } from "jotai";
 
-import { Button, Typography, TextField } from "@mui/material";
+import {
+  Button,
+  Typography,
+  TextField,
+  IconButton,
+  Stack,
+  InputLabel,
+} from "@mui/material";
 
 import {
   tableModalAtom,
@@ -11,6 +18,9 @@ import {
 import { analytics, logEvent } from "@src/analytics";
 import { find } from "lodash-es";
 
+import { WIKI_LINKS } from "@src/constants/externalLinks";
+import DocsIcon from "@mui/icons-material/ArrowUpward";
+
 export default function ImportFromAirtable() {
   const [{ baseId, tableId, apiKey }, setImportAirtable] = useAtom(
     importAirtableAtom,
@@ -108,10 +118,28 @@ export default function ImportFromAirtable() {
         manage with Rowy.
       </Typography>
       <TextField
+        sx={{ marginBottom: 1 }}
         variant="filled"
         autoFocus
         fullWidth
-        label="Airtable API Key"
+        label={
+          <Stack
+            direction="row"
+            justifyContent="space-between"
+            alignItems="end"
+          >
+            <InputLabel>Airtable API Key</InputLabel>
+            <IconButton
+              size="small"
+              color="primary"
+              target="_blank"
+              rel="noopener noreferrer"
+              href={WIKI_LINKS.importAirtableApiKey}
+            >
+              API Key <DocsIcon sx={{ rotate: "45deg" }} />
+            </IconButton>
+          </Stack>
+        }
         placeholder="Insert your API key here"
         value={apiKey}
         onChange={(e) =>
@@ -126,7 +154,24 @@ export default function ImportFromAirtable() {
       <TextField
         variant="filled"
         fullWidth
-        label="Airtable Table URL"
+        label={
+          <Stack
+            direction="row"
+            justifyContent="space-between"
+            alignItems="end"
+          >
+            <InputLabel>Airtable Table URL</InputLabel>
+            <IconButton
+              size="small"
+              color="primary"
+              target="_blank"
+              rel="noopener noreferrer"
+              href={WIKI_LINKS.importAirtableTableUrl}
+            >
+              Table URL <DocsIcon sx={{ rotate: "45deg" }} />
+            </IconButton>
+          </Stack>
+        }
         placeholder="Insert your Table URL here"
         value={tableUrl}
         onChange={(e) => {
diff --git a/src/constants/externalLinks.ts b/src/constants/externalLinks.ts
index 10538e14..84035a12 100644
--- a/src/constants/externalLinks.ts
+++ b/src/constants/externalLinks.ts
@@ -55,6 +55,10 @@ const WIKI_PATHS = {
   extensionsSendgridEmail: "/extensions/sendgrid-email",
   extensionsTwilioMessage: "/extensions/twilio-message",
   webhooks: "/webhooks",
+
+  importAirtable: "/import-export-data/import-airtable",
+  importAirtableApiKey: "/import-export-data/import-airtable#api-key",
+  importAirtableTableUrl: "/import-export-data/import-airtable#table-url",
 };
 export const WIKI_LINKS = mapValues(
   WIKI_PATHS,

From 4cbc6fcbfaffc5aa2b2b364b0475c7123dd37ae6 Mon Sep 17 00:00:00 2001
From: Miriam Shams-Rainey <mshamsrainey@gmail.com>
Date: Fri, 16 Sep 2022 17:09:03 -0400
Subject: [PATCH 107/309] #513: Added Customizable Icons for Ratings Field

---
 src/components/fields/Rating/Settings.tsx  | 113 +++++++++++++--------
 src/components/fields/Rating/TableCell.tsx |  13 ++-
 2 files changed, 84 insertions(+), 42 deletions(-)

diff --git a/src/components/fields/Rating/Settings.tsx b/src/components/fields/Rating/Settings.tsx
index 5504bd08..6b3cf710 100644
--- a/src/components/fields/Rating/Settings.tsx
+++ b/src/components/fields/Rating/Settings.tsx
@@ -1,48 +1,81 @@
 import { ISettingsProps } from "@src/components/fields/types";
-
-import { Slider, InputLabel, TextField, Grid } from "@mui/material";
+import RatingIcon from "@mui/icons-material/Star";
+import { Slider, InputLabel, TextField, Grid, FormControlLabel, Checkbox, Stack, Fab } from "@mui/material";
 import ToggleButton from "@mui/material/ToggleButton";
 import ToggleButtonGroup from "@mui/material/ToggleButtonGroup";
+import { get } from "lodash-es";
 
 export default function Settings({ onChange, config }: ISettingsProps) {
   return (
-    <>
-      <Grid container spacing={2} justifyItems="end" direction={"row"}>
-        <Grid item xs={6}>
-          <TextField
-            label="Maximum number of stars"
-            type={"number"}
-            value={config.max}
-            fullWidth
-            onChange={(e) => {
-              onChange("max")(parseInt(e.target.value));
-            }}
-            inputProps={{ min: 1, max: 20 }}
-          />
-        </Grid>
-        <Grid item xs={6}>
-          <InputLabel>Star fraction</InputLabel>
-          <ToggleButtonGroup
-            value={config.precision}
-            exclusive
-            fullWidth
-            onChange={(_, value) => {
-              onChange("precision")(value);
-            }}
-            aria-label="text alignment"
-          >
-            <ToggleButton value={0.25} aria-label="quarter">
-              1/4
-            </ToggleButton>
-            <ToggleButton value={0.5} aria-label="half">
-              1/2
-            </ToggleButton>
-            <ToggleButton value={1} aria-label="whole">
-              1
-            </ToggleButton>
-          </ToggleButtonGroup>
-        </Grid>
+    <Grid container spacing={2} justifyItems="end" direction={"row"}>
+      <Grid item xs={6}>
+        <TextField
+          label="Maximum number of stars"
+          type={"number"}
+          value={config.max}
+          fullWidth
+          onChange={(e) => {
+            onChange("max")(parseInt(e.target.value));
+          }}
+          inputProps={{ min: 1, max: 20 }}
+        />
       </Grid>
-    </>
+      <Grid item xs={6}>
+        <InputLabel>Star fraction</InputLabel>
+        <ToggleButtonGroup
+          value={config.precision}
+          exclusive
+          fullWidth
+          onChange={(_, value) => {
+            onChange("precision")(value);
+          }}
+          aria-label="text alignment"
+        >
+          <ToggleButton value={0.25} aria-label="quarter">
+            1/4
+          </ToggleButton>
+          <ToggleButton value={0.5} aria-label="half">
+            1/2
+          </ToggleButton>
+          <ToggleButton value={1} aria-label="whole">
+            1
+          </ToggleButton>
+        </ToggleButtonGroup>
+      </Grid>
+      <FormControlLabel
+        control={
+          <Checkbox
+            checked={config.customIcons?.enabled}
+            onChange={(e) =>
+              onChange("customIcons.enabled")(e.target.checked)
+            }
+            name="customIcons.enabled"
+          />
+        }
+        label="Customize button icons with emoji"
+        style={{ marginLeft: -11 }}
+      />
+      {config.customIcons?.enabled && (
+        <Grid container spacing={2} sx={{ mt: { xs: 0, sm: -1 } }}>
+          <Grid item xs={12} sm={true}>
+            <Stack direction="row" spacing={1}>
+              <TextField
+                id="customIcons.rating"
+                value={get(config, "customIcons.rating")}
+                onChange={(e) =>
+                  onChange("customIcons.rating")(e.target.value)
+                }
+                label="Rating:"
+                className="labelHorizontal"
+                inputProps={{ style: { width: "3ch" } }}
+              />
+              <Fab size="small" aria-label="Preview of rating button">
+                {get(config, "customIcons.rating") || <RatingIcon />}
+              </Fab>
+            </Stack>
+          </Grid>
+        </Grid>
+      )}
+    </Grid>
   );
-}
+}
\ No newline at end of file
diff --git a/src/components/fields/Rating/TableCell.tsx b/src/components/fields/Rating/TableCell.tsx
index 34da84cf..bd4df1ca 100644
--- a/src/components/fields/Rating/TableCell.tsx
+++ b/src/components/fields/Rating/TableCell.tsx
@@ -1,7 +1,15 @@
 import { IHeavyCellProps } from "@src/components/fields/types";
 
 import MuiRating from "@mui/material/Rating";
-import StarBorderIcon from "@mui/icons-material/StarBorder";
+import RatingIcon from "@mui/icons-material/Star";
+import { get } from "lodash-es";
+
+
+const getStateIcon = (config: any) => {
+  // only use the config to get the custom rating icon if enabled via toggle
+  if (!get(config, "customIcons.enabled")) { return <RatingIcon /> }
+  return get(config, "customIcons.rating") || <RatingIcon />;
+};
 
 export default function Rating({
   row,
@@ -28,9 +36,10 @@ export default function Rating({
       name={`${row.id}-${column.key}`}
       value={typeof value === "number" ? value : 0}
       onClick={(e) => e.stopPropagation()}
+      icon={getStateIcon(column.config)}
       disabled={disabled}
       onChange={(_, newValue) => onSubmit(newValue)}
-      emptyIcon={<StarBorderIcon />}
+      emptyIcon={getStateIcon(column.config)}
       max={max}
       precision={precision}
       sx={{ mx: -0.25 }}

From 394a843637804137fbd87066f604c5f4109d264c Mon Sep 17 00:00:00 2001
From: Miriam Shams-Rainey <mshamsrainey@gmail.com>
Date: Fri, 16 Sep 2022 23:29:04 -0400
Subject: [PATCH 108/309] #513: Customizable Rating Icons Side Drawer

Also updated formatting of custom rating icons to match default star sz
---
 src/components/fields/Rating/SideDrawerField.tsx | 9 +++++----
 src/components/fields/Rating/TableCell.tsx       | 4 +++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/components/fields/Rating/SideDrawerField.tsx b/src/components/fields/Rating/SideDrawerField.tsx
index d3e4ffcb..40e8a2bb 100644
--- a/src/components/fields/Rating/SideDrawerField.tsx
+++ b/src/components/fields/Rating/SideDrawerField.tsx
@@ -3,9 +3,8 @@ import { ISideDrawerFieldProps } from "@src/components/fields/types";
 import { Grid } from "@mui/material";
 import { Rating as MuiRating } from "@mui/material";
 import "@mui/lab";
-import StarBorderIcon from "@mui/icons-material/StarBorder";
-
-import { fieldSx, getFieldId } from "@src/components/SideDrawer/utils";
+import { getStateIcon } from "./TableCell";
+import { fieldSx } from "@src/components/SideDrawer/utils";
 
 export default function Rating({
   column,
@@ -29,7 +28,9 @@ export default function Rating({
           onChange(newValue);
           onSubmit();
         }}
-        emptyIcon={<StarBorderIcon fontSize="inherit" />}
+        icon={getStateIcon(column.config)}
+        emptyIcon={getStateIcon(column.config)}
+        size="small"
         max={max}
         precision={precision}
         sx={{ ml: -0.5 }}
diff --git a/src/components/fields/Rating/TableCell.tsx b/src/components/fields/Rating/TableCell.tsx
index bd4df1ca..f7640d59 100644
--- a/src/components/fields/Rating/TableCell.tsx
+++ b/src/components/fields/Rating/TableCell.tsx
@@ -3,9 +3,10 @@ import { IHeavyCellProps } from "@src/components/fields/types";
 import MuiRating from "@mui/material/Rating";
 import RatingIcon from "@mui/icons-material/Star";
 import { get } from "lodash-es";
+import { MonitorSmall } from "mdi-material-ui";
 
 
-const getStateIcon = (config: any) => {
+export const getStateIcon = (config: any) => {
   // only use the config to get the custom rating icon if enabled via toggle
   if (!get(config, "customIcons.enabled")) { return <RatingIcon /> }
   return get(config, "customIcons.rating") || <RatingIcon />;
@@ -37,6 +38,7 @@ export default function Rating({
       value={typeof value === "number" ? value : 0}
       onClick={(e) => e.stopPropagation()}
       icon={getStateIcon(column.config)}
+      size="small"
       disabled={disabled}
       onChange={(_, newValue) => onSubmit(newValue)}
       emptyIcon={getStateIcon(column.config)}

From 33dd82ac6bdb21bb9f8c8b1ed0cbac3c350ab18e Mon Sep 17 00:00:00 2001
From: Miriam Shams-Rainey <mshamsrainey@gmail.com>
Date: Fri, 16 Sep 2022 23:44:49 -0400
Subject: [PATCH 109/309] #816: Fixed Logic for Custom Icons in Action Field

---
 src/components/fields/Action/ActionFab.tsx | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/components/fields/Action/ActionFab.tsx b/src/components/fields/Action/ActionFab.tsx
index 67f00847..0e4db6cd 100644
--- a/src/components/fields/Action/ActionFab.tsx
+++ b/src/components/fields/Action/ActionFab.tsx
@@ -28,6 +28,16 @@ const replacer = (data: any) => (m: string, key: string) => {
 };
 
 const getStateIcon = (actionState: "undo" | "redo" | string, config: any) => {
+  if (!get(config, "customIcons.enabled", false)) {
+    switch (actionState) {
+      case "undo":
+        return <UndoIcon />;
+      case "redo":
+        return <RedoIcon />;
+      default:
+        return <RunIcon />;
+    }
+  }
   switch (actionState) {
     case "undo":
       return get(config, "customIcons.undo") || <UndoIcon />;

From 37887b3826048d0874e75e565f2738a9c1becdfd Mon Sep 17 00:00:00 2001
From: shamsmosowi <shams.mosowi@gmail.com>
Date: Sat, 17 Sep 2022 16:33:20 +0200
Subject: [PATCH 110/309] implement cell copy/paste for json field

---
 .../fields/Json/ContextMenuActions.tsx        | 75 +++++++++++++++++++
 src/components/fields/Json/index.tsx          |  2 +
 2 files changed, 77 insertions(+)
 create mode 100644 src/components/fields/Json/ContextMenuActions.tsx

diff --git a/src/components/fields/Json/ContextMenuActions.tsx b/src/components/fields/Json/ContextMenuActions.tsx
new file mode 100644
index 00000000..de0555e3
--- /dev/null
+++ b/src/components/fields/Json/ContextMenuActions.tsx
@@ -0,0 +1,75 @@
+import { useAtom, useSetAtom } from "jotai";
+import { find, get } from "lodash-es";
+import { useSnackbar } from "notistack";
+import { Copy } from "@src/assets/icons";
+import Paste from "@mui/icons-material/ContentPaste";
+
+import {
+  tableScope,
+  tableSchemaAtom,
+  tableRowsAtom,
+  updateFieldAtom,
+} from "@src/atoms/tableScope";
+import { IFieldConfig } from "@src/components/fields/types";
+
+export interface IContextMenuActions {
+  label: string;
+  icon: React.ReactNode;
+  onClick: () => void;
+}
+
+export const ContextMenuActions: IFieldConfig["contextMenuActions"] = (
+  selectedCell,
+  reset
+) => {
+  const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
+  const [tableRows] = useAtom(tableRowsAtom, tableScope);
+  const { enqueueSnackbar } = useSnackbar();
+  const updateField = useSetAtom(updateFieldAtom, tableScope);
+  const selectedCol = tableSchema.columns?.[selectedCell.columnKey];
+  if (!selectedCol) return [];
+
+  const selectedRow = find(tableRows, ["_rowy_ref.path", selectedCell.path]);
+  const cellValue = get(selectedRow, selectedCol.fieldName) || [];
+
+  const isEmpty =
+    cellValue === "" ||
+    cellValue === null ||
+    cellValue === undefined ||
+    cellValue.length === 0;
+
+  return [
+    {
+      label: "Copy",
+      icon: <Copy />,
+      onClick: () => {
+        try {
+          navigator.clipboard.writeText(JSON.stringify(cellValue));
+          enqueueSnackbar("Copied");
+        } catch (error) {
+          enqueueSnackbar(`Failed to copy: ${error}`, { variant: "error" });
+        }
+      },
+      disabled: isEmpty,
+    },
+    {
+      label: "Paste",
+      icon: <Paste />,
+      onClick: async () => {
+        try {
+          const text = await navigator.clipboard.readText();
+          const parsed = JSON.parse(text);
+          updateField({
+            path: selectedCell.path,
+            fieldName: selectedCol.fieldName,
+            value: parsed,
+          });
+        } catch (error) {
+          enqueueSnackbar(`Failed to paste: ${error}`, { variant: "error" });
+        }
+      },
+    },
+  ];
+};
+
+export default ContextMenuActions;
diff --git a/src/components/fields/Json/index.tsx b/src/components/fields/Json/index.tsx
index e4587c17..8981d877 100644
--- a/src/components/fields/Json/index.tsx
+++ b/src/components/fields/Json/index.tsx
@@ -5,6 +5,7 @@ import withBasicCell from "@src/components/fields/_withTableCell/withBasicCell";
 import { Json as JsonIcon } from "@src/assets/icons";
 import BasicCell from "./BasicCell";
 import withSideDrawerEditor from "@src/components/Table/editors/withSideDrawerEditor";
+import ContextMenuActions from "./ContextMenuActions";
 
 const SideDrawerField = lazy(
   () =>
@@ -35,5 +36,6 @@ export const config: IFieldConfig = {
   },
   SideDrawerField,
   settings: Settings,
+  contextMenuActions: ContextMenuActions,
 };
 export default config;

From 9105c167800426a81026fdad918cc2861523057d Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 19 Sep 2022 16:24:51 +1000
Subject: [PATCH 111/309] sync EmojiAvatar updates

---
 src/components/EmojiAvatar.tsx | 35 ++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/components/EmojiAvatar.tsx b/src/components/EmojiAvatar.tsx
index ea11a4b2..0f089e6c 100644
--- a/src/components/EmojiAvatar.tsx
+++ b/src/components/EmojiAvatar.tsx
@@ -4,17 +4,28 @@ import { colord } from "colord";
 import { useTheme, Avatar, AvatarProps } from "@mui/material";
 import { spreadSx } from "@src/utils/ui";
 
+// https://www.stefanjudis.com/snippets/how-to-detect-emojis-in-javascript-strings/
+const emojiRegex = /\p{Emoji}/u;
+
+export const EMOJI_AVATAR_L_LIGHT = 90;
+export const EMOJI_AVATAR_L_DARK = 30;
+export const EMOJI_AVATAR_C_LIGHT = 15;
+export const EMOJI_AVATAR_C_DARK = 20;
+
 export interface IEmojiAvatarProps extends Partial<AvatarProps> {
+  /** CSS color string or a number (as a string). If number, used as hue */
   bgColor?: string;
   emoji?: string;
   fallback: string;
+  uid?: string;
   size?: number;
 }
 
 export default function EmojiAvatar({
-  bgColor,
+  bgColor: bgColorProp,
   emoji,
   fallback,
+  uid,
   children,
   size = 40,
   ...props
@@ -22,7 +33,19 @@ export default function EmojiAvatar({
   const theme = useTheme();
   const darkMode = theme.palette.mode === "dark";
 
-  const bgcolor = bgColor || generateRandomColor(fallback, darkMode);
+  let bgcolor: string;
+  if (bgColorProp && !Number.isNaN(Number(bgColorProp))) {
+    bgcolor = colord({
+      l: darkMode ? EMOJI_AVATAR_L_DARK : EMOJI_AVATAR_L_LIGHT,
+      c: darkMode ? EMOJI_AVATAR_C_DARK : EMOJI_AVATAR_C_LIGHT,
+      h: Number(bgColorProp),
+    }).toHslString();
+  } else if (bgColorProp) {
+    bgcolor = bgColorProp;
+  } else {
+    bgcolor = generateRandomColor(`${fallback}__${uid}`, darkMode);
+  }
+
   const bgcolorLch = colord(bgcolor).toLch();
   const textColor = colord({
     l:
@@ -42,7 +65,7 @@ export default function EmojiAvatar({
           color: textColor,
           width: size,
           height: size,
-          fontSize: size * 0.45,
+          fontSize: size * (emojiRegex.test(emoji || "") ? 0.67 : 0.45),
         },
         props.variant === "rounded" && { borderRadius: size / 40 },
         ...spreadSx(props.sx),
@@ -61,6 +84,10 @@ export default function EmojiAvatar({
 
 const generateRandomColor = (seed: string, darkMode: boolean) => {
   const rng = seedrandom(seed);
-  const color = colord({ l: darkMode ? 30 : 90, c: 15, h: rng() * 360 });
+  const color = colord({
+    l: darkMode ? EMOJI_AVATAR_L_DARK : EMOJI_AVATAR_L_LIGHT,
+    c: darkMode ? EMOJI_AVATAR_C_DARK : EMOJI_AVATAR_C_LIGHT,
+    h: rng() * 360,
+  });
   return color.toHslString();
 };

From 067885b8dd51304b8ace9c9f8169154335d8d7c4 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 19 Sep 2022 19:48:20 +1000
Subject: [PATCH 112/309] ConfirmDialog: fix confirm command persisting after
 close

---
 src/components/ConfirmDialog.tsx | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/components/ConfirmDialog.tsx b/src/components/ConfirmDialog.tsx
index dd37b76d..e867dec0 100644
--- a/src/components/ConfirmDialog.tsx
+++ b/src/components/ConfirmDialog.tsx
@@ -1,5 +1,6 @@
 import { useState } from "react";
 import { useAtom } from "jotai";
+import { Scope } from "jotai/core/atom";
 
 import {
   Dialog,
@@ -14,11 +15,17 @@ import {
 import { SlideTransitionMui } from "@src/components/Modal/SlideTransition";
 import { projectScope, confirmDialogAtom } from "@src/atoms/projectScope";
 
+export interface IConfirmDialogProps {
+  scope?: Scope;
+}
+
 /**
  * Display a confirm dialog using `confirmDialogAtom` in `globalState`
  * @see {@link confirmDialogAtom | Usage example}
  */
-export default function ConfirmDialog() {
+export default function ConfirmDialog({
+  scope = projectScope,
+}: IConfirmDialogProps) {
   const [
     {
       open,
@@ -39,8 +46,12 @@ export default function ConfirmDialog() {
       buttonLayout = "horizontal",
     },
     setState,
-  ] = useAtom(confirmDialogAtom, projectScope);
-  const handleClose = () => setState({ open: false });
+  ] = useAtom(confirmDialogAtom, scope);
+
+  const handleClose = () => {
+    setState({ open: false });
+    setDryText("");
+  };
 
   const [dryText, setDryText] = useState("");
 
@@ -68,7 +79,7 @@ export default function ConfirmDialog() {
             value={dryText}
             onChange={(e) => setDryText(e.target.value)}
             autoFocus
-            label={`Type ${confirmationCommand} below to continue:`}
+            label={`Type “${confirmationCommand}” below to continue:`}
             placeholder={confirmationCommand}
             fullWidth
             id="dryText"

From e64b8ad7136c1a414b178b3b9f133940c47c7e91 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 20 Sep 2022 15:22:01 +1000
Subject: [PATCH 113/309] ref field: fix crashing when invalid path is typed

---
 .../fields/Reference/EditorCell.tsx           | 18 +++++++---
 .../fields/Reference/SideDrawerField.tsx      | 34 ++++++++++++++-----
 2 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/src/components/fields/Reference/EditorCell.tsx b/src/components/fields/Reference/EditorCell.tsx
index 824a8585..12c5e6b2 100644
--- a/src/components/fields/Reference/EditorCell.tsx
+++ b/src/components/fields/Reference/EditorCell.tsx
@@ -2,6 +2,7 @@ import { useRef, useLayoutEffect } from "react";
 import { useAtom, useSetAtom } from "jotai";
 import { EditorProps } from "react-data-grid";
 import { get } from "lodash-es";
+import { useSnackbar } from "notistack";
 
 import { TextField } from "@mui/material";
 
@@ -14,6 +15,7 @@ import { doc, deleteField } from "firebase/firestore";
 export default function TextEditor({ row, column }: EditorProps<any>) {
   const [firebaseDb] = useAtom(firebaseDbAtom, projectScope);
   const updateField = useSetAtom(updateFieldAtom, tableScope);
+  const { enqueueSnackbar } = useSnackbar();
 
   const inputRef = useRef<HTMLInputElement>(null);
 
@@ -23,11 +25,17 @@ export default function TextEditor({ row, column }: EditorProps<any>) {
     return () => {
       const newValue = inputElement?.value;
       if (newValue !== undefined && newValue !== "") {
-        updateField({
-          path: row._rowy_ref.path,
-          fieldName: column.key,
-          value: doc(firebaseDb, newValue),
-        });
+        try {
+          const refValue = doc(firebaseDb, newValue);
+
+          updateField({
+            path: row._rowy_ref.path,
+            fieldName: column.key,
+            value: refValue,
+          });
+        } catch (e: any) {
+          enqueueSnackbar(`Invalid path: ${e.message}`, { variant: "error" });
+        }
       } else {
         updateField({
           path: row._rowy_ref.path,
diff --git a/src/components/fields/Reference/SideDrawerField.tsx b/src/components/fields/Reference/SideDrawerField.tsx
index 2c13b345..677de82e 100644
--- a/src/components/fields/Reference/SideDrawerField.tsx
+++ b/src/components/fields/Reference/SideDrawerField.tsx
@@ -1,3 +1,4 @@
+import { useState } from "react";
 import { useAtom } from "jotai";
 import { doc } from "firebase/firestore";
 import { ISideDrawerFieldProps } from "@src/components/fields/types";
@@ -19,20 +20,37 @@ export default function Reference({
   const [projectId] = useAtom(projectIdAtom, projectScope);
   const [firebaseDb] = useAtom(firebaseDbAtom, projectScope);
 
-  const transformedValue =
+  const [localValue, setLocalValue] = useState(
     Boolean(value) && "path" in value && typeof value.path === "string"
       ? value.path
-      : "";
+      : ""
+  );
+  const [error, setError] = useState("");
 
   return (
-    <Stack direction="row">
+    <Stack direction="row" alignItems="flex-start">
       <TextField
         variant="filled"
         fullWidth
         margin="none"
-        onChange={(e) => onChange(doc(firebaseDb, e.target.value))}
-        onBlur={onSubmit}
-        value={transformedValue}
+        onChange={(e) => {
+          try {
+            doc(firebaseDb, e.target.value);
+            setError("");
+          } catch (e: any) {
+            setError(e.message);
+          }
+          setLocalValue(e.target.value);
+        }}
+        onBlur={() => {
+          if (!error) {
+            onChange(doc(firebaseDb, localValue));
+            onSubmit();
+          }
+        }}
+        value={localValue}
+        error={Boolean(error)}
+        helperText={error}
         id={getFieldId(column.key)}
         label=""
         hiddenLabel
@@ -41,14 +59,14 @@ export default function Reference({
 
       <IconButton
         size="small"
-        href={`https://console.firebase.google.com/project/${projectId}/firestore/data/~2F${transformedValue.replace(
+        href={`https://console.firebase.google.com/project/${projectId}/firestore/data/~2F${localValue.replace(
           /\//g,
           "~2F"
         )}`}
         target="_blank"
         rel="noopener"
         aria-label="Open in Firebase Console"
-        disabled={!transformedValue}
+        disabled={Boolean(error) || !localValue}
         edge="end"
         sx={{ ml: 1 }}
       >

From 422aebdfba8584e7029aeabf4ce9e2efffe597c2 Mon Sep 17 00:00:00 2001
From: Bobby Wang <bofei@mail.com>
Date: Wed, 21 Sep 2022 02:34:52 +0800
Subject: [PATCH 114/309] Fix the crash issue when pasting into action field
 input form

---
 src/components/fields/Action/Settings.tsx | 38 ++++++++++++-----------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/components/fields/Action/Settings.tsx b/src/components/fields/Action/Settings.tsx
index bf5fce43..3c5c26b8 100644
--- a/src/components/fields/Action/Settings.tsx
+++ b/src/components/fields/Action/Settings.tsx
@@ -88,7 +88,7 @@ const Settings = ({ config, onChange, fieldName }: ISettingsProps) => {
     Array.isArray(config.params) ? config.params : [],
     { space: 2 }
   );
-  const [codeValid, setCodeValid] = useState(true);
+  const [codeErrorMessage, setCodeErrorMessage] = useState<string | null>(null);
 
   const scriptExtraLibs = [
     [
@@ -96,14 +96,16 @@ const Settings = ({ config, onChange, fieldName }: ISettingsProps) => {
       "    /**",
       "     * actionParams are provided by dialog popup form",
       "     */",
-      (config.params ?? []).filter(Boolean).map((param: any) => {
-        const validationKeys = Object.keys(param.validation ?? {});
-        if (validationKeys.includes("string")) {
-          return `static ${param.name}: string`;
-        } else if (validationKeys.includes("array")) {
-          return `static ${param.name}: any[]`;
-        } else return `static ${param.name}: any`;
-      }),
+      (Array.isArray(config.params) ? config.params : [])
+        .filter(Boolean)
+        .map((param: any) => {
+          const validationKeys = Object.keys(param.validation ?? {});
+          if (validationKeys.includes("string")) {
+            return `static ${param.name}: string`;
+          } else if (validationKeys.includes("array")) {
+            return `static ${param.name}: any[]`;
+          } else return `static ${param.name}: any`;
+        }),
       "}",
     ].join("\n"),
     actionDefs,
@@ -256,25 +258,25 @@ const Settings = ({ config, onChange, fieldName }: ISettingsProps) => {
                       value={formattedParamsJson}
                       onChange={(v) => {
                         try {
-                          if (v) {
-                            const parsed = JSON.parse(v);
+                          const parsed = JSON.parse(v ?? "");
+                          if (Array.isArray(parsed)) {
                             onChange("params")(parsed);
+                            setCodeErrorMessage(null);
+                          } else {
+                            setCodeErrorMessage("Form fields must be array");
                           }
                         } catch (e) {
                           console.log(`Failed to parse JSON: ${e}`);
-                          setCodeValid(false);
+                          setCodeErrorMessage("Invalid JSON");
                         }
                       }}
-                      onValidStatusUpdate={({ isValid }) =>
-                        setCodeValid(isValid)
-                      }
-                      error={!codeValid}
+                      error={!!codeErrorMessage}
                     />
                   </Suspense>
 
-                  {!codeValid && (
+                  {codeErrorMessage && (
                     <FormHelperText error variant="filled">
-                      Invalid JSON
+                      {codeErrorMessage}
                     </FormHelperText>
                   )}
                 </FormControl>

From 892a51ecd30ed504bb9b55543b28b1ea74218f5b Mon Sep 17 00:00:00 2001
From: Miriam Shams-Rainey <mshamsrainey@gmail.com>
Date: Wed, 21 Sep 2022 08:27:07 -0400
Subject: [PATCH 115/309] #513: Rating customization preview uses MUIRatings

---
 src/components/fields/Rating/Settings.tsx | 85 +++++++++++++----------
 1 file changed, 49 insertions(+), 36 deletions(-)

diff --git a/src/components/fields/Rating/Settings.tsx b/src/components/fields/Rating/Settings.tsx
index 6b3cf710..2904cccb 100644
--- a/src/components/fields/Rating/Settings.tsx
+++ b/src/components/fields/Rating/Settings.tsx
@@ -1,8 +1,9 @@
 import { ISettingsProps } from "@src/components/fields/types";
 import RatingIcon from "@mui/icons-material/Star";
-import { Slider, InputLabel, TextField, Grid, FormControlLabel, Checkbox, Stack, Fab } from "@mui/material";
+import { InputLabel, TextField, Grid, FormControlLabel, Checkbox, Stack } from "@mui/material";
 import ToggleButton from "@mui/material/ToggleButton";
 import ToggleButtonGroup from "@mui/material/ToggleButtonGroup";
+import MuiRating from "@mui/material/Rating";
 import { get } from "lodash-es";
 
 export default function Settings({ onChange, config }: ISettingsProps) {
@@ -10,18 +11,20 @@ export default function Settings({ onChange, config }: ISettingsProps) {
     <Grid container spacing={2} justifyItems="end" direction={"row"}>
       <Grid item xs={6}>
         <TextField
-          label="Maximum number of stars"
+          label="Highest possible rating"
           type={"number"}
           value={config.max}
           fullWidth
+          error={false}
           onChange={(e) => {
-            onChange("max")(parseInt(e.target.value));
+            let input = parseInt(e.target.value) || 0
+            if (input > 20) { input = 20 }
+            onChange("max")(input);
           }}
-          inputProps={{ min: 1, max: 20 }}
         />
       </Grid>
       <Grid item xs={6}>
-        <InputLabel>Star fraction</InputLabel>
+        <InputLabel>Rating fraction</InputLabel>
         <ToggleButtonGroup
           value={config.precision}
           exclusive
@@ -30,6 +33,7 @@ export default function Settings({ onChange, config }: ISettingsProps) {
             onChange("precision")(value);
           }}
           aria-label="text alignment"
+          sx={{ pt: 0.5 }}
         >
           <ToggleButton value={0.25} aria-label="quarter">
             1/4
@@ -42,38 +46,47 @@ export default function Settings({ onChange, config }: ISettingsProps) {
           </ToggleButton>
         </ToggleButtonGroup>
       </Grid>
-      <FormControlLabel
-        control={
-          <Checkbox
-            checked={config.customIcons?.enabled}
-            onChange={(e) =>
-              onChange("customIcons.enabled")(e.target.checked)
-            }
-            name="customIcons.enabled"
-          />
-        }
-        label="Customize button icons with emoji"
-        style={{ marginLeft: -11 }}
-      />
+      <Grid item xs={6}>
+        <FormControlLabel
+          control={
+            <Checkbox
+              checked={config.customIcons?.enabled}
+              onChange={(e) =>
+                onChange("customIcons.enabled")(e.target.checked)
+              }
+              name="customIcons.enabled"
+            />
+          }
+          label="Customize ratings with emoji"
+          style={{ marginLeft: -11 }}
+        />
+      </Grid>
       {config.customIcons?.enabled && (
-        <Grid container spacing={2} sx={{ mt: { xs: 0, sm: -1 } }}>
-          <Grid item xs={12} sm={true}>
-            <Stack direction="row" spacing={1}>
-              <TextField
-                id="customIcons.rating"
-                value={get(config, "customIcons.rating")}
-                onChange={(e) =>
-                  onChange("customIcons.rating")(e.target.value)
-                }
-                label="Rating:"
-                className="labelHorizontal"
-                inputProps={{ style: { width: "3ch" } }}
-              />
-              <Fab size="small" aria-label="Preview of rating button">
-                {get(config, "customIcons.rating") || <RatingIcon />}
-              </Fab>
-            </Stack>
-          </Grid>
+        <Grid item xs={6} sm={true}>
+          <Stack direction="row" spacing={1}>
+            <TextField
+              id="customIcons.rating"
+              value={get(config, "customIcons.rating")}
+              onChange={(e) =>
+                onChange("customIcons.rating")(e.target.value)
+              }
+              label="Custom icon preview:"
+              className="labelHorizontal"
+              inputProps={{ style: { width: "2ch" } }}
+            />
+
+            <MuiRating aria-label="Preview of the rating field with custom icon"
+              name="Preview"
+              onClick={(e) => e.stopPropagation()}
+              icon={get(config, "customIcons.rating") || <RatingIcon />}
+              size="small"
+              emptyIcon={get(config, "customIcons.rating") || <RatingIcon />}
+              max={get(config, "max")}
+              precision={get(config, "precision")}
+              sx={{ pt: 0.5 }}
+            />
+          </Stack>
+
         </Grid>
       )}
     </Grid>

From 44b82cc2e255040e0440cf1a3e623791f098bd19 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Thu, 22 Sep 2022 13:38:22 +1000
Subject: [PATCH 116/309] Modal: use M3 FadeTransition

---
 src/components/ConfirmDialog.tsx | 4 ++--
 src/components/Modal/Modal.tsx   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/ConfirmDialog.tsx b/src/components/ConfirmDialog.tsx
index e867dec0..5819b169 100644
--- a/src/components/ConfirmDialog.tsx
+++ b/src/components/ConfirmDialog.tsx
@@ -12,7 +12,7 @@ import {
   Button,
 } from "@mui/material";
 
-import { SlideTransitionMui } from "@src/components/Modal/SlideTransition";
+import { FadeTransitionMui } from "@src/components/Modal/FadeTransition";
 import { projectScope, confirmDialogAtom } from "@src/atoms/projectScope";
 
 export interface IConfirmDialogProps {
@@ -63,7 +63,7 @@ export default function ConfirmDialog({
         else handleClose();
       }}
       maxWidth={maxWidth}
-      TransitionComponent={SlideTransitionMui}
+      TransitionComponent={FadeTransitionMui}
       sx={{ cursor: "default", zIndex: (theme) => theme.zIndex.modal + 50 }}
     >
       <DialogTitle>{title}</DialogTitle>
diff --git a/src/components/Modal/Modal.tsx b/src/components/Modal/Modal.tsx
index 475ae796..fa9a9baa 100644
--- a/src/components/Modal/Modal.tsx
+++ b/src/components/Modal/Modal.tsx
@@ -16,7 +16,7 @@ import {
 import LoadingButton, { LoadingButtonProps } from "@mui/lab/LoadingButton";
 import CloseIcon from "@mui/icons-material/Close";
 
-import { SlideTransitionMui } from "./SlideTransition";
+import { FadeTransitionMui } from "./FadeTransition";
 import ScrollableDialogContent, {
   IScrollableDialogContentProps,
 } from "./ScrollableDialogContent";
@@ -86,7 +86,7 @@ export default function Modal({
       onClose={handleClose}
       fullWidth
       fullScreen={fullScreen}
-      TransitionComponent={fullScreen ? Slide : SlideTransitionMui}
+      TransitionComponent={fullScreen ? Slide : FadeTransitionMui}
       TransitionProps={fullScreen ? ({ direction: "up" } as any) : undefined}
       aria-labelledby="modal-title"
       {...props}

From 3353978243d892036a80c06c0e816a7e32ea99c0 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Thu, 22 Sep 2022 13:38:29 +1000
Subject: [PATCH 117/309] upgrade jotai to latest

---
 package.json                                |  2 +-
 src/atoms/utils.ts                          |  3 +--
 src/components/ConfirmDialog.tsx            |  3 +--
 src/hooks/useBeforeUnload.ts                |  6 ++++--
 src/hooks/useFirestoreCollectionWithAtom.ts |  3 +--
 src/hooks/useFirestoreDocWithAtom.ts        |  3 +--
 src/hooks/useKeyPressWithAtom.ts            |  5 ++---
 src/layouts/RequireAuth.tsx                 | 12 +++++++++---
 yarn.lock                                   |  8 ++++----
 9 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index f6e3055d..721396ac 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
     "file-saver": "^2.0.5",
     "firebase": "^9.6.11",
     "firebaseui": "^6.0.1",
-    "jotai": "^1.7.2",
+    "jotai": "^1.8.4",
     "json-stable-stringify-without-jsonify": "^1.0.1",
     "json2csv": "^5.0.7",
     "jszip": "^3.10.0",
diff --git a/src/atoms/utils.ts b/src/atoms/utils.ts
index 7903ca86..2c1458ab 100644
--- a/src/atoms/utils.ts
+++ b/src/atoms/utils.ts
@@ -1,8 +1,7 @@
-import { Scope } from "jotai/core/atom";
 import { useAtomsDebugValue } from "jotai/devtools";
 
 export function DebugAtoms(
-  options: { scope: Scope } & Parameters<typeof useAtomsDebugValue>[0]
+  options: NonNullable<Parameters<typeof useAtomsDebugValue>[0]>
 ) {
   useAtomsDebugValue(options);
   return null;
diff --git a/src/components/ConfirmDialog.tsx b/src/components/ConfirmDialog.tsx
index 5819b169..ef2549f8 100644
--- a/src/components/ConfirmDialog.tsx
+++ b/src/components/ConfirmDialog.tsx
@@ -1,6 +1,5 @@
 import { useState } from "react";
 import { useAtom } from "jotai";
-import { Scope } from "jotai/core/atom";
 
 import {
   Dialog,
@@ -16,7 +15,7 @@ import { FadeTransitionMui } from "@src/components/Modal/FadeTransition";
 import { projectScope, confirmDialogAtom } from "@src/atoms/projectScope";
 
 export interface IConfirmDialogProps {
-  scope?: Scope;
+  scope?: Parameters<typeof useAtom>[1];
 }
 
 /**
diff --git a/src/hooks/useBeforeUnload.ts b/src/hooks/useBeforeUnload.ts
index 9a42ba66..98438a5f 100644
--- a/src/hooks/useBeforeUnload.ts
+++ b/src/hooks/useBeforeUnload.ts
@@ -1,6 +1,5 @@
 import { useEffect } from "react";
 import { useAtom, Atom } from "jotai";
-import { Scope } from "jotai/core/atom";
 
 function beforeUnloadHandler(event: BeforeUnloadEvent) {
   event.preventDefault();
@@ -14,7 +13,10 @@ function beforeUnloadHandler(event: BeforeUnloadEvent) {
  * @param atom - The atom’s value to listen to
  * @param scope - The atom scope
  */
-export default function useBeforeUnload(atom: Atom<any | null>, scope: Scope) {
+export default function useBeforeUnload(
+  atom: Atom<any | null>,
+  scope: NonNullable<Parameters<typeof useAtom>[1]>
+) {
   const [atomValue] = useAtom(atom, scope);
 
   const atomValueFalsy = !atomValue;
diff --git a/src/hooks/useFirestoreCollectionWithAtom.ts b/src/hooks/useFirestoreCollectionWithAtom.ts
index 23bc2ce5..43f7165a 100644
--- a/src/hooks/useFirestoreCollectionWithAtom.ts
+++ b/src/hooks/useFirestoreCollectionWithAtom.ts
@@ -1,7 +1,6 @@
 import { useState, useEffect } from "react";
 import useMemoValue from "use-memo-value";
 import { useAtom, PrimitiveAtom, useSetAtom, SetStateAction } from "jotai";
-import { Scope } from "jotai/core/atom";
 import { set } from "lodash-es";
 import {
   Firestore,
@@ -77,7 +76,7 @@ interface IUseFirestoreCollectionWithAtomOptions<T> {
  */
 export function useFirestoreCollectionWithAtom<T = TableRow>(
   dataAtom: PrimitiveAtom<T[]>,
-  dataScope: Scope | undefined,
+  dataScope: Parameters<typeof useAtom>[1] | undefined,
   path: string | undefined,
   options?: IUseFirestoreCollectionWithAtomOptions<T>
 ) {
diff --git a/src/hooks/useFirestoreDocWithAtom.ts b/src/hooks/useFirestoreDocWithAtom.ts
index e7691155..007061ac 100644
--- a/src/hooks/useFirestoreDocWithAtom.ts
+++ b/src/hooks/useFirestoreDocWithAtom.ts
@@ -1,7 +1,6 @@
 import { useEffect } from "react";
 import useMemoValue from "use-memo-value";
 import { useAtom, PrimitiveAtom, useSetAtom } from "jotai";
-import { Scope } from "jotai/core/atom";
 import { set } from "lodash-es";
 import {
   Firestore,
@@ -45,7 +44,7 @@ interface IUseFirestoreDocWithAtomOptions<T> {
  */
 export function useFirestoreDocWithAtom<T = TableRow>(
   dataAtom: PrimitiveAtom<T>,
-  dataScope: Scope | undefined,
+  dataScope: Parameters<typeof useAtom>[1] | undefined,
   path: string | undefined,
   options?: IUseFirestoreDocWithAtomOptions<T>
 ) {
diff --git a/src/hooks/useKeyPressWithAtom.ts b/src/hooks/useKeyPressWithAtom.ts
index 78d23286..e51b1dd0 100644
--- a/src/hooks/useKeyPressWithAtom.ts
+++ b/src/hooks/useKeyPressWithAtom.ts
@@ -1,6 +1,5 @@
 import { useEffect } from "react";
 import { useSetAtom } from "jotai";
-import { PrimitiveAtom, Scope } from "jotai/core/atom";
 
 /**
  * A hook that listens to when the target key is pressed
@@ -11,8 +10,8 @@ import { PrimitiveAtom, Scope } from "jotai/core/atom";
  */
 export default function useKeyPressWithAtom(
   targetKey: string,
-  atom: PrimitiveAtom<boolean>,
-  scope: Scope
+  atom: Parameters<typeof useSetAtom>[0],
+  scope: Parameters<typeof useSetAtom>[1]
 ) {
   const setAtom = useSetAtom(atom, scope);
 
diff --git a/src/layouts/RequireAuth.tsx b/src/layouts/RequireAuth.tsx
index f568b23a..bd5d7b09 100644
--- a/src/layouts/RequireAuth.tsx
+++ b/src/layouts/RequireAuth.tsx
@@ -1,4 +1,4 @@
-import { useAtom } from "jotai";
+import { useAtom, Atom } from "jotai";
 import { useLocation, Navigate } from "react-router-dom";
 
 import Loading from "@src/components/Loading";
@@ -8,10 +8,16 @@ import { ROUTES } from "@src/constants/routes";
 
 export interface IRequireAuthProps {
   children: React.ReactElement;
+  atom?: Atom<any>;
+  scope?: Parameters<typeof useAtom>[1];
 }
 
-export default function RequireAuth({ children }: IRequireAuthProps) {
-  const [currentUser] = useAtom(currentUserAtom, projectScope);
+export default function RequireAuth({
+  children,
+  atom = currentUserAtom,
+  scope = projectScope,
+}: IRequireAuthProps) {
+  const [currentUser] = useAtom(atom, scope);
   const location = useLocation();
 
   if (currentUser === undefined)
diff --git a/yarn.lock b/yarn.lock
index 3dbe40a8..3e2592d4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8745,10 +8745,10 @@ jju@~1.4.0:
   resolved "https://registry.yarnpkg.com/jju/-/jju-1.4.0.tgz#a3abe2718af241a2b2904f84a625970f389ae32a"
   integrity sha1-o6vicYryQaKykE+EpiWXDzia4yo=
 
-jotai@^1.7.2:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/jotai/-/jotai-1.7.2.tgz#80587cf10f51a614c2028688e12d2abc6ac0b00c"
-  integrity sha512-ksvpW1Wu+/HwW1iDYq23PpXLu2df5Vv+eWw70jRAx7IEY4c+qRsORULnqPFurSy/X8LSoPcRhVDJx/cyf8jjMg==
+jotai@^1.8.4:
+  version "1.8.4"
+  resolved "https://registry.yarnpkg.com/jotai/-/jotai-1.8.4.tgz#e188bff3cc790c758d25646f6f5daf9854c98eef"
+  integrity sha512-bkHDHNxm7bU4+bJL4z96fTlJYN34UDRTu3ghEajJrDepayON9YEaxPrXr7xhLnIRntoFC6eDYYhMNA/ilbj2RQ==
 
 js-base64@^2.4.3:
   version "2.6.4"

From 67c2a3b6638fd69d88b15a435c4531dc8a5ca3ca Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Fri, 23 Sep 2022 11:53:00 +1000
Subject: [PATCH 118/309] ROWY-684: set table auditing to off by default

---
 src/components/TableSettingsDialog/form.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/TableSettingsDialog/form.tsx b/src/components/TableSettingsDialog/form.tsx
index 11942034..d26e83d8 100644
--- a/src/components/TableSettingsDialog/form.tsx
+++ b/src/components/TableSettingsDialog/form.tsx
@@ -300,7 +300,7 @@ export const tableSettings = (
       type: FieldType.checkbox,
       name: "audit",
       label: "Enable auditing for this table",
-      defaultValue: true,
+      defaultValue: false,
     },
     {
       step: "auditing",

From 0acca9d8599b71c7dc04e866a055d4b439d024e1 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Fri, 23 Sep 2022 12:05:36 +1000
Subject: [PATCH 119/309] useBasicSearch: stricter search criteria

---
 src/hooks/useBasicSearch.ts | 6 ++++--
 src/pages/TablesPage.tsx    | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/hooks/useBasicSearch.ts b/src/hooks/useBasicSearch.ts
index cb61aebc..20c0ff48 100644
--- a/src/hooks/useBasicSearch.ts
+++ b/src/hooks/useBasicSearch.ts
@@ -1,6 +1,6 @@
 import { useState } from "react";
 import { useDebouncedCallback } from "use-debounce";
-import { matchSorter } from "match-sorter";
+import { matchSorter, rankings } from "match-sorter";
 
 export function useBasicSearch<T>(
   list: T[],
@@ -10,7 +10,9 @@ export function useBasicSearch<T>(
   const [query, setQuery] = useState("");
   const handleQuery = useDebouncedCallback(setQuery, debounce);
 
-  const results = query ? matchSorter(list, query, { keys }) : list;
+  const results = query
+    ? matchSorter(list, query, { keys, threshold: rankings.ACRONYM })
+    : list;
 
   return [results, query, handleQuery] as const;
 }
diff --git a/src/pages/TablesPage.tsx b/src/pages/TablesPage.tsx
index 4c914754..378f04a4 100644
--- a/src/pages/TablesPage.tsx
+++ b/src/pages/TablesPage.tsx
@@ -44,7 +44,7 @@ import { useScrollToHash } from "@src/hooks/useScrollToHash";
 
 const SEARCH_KEYS = ["id", "name", "section", "description"];
 
-export default function HomePage() {
+export default function TablesPage() {
   const [userRoles] = useAtom(userRolesAtom, projectScope);
   const [userSettings] = useAtom(userSettingsAtom, projectScope);
   const [updateUserSettings] = useAtom(updateUserSettingsAtom, projectScope);

From c33484fbba4b3682d5f095faf26001e3e4ce94e8 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Fri, 23 Sep 2022 12:13:27 +1000
Subject: [PATCH 120/309] ROWY-647: fix import wizard suggesting URLs should be
 a phone number column

---
 src/components/TableModals/ImportExistingWizard/utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/TableModals/ImportExistingWizard/utils.ts b/src/components/TableModals/ImportExistingWizard/utils.ts
index 98ec10e0..45750420 100644
--- a/src/components/TableModals/ImportExistingWizard/utils.ts
+++ b/src/components/TableModals/ImportExistingWizard/utils.ts
@@ -58,8 +58,8 @@ const inferTypeFromValue = (value: any) => {
 
   if (typeof value === "string") {
     if (REGEX_EMAIL.test(value)) return FieldType.email;
-    if (REGEX_PHONE.test(value)) return FieldType.phone;
     if (REGEX_URL.test(value)) return FieldType.url;
+    if (REGEX_PHONE.test(value)) return FieldType.phone;
     if (REGEX_HTML.test(value)) return FieldType.richText;
     if (value.length >= 50) return FieldType.longText;
     return FieldType.shortText;

From 9aa2ad8540b0de735177b9d2b6a5b882ccb107d4 Mon Sep 17 00:00:00 2001
From: Bobby Wang <bofei@mail.com>
Date: Mon, 26 Sep 2022 06:54:51 +0800
Subject: [PATCH 121/309] Add stripe webhook

---
 .../WebhooksModal/Schemas/basic.tsx           |  9 --
 .../WebhooksModal/Schemas/index.ts            |  3 +-
 .../WebhooksModal/Schemas/stripe.tsx          | 95 +++++++++++++++++++
 .../TableModals/WebhooksModal/utils.tsx       |  8 +-
 4 files changed, 102 insertions(+), 13 deletions(-)
 create mode 100644 src/components/TableModals/WebhooksModal/Schemas/stripe.tsx

diff --git a/src/components/TableModals/WebhooksModal/Schemas/basic.tsx b/src/components/TableModals/WebhooksModal/Schemas/basic.tsx
index 616e6528..d9f81121 100644
--- a/src/components/TableModals/WebhooksModal/Schemas/basic.tsx
+++ b/src/components/TableModals/WebhooksModal/Schemas/basic.tsx
@@ -3,15 +3,6 @@ import WarningIcon from "@mui/icons-material/WarningAmber";
 import { TableSettings } from "@src/types/table";
 import { IWebhook } from "@src/components/TableModals/WebhooksModal/utils";
 
-export const webhookTypes = [
-  "basic",
-  "typeform",
-  "sendgrid",
-  //"shopify",
-  //"twitter",
-  //"stripe",
-] as const;
-
 const requestType = [
   "declare type WebHookRequest {",
   "    /**",
diff --git a/src/components/TableModals/WebhooksModal/Schemas/index.ts b/src/components/TableModals/WebhooksModal/Schemas/index.ts
index 15ea2a1a..fff6341f 100644
--- a/src/components/TableModals/WebhooksModal/Schemas/index.ts
+++ b/src/components/TableModals/WebhooksModal/Schemas/index.ts
@@ -2,5 +2,6 @@ import basic from "./basic";
 import typeform from "./typeform";
 import sendgrid from "./sendgrid";
 import webform from "./webform";
+import stripe from "./stripe";
 
-export { basic, typeform, sendgrid, webform };
+export { basic, typeform, sendgrid, webform, stripe };
diff --git a/src/components/TableModals/WebhooksModal/Schemas/stripe.tsx b/src/components/TableModals/WebhooksModal/Schemas/stripe.tsx
new file mode 100644
index 00000000..77a78536
--- /dev/null
+++ b/src/components/TableModals/WebhooksModal/Schemas/stripe.tsx
@@ -0,0 +1,95 @@
+import { Typography, Link, TextField } from "@mui/material";
+import InlineOpenInNewIcon from "@src/components/InlineOpenInNewIcon";
+import { TableSettings } from "@src/types/table";
+import { IWebhook } from "@src/components/TableModals/WebhooksModal/utils";
+
+export const webhookStripe = {
+  name: "Stripe",
+  parser: {
+    additionalVariables: null,
+    extraLibs: null,
+    template: (
+      table: TableSettings
+    ) => `const sendgridParser: Parser = async ({ req, db, ref }) => {
+    const event = req.body
+    switch (event.type) {
+        case "payment_intent.succeeded":
+            break;
+        case "payment_intent.payment_failed":
+            break;
+    default:
+      // all other types
+  }
+};`,
+  },
+  condition: {
+    additionalVariables: null,
+    extraLibs: null,
+    template: (
+      table: TableSettings
+    ) => `const condition: Condition = async({ref,req,db}) => {
+  // feel free to add your own code logic here
+  return true;
+}`,
+  },
+  auth: (webhookObject: IWebhook, setWebhookObject: (w: IWebhook) => void) => {
+    return (
+      <>
+        <Typography gutterBottom>
+          Get your{" "}
+          <Link
+            href="https://dashboard.stripe.com/apikeys"
+            target="_blank"
+            rel="noopener noreferrer"
+            variant="inherit"
+          >
+            secret key
+            <InlineOpenInNewIcon />
+          </Link>{" "}
+          and{" "}
+          <Link
+            href="https://dashboard.stripe.com/webhooks"
+            target="_blank"
+            rel="noopener noreferrer"
+            variant="inherit"
+          >
+            signing key
+            <InlineOpenInNewIcon />
+          </Link>{" "}
+          from Stripe dashboard.
+          <br />
+          Then add the secret below.
+        </Typography>
+
+        <TextField
+          id="stripe-secret-key"
+          label="Secret key"
+          value={webhookObject.auth.secretKey}
+          fullWidth
+          multiline
+          onChange={(e) => {
+            setWebhookObject({
+              ...webhookObject,
+              auth: { ...webhookObject.auth, secretKey: e.target.value },
+            });
+          }}
+        />
+        <TextField
+          id="stripe-signing-secret"
+          label="Signing key"
+          value={webhookObject.auth.signingSecret}
+          fullWidth
+          multiline
+          onChange={(e) => {
+            setWebhookObject({
+              ...webhookObject,
+              auth: { ...webhookObject.auth, signingSecret: e.target.value },
+            });
+          }}
+        />
+      </>
+    );
+  },
+};
+
+export default webhookStripe;
diff --git a/src/components/TableModals/WebhooksModal/utils.tsx b/src/components/TableModals/WebhooksModal/utils.tsx
index db833809..c9cdccf1 100644
--- a/src/components/TableModals/WebhooksModal/utils.tsx
+++ b/src/components/TableModals/WebhooksModal/utils.tsx
@@ -1,6 +1,7 @@
 import { TableSettings } from "@src/types/table";
 import { generateId } from "@src/utils/table";
-import { typeform, basic, sendgrid, webform } from "./Schemas";
+import { typeform, basic, sendgrid, webform, stripe } from "./Schemas";
+
 export const webhookTypes = [
   "basic",
   "typeform",
@@ -8,7 +9,7 @@ export const webhookTypes = [
   "webform",
   //"shopify",
   //"twitter",
-  //"stripe",
+  "stripe",
 ] as const;
 
 const requestType = [
@@ -53,7 +54,7 @@ export const webhookNames: Record<WebhookType, string> = {
   //github:"GitHub",
   // shopify: "Shopify",
   // twitter: "Twitter",
-  // stripe: "Stripe",
+  stripe: "Stripe",
   basic: "Basic",
   webform: "Web form",
 };
@@ -82,6 +83,7 @@ export const webhookSchemas = {
   typeform,
   sendgrid,
   webform,
+  stripe,
 };
 
 export function emptyWebhookObject(

From 8a3632e4f99231cc6d701c4b68e4e6427422c672 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 26 Sep 2022 12:53:11 +1000
Subject: [PATCH 122/309] NavDrawer: update Help, Learning menus

---
 src/constants/externalLinks.ts                |  6 ++
 src/layouts/Navigation/NavDrawer/HelpMenu.tsx | 58 ++++++-------
 .../Navigation/NavDrawer/LearningMenu.tsx     | 86 +++++++++++++++++++
 .../Navigation/NavDrawer/NavDrawer.tsx        | 21 ++++-
 4 files changed, 136 insertions(+), 35 deletions(-)
 create mode 100644 src/layouts/Navigation/NavDrawer/LearningMenu.tsx

diff --git a/src/constants/externalLinks.ts b/src/constants/externalLinks.ts
index 84035a12..bf2f41ab 100644
--- a/src/constants/externalLinks.ts
+++ b/src/constants/externalLinks.ts
@@ -23,6 +23,9 @@ export const EXTERNAL_LINKS = {
   rowyAppHostName: "rowy.app",
 
   dateFormat: "https://date-fns.org/v2.24.0/docs/format",
+
+  welcomeVideo:
+    "https://www.youtube.com/watch?v=rJWASZW2ivg&list=PLow2dGbF6XclrTSvW3ug1pRxbGwsIgcWJ&index=1",
 } as const;
 
 const WIKI_PATHS = {
@@ -38,6 +41,9 @@ const WIKI_PATHS = {
   howToDefaultValues: "/how-to/default-values",
   howToCustomViews: "/how-to/custom-views",
 
+  faqs: "/category/faqs",
+  faqsAccess: "/faqs/access",
+
   fieldTypesSupportedFields: "/field-types/supported-fields",
   fieldTypesDerivative: "/field-types/derivative",
   fieldTypesConnectTable: "/field-types/connect-table",
diff --git a/src/layouts/Navigation/NavDrawer/HelpMenu.tsx b/src/layouts/Navigation/NavDrawer/HelpMenu.tsx
index 5ec00f04..75b7a5d4 100644
--- a/src/layouts/Navigation/NavDrawer/HelpMenu.tsx
+++ b/src/layouts/Navigation/NavDrawer/HelpMenu.tsx
@@ -3,16 +3,15 @@ import { useEffect } from "react";
 import {
   Menu,
   MenuProps,
-  ListSubheader,
   MenuItem,
-  ListItemIcon,
   ListItemSecondaryAction,
   Divider,
+  ListItem,
+  ListItemText,
 } from "@mui/material";
 import InlineOpenInNewIcon from "@src/components/InlineOpenInNewIcon";
-import SocialLogo from "@src/components/SocialLogo";
 
-import { EXTERNAL_LINKS } from "@src/constants/externalLinks";
+import { EXTERNAL_LINKS, WIKI_LINKS } from "@src/constants/externalLinks";
 import { logEvent, analytics } from "analytics";
 
 export default function HelpMenu({
@@ -46,28 +45,9 @@ export default function HelpMenu({
       id="help-menu"
       anchorOrigin={{ vertical: "bottom", horizontal: "right" }}
       transformOrigin={{ vertical: "bottom", horizontal: "left" }}
-      sx={{ "& .MuiPaper-root": { mt: 1.5, py: 1 } }}
+      sx={{ "& .MuiPaper-root": { mt: 1.5 } }}
       PaperProps={{ elevation: 12 }}
     >
-      <ListSubheader
-        sx={{
-          mb: 0.5,
-          typography: "subtitle1",
-        }}
-      >
-        Get support
-      </ListSubheader>
-      <ListSubheader
-        sx={{
-          mb: 1.5,
-          maxWidth: 260,
-          typography: "body2",
-          color: "text.secondary",
-        }}
-      >
-        Reach out for help and find FAQs on GitHub Discussions
-      </ListSubheader>
-
       <MenuItem
         component="a"
         href={EXTERNAL_LINKS.gitHub + "/discussions"}
@@ -75,14 +55,20 @@ export default function HelpMenu({
         rel="noopener noreferrer"
         onClick={onClose as any}
       >
-        <ListItemIcon sx={{ mr: 1 }}>
-          <SocialLogo platform="gitHub" />
-        </ListItemIcon>
-        GitHub Discussions
+        Get support
         {externalLinkIcon}
       </MenuItem>
 
-      <Divider variant="middle" />
+      <MenuItem
+        component="a"
+        href={WIKI_LINKS.faqs}
+        target="_blank"
+        rel="noopener noreferrer"
+        onClick={onClose as any}
+      >
+        FAQs
+        {externalLinkIcon}
+      </MenuItem>
 
       <MenuItem
         component="a"
@@ -91,12 +77,18 @@ export default function HelpMenu({
         rel="noopener noreferrer"
         onClick={onClose as any}
       >
-        <ListItemIcon sx={{ mr: 1 }}>
-          <SocialLogo platform="gitHub" />
-        </ListItemIcon>
-        Feature request
+        Feature requests
         {externalLinkIcon}
       </MenuItem>
+
+      <Divider variant="middle" />
+
+      <ListItem>
+        <ListItemText
+          primary={`Rowy v${meta.version}`}
+          primaryTypographyProps={{ color: "text.disabled" }}
+        />
+      </ListItem>
     </Menu>
   );
 }
diff --git a/src/layouts/Navigation/NavDrawer/LearningMenu.tsx b/src/layouts/Navigation/NavDrawer/LearningMenu.tsx
new file mode 100644
index 00000000..7aa65d14
--- /dev/null
+++ b/src/layouts/Navigation/NavDrawer/LearningMenu.tsx
@@ -0,0 +1,86 @@
+import { useEffect } from "react";
+import { Link } from "react-router-dom";
+
+import {
+  Menu,
+  MenuProps,
+  MenuItem,
+  ListItemSecondaryAction,
+} from "@mui/material";
+import InlineOpenInNewIcon from "@src/components/InlineOpenInNewIcon";
+import { ChevronRight as ChevronRightIcon } from "@src/assets/icons";
+
+import { EXTERNAL_LINKS, WIKI_LINKS } from "@src/constants/externalLinks";
+import { ROUTES } from "@src/constants/routes";
+import { logEvent, analytics } from "analytics";
+
+export default function LearningMenu({
+  anchorEl,
+  onClose,
+}: Pick<MenuProps, "anchorEl" | "onClose">) {
+  const open = Boolean(anchorEl);
+  useEffect(() => {
+    if (open) logEvent(analytics, "open_learning_menu");
+  }, [open]);
+
+  const externalLinkIcon = (
+    <ListItemSecondaryAction
+      sx={{
+        position: "relative",
+        transform: "none",
+        ml: "auto",
+        pl: 2,
+        color: "text.disabled",
+        right: -2,
+      }}
+    >
+      <InlineOpenInNewIcon />
+    </ListItemSecondaryAction>
+  );
+
+  return (
+    <Menu
+      anchorEl={anchorEl}
+      open={open}
+      onClose={onClose}
+      id="learning-menu"
+      anchorOrigin={{ vertical: "bottom", horizontal: "right" }}
+      transformOrigin={{ vertical: "bottom", horizontal: "left" }}
+      sx={{ "& .MuiPaper-root": { mt: 1.5 } }}
+      PaperProps={{ elevation: 12 }}
+    >
+      <MenuItem
+        component="a"
+        href={WIKI_LINKS.howTo}
+        target="_blank"
+        rel="noopener noreferrer"
+        onClick={onClose as any}
+      >
+        How-to guides
+        {externalLinkIcon}
+      </MenuItem>
+
+      <MenuItem
+        component={Link}
+        to={ROUTES.tableTutorial}
+        onClick={onClose as any}
+      >
+        Table tutorial
+        <ListItemSecondaryAction sx={{ color: "text.disabled", height: 20 }}>
+          <ChevronRightIcon />
+        </ListItemSecondaryAction>
+      </MenuItem>
+
+      <MenuItem
+        component="a"
+        href={EXTERNAL_LINKS.welcomeVideo}
+        target="_blank"
+        rel="noopener noreferrer"
+        onClick={onClose as any}
+      >
+        Video tutorials
+        {externalLinkIcon}
+      </MenuItem>
+    </Menu>
+  );
+}
diff --git a/src/layouts/Navigation/NavDrawer/NavDrawer.tsx b/src/layouts/Navigation/NavDrawer/NavDrawer.tsx
index 769a0667..118ab4c5 100644
--- a/src/layouts/Navigation/NavDrawer/NavDrawer.tsx
+++ b/src/layouts/Navigation/NavDrawer/NavDrawer.tsx
@@ -30,6 +30,7 @@ import {
 import Logo from "@src/assets/Logo";
 import NavItem from "./NavItem";
 import GetStartedProgress from "@src/components/GetStartedChecklist/GetStartedProgress";
+import LearningMenu from "./LearningMenu";
 import CommunityMenu from "./CommunityMenu";
 import HelpMenu from "./HelpMenu";
 import { INavDrawerContentsProps } from "./NavDrawerContents";
@@ -73,6 +74,8 @@ export default function NavDrawer({
   const [getStartedCompleted, getStartedCompletionCount] =
     useGetStartedCompletion();
 
+  const [learningMenuAnchorEl, setLearningMenuAnchorEl] =
+    useState<HTMLButtonElement | null>(null);
   const [communityMenuAnchorEl, setCommunityMenuAnchorEl] =
     useState<HTMLButtonElement | null>(null);
   const [helpMenuAnchorEl, setHelpMenuAnchorEl] =
@@ -300,13 +303,27 @@ export default function NavDrawer({
                 </li>
 
                 <li>
-                  <NavItem href={WIKI_LINKS.howTo}>
+                  <NavItem
+                    onClick={(e: any) => {
+                      setLearningMenuAnchorEl(e.currentTarget);
+                      setHover("persist");
+                    }}
+                  >
                     <ListItemIcon>
                       <LearningIcon />
                     </ListItemIcon>
                     <ListItemText primary="Learning" />
-                    {externalLinkIcon}
+                    <ListItemSecondaryAction>
+                      <ChevronRightIcon />
+                    </ListItemSecondaryAction>
                   </NavItem>
+                  <LearningMenu
+                    anchorEl={learningMenuAnchorEl}
+                    onClose={() => {
+                      setLearningMenuAnchorEl(null);
+                      setHover(false);
+                    }}
+                  />
                 </li>
 
                 <li>

From d801c5ecc963aedd9953d698c93d5a23604d1859 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 26 Sep 2022 12:54:05 +1000
Subject: [PATCH 123/309] fix missing import

---
 src/layouts/Navigation/NavDrawer/HelpMenu.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/layouts/Navigation/NavDrawer/HelpMenu.tsx b/src/layouts/Navigation/NavDrawer/HelpMenu.tsx
index 75b7a5d4..1ecdf03d 100644
--- a/src/layouts/Navigation/NavDrawer/HelpMenu.tsx
+++ b/src/layouts/Navigation/NavDrawer/HelpMenu.tsx
@@ -13,6 +13,7 @@ import InlineOpenInNewIcon from "@src/components/InlineOpenInNewIcon";
 
 import { EXTERNAL_LINKS, WIKI_LINKS } from "@src/constants/externalLinks";
 import { logEvent, analytics } from "analytics";
+import meta from "@root/package.json";
 
 export default function HelpMenu({
   anchorEl,

From 83ee0e10a81606ff1cb48ccd543c8629850b9092 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 26 Sep 2022 16:22:21 +1000
Subject: [PATCH 124/309] show rowy run popup for connector and action fields

---
 src/components/fields/Action/Settings.tsx    |  8 +++++++-
 src/components/fields/Connector/Settings.tsx | 17 ++++++++++++++---
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/components/fields/Action/Settings.tsx b/src/components/fields/Action/Settings.tsx
index 3c5c26b8..bc762c82 100644
--- a/src/components/fields/Action/Settings.tsx
+++ b/src/components/fields/Action/Settings.tsx
@@ -1,4 +1,4 @@
-import { lazy, Suspense, useState } from "react";
+import { lazy, Suspense, useState, useEffect } from "react";
 import { get } from "lodash-es";
 import stringify from "json-stable-stringify-without-jsonify";
 import { Link } from "react-router-dom";
@@ -37,6 +37,7 @@ import {
   projectRolesAtom,
   projectSettingsAtom,
   compatibleRowyRunVersionAtom,
+  rowyRunModalAtom,
 } from "@src/atoms/projectScope";
 import { tableScope, tableColumnsOrderedAtom } from "@src/atoms/tableScope";
 import { WIKI_LINKS } from "@src/constants/externalLinks";
@@ -68,6 +69,11 @@ const Settings = ({ config, onChange, fieldName }: ISettingsProps) => {
   );
   const [tableColumnsOrdered] = useAtom(tableColumnsOrderedAtom, tableScope);
 
+  const openRowyRunModal = useSetAtom(rowyRunModalAtom, projectScope);
+  useEffect(() => {
+    if (!settings.rowyRunUrl) openRowyRunModal({ feature: "Action fields" });
+  }, [settings.rowyRunUrl]);
+
   // const [activeStep, setActiveStep] = useState<
   //   "requirements" | "friction" | "action" | "undo" | "customization"
   // >("requirements");
diff --git a/src/components/fields/Connector/Settings.tsx b/src/components/fields/Connector/Settings.tsx
index a2c77c57..36548d03 100644
--- a/src/components/fields/Connector/Settings.tsx
+++ b/src/components/fields/Connector/Settings.tsx
@@ -1,5 +1,5 @@
-import { lazy, Suspense, useState } from "react";
-import { get } from "lodash-es";
+import { lazy, Suspense, useEffect } from "react";
+import { useAtom, useSetAtom } from "jotai";
 
 import {
   Grid,
@@ -11,7 +11,6 @@ import {
   Link,
 } from "@mui/material";
 
-import SteppedAccordion from "@src/components/SteppedAccordion";
 import FieldSkeleton from "@src/components/SideDrawer/FieldSkeleton";
 import CodeEditorHelper from "@src/components/CodeEditor/CodeEditorHelper";
 import InlineOpenInNewIcon from "@src/components/InlineOpenInNewIcon";
@@ -21,6 +20,11 @@ import connectorDefs from "!!raw-loader!./connector.d.ts";
 import { WIKI_LINKS } from "@src/constants/externalLinks";
 import { baseFunction } from "./utils";
 import { ISettingsProps } from "@src/components/fields/types";
+import {
+  projectScope,
+  projectSettingsAtom,
+  rowyRunModalAtom,
+} from "@src/atoms/projectScope";
 
 //import typeDefs from "!!raw-loader!./types.d.ts";
 const CodeEditor = lazy(
@@ -46,6 +50,13 @@ const diagnosticsOptions = {
 };
 
 export default function Settings({ config, onChange }: ISettingsProps) {
+  const [projectSettings] = useAtom(projectSettingsAtom, projectScope);
+  const openRowyRunModal = useSetAtom(rowyRunModalAtom, projectScope);
+  useEffect(() => {
+    if (!projectSettings.rowyRunUrl)
+      openRowyRunModal({ feature: "Connector fields" });
+  }, [projectSettings.rowyRunUrl]);
+
   return (
     <>
       <div>

From ae77fb066493eda54e017ce6b4a80ce1ec6c082a Mon Sep 17 00:00:00 2001
From: rohitb <rohit.belsare@druva.com>
Date: Wed, 21 Sep 2022 14:45:56 +0530
Subject: [PATCH 125/309] Copy Document Path to Clipboard

---
 src/components/SideDrawer/FieldWrapper.tsx | 29 ++++++++++++++++------
 src/constants/externalLinks.ts             |  1 +
 src/utils/ui.ts                            |  4 +++
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/components/SideDrawer/FieldWrapper.tsx b/src/components/SideDrawer/FieldWrapper.tsx
index 620cf60d..d9214b84 100644
--- a/src/components/SideDrawer/FieldWrapper.tsx
+++ b/src/components/SideDrawer/FieldWrapper.tsx
@@ -11,6 +11,7 @@ import {
 } from "@mui/material";
 import { DocumentPath as DocumentPathIcon } from "@src/assets/icons";
 import LaunchIcon from "@mui/icons-material/Launch";
+import ContentCopyIcon from "@mui/icons-material/ContentCopy";
 import LockIcon from "@mui/icons-material/LockOutlined";
 import VisibilityOffIcon from "@mui/icons-material/VisibilityOffOutlined";
 
@@ -25,6 +26,9 @@ import {
 import { FieldType } from "@src/constants/fields";
 import { getFieldProp } from "@src/components/fields";
 import { getLabelId, getFieldId } from "./utils";
+import { EXTERNAL_LINKS } from "@src/constants/externalLinks";
+import { useSnackbar } from "notistack";
+import { copyToClipboard } from "@src/utils/ui";
 
 export interface IFieldWrapperProps {
   children?: React.ReactNode;
@@ -47,9 +51,15 @@ export default function FieldWrapper({
   hidden,
   index,
 }: IFieldWrapperProps) {
-  const [projectId] = useAtom(projectIdAtom, projectScope);
-  const [altPress] = useAtom(altPressAtom, projectScope);
-
+  const [projectId] = useAtom(projectIdAtom, globalScope);
+  const [altPress] = useAtom(altPressAtom, globalScope);
+  const { enqueueSnackbar } = useSnackbar();
+  const documentPath = `${
+    EXTERNAL_LINKS.firebaseProjectbasePath
+  }/${projectId}/firestore/data/~2F${(debugText as string)?.replace(
+    /\//g,
+    "~2F"
+  )}`;
   return (
     <div>
       <Stack
@@ -126,11 +136,16 @@ export default function FieldWrapper({
           >
             {debugText}
           </Typography>
-
           <IconButton
-            href={`https://console.firebase.google.com/project/${projectId}/firestore/data/~2F${(
-              debugText as string
-            ).replace(/\//g, "~2F")}`}
+            onClick={() => {
+              copyToClipboard(documentPath);
+              enqueueSnackbar("Copied!");
+            }}
+          >
+            <ContentCopyIcon />
+          </IconButton>
+          <IconButton
+            href={documentPath}
             target="_blank"
             rel="noopener"
             aria-label="Open in Firebase Console"
diff --git a/src/constants/externalLinks.ts b/src/constants/externalLinks.ts
index bf2f41ab..159b3b61 100644
--- a/src/constants/externalLinks.ts
+++ b/src/constants/externalLinks.ts
@@ -26,6 +26,7 @@ export const EXTERNAL_LINKS = {
 
   welcomeVideo:
     "https://www.youtube.com/watch?v=rJWASZW2ivg&list=PLow2dGbF6XclrTSvW3ug1pRxbGwsIgcWJ&index=1",
+  firebaseProjectbasePath: "https://console.firebase.google.com/project",
 } as const;
 
 const WIKI_PATHS = {
diff --git a/src/utils/ui.ts b/src/utils/ui.ts
index 8d3007ca..5b426dc8 100644
--- a/src/utils/ui.ts
+++ b/src/utils/ui.ts
@@ -8,3 +8,7 @@ export const isTargetInsideBox = (target: Element, box: Element) => {
 
 export const spreadSx = (sx?: SxProps<Theme>) =>
   Array.isArray(sx) ? sx : sx ? [sx] : [];
+
+export const copyToClipboard = (text: string) => {
+  navigator.clipboard.writeText(text);
+};

From c31b9e38c4f564128192968060abf96e1e8b57a6 Mon Sep 17 00:00:00 2001
From: rohitb <rohit.belsare@druva.com>
Date: Mon, 26 Sep 2022 16:07:56 +0530
Subject: [PATCH 126/309] Fixed merge issue

---
 src/components/SideDrawer/FieldWrapper.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/SideDrawer/FieldWrapper.tsx b/src/components/SideDrawer/FieldWrapper.tsx
index d9214b84..3ee90927 100644
--- a/src/components/SideDrawer/FieldWrapper.tsx
+++ b/src/components/SideDrawer/FieldWrapper.tsx
@@ -51,8 +51,8 @@ export default function FieldWrapper({
   hidden,
   index,
 }: IFieldWrapperProps) {
-  const [projectId] = useAtom(projectIdAtom, globalScope);
-  const [altPress] = useAtom(altPressAtom, globalScope);
+  const [projectId] = useAtom(projectIdAtom, projectScope);
+  const [altPress] = useAtom(altPressAtom, projectScope);
   const { enqueueSnackbar } = useSnackbar();
   const documentPath = `${
     EXTERNAL_LINKS.firebaseProjectbasePath

From 0cc440c3539e2d8482c6b38ac003e2f7d1041b6c Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 27 Sep 2022 16:17:44 +1000
Subject: [PATCH 127/309] lock settings routes to admin only

---
 src/App.tsx                              | 23 ++++++-------
 src/components/AccessDenied.tsx          |  4 +--
 src/components/CircularProgressTimed.tsx |  1 +
 src/layouts/AdminRoute.tsx               | 44 ++++++++++++++++++++++++
 4 files changed, 58 insertions(+), 14 deletions(-)
 create mode 100644 src/layouts/AdminRoute.tsx

diff --git a/src/App.tsx b/src/App.tsx
index 97209c9e..2890beba 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -9,6 +9,7 @@ import ConfirmDialog from "@src/components/ConfirmDialog";
 import RowyRunModal from "@src/components/RowyRunModal";
 import NotFound from "@src/pages/NotFoundPage";
 import RequireAuth from "@src/layouts/RequireAuth";
+import AdminRoute from "@src/layouts/AdminRoute";
 
 import {
   projectScope,
@@ -20,7 +21,6 @@ import { ROUTES } from "@src/constants/routes";
 import useKeyPressWithAtom from "@src/hooks/useKeyPressWithAtom";
 
 import TableGroupRedirectPage from "./pages/TableGroupRedirectPage";
-import JotaiTestPage from "@src/pages/Test/JotaiTestPage";
 import SignOutPage from "@src/pages/Auth/SignOutPage";
 
 // prettier-ignore
@@ -60,10 +60,6 @@ const MembersPage = lazy(() => import("@src/pages/Settings/MembersPage" /* webpa
 // prettier-ignore
 const DebugSettingsPage = lazy(() => import("@src/pages/Settings/DebugSettingsPage" /* webpackChunkName: "DebugSettingsPage" */));
 
-// prettier-ignore
-const ThemeTestPage = lazy(() => import("@src/pages/Test/ThemeTestPage" /* webpackChunkName: "ThemeTestPage" */));
-// const RowyRunTestPage = lazy(() => import("@src/pages/RowyRunTestPage" /* webpackChunkName: "RowyRunTestPage" */));
-
 export default function App() {
   const [currentUser] = useAtom(currentUserAtom, projectScope);
   const [userRoles] = useAtom(userRolesAtom, projectScope);
@@ -150,19 +146,22 @@ export default function App() {
             <Route path={ROUTES.userSettings} element={<UserSettingsPage />} />
             <Route
               path={ROUTES.projectSettings}
-              element={<ProjectSettingsPage />}
+              element={
+                <AdminRoute>
+                  <ProjectSettingsPage />
+                </AdminRoute>
+              }
             />
             <Route path={ROUTES.members} element={<MembersPage />} />
             <Route
               path={ROUTES.debugSettings}
-              element={<DebugSettingsPage />}
+              element={
+                <AdminRoute>
+                  <DebugSettingsPage />
+                </AdminRoute>
+              }
             />
-            {/* <Route path={ROUTES.rowyRunTest} element={<RowyRunTestPage />} /> */}
-
-            <Route path="/test/jotai" element={<JotaiTestPage />} />
           </Route>
-
-          <Route path={ROUTES.themeTest} element={<ThemeTestPage />} />
         </Routes>
       )}
     </Suspense>
diff --git a/src/components/AccessDenied.tsx b/src/components/AccessDenied.tsx
index 792e9af3..7d068602 100644
--- a/src/components/AccessDenied.tsx
+++ b/src/components/AccessDenied.tsx
@@ -11,7 +11,7 @@ import {
   Link as MuiLink,
   Button,
 } from "@mui/material";
-import SecurityIcon from "@mui/icons-material/SecurityOutlined";
+import LockIcon from "@mui/icons-material/LockOutlined";
 
 import EmptyState from "@src/components/EmptyState";
 
@@ -33,7 +33,7 @@ export default function AccessDenied({ resetErrorBoundary }: FallbackProps) {
     <EmptyState
       role="alert"
       fullScreen
-      Icon={SecurityIcon}
+      Icon={LockIcon}
       message="Access denied"
       description={
         <>
diff --git a/src/components/CircularProgressTimed.tsx b/src/components/CircularProgressTimed.tsx
index 12c62862..11959f37 100644
--- a/src/components/CircularProgressTimed.tsx
+++ b/src/components/CircularProgressTimed.tsx
@@ -7,6 +7,7 @@ import { Box } from "@mui/material";
 
 export interface ICircularProgressTimedProps
   extends ICircularProgressOpticalProps {
+  /** Duration in seconds */
   duration: number;
   complete: boolean;
 }
diff --git a/src/layouts/AdminRoute.tsx b/src/layouts/AdminRoute.tsx
new file mode 100644
index 00000000..79cf2bcf
--- /dev/null
+++ b/src/layouts/AdminRoute.tsx
@@ -0,0 +1,44 @@
+import { PropsWithChildren } from "react";
+import { useAtom } from "jotai";
+import { Link } from "react-router-dom";
+
+import { Typography, Button } from "@mui/material";
+import LockIcon from "@mui/icons-material/LockOutlined";
+import HomeIcon from "@mui/icons-material/HomeOutlined";
+
+import EmptyState from "@src/components/EmptyState";
+
+import { projectScope, userRolesAtom } from "@src/atoms/projectScope";
+import { ROUTES } from "@src/constants/routes";
+import { TOP_BAR_HEIGHT } from "@src/layouts/Navigation/TopBar";
+
+/**
+ * Lock pages for admins only
+ */
+export default function AdminRoute({ children }: PropsWithChildren<{}>) {
+  const [userRoles] = useAtom(userRolesAtom, projectScope);
+
+  if (!userRoles.includes("ADMIN"))
+    return (
+      <EmptyState
+        role="alert"
+        fullScreen
+        Icon={LockIcon}
+        message="Access denied"
+        description={
+          <>
+            <Typography>
+              You must be an admin of this workspace to access this page.
+            </Typography>
+
+            <Button component={Link} to={ROUTES.home} startIcon={<HomeIcon />}>
+              Home
+            </Button>
+          </>
+        }
+        style={{ marginTop: -TOP_BAR_HEIGHT, marginBottom: -TOP_BAR_HEIGHT }}
+      />
+    );
+
+  return children as JSX.Element;
+}

From b2102fd88a33dce12f9dc12eac8e669edf6cfb26 Mon Sep 17 00:00:00 2001
From: shamsmosowi <shams.mosowi@gmail.com>
Date: Tue, 27 Sep 2022 17:31:02 +0200
Subject: [PATCH 128/309] fix confirmation label

---
 src/components/ColumnMenu/ColumnMenu.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/ColumnMenu/ColumnMenu.tsx b/src/components/ColumnMenu/ColumnMenu.tsx
index 9a4886bd..4884a75a 100644
--- a/src/components/ColumnMenu/ColumnMenu.tsx
+++ b/src/components/ColumnMenu/ColumnMenu.tsx
@@ -329,6 +329,7 @@ export default function ColumnMenu() {
                 </>
               ),
               handleConfirm: handleEvaluateAll,
+              confirm: "Evaluate",
             }),
     },
   ];

From c5730d6abe4e29227a044f934407a8b051c0e981 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 28 Sep 2022 10:30:55 +1000
Subject: [PATCH 129/309] fix tables not loading from URL

---
 src/pages/Table/ProvidedTablePage.tsx | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/pages/Table/ProvidedTablePage.tsx b/src/pages/Table/ProvidedTablePage.tsx
index 777b59e5..f609ac4c 100644
--- a/src/pages/Table/ProvidedTablePage.tsx
+++ b/src/pages/Table/ProvidedTablePage.tsx
@@ -3,7 +3,7 @@ import { useAtom, Provider } from "jotai";
 import { DebugAtoms } from "@src/atoms/utils";
 import { useParams, useOutlet } from "react-router-dom";
 import { ErrorBoundary } from "react-error-boundary";
-import { find } from "lodash-es";
+import { find, isEmpty } from "lodash-es";
 
 import ErrorFallback, {
   ERROR_TABLE_NOT_FOUND,
@@ -16,6 +16,7 @@ import TableSkeleton from "@src/components/Table/TableSkeleton";
 import {
   projectScope,
   currentUserAtom,
+  projectSettingsAtom,
   tablesAtom,
 } from "@src/atoms/projectScope";
 import {
@@ -32,10 +33,22 @@ export default function ProvidedTablePage() {
   const { id } = useParams();
   const outlet = useOutlet();
   const [currentUser] = useAtom(currentUserAtom, projectScope);
+  const [projectSettings] = useAtom(projectSettingsAtom, projectScope);
   const [tables] = useAtom(tablesAtom, projectScope);
 
   const tableSettings = useMemo(() => find(tables, ["id", id]), [tables, id]);
-  if (!tableSettings) throw new Error(ERROR_TABLE_NOT_FOUND + ": " + id);
+  if (!tableSettings) {
+    if (isEmpty(projectSettings)) {
+      return (
+        <>
+          <TableToolbarSkeleton />
+          <TableSkeleton />
+        </>
+      );
+    } else {
+      throw new Error(ERROR_TABLE_NOT_FOUND + ": " + id);
+    }
+  }
 
   return (
     <ErrorBoundary FallbackComponent={ErrorFallback}>

From 7a5b181852709704780a683fbd667475c02439ea Mon Sep 17 00:00:00 2001
From: Miriam Shams-Rainey <mshamsrainey@gmail.com>
Date: Wed, 28 Sep 2022 13:11:08 -0400
Subject: [PATCH 130/309] #513: Using star icon outline for visibility

---
 src/components/fields/Rating/Settings.tsx        | 3 ++-
 src/components/fields/Rating/SideDrawerField.tsx | 4 ++--
 src/components/fields/Rating/TableCell.tsx       | 9 +++++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/components/fields/Rating/Settings.tsx b/src/components/fields/Rating/Settings.tsx
index 2904cccb..6134b530 100644
--- a/src/components/fields/Rating/Settings.tsx
+++ b/src/components/fields/Rating/Settings.tsx
@@ -1,5 +1,6 @@
 import { ISettingsProps } from "@src/components/fields/types";
 import RatingIcon from "@mui/icons-material/Star";
+import RatingOutlineIcon from "@mui/icons-material/StarBorder"
 import { InputLabel, TextField, Grid, FormControlLabel, Checkbox, Stack } from "@mui/material";
 import ToggleButton from "@mui/material/ToggleButton";
 import ToggleButtonGroup from "@mui/material/ToggleButtonGroup";
@@ -80,7 +81,7 @@ export default function Settings({ onChange, config }: ISettingsProps) {
               onClick={(e) => e.stopPropagation()}
               icon={get(config, "customIcons.rating") || <RatingIcon />}
               size="small"
-              emptyIcon={get(config, "customIcons.rating") || <RatingIcon />}
+              emptyIcon={get(config, "customIcons.rating") || <RatingOutlineIcon />}
               max={get(config, "max")}
               precision={get(config, "precision")}
               sx={{ pt: 0.5 }}
diff --git a/src/components/fields/Rating/SideDrawerField.tsx b/src/components/fields/Rating/SideDrawerField.tsx
index 40e8a2bb..eb117dd4 100644
--- a/src/components/fields/Rating/SideDrawerField.tsx
+++ b/src/components/fields/Rating/SideDrawerField.tsx
@@ -3,7 +3,7 @@ import { ISideDrawerFieldProps } from "@src/components/fields/types";
 import { Grid } from "@mui/material";
 import { Rating as MuiRating } from "@mui/material";
 import "@mui/lab";
-import { getStateIcon } from "./TableCell";
+import { getStateIcon, getStateOutline } from "./TableCell";
 import { fieldSx } from "@src/components/SideDrawer/utils";
 
 export default function Rating({
@@ -29,7 +29,7 @@ export default function Rating({
           onSubmit();
         }}
         icon={getStateIcon(column.config)}
-        emptyIcon={getStateIcon(column.config)}
+        emptyIcon={getStateOutline(column.config)}
         size="small"
         max={max}
         precision={precision}
diff --git a/src/components/fields/Rating/TableCell.tsx b/src/components/fields/Rating/TableCell.tsx
index f7640d59..2e7aee52 100644
--- a/src/components/fields/Rating/TableCell.tsx
+++ b/src/components/fields/Rating/TableCell.tsx
@@ -2,8 +2,8 @@ import { IHeavyCellProps } from "@src/components/fields/types";
 
 import MuiRating from "@mui/material/Rating";
 import RatingIcon from "@mui/icons-material/Star";
+import RatingOutlineIcon from "@mui/icons-material/StarBorder"
 import { get } from "lodash-es";
-import { MonitorSmall } from "mdi-material-ui";
 
 
 export const getStateIcon = (config: any) => {
@@ -12,6 +12,11 @@ export const getStateIcon = (config: any) => {
   return get(config, "customIcons.rating") || <RatingIcon />;
 };
 
+export const getStateOutline = (config: any) => {
+  if (!get(config, "customIcons.enabled")) { return <RatingOutlineIcon /> }
+  return get(config, "customIcons.rating") || <RatingOutlineIcon />;
+}
+
 export default function Rating({
   row,
   column,
@@ -41,7 +46,7 @@ export default function Rating({
       size="small"
       disabled={disabled}
       onChange={(_, newValue) => onSubmit(newValue)}
-      emptyIcon={getStateIcon(column.config)}
+      emptyIcon={getStateOutline(column.config)}
       max={max}
       precision={precision}
       sx={{ mx: -0.25 }}

From 5c4f732e982e8abad1319f915f128fdc13dab35f Mon Sep 17 00:00:00 2001
From: shamsmosowi <shams.mosowi@gmail.com>
Date: Wed, 28 Sep 2022 23:25:25 +0100
Subject: [PATCH 131/309] change row and ref to be additional variable

---
 .../CodeEditor/CodeEditorHelper.tsx           | 10 +--------
 .../ColumnConfigModal/DefaultValueInput.tsx   | 14 +++++++++++-
 .../ExtensionsModal/Step3Conditions.tsx       |  8 +++++++
 .../TableModals/ExtensionsModal/Step4Body.tsx |  8 +++++++
 .../TableModals/WebhooksModal/Step3Parser.tsx |  4 ++++
 src/components/fields/Action/Settings.tsx     | 22 +++++++++++++++++--
 src/components/fields/Connector/Settings.tsx  | 11 +++++++++-
 src/components/fields/Derivative/Settings.tsx | 14 +++++++++++-
 8 files changed, 77 insertions(+), 14 deletions(-)

diff --git a/src/components/CodeEditor/CodeEditorHelper.tsx b/src/components/CodeEditor/CodeEditorHelper.tsx
index 0b816c36..299c2134 100644
--- a/src/components/CodeEditor/CodeEditorHelper.tsx
+++ b/src/components/CodeEditor/CodeEditorHelper.tsx
@@ -22,18 +22,10 @@ export default function CodeEditorHelper({
   const [projectId] = useAtom(projectIdAtom, projectScope);
 
   const availableVariables = [
-    {
-      key: "row",
-      description: `row has the value of doc.data() it has type definitions using this table's schema, but you can access any field in the document.`,
-    },
     {
       key: "db",
       description: `db object provides access to firestore database instance of this project. giving you access to any collection or document in this firestore instance`,
     },
-    {
-      key: "ref",
-      description: `ref object that represents the reference to the current row in firestore db (ie: doc.ref).`,
-    },
     {
       key: "auth",
       description: `auth provides access to a firebase auth instance, can be used to manage auth users or generate tokens.`,
@@ -44,7 +36,7 @@ export default function CodeEditorHelper({
     },
     {
       key: "rowy",
-      description: `rowy provides a set of functions that are commonly used, such as easy access to GCP Secret Manager`,
+      description: `rowy provides a set of functions that are commonly used, such as easy file uploads & access to GCP Secret Manager`,
     },
   ];
 
diff --git a/src/components/ColumnModals/ColumnConfigModal/DefaultValueInput.tsx b/src/components/ColumnModals/ColumnConfigModal/DefaultValueInput.tsx
index 52ff712a..5213eb8a 100644
--- a/src/components/ColumnModals/ColumnConfigModal/DefaultValueInput.tsx
+++ b/src/components/ColumnModals/ColumnConfigModal/DefaultValueInput.tsx
@@ -204,7 +204,19 @@ export default function DefaultValueInput({
 
       {column.config?.defaultValue?.type === "dynamic" && (
         <>
-          <CodeEditorHelper docLink={WIKI_LINKS.howToDefaultValues} />
+          <CodeEditorHelper
+            docLink={WIKI_LINKS.howToDefaultValues}
+            additionalVariables={[
+              {
+                key: "row",
+                description: `row has the value of doc.data() it has type definitions using this table's schema, but you can access any field in the document.`,
+              },
+              {
+                key: "ref",
+                description: `reference object that represents the reference to the current row in firestore db (ie: doc.ref).`,
+              },
+            ]}
+          />
           <Suspense fallback={<FieldSkeleton height={100} />}>
             <CodeEditor
               column={column}
diff --git a/src/components/TableModals/ExtensionsModal/Step3Conditions.tsx b/src/components/TableModals/ExtensionsModal/Step3Conditions.tsx
index 379505bc..21cf609c 100644
--- a/src/components/TableModals/ExtensionsModal/Step3Conditions.tsx
+++ b/src/components/TableModals/ExtensionsModal/Step3Conditions.tsx
@@ -13,6 +13,14 @@ const CodeEditor = lazy(
 );
 
 const additionalVariables = [
+  {
+    key: "row",
+    description: `row has the value of doc.data() it has type definitions using this table's schema, but you can access any field in the document.`,
+  },
+  {
+    key: "ref",
+    description: `reference object that represents the reference to the current row in firestore db (ie: doc.ref).`,
+  },
   {
     key: "change",
     description:
diff --git a/src/components/TableModals/ExtensionsModal/Step4Body.tsx b/src/components/TableModals/ExtensionsModal/Step4Body.tsx
index 9633c3b9..dcd49ec6 100644
--- a/src/components/TableModals/ExtensionsModal/Step4Body.tsx
+++ b/src/components/TableModals/ExtensionsModal/Step4Body.tsx
@@ -14,6 +14,14 @@ const CodeEditor = lazy(
 );
 
 const additionalVariables = [
+  {
+    key: "row",
+    description: `row has the value of doc.data() it has type definitions using this table's schema, but you can access any field in the document.`,
+  },
+  {
+    key: "ref",
+    description: `reference object that represents the reference to the current row in firestore db (ie: doc.ref).`,
+  },
   {
     key: "change",
     description:
diff --git a/src/components/TableModals/WebhooksModal/Step3Parser.tsx b/src/components/TableModals/WebhooksModal/Step3Parser.tsx
index be6e1f9b..b00fd86d 100644
--- a/src/components/TableModals/WebhooksModal/Step3Parser.tsx
+++ b/src/components/TableModals/WebhooksModal/Step3Parser.tsx
@@ -11,6 +11,10 @@ import { WIKI_LINKS } from "@src/constants/externalLinks";
 import { parserExtraLibs } from "./utils";
 
 const additionalVariables = [
+  {
+    key: "ref",
+    description: `reference object that represents the reference to the current collection in firestore db.`,
+  },
   {
     key: "req",
     description: "webhook request",
diff --git a/src/components/fields/Action/Settings.tsx b/src/components/fields/Action/Settings.tsx
index bc762c82..0c0655b1 100644
--- a/src/components/fields/Action/Settings.tsx
+++ b/src/components/fields/Action/Settings.tsx
@@ -414,7 +414,16 @@ const Settings = ({ config, onChange, fieldName }: ISettingsProps) => {
                     </Suspense>
                     <CodeEditorHelper
                       docLink={WIKI_LINKS.fieldTypesAction + "#script"}
-                      additionalVariables={[]}
+                      additionalVariables={[
+                        {
+                          key: "row",
+                          description: `row has the value of doc.data() it has type definitions using this table's schema, but you can access any field in the document.`,
+                        },
+                        {
+                          key: "ref",
+                          description: `reference object that represents the reference to the current row in firestore db (ie: doc.ref).`,
+                        },
+                      ]}
                     />
                   </FormControl>
 
@@ -530,7 +539,16 @@ const Settings = ({ config, onChange, fieldName }: ISettingsProps) => {
                   </Suspense>
                   <CodeEditorHelper
                     docLink={WIKI_LINKS.fieldTypesAction + "#script"}
-                    additionalVariables={[]}
+                    additionalVariables={[
+                      {
+                        key: "row",
+                        description: `row has the value of doc.data() it has type definitions using this table's schema, but you can access any field in the document.`,
+                      },
+                      {
+                        key: "ref",
+                        description: `reference object that represents the reference to the current row in firestore db (ie: doc.ref).`,
+                      },
+                    ]}
                   />
                 </FormControl>
               </Stack>
diff --git a/src/components/fields/Connector/Settings.tsx b/src/components/fields/Connector/Settings.tsx
index 36548d03..fc20de5a 100644
--- a/src/components/fields/Connector/Settings.tsx
+++ b/src/components/fields/Connector/Settings.tsx
@@ -72,7 +72,16 @@ export default function Settings({ config, onChange }: ISettingsProps) {
         </Suspense>
         <CodeEditorHelper
           docLink={WIKI_LINKS.fieldTypesConnector + "#examples"}
-          additionalVariables={[]}
+          additionalVariables={[
+            {
+              key: "row",
+              description: `row has the value of doc.data() it has type definitions using this table's schema, but you can access any field in the document.`,
+            },
+            {
+              key: "ref",
+              description: `reference object that represents the reference to the current row in firestore db (ie: doc.ref).`,
+            },
+          ]}
         />
       </div>
       <FormControl>
diff --git a/src/components/fields/Derivative/Settings.tsx b/src/components/fields/Derivative/Settings.tsx
index e084bc32..32ce65dc 100644
--- a/src/components/fields/Derivative/Settings.tsx
+++ b/src/components/fields/Derivative/Settings.tsx
@@ -135,7 +135,19 @@ export default function Settings({
 
       <div>
         <InputLabel>Derivative script</InputLabel>
-        <CodeEditorHelper docLink={WIKI_LINKS.fieldTypesDerivative} />
+        <CodeEditorHelper
+          docLink={WIKI_LINKS.fieldTypesDerivative}
+          additionalVariables={[
+            {
+              key: "row",
+              description: `row has the value of doc.data() it has type definitions using this table's schema, but you can access any field in the document.`,
+            },
+            {
+              key: "ref",
+              description: `reference object that represents the reference to the current row in firestore db (ie: doc.ref).`,
+            },
+          ]}
+        />
         <Suspense fallback={<FieldSkeleton height={200} />}>
           <CodeEditor
             diagnosticsOptions={

From 21efbd1cc520784a942f03245e614fdf0afc4399 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Thu, 29 Sep 2022 14:44:47 +1000
Subject: [PATCH 132/309] TablesPage: sort sections by name

---
 src/atoms/tableScope/table.ts | 2 +-
 src/pages/TablesPage.tsx      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/atoms/tableScope/table.ts b/src/atoms/tableScope/table.ts
index 29bc400e..971601e6 100644
--- a/src/atoms/tableScope/table.ts
+++ b/src/atoms/tableScope/table.ts
@@ -1,6 +1,6 @@
 import { atom } from "jotai";
 import { atomWithReducer, atomWithHash } from "jotai/utils";
-import { uniqBy, findIndex, cloneDeep, unset, orderBy } from "lodash-es";
+import { findIndex, cloneDeep, unset, orderBy } from "lodash-es";
 
 import {
   TableSettings,
diff --git a/src/pages/TablesPage.tsx b/src/pages/TablesPage.tsx
index 378f04a4..060e46e5 100644
--- a/src/pages/TablesPage.tsx
+++ b/src/pages/TablesPage.tsx
@@ -1,5 +1,5 @@
 import { useAtom, useSetAtom } from "jotai";
-import { find, groupBy } from "lodash-es";
+import { find, groupBy, sortBy } from "lodash-es";
 
 import {
   Container,
@@ -67,7 +67,7 @@ export default function TablesPage() {
     : [];
   const sections: Record<string, TableSettings[]> = {
     Favorites: favorites.map((id) => find(results, { id })) as TableSettings[],
-    ...groupBy(results, "section"),
+    ...groupBy(sortBy(results, ["section", "name"]), "section"),
   };
 
   if (!Array.isArray(tables))

From 3b7c142a0c66bfe5a36fbf69d5dcbe035ae85dde Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Thu, 29 Sep 2022 14:45:02 +1000
Subject: [PATCH 133/309] auth redirect preserves location state

---
 src/layouts/RequireAuth.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/layouts/RequireAuth.tsx b/src/layouts/RequireAuth.tsx
index bd5d7b09..ebe35e99 100644
--- a/src/layouts/RequireAuth.tsx
+++ b/src/layouts/RequireAuth.tsx
@@ -31,6 +31,7 @@ export default function RequireAuth({
       <Navigate
         to={ROUTES.auth + `?redirect=${encodeURIComponent(redirect)}`}
         replace
+        state={location.state}
       />
     );
 

From f136677ec85fb7bf75d897386f0af5b131146303 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Fri, 30 Sep 2022 13:16:32 +1000
Subject: [PATCH 134/309] Modal: add MemoizedText component

---
 src/components/Modal/MemoizedText.tsx | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 src/components/Modal/MemoizedText.tsx

diff --git a/src/components/Modal/MemoizedText.tsx b/src/components/Modal/MemoizedText.tsx
new file mode 100644
index 00000000..1b77485b
--- /dev/null
+++ b/src/components/Modal/MemoizedText.tsx
@@ -0,0 +1,14 @@
+import { memo } from "react";
+
+/**
+ * Used for global Modals that can have customizable text
+ * so that the default text doesn’t appear as the modal closes.
+ */
+const MemoizedText = memo(
+  function MemoizedTextComponent({ text }: { text: React.ReactNode }) {
+    return <>{text}</>;
+  },
+  () => true
+);
+
+export default MemoizedText;

From 3bff1fbbd5374cc0e36ff766ff04f813039930f2 Mon Sep 17 00:00:00 2001
From: rohitb <rohit.belsare@druva.com>
Date: Sun, 2 Oct 2022 22:59:14 +0530
Subject: [PATCH 135/309] Fixed review comments issue

---
 src/components/SideDrawer/FieldWrapper.tsx | 13 ++++---------
 src/constants/externalLinks.ts             |  1 -
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/components/SideDrawer/FieldWrapper.tsx b/src/components/SideDrawer/FieldWrapper.tsx
index 3ee90927..ffedd66b 100644
--- a/src/components/SideDrawer/FieldWrapper.tsx
+++ b/src/components/SideDrawer/FieldWrapper.tsx
@@ -26,7 +26,6 @@ import {
 import { FieldType } from "@src/constants/fields";
 import { getFieldProp } from "@src/components/fields";
 import { getLabelId, getFieldId } from "./utils";
-import { EXTERNAL_LINKS } from "@src/constants/externalLinks";
 import { useSnackbar } from "notistack";
 import { copyToClipboard } from "@src/utils/ui";
 
@@ -54,12 +53,6 @@ export default function FieldWrapper({
   const [projectId] = useAtom(projectIdAtom, projectScope);
   const [altPress] = useAtom(altPressAtom, projectScope);
   const { enqueueSnackbar } = useSnackbar();
-  const documentPath = `${
-    EXTERNAL_LINKS.firebaseProjectbasePath
-  }/${projectId}/firestore/data/~2F${(debugText as string)?.replace(
-    /\//g,
-    "~2F"
-  )}`;
   return (
     <div>
       <Stack
@@ -138,14 +131,16 @@ export default function FieldWrapper({
           </Typography>
           <IconButton
             onClick={() => {
-              copyToClipboard(documentPath);
+              copyToClipboard((debugText as string).replace(/\//g, "~2F"));
               enqueueSnackbar("Copied!");
             }}
           >
             <ContentCopyIcon />
           </IconButton>
           <IconButton
-            href={documentPath}
+            href={`https://console.firebase.google.com/project/${projectId}/firestore/data/~2F${(
+              debugText as string
+            ).replace(/\//g, "~2F")}`}
             target="_blank"
             rel="noopener"
             aria-label="Open in Firebase Console"
diff --git a/src/constants/externalLinks.ts b/src/constants/externalLinks.ts
index 159b3b61..bf2f41ab 100644
--- a/src/constants/externalLinks.ts
+++ b/src/constants/externalLinks.ts
@@ -26,7 +26,6 @@ export const EXTERNAL_LINKS = {
 
   welcomeVideo:
     "https://www.youtube.com/watch?v=rJWASZW2ivg&list=PLow2dGbF6XclrTSvW3ug1pRxbGwsIgcWJ&index=1",
-  firebaseProjectbasePath: "https://console.firebase.google.com/project",
 } as const;
 
 const WIKI_PATHS = {

From 1d63ca9bea91863b9226d6b56172f35650306b57 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 3 Oct 2022 10:50:27 +1100
Subject: [PATCH 136/309] Remove replacement of `/` with `2F` in copy button

---
 src/components/SideDrawer/FieldWrapper.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/SideDrawer/FieldWrapper.tsx b/src/components/SideDrawer/FieldWrapper.tsx
index ffedd66b..c6a352cd 100644
--- a/src/components/SideDrawer/FieldWrapper.tsx
+++ b/src/components/SideDrawer/FieldWrapper.tsx
@@ -131,7 +131,7 @@ export default function FieldWrapper({
           </Typography>
           <IconButton
             onClick={() => {
-              copyToClipboard((debugText as string).replace(/\//g, "~2F"));
+              copyToClipboard(debugText as string);
               enqueueSnackbar("Copied!");
             }}
           >

From b346b892a018e7d94c4d4470b17d044f09a2de65 Mon Sep 17 00:00:00 2001
From: Miriam Shams-Rainey <miriam.shams.rainey@duke.edu>
Date: Mon, 3 Oct 2022 01:25:28 -0400
Subject: [PATCH 137/309] #513: Added Customizable Icons for Ratings Field
 (#817)

* Update README.md

* #513: Added Customizable Icons for Ratings Field

* #513: Customizable Rating Icons Side Drawer

Also updated formatting of custom rating icons to match default star sz

* #513: Rating customization preview uses MUIRatings

* #513: Using star icon outline for visibility

Co-authored-by: Harini Janakiraman <harinijanakiraman@gmail.com>
---
 src/components/fields/Rating/Settings.tsx     | 127 ++++++++++++------
 .../fields/Rating/SideDrawerField.tsx         |   9 +-
 src/components/fields/Rating/TableCell.tsx    |  20 ++-
 3 files changed, 110 insertions(+), 46 deletions(-)

diff --git a/src/components/fields/Rating/Settings.tsx b/src/components/fields/Rating/Settings.tsx
index 5504bd08..6134b530 100644
--- a/src/components/fields/Rating/Settings.tsx
+++ b/src/components/fields/Rating/Settings.tsx
@@ -1,48 +1,95 @@
 import { ISettingsProps } from "@src/components/fields/types";
-
-import { Slider, InputLabel, TextField, Grid } from "@mui/material";
+import RatingIcon from "@mui/icons-material/Star";
+import RatingOutlineIcon from "@mui/icons-material/StarBorder"
+import { InputLabel, TextField, Grid, FormControlLabel, Checkbox, Stack } from "@mui/material";
 import ToggleButton from "@mui/material/ToggleButton";
 import ToggleButtonGroup from "@mui/material/ToggleButtonGroup";
+import MuiRating from "@mui/material/Rating";
+import { get } from "lodash-es";
 
 export default function Settings({ onChange, config }: ISettingsProps) {
   return (
-    <>
-      <Grid container spacing={2} justifyItems="end" direction={"row"}>
-        <Grid item xs={6}>
-          <TextField
-            label="Maximum number of stars"
-            type={"number"}
-            value={config.max}
-            fullWidth
-            onChange={(e) => {
-              onChange("max")(parseInt(e.target.value));
-            }}
-            inputProps={{ min: 1, max: 20 }}
-          />
-        </Grid>
-        <Grid item xs={6}>
-          <InputLabel>Star fraction</InputLabel>
-          <ToggleButtonGroup
-            value={config.precision}
-            exclusive
-            fullWidth
-            onChange={(_, value) => {
-              onChange("precision")(value);
-            }}
-            aria-label="text alignment"
-          >
-            <ToggleButton value={0.25} aria-label="quarter">
-              1/4
-            </ToggleButton>
-            <ToggleButton value={0.5} aria-label="half">
-              1/2
-            </ToggleButton>
-            <ToggleButton value={1} aria-label="whole">
-              1
-            </ToggleButton>
-          </ToggleButtonGroup>
-        </Grid>
+    <Grid container spacing={2} justifyItems="end" direction={"row"}>
+      <Grid item xs={6}>
+        <TextField
+          label="Highest possible rating"
+          type={"number"}
+          value={config.max}
+          fullWidth
+          error={false}
+          onChange={(e) => {
+            let input = parseInt(e.target.value) || 0
+            if (input > 20) { input = 20 }
+            onChange("max")(input);
+          }}
+        />
       </Grid>
-    </>
+      <Grid item xs={6}>
+        <InputLabel>Rating fraction</InputLabel>
+        <ToggleButtonGroup
+          value={config.precision}
+          exclusive
+          fullWidth
+          onChange={(_, value) => {
+            onChange("precision")(value);
+          }}
+          aria-label="text alignment"
+          sx={{ pt: 0.5 }}
+        >
+          <ToggleButton value={0.25} aria-label="quarter">
+            1/4
+          </ToggleButton>
+          <ToggleButton value={0.5} aria-label="half">
+            1/2
+          </ToggleButton>
+          <ToggleButton value={1} aria-label="whole">
+            1
+          </ToggleButton>
+        </ToggleButtonGroup>
+      </Grid>
+      <Grid item xs={6}>
+        <FormControlLabel
+          control={
+            <Checkbox
+              checked={config.customIcons?.enabled}
+              onChange={(e) =>
+                onChange("customIcons.enabled")(e.target.checked)
+              }
+              name="customIcons.enabled"
+            />
+          }
+          label="Customize ratings with emoji"
+          style={{ marginLeft: -11 }}
+        />
+      </Grid>
+      {config.customIcons?.enabled && (
+        <Grid item xs={6} sm={true}>
+          <Stack direction="row" spacing={1}>
+            <TextField
+              id="customIcons.rating"
+              value={get(config, "customIcons.rating")}
+              onChange={(e) =>
+                onChange("customIcons.rating")(e.target.value)
+              }
+              label="Custom icon preview:"
+              className="labelHorizontal"
+              inputProps={{ style: { width: "2ch" } }}
+            />
+
+            <MuiRating aria-label="Preview of the rating field with custom icon"
+              name="Preview"
+              onClick={(e) => e.stopPropagation()}
+              icon={get(config, "customIcons.rating") || <RatingIcon />}
+              size="small"
+              emptyIcon={get(config, "customIcons.rating") || <RatingOutlineIcon />}
+              max={get(config, "max")}
+              precision={get(config, "precision")}
+              sx={{ pt: 0.5 }}
+            />
+          </Stack>
+
+        </Grid>
+      )}
+    </Grid>
   );
-}
+}
\ No newline at end of file
diff --git a/src/components/fields/Rating/SideDrawerField.tsx b/src/components/fields/Rating/SideDrawerField.tsx
index d3e4ffcb..eb117dd4 100644
--- a/src/components/fields/Rating/SideDrawerField.tsx
+++ b/src/components/fields/Rating/SideDrawerField.tsx
@@ -3,9 +3,8 @@ import { ISideDrawerFieldProps } from "@src/components/fields/types";
 import { Grid } from "@mui/material";
 import { Rating as MuiRating } from "@mui/material";
 import "@mui/lab";
-import StarBorderIcon from "@mui/icons-material/StarBorder";
-
-import { fieldSx, getFieldId } from "@src/components/SideDrawer/utils";
+import { getStateIcon, getStateOutline } from "./TableCell";
+import { fieldSx } from "@src/components/SideDrawer/utils";
 
 export default function Rating({
   column,
@@ -29,7 +28,9 @@ export default function Rating({
           onChange(newValue);
           onSubmit();
         }}
-        emptyIcon={<StarBorderIcon fontSize="inherit" />}
+        icon={getStateIcon(column.config)}
+        emptyIcon={getStateOutline(column.config)}
+        size="small"
         max={max}
         precision={precision}
         sx={{ ml: -0.5 }}
diff --git a/src/components/fields/Rating/TableCell.tsx b/src/components/fields/Rating/TableCell.tsx
index 34da84cf..2e7aee52 100644
--- a/src/components/fields/Rating/TableCell.tsx
+++ b/src/components/fields/Rating/TableCell.tsx
@@ -1,7 +1,21 @@
 import { IHeavyCellProps } from "@src/components/fields/types";
 
 import MuiRating from "@mui/material/Rating";
-import StarBorderIcon from "@mui/icons-material/StarBorder";
+import RatingIcon from "@mui/icons-material/Star";
+import RatingOutlineIcon from "@mui/icons-material/StarBorder"
+import { get } from "lodash-es";
+
+
+export const getStateIcon = (config: any) => {
+  // only use the config to get the custom rating icon if enabled via toggle
+  if (!get(config, "customIcons.enabled")) { return <RatingIcon /> }
+  return get(config, "customIcons.rating") || <RatingIcon />;
+};
+
+export const getStateOutline = (config: any) => {
+  if (!get(config, "customIcons.enabled")) { return <RatingOutlineIcon /> }
+  return get(config, "customIcons.rating") || <RatingOutlineIcon />;
+}
 
 export default function Rating({
   row,
@@ -28,9 +42,11 @@ export default function Rating({
       name={`${row.id}-${column.key}`}
       value={typeof value === "number" ? value : 0}
       onClick={(e) => e.stopPropagation()}
+      icon={getStateIcon(column.config)}
+      size="small"
       disabled={disabled}
       onChange={(_, newValue) => onSubmit(newValue)}
-      emptyIcon={<StarBorderIcon />}
+      emptyIcon={getStateOutline(column.config)}
       max={max}
       precision={precision}
       sx={{ mx: -0.25 }}

From da81271ba797c8b04ae986023d6031b8b01758a2 Mon Sep 17 00:00:00 2001
From: Bobby Wang <bofei@mail.com>
Date: Mon, 3 Oct 2022 16:27:46 +1100
Subject: [PATCH 138/309] fix code editor type declarations not found error for
 dynamic import

---
 src/components/CodeEditor/useMonacoCustomizations.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/CodeEditor/useMonacoCustomizations.ts b/src/components/CodeEditor/useMonacoCustomizations.ts
index f16f621b..e6d55533 100644
--- a/src/components/CodeEditor/useMonacoCustomizations.ts
+++ b/src/components/CodeEditor/useMonacoCustomizations.ts
@@ -78,6 +78,8 @@ export default function useMonacoCustomizations({
 
     try {
       monaco.languages.typescript.javascriptDefaults.setCompilerOptions({
+        moduleResolution:
+          monaco.languages.typescript.ModuleResolutionKind.NodeJs,
         target: monaco.languages.typescript.ScriptTarget.ES2020,
         allowNonTsExtensions: true,
       });
@@ -125,6 +127,7 @@ export default function useMonacoCustomizations({
         ...JSON.parse(stringifiedDiagnosticsOptions),
         diagnosticCodesToIgnore: [
           1323, // remove dynamic import error
+          2307, // silence type declarations not found for dynamic import
         ],
       });
     } catch (error) {

From c158adb4dd154588d8f84c87ebea296cfc518c5d Mon Sep 17 00:00:00 2001
From: Raj Gaurav Maurya <rajgmsocial19@gmail.com>
Date: Mon, 3 Oct 2022 11:10:31 +0530
Subject: [PATCH 139/309] Feat: Customization options added to long text field
 (#821)

* Update README.md

* Update config.yml

* Feat: Customization options added to long text field

Signed-off-by: Raj Gaurav Maurya <rajgmsocial19@gmail.com>

* Bug:LongText working

Signed-off-by: Raj Gaurav Maurya <rajgmsocial19@gmail.com>
---
 .github/ISSUE_TEMPLATE/config.yml           |  6 ++--
 src/components/fields/LongText/Filter.tsx   | 12 ++++++++
 src/components/fields/LongText/Settings.tsx | 31 +++++++++++++++++++++
 src/components/fields/LongText/index.tsx    |  8 +++++-
 src/components/fields/ShortText/index.tsx   |  1 +
 5 files changed, 54 insertions(+), 4 deletions(-)
 create mode 100644 src/components/fields/LongText/Filter.tsx
 create mode 100644 src/components/fields/LongText/Settings.tsx

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 35aaf69b..4aeb6a48 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,8 +1,8 @@
 blank_issues_enabled: false
 contact_links:
-  - name: 🤔 Support & questions
-    url: https://discord.com/invite/fjBugmvzZP
-    about: Chat with us for live support on discord.
+  - name: 🤔 Need support / Q&A
+    url: https://github.com/rowyio/rowy/discussions/categories/support-q-a
+    about: Raise a support query on Github Discussion
   - name: 🙌 Want to join our team?
     url: https://www.rowy.io/jobs
     about: Get in touch to contribute & work with Rowy
diff --git a/src/components/fields/LongText/Filter.tsx b/src/components/fields/LongText/Filter.tsx
new file mode 100644
index 00000000..1fbbbdf7
--- /dev/null
+++ b/src/components/fields/LongText/Filter.tsx
@@ -0,0 +1,12 @@
+import { IFilterOperator } from "@src/components/fields/types";
+
+export const filterOperators: IFilterOperator[] = [
+  {
+    label: "equals",
+    value: "==",
+  },
+  {
+    label: "not equals",
+    value: "!=",
+  },
+];
diff --git a/src/components/fields/LongText/Settings.tsx b/src/components/fields/LongText/Settings.tsx
new file mode 100644
index 00000000..77cc58f9
--- /dev/null
+++ b/src/components/fields/LongText/Settings.tsx
@@ -0,0 +1,31 @@
+import { ISettingsProps } from "@src/components/fields/types";
+import { TextField } from "@mui/material";
+
+export default function Settings({ onChange, config }: ISettingsProps) {
+  return (
+    <>
+      <TextField
+        type="number"
+        label="Character limit"
+        id="character-limit"
+        value={config.maxLength}
+        fullWidth
+        onChange={(e) => {
+          if (e.target.value === "0") onChange("maxLength")(null);
+          else onChange("maxLength")(e.target.value);
+        }}
+      />
+      <TextField
+        type="text"
+        label="Validation regex"
+        id="validation-regex"
+        value={config.validationRegex}
+        fullWidth
+        onChange={(e) => {
+          if (e.target.value === "") onChange("validationRegex")(null);
+          else onChange("validationRegex")(e.target.value);
+        }}
+      />
+    </>
+  );
+}
diff --git a/src/components/fields/LongText/index.tsx b/src/components/fields/LongText/index.tsx
index 2c501ce6..c4cec831 100644
--- a/src/components/fields/LongText/index.tsx
+++ b/src/components/fields/LongText/index.tsx
@@ -5,7 +5,8 @@ import withBasicCell from "@src/components/fields/_withTableCell/withBasicCell";
 import LongTextIcon from "@mui/icons-material/Notes";
 import BasicCell from "./BasicCell";
 import TextEditor from "@src/components/Table/editors/TextEditor";
-import { filterOperators } from "@src/components/fields/ShortText/Filter";
+
+import { filterOperators } from "./Filter";
 import BasicContextMenuActions from "@src/components/fields/_BasicCell/BasicCellContextMenuActions";
 
 const SideDrawerField = lazy(
@@ -15,6 +16,10 @@ const SideDrawerField = lazy(
     )
 );
 
+const Settings = lazy(
+  () => import("./Settings" /* webpackChunkName: "Settings-LongText" */)
+);
+
 export const config: IFieldConfig = {
   type: FieldType.longText,
   name: "Long Text",
@@ -28,6 +33,7 @@ export const config: IFieldConfig = {
   TableCell: withBasicCell(BasicCell),
   TableEditor: TextEditor,
   SideDrawerField,
+  settings: Settings,
   filter: {
     operators: filterOperators,
   },
diff --git a/src/components/fields/ShortText/index.tsx b/src/components/fields/ShortText/index.tsx
index aa288624..88ef7a20 100644
--- a/src/components/fields/ShortText/index.tsx
+++ b/src/components/fields/ShortText/index.tsx
@@ -15,6 +15,7 @@ const SideDrawerField = lazy(
       "./SideDrawerField" /* webpackChunkName: "SideDrawerField-ShortText" */
     )
 );
+
 const Settings = lazy(
   () => import("./Settings" /* webpackChunkName: "Settings-ShortText" */)
 );

From 5344d0c4085e5b5f0fbbe21d207ea8a02e739d04 Mon Sep 17 00:00:00 2001
From: shamsmosowi <shams.mosowi@gmail.com>
Date: Mon, 3 Oct 2022 07:58:06 +0200
Subject: [PATCH 140/309] remove max column width

---
 src/components/Table/Table.tsx | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index cf3a3dff..73f910af 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -114,11 +114,7 @@ export default function Table({
           tableSettings.readOnly && !userRoles.includes("ADMIN")
             ? false
             : column.editable ?? true,
-        width: (column.width as number)
-          ? (column.width as number) > MAX_COL_WIDTH
-            ? MAX_COL_WIDTH
-            : (column.width as number)
-          : DEFAULT_COL_WIDTH,
+        width: column.width ?? 100,
       }));
 
     if (userRoles.includes("ADMIN") || !tableSettings.readOnly) {

From 46bf61c47b5ad69c577dfcb0b79e9b3156669d41 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 4 Oct 2022 16:11:11 +1100
Subject: [PATCH 141/309] =?UTF-8?q?fix=20bug=20where=20a=20row=20may=20not?=
 =?UTF-8?q?=20be=20deleted=20from=20the=20db=20if=20it=E2=80=99s=20in=20ro?=
 =?UTF-8?q?wsLocal?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/atoms/tableScope/rowActions.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/atoms/tableScope/rowActions.ts b/src/atoms/tableScope/rowActions.ts
index f6d62f7d..add6af4f 100644
--- a/src/atoms/tableScope/rowActions.ts
+++ b/src/atoms/tableScope/rowActions.ts
@@ -213,7 +213,9 @@ export const deleteRowAtom = atom(
         find(tableRowsLocal, ["_rowy_ref.path", path])
       );
       if (isLocalRow) set(tableRowsLocalAtom, { type: "delete", path });
-      else await deleteRowDb(path);
+
+      // Always delete from db in case it exists
+      await deleteRowDb(path);
       if (auditChange) auditChange("DELETE_ROW", path);
     };
 

From 852f85e0017c51e4e19c2bbd7129233008362614 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 4 Oct 2022 17:09:47 +1100
Subject: [PATCH 142/309] fix bug where adding multiple rows with missing
 fields results in them having the same ID

---
 src/atoms/tableScope/rowActions.ts | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/atoms/tableScope/rowActions.ts b/src/atoms/tableScope/rowActions.ts
index add6af4f..4ee3fe0f 100644
--- a/src/atoms/tableScope/rowActions.ts
+++ b/src/atoms/tableScope/rowActions.ts
@@ -15,7 +15,6 @@ import {
   tableColumnsOrderedAtom,
   tableFiltersAtom,
   tableRowsLocalAtom,
-  tableRowsDbAtom,
   tableRowsAtom,
   _updateRowDbAtom,
   _deleteRowDbAtom,
@@ -62,7 +61,7 @@ export const addRowAtom = atom(
     const auditChange = get(auditChangeAtom);
     const tableFilters = get(tableFiltersAtom);
     const tableColumnsOrdered = get(tableColumnsOrderedAtom);
-    const tableRowsDb = get(tableRowsDbAtom);
+    const tableRows = get(tableRowsAtom);
 
     const _addSingleRowAndAudit = async (row: TableRow) => {
       // Store initial values to be written
@@ -147,10 +146,19 @@ export const addRowAtom = atom(
       if (auditChange) auditChange("ADD_ROW", row._rowy_ref.path);
     };
 
+    // Find the first row in order to be used to decrement ID
+    let firstInOrderRowId = tableRows[0]?._rowy_ref.id;
+    for (const row of tableRows) {
+      if (row._rowy_outOfOrder === false) {
+        firstInOrderRowId = row._rowy_ref.id;
+        break;
+      }
+    }
+
     if (Array.isArray(row)) {
       const promises: Promise<void>[] = [];
 
-      let lastId = tableRowsDb[0]?._rowy_ref.id;
+      let lastId = firstInOrderRowId;
       for (const r of row) {
         const id =
           setId === "random"
@@ -175,7 +183,7 @@ export const addRowAtom = atom(
         setId === "random"
           ? generateId()
           : setId === "decrement"
-          ? decrementId(tableRowsDb[0]?._rowy_ref.id)
+          ? decrementId(firstInOrderRowId)
           : row._rowy_ref.id;
 
       const path = setId

From a0ff25b983330c49796432f2021cbd521d752978 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 4 Oct 2022 17:15:17 +1100
Subject: [PATCH 143/309] Table: use DEFAULT_COL_WIDTH

---
 src/components/Table/Table.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index 73f910af..a05026b6 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -114,7 +114,7 @@ export default function Table({
           tableSettings.readOnly && !userRoles.includes("ADMIN")
             ? false
             : column.editable ?? true,
-        width: column.width ?? 100,
+        width: column.width ?? DEFAULT_COL_WIDTH,
       }));
 
     if (userRoles.includes("ADMIN") || !tableSettings.readOnly) {

From a1473cf58c3244188d5b65c30cd0dc2f69c883d1 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 4 Oct 2022 18:16:58 +1100
Subject: [PATCH 144/309] update addRow code for clarity

---
 src/atoms/tableScope/rowActions.ts | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/atoms/tableScope/rowActions.ts b/src/atoms/tableScope/rowActions.ts
index 4ee3fe0f..37d1f9de 100644
--- a/src/atoms/tableScope/rowActions.ts
+++ b/src/atoms/tableScope/rowActions.ts
@@ -113,33 +113,33 @@ export const addRowAtom = atom(
       // Combine initial values with row values
       const rowValues = { ...initialValues, ...row };
 
-      // Add to rowsLocal (i.e. display on top, out of order) if:
-      // - any required fields are missing
-      //   (**not out of order if IDs are not decrementing**)
+      // Add to rowsLocal (display on top, out of order) if:
       // - deliberately out of order
       // - there are filters set and we couldn’t set the value of a field to
       //   fit in the filtered query
       // - user did not set ID to decrement
       if (
-        missingRequiredFields.length > 0 ||
         row._rowy_outOfOrder === true ||
         outOfOrderFilters.size > 0 ||
         setId !== "decrement"
       ) {
         set(tableRowsLocalAtom, {
           type: "add",
-          row: {
-            ...rowValues,
-            _rowy_outOfOrder:
-              row._rowy_outOfOrder === true ||
-              outOfOrderFilters.size > 0 ||
-              setId !== "decrement",
-          },
+          row: { ...rowValues, _rowy_outOfOrder: true },
+        });
+      }
+
+      // Also add to rowsLocal if  any required fields are missing
+      // (not out of order since those cases are handled above)
+      if (missingRequiredFields.length > 0) {
+        set(tableRowsLocalAtom, {
+          type: "add",
+          row: { ...rowValues, _rowy_outOfOrder: false },
         });
       }
 
       // Write to database if no required fields are missing
-      if (missingRequiredFields.length === 0) {
+      else {
         await updateRowDb(row._rowy_ref.path, omitRowyFields(rowValues));
       }
 

From 751fa29be91e4284995015332c8565a9355191d1 Mon Sep 17 00:00:00 2001
From: shamsmosowi <shams.mosowi@gmail.com>
Date: Tue, 4 Oct 2022 12:25:53 +0200
Subject: [PATCH 145/309] history snapshot make collectionId customizable

---
 src/components/TableModals/ExtensionsModal/utils.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/TableModals/ExtensionsModal/utils.ts b/src/components/TableModals/ExtensionsModal/utils.ts
index e85bd207..117ef381 100644
--- a/src/components/TableModals/ExtensionsModal/utils.ts
+++ b/src/components/TableModals/ExtensionsModal/utils.ts
@@ -95,6 +95,7 @@ const extensionBodyTemplate = {
   
   return ({
     trackedFields: [],    // a list of string of column names
+    collectionId: "historySnapshots",    // optionally change the sub-collection id of where the history snapshots are stored
   })
 }`,
   algoliaIndex: `const extensionBody: AlgoliaIndexBody = async({row, db, change, ref}) => {

From 433ee68c2c3aba0f588c5f0ee1673e95469f74fd Mon Sep 17 00:00:00 2001
From: shamsmosowi <shams.mosowi@gmail.com>
Date: Tue, 4 Oct 2022 12:26:43 +0200
Subject: [PATCH 146/309] prevent failed version request from crashing table
 view

---
 src/atoms/projectScope/rowyRun.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/atoms/projectScope/rowyRun.ts b/src/atoms/projectScope/rowyRun.ts
index 1699be63..bc6d35cd 100644
--- a/src/atoms/projectScope/rowyRun.ts
+++ b/src/atoms/projectScope/rowyRun.ts
@@ -117,8 +117,13 @@ export const rowyRunAtom = atom((get) => {
 /** Store deployed Rowy Run version */
 export const rowyRunVersionAtom = atom(async (get) => {
   const rowyRun = get(rowyRunAtom);
-  const response = await rowyRun({ route: runRoutes.version });
-  return response.version as string | false;
+  try {
+    const response = await rowyRun({ route: runRoutes.version });
+    return response.version as string | false;
+  } catch (e) {
+    console.log(e);
+    return false;
+  }
 });
 
 /**

From 3504ef5ddb311b700fafbce70cd82b6ad2cbd9bc Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 5 Oct 2022 11:50:08 +1100
Subject: [PATCH 147/309] search fields: update clear icon to match m3

---
 src/theme/components.tsx | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/theme/components.tsx b/src/theme/components.tsx
index fc941109..003a621f 100644
--- a/src/theme/components.tsx
+++ b/src/theme/components.tsx
@@ -384,6 +384,18 @@ export const components = (theme: Theme): ThemeOptions => {
                 paddingRight: theme.spacing(1),
               },
             },
+
+            "input[type='search']::-webkit-search-cancel-button": {
+              appearance: "none",
+              mask: `url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'%3e%3cpath d='M12 2C6.47 2 2 6.47 2 12s4.47 10 10 10 10-4.47 10-10S17.53 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8zm3.59-13L12 10.59 8.41 7 7 8.41 10.59 12 7 15.59 8.41 17 12 13.41 15.59 17 17 15.59 13.41 12 17 8.41z'/%3e%3c/svg%3e") no-repeat 50% 50%`,
+              backgroundColor: "currentColor",
+              opacity: 0.67,
+
+              width: "1.5rem",
+              height: "1.5rem",
+              marginLeft: theme.spacing(0.5),
+              marginRight: 0,
+            },
           },
         },
       },

From f48b49de87fbad8cc51840c48f9168765df66327 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 5 Oct 2022 11:53:31 +1100
Subject: [PATCH 148/309] NavDrawer: sort tables by section and name

---
 src/layouts/Navigation/NavDrawer/NavDrawerContents.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/layouts/Navigation/NavDrawer/NavDrawerContents.tsx b/src/layouts/Navigation/NavDrawer/NavDrawerContents.tsx
index b32cfea0..dc758436 100644
--- a/src/layouts/Navigation/NavDrawer/NavDrawerContents.tsx
+++ b/src/layouts/Navigation/NavDrawer/NavDrawerContents.tsx
@@ -1,5 +1,5 @@
 import { useAtom, useSetAtom } from "jotai";
-import { find, groupBy } from "lodash-es";
+import { find, groupBy, sortBy } from "lodash-es";
 
 import { ListItemIcon, ListItemText, Divider } from "@mui/material";
 import { Tables as TablesIcon } from "@src/assets/icons";
@@ -44,11 +44,11 @@ export default function NavDrawerContents({
   const favorites = Array.isArray(userSettings.favoriteTables)
     ? userSettings.favoriteTables
     : [];
-  const sections = {
+  const sections: Record<string, TableSettings[]> = {
     Favorites: favorites
       .map((id) => find(tables, { id }))
       .filter((x) => x !== undefined) as TableSettings[],
-    ...groupBy(tables, "section"),
+    ...groupBy(sortBy(tables, ["section", "name"]), "section"),
   };
 
   return (

From 92c1fb5bf92e59e00e0937fc6808950cad46b9c4 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 19 Sep 2022 18:02:42 +1000
Subject: [PATCH 149/309] temp disable full screen dialog effect

---
 src/theme/colors.ts      | 12 +++----
 src/theme/components.tsx | 70 ++++++++++++++++++++--------------------
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/src/theme/colors.ts b/src/theme/colors.ts
index 2cf5e12d..0cbdede1 100644
--- a/src/theme/colors.ts
+++ b/src/theme/colors.ts
@@ -99,9 +99,9 @@ export const colorsLight = (
             backgroundColor: colord({ l: 70, c: 5, h })
               .alpha(0.6)
               .toHslString(),
-            ".MuiDialog-root:has(.MuiDialog-paperFullScreen) &": {
-              backgroundColor: "rgba(0, 0, 0, 0)",
-            },
+            // ".MuiDialog-root:has(.MuiDialog-paperFullScreen) &": {
+            //   backgroundColor: "rgba(0, 0, 0, 0)",
+            // },
           },
           invisible: { backgroundColor: "transparent" },
         },
@@ -202,9 +202,9 @@ export const colorsDark = (
         styleOverrides: {
           root: {
             backgroundColor: colord({ l: 0, c: 1, h }).alpha(0.6).toHslString(),
-            ".MuiDialog-root:has(.MuiDialog-paperFullScreen) &": {
-              backgroundColor: "rgba(0, 0, 0, 0)",
-            },
+            // ".MuiDialog-root:has(.MuiDialog-paperFullScreen) &": {
+            //   backgroundColor: "rgba(0, 0, 0, 0)",
+            // },
           },
           invisible: { backgroundColor: "transparent" },
         },
diff --git a/src/theme/components.tsx b/src/theme/components.tsx
index fc941109..752da0c1 100644
--- a/src/theme/components.tsx
+++ b/src/theme/components.tsx
@@ -81,22 +81,22 @@ export const components = (theme: Theme): ThemeOptions => {
 
           body: { cursor: "default" },
 
-          "@supports selector(:has(a))": {
-            body: {
-              transition: "background-color 0s",
-              transitionDelay: theme.transitions.duration.leavingScreen + "ms",
-            },
+          // "@supports selector(:has(a))": {
+          //   body: {
+          //     transition: "background-color 0s",
+          //     transitionDelay: theme.transitions.duration.leavingScreen + "ms",
+          //   },
 
-            "#root": {
-              transformOrigin: `50% 0%`,
-              transition: theme.transitions.create([
-                "transform",
-                "border-radius",
-              ]),
-              transitionDuration: `${theme.transitions.duration.leavingScreen}ms, 0s`,
-              transitionDelay: `0s, ${theme.transitions.duration.leavingScreen}ms`,
-            },
-          },
+          //   "#root": {
+          //     transformOrigin: `50% 0%`,
+          //     transition: theme.transitions.create([
+          //       "transform",
+          //       "border-radius",
+          //     ]),
+          //     transitionDuration: `${theme.transitions.duration.leavingScreen}ms, 0s`,
+          //     transitionDelay: `0s, ${theme.transitions.duration.leavingScreen}ms`,
+          //   },
+          // },
 
           "code, pre, pre.MuiTypography-root": {
             fontFamily: theme.typography.fontFamilyMono,
@@ -279,28 +279,28 @@ export const components = (theme: Theme): ThemeOptions => {
             paddingRight: "env(safe-area-inset-right)",
             paddingBottom: "env(safe-area-inset-bottom)",
 
-            "body:has([data-open=true] &)": {
-              backgroundColor: theme.palette.common.black,
-              transitionDelay: "0s",
+            // "body:has([data-open=true] &)": {
+            //   backgroundColor: theme.palette.common.black,
+            //   transitionDelay: "0s",
 
-              "#root": {
-                borderRadius: (theme.shape.borderRadius as number) * 2,
-                overflow: "hidden",
-                filter: `grayscale(100%) contrast(${
-                  theme.palette.mode === "dark" ? "80" : "75"
-                }%)`,
+            //   "#root": {
+            //     borderRadius: (theme.shape.borderRadius as number) * 2,
+            //     overflow: "hidden",
+            //     filter: `grayscale(100%) contrast(${
+            //       theme.palette.mode === "dark" ? "80" : "75"
+            //     }%)`,
 
-                transform: `scale(0.9)`,
-                transition: theme.transitions.create(
-                  ["transform", "border-radius"],
-                  {
-                    easing: theme.transitions.easing.easeOut,
-                  }
-                ),
-                transitionDuration: `${theme.transitions.duration.enteringScreen}ms, 0s`,
-                transitionDelay: "0s, 0s",
-              },
-            },
+            //     transform: `scale(0.9)`,
+            //     transition: theme.transitions.create(
+            //       ["transform", "border-radius"],
+            //       {
+            //         easing: theme.transitions.easing.easeOut,
+            //       }
+            //     ),
+            //     transitionDuration: `${theme.transitions.duration.enteringScreen}ms, 0s`,
+            //     transitionDelay: "0s, 0s",
+            //   },
+            // },
           },
         },
       },

From 01b248583fd80096742959f816aba982adfc3120 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 5 Oct 2022 12:33:12 +1100
Subject: [PATCH 150/309] tableRowsLocalReducer: use switch statement & ensure
 updated row is a cloned object

---
 src/atoms/tableScope/table.ts | 78 ++++++++++++++++++-----------------
 1 file changed, 41 insertions(+), 37 deletions(-)

diff --git a/src/atoms/tableScope/table.ts b/src/atoms/tableScope/table.ts
index 971601e6..0018202f 100644
--- a/src/atoms/tableScope/table.ts
+++ b/src/atoms/tableScope/table.ts
@@ -102,49 +102,53 @@ const tableRowsLocalReducer = (
   prev: TableRow[],
   action: TableRowsLocalAction
 ): TableRow[] => {
-  if (action.type === "set") {
-    return [...action.rows];
-  }
-  if (action.type === "add") {
-    if (Array.isArray(action.row)) return [...action.row, ...prev];
-    return [action.row, ...prev];
-  }
-  if (action.type === "update") {
-    const index = findIndex(prev, ["_rowy_ref.path", action.path]);
-    if (index > -1) {
-      const updatedRows = [...prev];
-      if (Array.isArray(action.deleteFields)) {
+  switch (action.type) {
+    case "set":
+      return [...action.rows];
+
+    case "add":
+      if (Array.isArray(action.row)) return [...action.row, ...prev];
+      return [action.row, ...prev];
+
+    case "update":
+      const index = findIndex(prev, ["_rowy_ref.path", action.path]);
+      if (index > -1) {
+        const updatedRows = [...prev];
         updatedRows[index] = cloneDeep(prev[index]);
-        for (const field of action.deleteFields) {
-          unset(updatedRows[index], field);
+        if (Array.isArray(action.deleteFields)) {
+          for (const field of action.deleteFields) {
+            unset(updatedRows[index], field);
+          }
         }
+        updatedRows[index] = updateRowData(updatedRows[index], action.row);
+        return updatedRows;
       }
-      updatedRows[index] = updateRowData(updatedRows[index], action.row);
-      return updatedRows;
-    }
-    // If not found, add to start
-    if (index === -1)
-      return [
-        {
-          ...action.row,
-          _rowy_ref: {
-            path: action.path,
-            id: action.path.split("/").pop() || action.path,
+      // If not found, add to start
+      else {
+        return [
+          {
+            ...action.row,
+            _rowy_ref: {
+              path: action.path,
+              id: action.path.split("/").pop() || action.path,
+            },
           },
-        },
-        ...prev,
-      ];
-  }
-  if (action.type === "delete") {
-    return prev.filter((row) => {
-      if (Array.isArray(action.path)) {
-        return !action.path.includes(row._rowy_ref.path);
-      } else {
-        return row._rowy_ref.path !== action.path;
+          ...prev,
+        ];
       }
-    });
+
+    case "delete":
+      return prev.filter((row) => {
+        if (Array.isArray(action.path)) {
+          return !action.path.includes(row._rowy_ref.path);
+        } else {
+          return row._rowy_ref.path !== action.path;
+        }
+      });
+
+    default:
+      throw new Error("Invalid action");
   }
-  throw new Error("Invalid action");
 };
 /**
  * Store rows that are out of order or not ready to be written to the db.

From 18fe50e0da33adf90856dbb2fe5112476a01495f Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 5 Oct 2022 14:51:16 +1100
Subject: [PATCH 151/309] Duplicate row confirmation: don't use success color
 button

---
 src/components/Table/ContextMenu/MenuContents.tsx | 1 -
 src/components/Table/formatters/FinalColumn.tsx   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/components/Table/ContextMenu/MenuContents.tsx b/src/components/Table/ContextMenu/MenuContents.tsx
index 52b2d3d3..60d58069 100644
--- a/src/components/Table/ContextMenu/MenuContents.tsx
+++ b/src/components/Table/ContextMenu/MenuContents.tsx
@@ -202,7 +202,6 @@ export default function MenuContents({ onClose }: IMenuContentsProps) {
                       </>
                     ),
                     confirm: "Duplicate",
-                    confirmColor: "success",
                     handleConfirm: handleDuplicate,
                   });
                   onClose();
diff --git a/src/components/Table/formatters/FinalColumn.tsx b/src/components/Table/formatters/FinalColumn.tsx
index 73f1c7b1..84dd4563 100644
--- a/src/components/Table/formatters/FinalColumn.tsx
+++ b/src/components/Table/formatters/FinalColumn.tsx
@@ -66,7 +66,6 @@ export default function FinalColumn({ row }: FormatterProps<TableRow, any>) {
                       </>
                     ),
                     confirm: "Duplicate",
-                    confirmColor: "success",
                     handleConfirm: handleDuplicate,
                   });
                 }

From 4f7f5e3d4f7276be4608cadaea0ff985adffa884 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 5 Oct 2022 16:38:08 +1100
Subject: [PATCH 152/309] Image: fix table cell always deleting last image

---
 src/components/fields/Image/TableCell.tsx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/components/fields/Image/TableCell.tsx b/src/components/fields/Image/TableCell.tsx
index 84a44904..9455a059 100644
--- a/src/components/fields/Image/TableCell.tsx
+++ b/src/components/fields/Image/TableCell.tsx
@@ -126,9 +126,8 @@ export default function Image_({
     [value]
   );
 
-  const handleDelete = (ref: string) => () => {
+  const handleDelete = (index: number) => () => {
     const newValue = [...value];
-    const index = findIndex(newValue, ["ref", ref]);
     const toBeDeleted = newValue.splice(index, 1);
     toBeDeleted.length && deleteUpload(toBeDeleted[0]);
     onSubmit(newValue);
@@ -184,7 +183,7 @@ export default function Image_({
       >
         <Grid container spacing={0.5} wrap="nowrap">
           {Array.isArray(value) &&
-            value.map((file: FileValue) => (
+            value.map((file: FileValue, i) => (
               <Grid item key={file.downloadURL}>
                 {disabled ? (
                   <Tooltip title="Open">
@@ -225,7 +224,7 @@ export default function Image_({
                             body: "This image cannot be recovered after",
                             confirm: "Delete",
                             confirmColor: "error",
-                            handleConfirm: handleDelete(file.ref),
+                            handleConfirm: handleDelete(i),
                           });
                         }}
                       >

From d10f3f37b27798b5626f1ec26720cca0469c3b8f Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Thu, 6 Oct 2022 14:38:02 +1100
Subject: [PATCH 153/309] update import airtable UI for consistency

---
 src/components/Table/EmptyTable.tsx           |   2 +-
 .../TableToolbar/ImportData/ImportData.tsx    |   4 +-
 .../ImportData/ImportFromAirtable.tsx         | 147 ++++++++++--------
 3 files changed, 85 insertions(+), 68 deletions(-)

diff --git a/src/components/Table/EmptyTable.tsx b/src/components/Table/EmptyTable.tsx
index bb6d2e86..726f62f9 100644
--- a/src/components/Table/EmptyTable.tsx
+++ b/src/components/Table/EmptyTable.tsx
@@ -83,7 +83,7 @@ export default function EmptyTable() {
                   startIcon={<ImportIcon />}
                   onClick={onClick}
                 >
-                  Import Data
+                  Import data
                 </Button>
               )}
               PopoverProps={{
diff --git a/src/components/TableToolbar/ImportData/ImportData.tsx b/src/components/TableToolbar/ImportData/ImportData.tsx
index d2743cf2..01b2aa4e 100644
--- a/src/components/TableToolbar/ImportData/ImportData.tsx
+++ b/src/components/TableToolbar/ImportData/ImportData.tsx
@@ -55,7 +55,7 @@ export default function ImportData({ render, PopoverProps }: IImportDataProps) {
         render(handleOpen)
       ) : (
         <TableToolbarButton
-          title="Import Data"
+          title="Import data"
           onClick={handleOpen}
           icon={<ImportIcon />}
         />
@@ -84,7 +84,7 @@ export default function ImportData({ render, PopoverProps }: IImportDataProps) {
         <TabContext value={tab}>
           <TabList
             onChange={(_, v) => setTab(v)}
-            aria-label="Import Data method tabs"
+            aria-label="Import data method tabs"
             action={(actions) =>
               setTimeout(() => actions?.updateIndicator(), 200)
             }
diff --git a/src/components/TableToolbar/ImportData/ImportFromAirtable.tsx b/src/components/TableToolbar/ImportData/ImportFromAirtable.tsx
index f5ed3aa9..60095363 100644
--- a/src/components/TableToolbar/ImportData/ImportFromAirtable.tsx
+++ b/src/components/TableToolbar/ImportData/ImportFromAirtable.tsx
@@ -4,11 +4,14 @@ import { useAtom, useSetAtom } from "jotai";
 import {
   Button,
   Typography,
-  TextField,
-  IconButton,
-  Stack,
+  FormControl,
   InputLabel,
+  FilledInput,
+  FormHelperText,
+  Stack,
 } from "@mui/material";
+import LoadingButton from "@mui/lab/LoadingButton";
+import InlineOpenInNewIcon from "@src/components/InlineOpenInNewIcon";
 
 import {
   tableModalAtom,
@@ -19,7 +22,6 @@ import { analytics, logEvent } from "@src/analytics";
 import { find } from "lodash-es";
 
 import { WIKI_LINKS } from "@src/constants/externalLinks";
-import DocsIcon from "@mui/icons-material/ArrowUpward";
 
 export default function ImportFromAirtable() {
   const [{ baseId, tableId, apiKey }, setImportAirtable] = useAtom(
@@ -112,78 +114,93 @@ export default function ImportFromAirtable() {
 
   return (
     <>
-      <Typography variant="caption" color="gray">
+      <Typography color="text.secondary" paragraph>
         Forget the storage limitations of Airtable. Migrate your app data from
         Airtable to a more scalable Firestore database that you can easily
         manage with Rowy.
       </Typography>
-      <TextField
-        sx={{ marginBottom: 1 }}
+
+      <FormControl
         variant="filled"
-        autoFocus
         fullWidth
-        label={
-          <Stack
-            direction="row"
-            justifyContent="space-between"
-            alignItems="end"
-          >
-            <InputLabel>Airtable API Key</InputLabel>
-            <IconButton
-              size="small"
-              color="primary"
-              target="_blank"
-              rel="noopener noreferrer"
-              href={WIKI_LINKS.importAirtableApiKey}
-            >
-              API Key <DocsIcon sx={{ rotate: "45deg" }} />
-            </IconButton>
-          </Stack>
-        }
-        placeholder="Insert your API key here"
-        value={apiKey}
-        onChange={(e) =>
-          setImportAirtable((prev) => ({
-            ...prev,
-            apiKey: e.currentTarget.value,
-          }))
-        }
-        helperText={error?.apiKey?.message}
+        margin="dense"
         error={!!error?.apiKey?.message}
-      />
-      <TextField
+      >
+        <Stack direction="row" justifyContent="space-between" alignItems="end">
+          <InputLabel htmlFor="import-airtable-api-key">API key</InputLabel>
+          <Button
+            variant="text"
+            color="primary"
+            target="_blank"
+            rel="noopener noreferrer"
+            href={WIKI_LINKS.importAirtableApiKey}
+            sx={{ py: 0, minHeight: 24 }}
+          >
+            Find API key <InlineOpenInNewIcon />
+          </Button>
+        </Stack>
+
+        <FilledInput
+          id="import-airtable-api-key"
+          autoFocus
+          fullWidth
+          size="small"
+          placeholder="key…"
+          value={apiKey}
+          onChange={(e) =>
+            setImportAirtable((prev) => ({
+              ...prev,
+              apiKey: e.currentTarget.value,
+            }))
+          }
+          aria-describedby="import-airtable-api-key-error-text"
+        />
+        <FormHelperText id="import-airtable-api-key-error-text">
+          {error?.apiKey?.message}
+        </FormHelperText>
+      </FormControl>
+
+      <FormControl
         variant="filled"
         fullWidth
-        label={
-          <Stack
-            direction="row"
-            justifyContent="space-between"
-            alignItems="end"
-          >
-            <InputLabel>Airtable Table URL</InputLabel>
-            <IconButton
-              size="small"
-              color="primary"
-              target="_blank"
-              rel="noopener noreferrer"
-              href={WIKI_LINKS.importAirtableTableUrl}
-            >
-              Table URL <DocsIcon sx={{ rotate: "45deg" }} />
-            </IconButton>
-          </Stack>
-        }
-        placeholder="Insert your Table URL here"
-        value={tableUrl}
-        onChange={(e) => {
-          setTableUrl(e.currentTarget.value);
-        }}
-        helperText={error?.baseId?.message || error?.tableId?.message}
+        margin="dense"
         error={!!error?.baseId?.message || error?.tableId?.message}
-      />
-      <Button
+      >
+        <Stack direction="row" justifyContent="space-between" alignItems="end">
+          <InputLabel htmlFor="import-airtable-table-url">Table URL</InputLabel>
+          <Button
+            variant="text"
+            color="primary"
+            target="_blank"
+            rel="noopener noreferrer"
+            href={WIKI_LINKS.importAirtableTableUrl}
+            sx={{ py: 0, minHeight: 24 }}
+          >
+            Find table URL <InlineOpenInNewIcon />
+          </Button>
+        </Stack>
+
+        <FilledInput
+          id="import-airtable-table-url"
+          autoFocus
+          fullWidth
+          size="small"
+          placeholder="https://airtable.com/app…/tbl…"
+          value={tableUrl}
+          onChange={(e) => {
+            setTableUrl(e.currentTarget.value);
+          }}
+          aria-describedby="import-airtable-table-url-error-text"
+        />
+        <FormHelperText id="import-airtable-table-url-error-text">
+          {error?.baseId?.message || error?.tableId?.message}
+        </FormHelperText>
+      </FormControl>
+
+      <LoadingButton
         variant="contained"
         color="primary"
-        disabled={loading}
+        loading={loading}
         sx={{
           my: 2,
           mx: "auto",
@@ -196,7 +213,7 @@ export default function ImportFromAirtable() {
         }}
       >
         Continue
-      </Button>
+      </LoadingButton>
     </>
   );
 }

From f6d35991f938a536a0b633c6d5d20a03538debe0 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Thu, 6 Oct 2022 14:42:28 +1100
Subject: [PATCH 154/309] GetStartedChecklist: fix transition

---
 src/components/GetStartedChecklist/GetStartedChecklist.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/GetStartedChecklist/GetStartedChecklist.tsx b/src/components/GetStartedChecklist/GetStartedChecklist.tsx
index 21ae6bbe..ad6ba46a 100644
--- a/src/components/GetStartedChecklist/GetStartedChecklist.tsx
+++ b/src/components/GetStartedChecklist/GetStartedChecklist.tsx
@@ -62,6 +62,7 @@ export default function GetStartedChecklist({
           "& .MuiDialog-container": {
             justifyContent: "flex-start",
             alignItems: "flex-end",
+            transformOrigin: "0% calc(100% - 160px)",
           },
 
           "& .MuiDialog-paper": {

From f565cfceef59a7279a0570261bff5e383cc40a61 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Thu, 6 Oct 2022 15:15:28 +1100
Subject: [PATCH 155/309] fix ROWY-700

---
 src/components/Table/Table.tsx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index a05026b6..308e8767 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -176,9 +176,16 @@ export default function Table({
     (event: React.UIEvent<HTMLDivElement>) => {
       // Select corresponding header cell when scrolled to prevent jumping
       dataGridRef?.current?.selectCell({
-        idx: selectedColumnIndex || 0,
+        idx:
+          selectedColumnIndex > -1 ? selectedColumnIndex : columns.length - 1,
         rowIdx: -1,
       });
+      // console.log(
+      //   "scroll",
+      //   dataGridRef?.current,
+      //   selectedColumnIndex,
+      //   columns.length
+      // );
 
       const target = event.target as HTMLDivElement;
 

From 5fcfb9956fa9dc9380954f06fbd61f3e93369661 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Thu, 6 Oct 2022 16:12:02 +1100
Subject: [PATCH 156/309] move types in src/atoms/projectScope to
 src/types/settings

---
 src/atoms/projectScope/project.ts             | 38 ++---------
 src/atoms/projectScope/user.ts                | 37 +----------
 .../Settings/UserManagement/UserItem.tsx      |  2 +-
 src/types/settings.d.ts                       | 64 +++++++++++++++++++
 4 files changed, 72 insertions(+), 69 deletions(-)
 create mode 100644 src/types/settings.d.ts

diff --git a/src/atoms/projectScope/project.ts b/src/atoms/projectScope/project.ts
index 4295a897..9a5810cb 100644
--- a/src/atoms/projectScope/project.ts
+++ b/src/atoms/projectScope/project.ts
@@ -1,9 +1,12 @@
 import { atom } from "jotai";
 import { sortBy } from "lodash-es";
-import { ThemeOptions } from "@mui/material";
 
 import { userRolesAtom } from "./auth";
-import { UserSettings } from "./user";
+import {
+  PublicSettings,
+  ProjectSettings,
+  UserSettings,
+} from "@src/types/settings";
 import {
   UpdateDocFunction,
   UpdateCollectionDocFunction,
@@ -15,22 +18,6 @@ import { FunctionSettings } from "@src/types/function";
 
 export const projectIdAtom = atom<string>("");
 
-/** Public settings are visible to unauthenticated users */
-export type PublicSettings = Partial<{
-  signInOptions: Array<
-    | "google"
-    | "twitter"
-    | "facebook"
-    | "github"
-    | "microsoft"
-    | "apple"
-    | "yahoo"
-    | "email"
-    | "phone"
-    | "anonymous"
-  >;
-  theme: Record<"base" | "light" | "dark", ThemeOptions>;
-}>;
 /** Public settings are visible to unauthenticated users */
 export const publicSettingsAtom = atom<PublicSettings>({});
 /** Stores a function that updates public settings */
@@ -38,21 +25,6 @@ export const updatePublicSettingsAtom = atom<
   UpdateDocFunction<PublicSettings> | undefined
 >(undefined);
 
-/** Project settings are visible to authenticated users */
-export type ProjectSettings = Partial<{
-  tables: TableSettings[];
-
-  setupCompleted: boolean;
-
-  rowyRunUrl: string;
-  rowyRunRegion: string;
-  rowyRunDeployStatus: "BUILDING" | "COMPLETE";
-  services: Partial<{
-    hooks: string;
-    builder: string;
-    terminal: string;
-  }>;
-}>;
 /** Project settings are visible to authenticated users */
 export const projectSettingsAtom = atom<ProjectSettings>({});
 /**
diff --git a/src/atoms/projectScope/user.ts b/src/atoms/projectScope/user.ts
index 4f8aad75..62bcc175 100644
--- a/src/atoms/projectScope/user.ts
+++ b/src/atoms/projectScope/user.ts
@@ -1,45 +1,12 @@
 import { atom } from "jotai";
 import { atomWithStorage } from "jotai/utils";
 import { merge } from "lodash-es";
-import { ThemeOptions } from "@mui/material";
 
 import themes from "@src/theme";
 import { publicSettingsAtom } from "./project";
-import {
-  UpdateDocFunction,
-  TableFilter,
-  TableRowRef,
-  TableSort,
-} from "@src/types/table";
+import { UserSettings } from "@src/types/settings";
+import { UpdateDocFunction } from "@src/types/table";
 
-/** User info and settings */
-export type UserSettings = Partial<{
-  _rowy_ref: TableRowRef;
-  /** Synced from user auth info */
-  user: {
-    email: string;
-    displayName?: string;
-    photoURL?: string;
-    phoneNumber?: string;
-  };
-  roles: string[];
-
-  theme: Record<"base" | "light" | "dark", ThemeOptions>;
-
-  favoriteTables: string[];
-  /** Stores user overrides */
-  tables: Record<
-    string,
-    Partial<{
-      filters: TableFilter[];
-      hiddenFields: string[];
-      sorts: TableSort[];
-    }>
-  >;
-
-  /** Stores table tutorial completion */
-  tableTutorialComplete?: boolean;
-}>;
 /** User info and settings */
 export const userSettingsAtom = atom<UserSettings>({});
 /** Stores a function that updates user settings */
diff --git a/src/components/Settings/UserManagement/UserItem.tsx b/src/components/Settings/UserManagement/UserItem.tsx
index 4aab15e5..3b9d2701 100644
--- a/src/components/Settings/UserManagement/UserItem.tsx
+++ b/src/components/Settings/UserManagement/UserItem.tsx
@@ -23,12 +23,12 @@ import {
   projectSettingsAtom,
   rowyRunAtom,
   rowyRunModalAtom,
-  UserSettings,
   updateUserAtom,
   confirmDialogAtom,
 } from "@src/atoms/projectScope";
 import { runRoutes } from "@src/constants/runRoutes";
 import { USERS } from "@src/config/dbPaths";
+import type { UserSettings } from "@src/types/settings";
 
 export default function UserItem({
   _rowy_ref,
diff --git a/src/types/settings.d.ts b/src/types/settings.d.ts
new file mode 100644
index 00000000..0f3b5761
--- /dev/null
+++ b/src/types/settings.d.ts
@@ -0,0 +1,64 @@
+import { ThemeOptions } from "@mui/material";
+import { TableSettings, TableFilter, TableRowRef, TableSort } from "./table";
+
+/** Public settings are visible to unauthenticated users */
+export type PublicSettings = Partial<{
+  signInOptions: Array<
+    | "google"
+    | "twitter"
+    | "facebook"
+    | "github"
+    | "microsoft"
+    | "apple"
+    | "yahoo"
+    | "email"
+    | "phone"
+    | "anonymous"
+  >;
+  theme: Record<"base" | "light" | "dark", ThemeOptions>;
+}>;
+
+/** Project settings are visible to authenticated users */
+export type ProjectSettings = Partial<{
+  tables: TableSettings[];
+
+  setupCompleted: boolean;
+
+  rowyRunUrl: string;
+  rowyRunRegion: string;
+  rowyRunDeployStatus: "BUILDING" | "COMPLETE";
+  services: Partial<{
+    hooks: string;
+    builder: string;
+    terminal: string;
+  }>;
+}>;
+
+/** User info and settings */
+export type UserSettings = Partial<{
+  _rowy_ref: TableRowRef;
+  /** Synced from user auth info */
+  user: {
+    email: string;
+    displayName?: string;
+    photoURL?: string;
+    phoneNumber?: string;
+  };
+  roles: string[];
+
+  theme: Record<"base" | "light" | "dark", ThemeOptions>;
+
+  favoriteTables: string[];
+  /** Stores user overrides */
+  tables: Record<
+    string,
+    Partial<{
+      filters: TableFilter[];
+      hiddenFields: string[];
+      sorts: TableSort[];
+    }>
+  >;
+
+  /** Stores table tutorial completion */
+  tableTutorialComplete?: boolean;
+}>;

From a99a1d19c2b8e8cfdfd10ecdf98850ae01ff99e8 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Thu, 6 Oct 2022 17:21:58 +1100
Subject: [PATCH 157/309] add types to settings UI components

---
 .../Settings/ProjectSettings/Authentication.tsx    | 14 +++++++++-----
 .../Settings/ProjectSettings/Customization.tsx     | 12 ++++++++----
 src/components/Settings/UserSettings/Account.tsx   |  6 +++---
 .../Settings/UserSettings/Personalization.tsx      | 10 ++++++----
 src/components/Settings/UserSettings/Theme.tsx     |  4 +++-
 src/pages/Settings/DebugSettingsPage.tsx           |  7 -------
 src/pages/Settings/ProjectSettingsPage.tsx         |  9 +++++----
 src/pages/Settings/UserSettingsPage.tsx            |  5 +++--
 8 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/src/components/Settings/ProjectSettings/Authentication.tsx b/src/components/Settings/ProjectSettings/Authentication.tsx
index b55ad737..aceccee5 100644
--- a/src/components/Settings/ProjectSettings/Authentication.tsx
+++ b/src/components/Settings/ProjectSettings/Authentication.tsx
@@ -12,7 +12,9 @@ export default function Authentication({
   publicSettings,
   updatePublicSettings,
 }: IProjectSettingsChildProps) {
-  const [signInOptions, setSignInOptions] = useState(
+  const [signInOptions, setSignInOptions] = useState<
+    NonNullable<typeof publicSettings["signInOptions"]>
+  >(
     Array.isArray(publicSettings?.signInOptions)
       ? publicSettings.signInOptions
       : ["google"]
@@ -23,10 +25,12 @@ export default function Authentication({
       <MultiSelect
         label="Sign-in options"
         value={signInOptions}
-        options={Object.keys(authOptions).map((option) => ({
-          value: option,
-          label: startCase(option).replace("Github", "GitHub"),
-        }))}
+        options={
+          Object.keys(authOptions).map((option) => ({
+            value: option,
+            label: startCase(option).replace("Github", "GitHub"),
+          })) as any
+        }
         onChange={setSignInOptions}
         onClose={() => updatePublicSettings({ signInOptions })}
         multiple
diff --git a/src/components/Settings/ProjectSettings/Customization.tsx b/src/components/Settings/ProjectSettings/Customization.tsx
index c6d61919..320586a8 100644
--- a/src/components/Settings/ProjectSettings/Customization.tsx
+++ b/src/components/Settings/ProjectSettings/Customization.tsx
@@ -13,8 +13,8 @@ export default function Customization({
   updatePublicSettings,
 }: IProjectSettingsChildProps) {
   const [customizedThemeColor, setCustomizedThemeColor] = useState(
-    publicSettings.theme?.light?.palette?.primary?.main ||
-      publicSettings.theme?.dark?.palette?.primary?.main
+    (publicSettings.theme?.light?.palette?.primary as any)?.main ||
+      (publicSettings.theme?.dark?.palette?.primary as any)?.main
   );
 
   const handleSave = ({ light, dark }: { light: string; dark: string }) => {
@@ -50,8 +50,12 @@ export default function Customization({
       <Collapse in={customizedThemeColor} style={{ marginTop: 0 }}>
         <Suspense fallback={<Loading />}>
           <ThemeColorPicker
-            currentLight={publicSettings.theme?.light?.palette?.primary?.main}
-            currentDark={publicSettings.theme?.dark?.palette?.primary?.main}
+            currentLight={
+              (publicSettings.theme?.light?.palette?.primary as any)?.main
+            }
+            currentDark={
+              (publicSettings.theme?.dark?.palette?.primary as any)?.main
+            }
             handleSave={handleSave}
           />
         </Suspense>
diff --git a/src/components/Settings/UserSettings/Account.tsx b/src/components/Settings/UserSettings/Account.tsx
index f5c5c744..57f49b73 100644
--- a/src/components/Settings/UserSettings/Account.tsx
+++ b/src/components/Settings/UserSettings/Account.tsx
@@ -9,19 +9,19 @@ export default function Account({ settings }: IUserSettingsChildProps) {
   return (
     <Grid container spacing={2} alignItems="center">
       <Grid item>
-        <Avatar src={settings.user.photoURL} />
+        <Avatar src={settings.user?.photoURL} />
       </Grid>
 
       <Grid item xs>
         <Typography variant="body1" style={{ userSelect: "all" }}>
-          {settings.user.displayName}
+          {settings.user?.displayName}
         </Typography>
         <Typography
           variant="body2"
           color="textSecondary"
           style={{ userSelect: "all" }}
         >
-          {settings.user.email}
+          {settings.user?.email}
         </Typography>
       </Grid>
 
diff --git a/src/components/Settings/UserSettings/Personalization.tsx b/src/components/Settings/UserSettings/Personalization.tsx
index 65542669..f2687b49 100644
--- a/src/components/Settings/UserSettings/Personalization.tsx
+++ b/src/components/Settings/UserSettings/Personalization.tsx
@@ -14,8 +14,8 @@ export default function Personalization({
 }: IUserSettingsChildProps) {
   const [customizedThemeColor, setCustomizedThemeColor] = useState(
     Boolean(
-      settings.theme?.light?.palette?.primary?.main ||
-        settings.theme?.dark?.palette?.primary?.main
+      (settings.theme?.light?.palette?.primary as any)?.main ||
+        (settings.theme?.dark?.palette?.primary as any)?.main
     )
   );
 
@@ -52,8 +52,10 @@ export default function Personalization({
       <Collapse in={customizedThemeColor} style={{ marginTop: 0 }}>
         <Suspense fallback={<Loading style={{ height: "auto" }} />}>
           <ThemeColorPicker
-            currentLight={settings.theme?.light?.palette?.primary?.main}
-            currentDark={settings.theme?.dark?.palette?.primary?.main}
+            currentLight={
+              (settings.theme?.light?.palette?.primary as any)?.main
+            }
+            currentDark={(settings.theme?.dark?.palette?.primary as any)?.main}
             handleSave={handleSave}
           />
         </Suspense>
diff --git a/src/components/Settings/UserSettings/Theme.tsx b/src/components/Settings/UserSettings/Theme.tsx
index 6f6f1c83..e7f491b4 100644
--- a/src/components/Settings/UserSettings/Theme.tsx
+++ b/src/components/Settings/UserSettings/Theme.tsx
@@ -62,7 +62,9 @@ export default function Theme({
       <FormControlLabel
         control={
           <Checkbox
-            defaultChecked={Boolean(settings.theme?.dark?.palette?.darker)}
+            defaultChecked={Boolean(
+              (settings.theme?.dark?.palette as any)?.darker
+            )}
             onChange={(e) => {
               updateSettings({
                 theme: merge(settings.theme, {
diff --git a/src/pages/Settings/DebugSettingsPage.tsx b/src/pages/Settings/DebugSettingsPage.tsx
index 45c2c77f..c5ad9025 100644
--- a/src/pages/Settings/DebugSettingsPage.tsx
+++ b/src/pages/Settings/DebugSettingsPage.tsx
@@ -23,13 +23,6 @@ import { USERS } from "@src/config/dbPaths";
 import { getTableSchemaPath } from "@src/utils/table";
 import { useScrollToHash } from "@src/hooks/useScrollToHash";
 
-export interface IProjectSettingsChildProps {
-  settings: Record<string, any>;
-  updateSettings: (data: Record<string, any>) => void;
-  publicSettings: Record<string, any>;
-  updatePublicSettings: (data: Record<string, any>) => void;
-}
-
 export default function DebugSettingsPage() {
   const [firebaseDb] = useAtom(firebaseDbAtom, projectScope);
   const [projectSettings] = useAtom(projectSettingsAtom, projectScope);
diff --git a/src/pages/Settings/ProjectSettingsPage.tsx b/src/pages/Settings/ProjectSettingsPage.tsx
index 96f0e93c..f468497e 100644
--- a/src/pages/Settings/ProjectSettingsPage.tsx
+++ b/src/pages/Settings/ProjectSettingsPage.tsx
@@ -19,12 +19,13 @@ import {
   updatePublicSettingsAtom,
 } from "@src/atoms/projectScope";
 import { useScrollToHash } from "@src/hooks/useScrollToHash";
+import { ProjectSettings, PublicSettings } from "@src/types/settings";
 
 export interface IProjectSettingsChildProps {
-  settings: Record<string, any>;
-  updateSettings: (data: Record<string, any>) => void;
-  publicSettings: Record<string, any>;
-  updatePublicSettings: (data: Record<string, any>) => void;
+  settings: ProjectSettings;
+  updateSettings: (data: Partial<ProjectSettings>) => void;
+  publicSettings: PublicSettings;
+  updatePublicSettings: (data: Partial<PublicSettings>) => void;
 }
 
 export default function ProjectSettingsPage() {
diff --git a/src/pages/Settings/UserSettingsPage.tsx b/src/pages/Settings/UserSettingsPage.tsx
index be4d43ec..1981157f 100644
--- a/src/pages/Settings/UserSettingsPage.tsx
+++ b/src/pages/Settings/UserSettingsPage.tsx
@@ -18,10 +18,11 @@ import {
   updateUserSettingsAtom,
 } from "@src/atoms/projectScope";
 import { useScrollToHash } from "@src/hooks/useScrollToHash";
+import { UserSettings } from "@src/types/settings";
 
 export interface IUserSettingsChildProps {
-  settings: Record<string, any>;
-  updateSettings: (data: Record<string, any>) => void;
+  settings: UserSettings;
+  updateSettings: (data: Partial<UserSettings>) => void;
 }
 
 export default function UserSettingsPage() {

From cdba5d3bbffddf525ee3dc482c8572a2dc63b3be Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Fri, 7 Oct 2022 12:06:36 +1100
Subject: [PATCH 158/309] ROWY-707 update RowyRunModal copy

---
 src/components/Modal/MemoizedText.tsx |  6 +-
 src/components/RowyRunModal.tsx       | 90 ++++++++++++++++++---------
 2 files changed, 63 insertions(+), 33 deletions(-)

diff --git a/src/components/Modal/MemoizedText.tsx b/src/components/Modal/MemoizedText.tsx
index 1b77485b..00ee07c6 100644
--- a/src/components/Modal/MemoizedText.tsx
+++ b/src/components/Modal/MemoizedText.tsx
@@ -1,12 +1,12 @@
-import { memo } from "react";
+import { memo, PropsWithChildren } from "react";
 
 /**
  * Used for global Modals that can have customizable text
  * so that the default text doesn’t appear as the modal closes.
  */
 const MemoizedText = memo(
-  function MemoizedTextComponent({ text }: { text: React.ReactNode }) {
-    return <>{text}</>;
+  function MemoizedTextComponent({ children }: PropsWithChildren<{}>) {
+    return <>{children}</>;
   },
   () => true
 );
diff --git a/src/components/RowyRunModal.tsx b/src/components/RowyRunModal.tsx
index 290fa931..5057968d 100644
--- a/src/components/RowyRunModal.tsx
+++ b/src/components/RowyRunModal.tsx
@@ -6,10 +6,12 @@ import {
   Button,
   DialogContentText,
   Link as MuiLink,
+  Box,
 } from "@mui/material";
+import CheckIcon from "@mui/icons-material/CheckCircle";
 
 import Modal from "@src/components/Modal";
-import Logo from "@src/assets/LogoRowyRun";
+import MemoizedText from "@src/components/Modal/MemoizedText";
 import InlineOpenInNewIcon from "@src/components/InlineOpenInNewIcon";
 
 import {
@@ -43,45 +45,73 @@ export default function RowyRunModal() {
       open={rowyRunModal.open}
       onClose={handleClose}
       title={
-        <Logo
-          size={2}
-          style={{
-            margin: "16px auto",
-            display: "block",
-            position: "relative",
-            right: 44 / -2,
-          }}
-        />
+        <MemoizedText>
+          {rowyRunModal.feature
+            ? `${
+                showUpdateModal ? "Update" : "Set up"
+              } Cloud Functions to use ${rowyRunModal.feature}`
+            : `Your Cloud isn’t set up`}
+        </MemoizedText>
       }
       maxWidth="xs"
       body={
         <>
-          <Typography variant="h5" paragraph align="center">
-            {showUpdateModal ? "Update" : "Set up"} Rowy Run to use{" "}
-            {rowyRunModal.feature || "this feature"}
-          </Typography>
-
           {showUpdateModal && (
-            <DialogContentText variant="body1" paragraph textAlign="center">
+            <DialogContentText variant="button" paragraph>
               {rowyRunModal.feature || "This feature"} requires Rowy Run v
               {rowyRunModal.version} or later.
             </DialogContentText>
           )}
 
-          <DialogContentText variant="body1" paragraph textAlign="center">
-            Rowy Run is a Cloud Run instance that provides backend
-            functionality, such as table action scripts, user management, and
-            easy Cloud Function deployment.{" "}
-            <MuiLink
-              href={WIKI_LINKS.rowyRun}
-              target="_blank"
-              rel="noopener noreferrer"
-            >
-              Learn more
-              <InlineOpenInNewIcon />
-            </MuiLink>
+          <DialogContentText paragraph>
+            Cloud Functions are free to use in our Base plan, you just need to
+            set a few things up first. Enable Cloud Functions for:
           </DialogContentText>
 
+          <Box
+            component="ol"
+            sx={{
+              margin: 0,
+              padding: 0,
+              alignSelf: "stretch",
+              "& li": {
+                listStyleType: "none",
+                display: "flex",
+                gap: 1,
+                marginBottom: 2,
+
+                "& svg": {
+                  display: "flex",
+                  fontSize: "1.25rem",
+                  color: "action.active",
+                },
+              },
+            }}
+          >
+            <li>
+              <CheckIcon />
+              Derivative fields, Extensions, Webhooks
+            </li>
+            <li>
+              <CheckIcon />
+              Table and Action scripts
+            </li>
+            <li>
+              <CheckIcon />
+              Easy Cloud Function deployment
+            </li>
+          </Box>
+
+          <MuiLink
+            href={WIKI_LINKS.rowyRun}
+            target="_blank"
+            rel="noopener noreferrer"
+            sx={{ display: "flex", mb: 3 }}
+          >
+            Learn more
+            <InlineOpenInNewIcon />
+          </MuiLink>
+
           <Button
             component={Link}
             to={ROUTES.projectSettings + "#rowyRun"}
@@ -92,7 +122,7 @@ export default function RowyRunModal() {
             style={{ display: "flex" }}
             disabled={!userRoles.includes("ADMIN")}
           >
-            Set up Rowy Run
+            Set up Cloud Functions
           </Button>
 
           {!userRoles.includes("ADMIN") && (
@@ -102,7 +132,7 @@ export default function RowyRunModal() {
               color="error"
               sx={{ mt: 1 }}
             >
-              Contact the project owner to set up Rowy&nbsp;Run
+              Only admins can set up Cloud Functions
             </Typography>
           )}
         </>

From 12e0528ae639a9c32992947ceb5e92d534c9966d Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Fri, 7 Oct 2022 12:32:23 +1100
Subject: [PATCH 159/309] update modal styles & transition

---
 package.json                             |  2 +-
 src/components/ConfirmDialog.tsx         |  2 -
 src/components/Modal/FadeTransition.tsx  | 76 --------------------
 src/components/Modal/Modal.tsx           |  4 --
 src/components/Modal/ModalTransition.tsx | 91 ++++++++++++++++++++++++
 src/theme/components.tsx                 | 14 ++--
 yarn.lock                                |  8 +--
 7 files changed, 102 insertions(+), 95 deletions(-)
 delete mode 100644 src/components/Modal/FadeTransition.tsx
 create mode 100644 src/components/Modal/ModalTransition.tsx

diff --git a/package.json b/package.json
index 721396ac..6f35de2b 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "@mui/material": "5.6.0",
     "@mui/styles": "5.6.0",
     "@mui/x-date-pickers": "^5.0.0-alpha.4",
-    "@rowy/form-builder": "^0.6.2",
+    "@rowy/form-builder": "^0.7.0",
     "@rowy/multiselect": "^0.4.0",
     "@tinymce/tinymce-react": "^3",
     "@uiw/react-md-editor": "^3.14.1",
diff --git a/src/components/ConfirmDialog.tsx b/src/components/ConfirmDialog.tsx
index ef2549f8..5bb298ef 100644
--- a/src/components/ConfirmDialog.tsx
+++ b/src/components/ConfirmDialog.tsx
@@ -11,7 +11,6 @@ import {
   Button,
 } from "@mui/material";
 
-import { FadeTransitionMui } from "@src/components/Modal/FadeTransition";
 import { projectScope, confirmDialogAtom } from "@src/atoms/projectScope";
 
 export interface IConfirmDialogProps {
@@ -62,7 +61,6 @@ export default function ConfirmDialog({
         else handleClose();
       }}
       maxWidth={maxWidth}
-      TransitionComponent={FadeTransitionMui}
       sx={{ cursor: "default", zIndex: (theme) => theme.zIndex.modal + 50 }}
     >
       <DialogTitle>{title}</DialogTitle>
diff --git a/src/components/Modal/FadeTransition.tsx b/src/components/Modal/FadeTransition.tsx
deleted file mode 100644
index 48e4441d..00000000
--- a/src/components/Modal/FadeTransition.tsx
+++ /dev/null
@@ -1,76 +0,0 @@
-import { forwardRef, cloneElement } from "react";
-import { useTheme } from "@mui/material";
-import { Transition } from "react-transition-group";
-import { TransitionProps } from "react-transition-group/Transition";
-import { TransitionProps as MuiTransitionProps } from "@mui/material/transitions";
-
-export const FadeTransition: React.ForwardRefExoticComponent<
-  Pick<TransitionProps, React.ReactText> & React.RefAttributes<any>
-> = forwardRef(
-  ({ children, ...props }: TransitionProps, ref: React.Ref<any>) => {
-    const theme = useTheme();
-
-    if (!children) return null;
-
-    const defaultStyle = {
-      opacity: 0,
-      transform: "scale(0.8)",
-
-      transition: theme.transitions.create(["transform", "opacity"], {
-        duration: "300ms",
-        easing: theme.transitions.easing.strong,
-      }),
-    };
-
-    const transitionStyles = {
-      entering: {
-        willChange: "transform, opacity",
-      },
-
-      entered: {
-        opacity: 1,
-        transform: "none",
-      },
-
-      exiting: {
-        opacity: 0,
-        transform: "scale(0.8)",
-
-        transitionDuration: theme.transitions.duration.leavingScreen,
-      },
-
-      exited: {
-        opacity: 0,
-        transform: "none",
-        transition: "none",
-      },
-
-      unmounted: {},
-    };
-
-    return (
-      <Transition
-        appear
-        timeout={{ enter: 0, exit: theme.transitions.duration.leavingScreen }}
-        {...props}
-      >
-        {(state) =>
-          cloneElement(children as any, {
-            style: { ...defaultStyle, ...transitionStyles[state] },
-            tabIndex: -1,
-            ref,
-          })
-        }
-      </Transition>
-    );
-  }
-);
-
-export default FadeTransition;
-
-export const FadeTransitionMui = forwardRef(function Transition(
-  props: MuiTransitionProps & { children?: React.ReactElement<any, any> },
-  ref: React.Ref<unknown>
-) {
-  return <FadeTransition ref={ref} {...props} />;
-});
diff --git a/src/components/Modal/Modal.tsx b/src/components/Modal/Modal.tsx
index fa9a9baa..7cf12cb5 100644
--- a/src/components/Modal/Modal.tsx
+++ b/src/components/Modal/Modal.tsx
@@ -11,12 +11,10 @@ import {
   DialogActions,
   Button,
   ButtonProps,
-  Slide,
 } from "@mui/material";
 import LoadingButton, { LoadingButtonProps } from "@mui/lab/LoadingButton";
 import CloseIcon from "@mui/icons-material/Close";
 
-import { FadeTransitionMui } from "./FadeTransition";
 import ScrollableDialogContent, {
   IScrollableDialogContentProps,
 } from "./ScrollableDialogContent";
@@ -86,8 +84,6 @@ export default function Modal({
       onClose={handleClose}
       fullWidth
       fullScreen={fullScreen}
-      TransitionComponent={fullScreen ? Slide : FadeTransitionMui}
-      TransitionProps={fullScreen ? ({ direction: "up" } as any) : undefined}
       aria-labelledby="modal-title"
       {...props}
       sx={
diff --git a/src/components/Modal/ModalTransition.tsx b/src/components/Modal/ModalTransition.tsx
new file mode 100644
index 00000000..d79f590c
--- /dev/null
+++ b/src/components/Modal/ModalTransition.tsx
@@ -0,0 +1,91 @@
+import { forwardRef, cloneElement } from "react";
+import { useTheme, Slide } from "@mui/material";
+import { Transition } from "react-transition-group";
+import { TransitionProps } from "react-transition-group/Transition";
+import { TransitionProps as MuiTransitionProps } from "@mui/material/transitions";
+
+export const ModalTransition: React.ForwardRefExoticComponent<
+  Pick<TransitionProps, React.ReactText> & React.RefAttributes<any>
+> = forwardRef(function ModalTransition(
+  { children, ...props }: TransitionProps,
+  ref: React.Ref<any>
+) {
+  const theme = useTheme();
+
+  if (!children) return null;
+
+  const isFullScreenDialog = (
+    Array.isArray(children) ? children[0] : children
+  ).props?.children?.props?.className?.includes("MuiDialog-paperFullScreen");
+
+  if (isFullScreenDialog)
+    return (
+      <Slide direction="up" appear {...props}>
+        {children as any}
+      </Slide>
+    );
+
+  const defaultStyle = {
+    opacity: 0,
+    transform: "scale(0.8)",
+
+    transition: theme.transitions.create(["transform", "opacity"], {
+      duration: theme.transitions.duration.enteringScreen,
+      easing: theme.transitions.easing.strong,
+    }),
+  };
+
+  const transitionStyles = {
+    entering: {
+      willChange: "transform, opacity",
+    },
+
+    entered: {
+      opacity: 1,
+      transform: "none",
+    },
+
+    exiting: {
+      opacity: 0,
+      transform: "scale(0.8)",
+
+      transitionDuration: theme.transitions.duration.leavingScreen,
+    },
+
+    exited: {
+      opacity: 0,
+      transform: "none",
+      transition: "none",
+    },
+
+    unmounted: {},
+  };
+
+  return (
+    <Transition
+      appear
+      timeout={{
+        enter: theme.transitions.duration.enteringScreen,
+        exit: theme.transitions.duration.leavingScreen,
+      }}
+      {...props}
+    >
+      {(state) =>
+        cloneElement(children as any, {
+          style: { ...defaultStyle, ...transitionStyles[state] },
+          tabIndex: -1,
+          ref,
+        })
+      }
+    </Transition>
+  );
+});
+
+export default ModalTransition;
+
+export const ModalTransitionMui = forwardRef(function Transition(
+  props: MuiTransitionProps & { children?: React.ReactElement<any, any> },
+  ref: React.Ref<unknown>
+) {
+  return <ModalTransition ref={ref} {...props} />;
+});
diff --git a/src/theme/components.tsx b/src/theme/components.tsx
index c537dfb4..6c0770c1 100644
--- a/src/theme/components.tsx
+++ b/src/theme/components.tsx
@@ -4,6 +4,7 @@ import type {} from "@mui/lab/themeAugmentation";
 import { MultiSelectProps } from "@rowy/multiselect";
 import { toRem } from "./typography";
 
+import ModalTransition from "@src/components/Modal/ModalTransition";
 import RadioIcon from "@src/theme/RadioIcon";
 import CheckboxIcon from "@src/theme/CheckboxIcon";
 import CheckboxIndeterminateIcon from "@src/theme/CheckboxIndeterminateIcon";
@@ -248,6 +249,9 @@ export const components = (theme: Theme): ThemeOptions => {
       },
 
       MuiDialog: {
+        defaultProps: {
+          TransitionComponent: ModalTransition,
+        },
         styleOverrides: {
           root: {
             "--dialog-title-height": "64px",
@@ -307,14 +311,8 @@ export const components = (theme: Theme): ThemeOptions => {
       MuiDialogTitle: {
         styleOverrides: {
           root: {
-            padding: "var(--dialog-spacing)",
-            paddingTop: (64 - 28) / 2,
-            paddingBottom: (64 - 28) / 2,
-
-            [theme.breakpoints.down("sm")]: {
-              paddingTop: (56 - 28) / 2,
-              paddingBottom: (56 - 28) / 2,
-            },
+            ...(theme.typography.h5 as any),
+            padding: `calc((var(--dialog-title-height) - ${theme.typography.h5.lineHeight} * ${theme.typography.h5.fontSize}) / 2) var(--dialog-spacing)`,
           },
         },
       },
diff --git a/yarn.lock b/yarn.lock
index 5861d12c..b3672bac 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3350,10 +3350,10 @@
     estree-walker "^1.0.1"
     picomatch "^2.2.2"
 
-"@rowy/form-builder@^0.6.2":
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/@rowy/form-builder/-/form-builder-0.6.2.tgz#aa51c877525afc061f25d614e6526ff57193dd3a"
-  integrity sha512-Lr4CJk4zQpp8ae27umsuxkRf8zs6GQGGA26u/z6lFDIeM+wIr33IOsRjgx9XlNhrRHGEhfLdwX4okuQGv3MwOA==
+"@rowy/form-builder@^0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@rowy/form-builder/-/form-builder-0.7.0.tgz#75c95d7114d0912a944f737a1c61b60b6cefa935"
+  integrity sha512-D5koLnPdcGuHCMWgiU0stLVK8Dvu+mKWJY+WSKNUsPtqCxuSeoi1RWTQEy+DYkQl2msVFWvxt4Ei1FlPTNwNsQ==
   dependencies:
     "@hookform/resolvers" "^2.6.0"
     "@types/lodash-es" "^4.17.6"

From 58eec2e0ea18e244651a502ccab18ddb2de7d339 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 10 Oct 2022 12:46:04 +1100
Subject: [PATCH 160/309] LoadedRowsSearch: add icon & offline indicator

---
 package.json                                  |  2 +
 .../TableToolbar/LoadedRowsStatus.tsx         | 64 +++++++++++++++----
 yarn.lock                                     | 12 ++++
 3 files changed, 65 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index 6f35de2b..f0051f54 100644
--- a/package.json
+++ b/package.json
@@ -48,6 +48,7 @@
     "react-beautiful-dnd": "^13.1.0",
     "react-color-palette": "^6.2.0",
     "react-data-grid": "7.0.0-beta.5",
+    "react-detect-offline": "^2.4.5",
     "react-div-100vh": "^0.7.0",
     "react-dnd": "^16.0.1",
     "react-dnd-html5-backend": "^16.0.1",
@@ -157,6 +158,7 @@
     "@types/node": "^17.0.23",
     "@types/react": "^18.0.5",
     "@types/react-beautiful-dnd": "^13.1.2",
+    "@types/react-detect-offline": "^2.4.1",
     "@types/react-div-100vh": "^0.4.0",
     "@types/react-dom": "^18.0.0",
     "@types/react-router-dom": "^5.3.3",
diff --git a/src/components/TableToolbar/LoadedRowsStatus.tsx b/src/components/TableToolbar/LoadedRowsStatus.tsx
index 04f619bd..f27531d9 100644
--- a/src/components/TableToolbar/LoadedRowsStatus.tsx
+++ b/src/components/TableToolbar/LoadedRowsStatus.tsx
@@ -1,13 +1,17 @@
 import { Suspense, forwardRef } from "react";
 import { useAtom } from "jotai";
+import { Offline, Online } from "react-detect-offline";
 
 import { Tooltip, Typography, TypographyProps } from "@mui/material";
+import SyncIcon from "@mui/icons-material/Sync";
+import OfflineIcon from "@mui/icons-material/CloudOffOutlined";
 
 import {
   tableScope,
   tableRowsAtom,
   tableNextPageAtom,
 } from "@src/atoms/tableScope";
+import { spreadSx } from "@src/utils/ui";
 
 const StatusText = forwardRef(function StatusText(
   props: TypographyProps,
@@ -20,27 +24,48 @@ const StatusText = forwardRef(function StatusText(
       color="text.disabled"
       display="block"
       {...props}
-      style={{ userSelect: "none", ...props.style }}
+      sx={[
+        {
+          userSelect: "none",
+
+          "& svg": {
+            fontSize: 20,
+            width: "1em",
+            height: "1em",
+            verticalAlign: "bottom",
+            display: "inline-block",
+            mr: 0.75,
+          },
+        },
+        ...spreadSx(props.sx),
+      ]}
     />
   );
 });
 
+const loadingIcon = (
+  <SyncIcon
+    sx={{
+      animation: "spin-infinite 1.5s linear infinite",
+      "@keyframes spin-infinite": {
+        from: { transform: "rotate(45deg)" },
+        to: { transform: `rotate(${45 - 360}deg)` },
+      },
+    }}
+  />
+);
+
 function LoadedRowsStatus() {
   const [tableRows] = useAtom(tableRowsAtom, tableScope);
   const [tableNextPage] = useAtom(tableNextPageAtom, tableScope);
 
-  if (tableNextPage.loading) return <StatusText>Loading more…</StatusText>;
+  if (tableNextPage.loading)
+    return <StatusText>{loadingIcon}Loading more…</StatusText>;
 
   return (
-    <Tooltip
-      title={
-        tableNextPage.available
-          ? "Scroll to the bottom to load more rows"
-          : "All rows have been loaded in this table"
-      }
-      describeChild
-    >
+    <Tooltip title="Syncing with database in realtime" describeChild>
       <StatusText>
+        <SyncIcon style={{ transform: "rotate(45deg)" }} />
         Loaded {!tableNextPage.available && "all "}
         {tableRows.length} row{tableRows.length !== 1 && "s"}
       </StatusText>
@@ -50,8 +75,21 @@ function LoadedRowsStatus() {
 
 export default function SuspendedLoadedRowsStatus() {
   return (
-    <Suspense fallback={<StatusText>Loading…</StatusText>}>
-      <LoadedRowsStatus />
-    </Suspense>
+    <>
+      <Online>
+        <Suspense fallback={<StatusText>{loadingIcon}Loading…</StatusText>}>
+          <LoadedRowsStatus />
+        </Suspense>
+      </Online>
+
+      <Offline>
+        <Tooltip title="Changes will be saved when you reconnect" describeChild>
+          <StatusText color="error.main">
+            <OfflineIcon />
+            Offline
+          </StatusText>
+        </Tooltip>
+      </Offline>
+    </>
   );
 }
diff --git a/yarn.lock b/yarn.lock
index b3672bac..5bf216e0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4052,6 +4052,13 @@
   dependencies:
     "@types/react" "*"
 
+"@types/react-detect-offline@^2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@types/react-detect-offline/-/react-detect-offline-2.4.1.tgz#5a71625d3614a56a6c3dacc53c5e9baed0610de0"
+  integrity sha512-ympSl07fvDbu7+EsnhrKwDWkdOqHp22lukhJYIHxnTfSIzOh1T/K9NGmpwKUtgJaNCfllwLvMSXBlyC6nHEObw==
+  dependencies:
+    "@types/react" "*"
+
 "@types/react-div-100vh@^0.4.0":
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/@types/react-div-100vh/-/react-div-100vh-0.4.0.tgz#750e3ac45ee239ec2952089c1516f3b510bd103e"
@@ -11362,6 +11369,11 @@ react-data-grid@7.0.0-beta.5:
   dependencies:
     clsx "^1.1.1"
 
+react-detect-offline@^2.4.5:
+  version "2.4.5"
+  resolved "https://registry.yarnpkg.com/react-detect-offline/-/react-detect-offline-2.4.5.tgz#3c242516c37b6789cf89102881031f87e70b80e6"
+  integrity sha512-sI13NPEKl3uQp95FT5CwrYzH3DnXCwNP6TnY6NRF5gFDM4NU9KDlbtA6HG2dwhDVS0RYQGXwZW/mHbdf8fCnaw==
+
 react-dev-utils@^12.0.0:
   version "12.0.0"
   resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-12.0.0.tgz#4eab12cdb95692a077616770b5988f0adf806526"

From b585439f3e67d1d5780c6493c2ecf61282d40961 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 10 Oct 2022 13:21:54 +1100
Subject: [PATCH 161/309] support offline errors

---
 src/components/ErrorFallback.tsx | 102 ++++++++++++++++++-------------
 src/hooks/useOffline.ts          |  19 ++++++
 2 files changed, 79 insertions(+), 42 deletions(-)
 create mode 100644 src/hooks/useOffline.ts

diff --git a/src/components/ErrorFallback.tsx b/src/components/ErrorFallback.tsx
index d1c541b5..1b6d0159 100644
--- a/src/components/ErrorFallback.tsx
+++ b/src/components/ErrorFallback.tsx
@@ -1,10 +1,12 @@
 import { useState, useEffect } from "react";
 import { FallbackProps } from "react-error-boundary";
 import { useLocation, Link } from "react-router-dom";
+import useOffline from "@src/hooks/useOffline";
 
 import { Typography, Button } from "@mui/material";
 import ReloadIcon from "@mui/icons-material/Refresh";
 import InlineOpenInNewIcon from "@src/components/InlineOpenInNewIcon";
+import OfflineIcon from "@mui/icons-material/CloudOff";
 import { Tables as TablesIcon } from "@src/assets/icons";
 
 import EmptyState, { IEmptyStateProps } from "@src/components/EmptyState";
@@ -22,6 +24,8 @@ export function ErrorFallbackContents({
   resetErrorBoundary,
   ...props
 }: IErrorFallbackProps) {
+  const isOffline = useOffline();
+
   if ((error as any).code === "permission-denied")
     return (
       <AccessDenied error={error} resetErrorBoundary={resetErrorBoundary} />
@@ -53,51 +57,65 @@ export function ErrorFallbackContents({
   };
 
   if (error.message.startsWith(ERROR_TABLE_NOT_FOUND)) {
-    renderProps = {
-      message: ERROR_TABLE_NOT_FOUND,
-      description: (
-        <>
-          <Typography variant="inherit">
-            Make sure you have the right ID
-          </Typography>
-          <code>{error.message.replace(ERROR_TABLE_NOT_FOUND + ": ", "")}</code>
-          <Button
-            size={props.basic ? "small" : "medium"}
-            variant="outlined"
-            color="secondary"
-            component={Link}
-            to={ROUTES.tables}
-            startIcon={<TablesIcon />}
-            onClick={() => resetErrorBoundary()}
-          >
-            All tables
-          </Button>
-        </>
-      ),
-    };
+    if (isOffline) {
+      renderProps = { Icon: OfflineIcon, message: "You’re offline" };
+    } else {
+      renderProps = {
+        message: ERROR_TABLE_NOT_FOUND,
+        description: (
+          <>
+            <Typography variant="inherit">
+              Make sure you have the right ID
+            </Typography>
+            <code>
+              {error.message.replace(ERROR_TABLE_NOT_FOUND + ": ", "")}
+            </code>
+            <Button
+              size={props.basic ? "small" : "medium"}
+              variant="outlined"
+              color="secondary"
+              component={Link}
+              to={ROUTES.tables}
+              startIcon={<TablesIcon />}
+              onClick={() => resetErrorBoundary()}
+            >
+              All tables
+            </Button>
+          </>
+        ),
+      };
+    }
   }
 
   if (error.message.startsWith("Loading chunk")) {
-    renderProps = {
-      Icon: ReloadIcon,
-      message: "New update available",
-      description: (
-        <>
-          <Typography variant="inherit">
-            Reload this page to get the latest update
-          </Typography>
-          <Button
-            size={props.basic ? "small" : "medium"}
-            variant="outlined"
-            color="secondary"
-            startIcon={<ReloadIcon />}
-            onClick={() => window.location.reload()}
-          >
-            Reload
-          </Button>
-        </>
-      ),
-    };
+    if (isOffline) {
+      renderProps = { Icon: OfflineIcon, message: "You’re offline" };
+    } else {
+      renderProps = {
+        Icon: ReloadIcon,
+        message: "New update available",
+        description: (
+          <>
+            <Typography variant="inherit">
+              Reload this page to get the latest update
+            </Typography>
+            <Button
+              size={props.basic ? "small" : "medium"}
+              variant="outlined"
+              color="secondary"
+              startIcon={<ReloadIcon />}
+              onClick={() => window.location.reload()}
+            >
+              Reload
+            </Button>
+          </>
+        ),
+      };
+    }
+  }
+
+  if (error.message.includes("Failed to fetch")) {
+    renderProps = { Icon: OfflineIcon, message: "You’re offline" };
   }
 
   return <EmptyState role="alert" fullScreen {...renderProps} {...props} />;
diff --git a/src/hooks/useOffline.ts b/src/hooks/useOffline.ts
new file mode 100644
index 00000000..f5f09ce3
--- /dev/null
+++ b/src/hooks/useOffline.ts
@@ -0,0 +1,19 @@
+import { useState, useEffect } from "react";
+
+export default function useOffline() {
+  const [isOffline, setIsOffline] = useState(true);
+  const handleOffline = () => setIsOffline(true);
+  const handleOnline = () => setIsOffline(false);
+
+  useEffect(() => {
+    window.addEventListener("offline", handleOffline);
+    window.addEventListener("online", handleOnline);
+
+    return () => {
+      window.removeEventListener("offline", handleOffline);
+      window.removeEventListener("online", handleOnline);
+    };
+  }, []);
+
+  return isOffline;
+}

From 6be4377768562b96919d4a62ca3a1b814577cc51 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 10 Oct 2022 13:34:09 +1100
Subject: [PATCH 162/309] display offline indicator instead of empty table

---
 src/components/ErrorFallback.tsx    | 43 +++++++++++++---------
 src/components/Table/EmptyTable.tsx | 55 +++++++++++++++++++----------
 2 files changed, 64 insertions(+), 34 deletions(-)

diff --git a/src/components/ErrorFallback.tsx b/src/components/ErrorFallback.tsx
index 1b6d0159..ba3b8b97 100644
--- a/src/components/ErrorFallback.tsx
+++ b/src/components/ErrorFallback.tsx
@@ -93,29 +93,40 @@ export function ErrorFallbackContents({
     } else {
       renderProps = {
         Icon: ReloadIcon,
-        message: "New update available",
+        message: "Update available",
         description: (
-          <>
-            <Typography variant="inherit">
-              Reload this page to get the latest update
-            </Typography>
-            <Button
-              size={props.basic ? "small" : "medium"}
-              variant="outlined"
-              color="secondary"
-              startIcon={<ReloadIcon />}
-              onClick={() => window.location.reload()}
-            >
-              Reload
-            </Button>
-          </>
+          <Button
+            size={props.basic ? "small" : "medium"}
+            variant="outlined"
+            color="secondary"
+            startIcon={<ReloadIcon />}
+            onClick={() => window.location.reload()}
+            sx={{ mt: 1 }}
+          >
+            Reload
+          </Button>
         ),
       };
     }
   }
 
   if (error.message.includes("Failed to fetch")) {
-    renderProps = { Icon: OfflineIcon, message: "You’re offline" };
+    renderProps = {
+      Icon: OfflineIcon,
+      message: "You’re offline",
+      description: isOffline ? null : (
+        <Button
+          size={props.basic ? "small" : "medium"}
+          variant="outlined"
+          color="secondary"
+          startIcon={<ReloadIcon />}
+          onClick={() => window.location.reload()}
+          sx={{ mt: 1 }}
+        >
+          Reload
+        </Button>
+      ),
+    };
   }
 
   return <EmptyState role="alert" fullScreen {...renderProps} {...props} />;
diff --git a/src/components/Table/EmptyTable.tsx b/src/components/Table/EmptyTable.tsx
index 726f62f9..b9b3fadc 100644
--- a/src/components/Table/EmptyTable.tsx
+++ b/src/components/Table/EmptyTable.tsx
@@ -1,9 +1,14 @@
 import { useAtom, useSetAtom } from "jotai";
+import { Offline, Online } from "react-detect-offline";
 
 import { Grid, Stack, Typography, Button, Divider } from "@mui/material";
-import { Import as ImportIcon } from "@src/assets/icons";
-import { AddColumn as AddColumnIcon } from "@src/assets/icons";
+import {
+  Import as ImportIcon,
+  AddColumn as AddColumnIcon,
+} from "@src/assets/icons";
+import OfflineIcon from "@mui/icons-material/CloudOff";
 
+import EmptyState from "@src/components/EmptyState";
 import ImportData from "@src/components/TableToolbar/ImportData/ImportData";
 
 import {
@@ -125,21 +130,35 @@ export default function EmptyTable() {
   }
 
   return (
-    <Stack
-      spacing={3}
-      justifyContent="center"
-      alignItems="center"
-      sx={{
-        height: `calc(100vh - ${TOP_BAR_HEIGHT}px)`,
-        width: "100%",
-        p: 2,
-        maxWidth: 480,
-        margin: "0 auto",
-        textAlign: "center",
-      }}
-      id="empty-table"
-    >
-      {contents}
-    </Stack>
+    <>
+      <Offline>
+        <EmptyState
+          role="alert"
+          Icon={OfflineIcon}
+          message="You’re offline"
+          description="Go online to view this table’s data"
+          style={{ height: `calc(100vh - ${TOP_BAR_HEIGHT}px)` }}
+        />
+      </Offline>
+
+      <Online>
+        <Stack
+          spacing={3}
+          justifyContent="center"
+          alignItems="center"
+          sx={{
+            height: `calc(100vh - ${TOP_BAR_HEIGHT}px)`,
+            width: "100%",
+            p: 2,
+            maxWidth: 480,
+            margin: "0 auto",
+            textAlign: "center",
+          }}
+          id="empty-table"
+        >
+          {contents}
+        </Stack>
+      </Online>
+    </>
   );
 }

From d5ebe337b071313ab25e4a5bc59af83f6430e90f Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 11 Oct 2022 11:41:06 +1100
Subject: [PATCH 163/309] useFirestoreDocWithAtom: fix createIfNonExistent
 overwriting doc when offline

---
 src/hooks/useFirestoreDocWithAtom.ts | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/hooks/useFirestoreDocWithAtom.ts b/src/hooks/useFirestoreDocWithAtom.ts
index 007061ac..c387a3bb 100644
--- a/src/hooks/useFirestoreDocWithAtom.ts
+++ b/src/hooks/useFirestoreDocWithAtom.ts
@@ -85,10 +85,17 @@ export function useFirestoreDocWithAtom<T = TableRow>(
     // Create a listener for the document
     const unsubscribe = onSnapshot(
       memoizedDocRef,
+      { includeMetadataChanges: true },
       (docSnapshot) => {
         try {
-          // Create doc if it doesn’t exist
-          if (!docSnapshot.exists() && !!createIfNonExistent) {
+          // Create doc if it doesn’t exist and we’re online
+          // WARNING: If offline and we doc doesn’t exist in cache, it will
+          // ovewrite with default values when we go online
+          if (
+            !docSnapshot.exists() &&
+            !!createIfNonExistent &&
+            !docSnapshot.metadata.fromCache
+          ) {
             setDoc(docSnapshot.ref, createIfNonExistent);
             setDataAtom({ ...createIfNonExistent, _rowy_ref: docSnapshot.ref });
           } else {
@@ -121,8 +128,6 @@ export function useFirestoreDocWithAtom<T = TableRow>(
     disableSuspense,
     createIfNonExistent,
     handleError,
-    updateDataAtom,
-    setUpdateDataAtom,
   ]);
 
   // Set updateDocAtom and deleteDocAtom values if they exist

From 964f96a12544339c1d3925d0833f64d38f6a0a1f Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 11 Oct 2022 12:01:00 +1100
Subject: [PATCH 164/309] update debug page

---
 src/App.tsx                              |  12 +-
 src/constants/routes.tsx                 |  12 +-
 src/pages/Settings/DebugPage.tsx         | 190 +++++++++++++++++++++++
 src/pages/Settings/DebugSettingsPage.tsx | 142 -----------------
 4 files changed, 195 insertions(+), 161 deletions(-)
 create mode 100644 src/pages/Settings/DebugPage.tsx
 delete mode 100644 src/pages/Settings/DebugSettingsPage.tsx

diff --git a/src/App.tsx b/src/App.tsx
index 2890beba..79162f2d 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -58,7 +58,7 @@ const ProjectSettingsPage = lazy(() => import("@src/pages/Settings/ProjectSettin
 // prettier-ignore
 const MembersPage = lazy(() => import("@src/pages/Settings/MembersPage" /* webpackChunkName: "MembersPage" */));
 // prettier-ignore
-const DebugSettingsPage = lazy(() => import("@src/pages/Settings/DebugSettingsPage" /* webpackChunkName: "DebugSettingsPage" */));
+const DebugPage = lazy(() => import("@src/pages/Settings/DebugPage" /* webpackChunkName: "DebugPage" */));
 
 export default function App() {
   const [currentUser] = useAtom(currentUserAtom, projectScope);
@@ -153,14 +153,8 @@ export default function App() {
               }
             />
             <Route path={ROUTES.members} element={<MembersPage />} />
-            <Route
-              path={ROUTES.debugSettings}
-              element={
-                <AdminRoute>
-                  <DebugSettingsPage />
-                </AdminRoute>
-              }
-            />
+
+            <Route path={ROUTES.debug} element={<DebugPage />} />
           </Route>
         </Routes>
       )}
diff --git a/src/constants/routes.tsx b/src/constants/routes.tsx
index 8e4ef19b..4b59b687 100644
--- a/src/constants/routes.tsx
+++ b/src/constants/routes.tsx
@@ -36,14 +36,10 @@ export enum ROUTES {
   userSettings = "/settings/user",
   projectSettings = "/settings/project",
   members = "/members",
-  debugSettings = "/settings/debug",
+  debug = "/debug",
 
   tutorial = "/tutorial",
   tableTutorial = "/tutorial/table",
-
-  test = "/test",
-  themeTest = "/test/theme",
-  rowyRunTest = "/test/rowyRunTest",
 }
 
 export const ROUTE_TITLES = {
@@ -66,7 +62,7 @@ export const ROUTE_TITLES = {
   [ROUTES.userSettings]: "Settings",
   [ROUTES.projectSettings]: "Project Settings",
   [ROUTES.members]: "Members",
-  [ROUTES.debugSettings]: "Debug",
+  [ROUTES.debug]: "Debug",
 
   [ROUTES.tutorial]: "Tutorial",
   [ROUTES.tableTutorial]: {
@@ -79,10 +75,6 @@ export const ROUTE_TITLES = {
     titleTransitionProps: { style: { transformOrigin: "0 50%" } },
     leftAligned: true,
   },
-
-  [ROUTES.test]: "Test",
-  [ROUTES.themeTest]: "Theme Test",
-  [ROUTES.rowyRunTest]: "Rowy Run Test",
 } as Record<
   ROUTES,
   | string
diff --git a/src/pages/Settings/DebugPage.tsx b/src/pages/Settings/DebugPage.tsx
new file mode 100644
index 00000000..d3ec7ad1
--- /dev/null
+++ b/src/pages/Settings/DebugPage.tsx
@@ -0,0 +1,190 @@
+import { useAtom } from "jotai";
+import { useSnackbar } from "notistack";
+import {
+  updateDoc,
+  doc,
+  terminate,
+  clearIndexedDbPersistence,
+} from "firebase/firestore";
+
+import { Container, Stack, Button } from "@mui/material";
+import InlineOpenInNewIcon from "@src/components/InlineOpenInNewIcon";
+
+import SettingsSection from "@src/components/Settings/SettingsSection";
+
+import {
+  projectScope,
+  projectIdAtom,
+  projectSettingsAtom,
+  userRolesAtom,
+  allUsersAtom,
+  updateUserAtom,
+} from "@src/atoms/projectScope";
+import UserManagementSourceFirebase from "@src/sources/MembersSourceFirebase";
+import { firebaseDbAtom } from "@src/sources/ProjectSourceFirebase";
+import { CONFIG, TABLE_SCHEMAS, USERS } from "@src/config/dbPaths";
+import { getTableSchemaPath } from "@src/utils/table";
+import { useScrollToHash } from "@src/hooks/useScrollToHash";
+
+export default function DebugPage() {
+  const [firebaseDb] = useAtom(firebaseDbAtom, projectScope);
+  const [projectId] = useAtom(projectIdAtom, projectScope);
+  const [projectSettings] = useAtom(projectSettingsAtom, projectScope);
+  const [userRoles] = useAtom(userRolesAtom, projectScope);
+  const [users] = useAtom(allUsersAtom, projectScope);
+  const [updateUser] = useAtom(updateUserAtom, projectScope);
+  const { enqueueSnackbar, closeSnackbar } = useSnackbar();
+  useScrollToHash();
+
+  return (
+    <Container maxWidth="sm" sx={{ px: 1, pt: 1, pb: 7 + 3 + 3 }}>
+      {userRoles.includes("ADMIN") && <UserManagementSourceFirebase />}
+
+      <Stack spacing={4}>
+        <SettingsSection title="Firestore config">
+          <Button
+            href={`https://console.firebase.google.com/project/${projectId}/firestore/data/~2F${CONFIG.replace(
+              /\//g,
+              "~2F"
+            )}`}
+            target="_blank"
+            rel="noopener noreferrer"
+            color="primary"
+            style={{ display: "flex", width: "max-content" }}
+          >
+            Config <InlineOpenInNewIcon />
+          </Button>
+
+          <Button
+            href={`https://console.firebase.google.com/project/${projectId}/firestore/data/~2F${TABLE_SCHEMAS.replace(
+              /\//g,
+              "~2F"
+            )}`}
+            target="_blank"
+            rel="noopener noreferrer"
+            color="primary"
+            style={{ display: "flex", width: "max-content" }}
+          >
+            Table schemas <InlineOpenInNewIcon />
+          </Button>
+
+          <Button
+            href={`https://console.firebase.google.com/project/${projectId}/firestore/data/~2F${USERS.replace(
+              /\//g,
+              "~2F"
+            )}`}
+            target="_blank"
+            rel="noopener noreferrer"
+            color="primary"
+            style={{ display: "flex", width: "max-content" }}
+          >
+            Users <InlineOpenInNewIcon />
+          </Button>
+        </SettingsSection>
+
+        {userRoles.includes("ADMIN") && (
+          <SettingsSection title="Reset table filters">
+            <Button
+              onClick={async () => {
+                if (!updateUser)
+                  enqueueSnackbar("Could not update user settings", {
+                    variant: "error",
+                  });
+
+                const loadingSnackbar = enqueueSnackbar(
+                  "Resetting all user filters…",
+                  {
+                    persist: true,
+                  }
+                );
+                try {
+                  const promises = users.map((user) =>
+                    updateUser!(`${USERS}/${user._rowy_ref!.id}`, {
+                      tables: Object.entries(user.tables ?? {}).reduce(
+                        (a, [key, table]) => {
+                          a[key] = { ...table, filters: [] };
+                          return a;
+                        },
+                        {} as Record<string, any>
+                      ),
+                    })
+                  );
+
+                  await Promise.all(promises);
+
+                  closeSnackbar(loadingSnackbar);
+                  enqueueSnackbar("Reset all user filters", {
+                    variant: "success",
+                  });
+                } catch (e) {
+                  enqueueSnackbar((e as Error).message, { variant: "error" });
+                  closeSnackbar(loadingSnackbar);
+                }
+              }}
+              color="error"
+              style={{ display: "flex" }}
+            >
+              Reset all user filters
+            </Button>
+            <Button
+              onClick={async () => {
+                if (!projectSettings.tables) {
+                  enqueueSnackbar("No tables to update");
+                  return;
+                }
+
+                const loadingSnackbar = enqueueSnackbar(
+                  "Resetting all table-level filters…",
+                  { persist: true }
+                );
+                try {
+                  const promises = projectSettings.tables.map((table) =>
+                    updateDoc(
+                      doc(firebaseDb, getTableSchemaPath(table)),
+                      "filters",
+                      []
+                    )
+                  );
+
+                  await Promise.all(promises);
+
+                  closeSnackbar(loadingSnackbar);
+                  enqueueSnackbar("Reset all table-level filters", {
+                    variant: "success",
+                  });
+                } catch (e) {
+                  enqueueSnackbar((e as Error).message, { variant: "error" });
+                  closeSnackbar(loadingSnackbar);
+                }
+              }}
+              color="error"
+              style={{ display: "flex" }}
+            >
+              Reset all table-level filters
+            </Button>
+          </SettingsSection>
+        )}
+
+        <SettingsSection
+          title="Local Firestore instance"
+          transitionTimeout={1 * 100}
+        >
+          <Button
+            onClick={async () => {
+              enqueueSnackbar("Clearing cache. Page will reload…", {
+                persist: true,
+              });
+              await terminate(firebaseDb);
+              await clearIndexedDbPersistence(firebaseDb);
+              window.location.reload();
+            }}
+            color="error"
+            style={{ display: "flex" }}
+          >
+            Reset local Firestore cache
+          </Button>
+        </SettingsSection>
+      </Stack>
+    </Container>
+  );
+}
diff --git a/src/pages/Settings/DebugSettingsPage.tsx b/src/pages/Settings/DebugSettingsPage.tsx
deleted file mode 100644
index c5ad9025..00000000
--- a/src/pages/Settings/DebugSettingsPage.tsx
+++ /dev/null
@@ -1,142 +0,0 @@
-import { useAtom } from "jotai";
-import { useSnackbar } from "notistack";
-import {
-  updateDoc,
-  doc,
-  terminate,
-  clearIndexedDbPersistence,
-} from "firebase/firestore";
-
-import { Container, Stack, Button } from "@mui/material";
-
-import SettingsSection from "@src/components/Settings/SettingsSection";
-
-import {
-  projectScope,
-  projectSettingsAtom,
-  allUsersAtom,
-  updateUserAtom,
-} from "@src/atoms/projectScope";
-import UserManagementSourceFirebase from "@src/sources/MembersSourceFirebase";
-import { firebaseDbAtom } from "@src/sources/ProjectSourceFirebase";
-import { USERS } from "@src/config/dbPaths";
-import { getTableSchemaPath } from "@src/utils/table";
-import { useScrollToHash } from "@src/hooks/useScrollToHash";
-
-export default function DebugSettingsPage() {
-  const [firebaseDb] = useAtom(firebaseDbAtom, projectScope);
-  const [projectSettings] = useAtom(projectSettingsAtom, projectScope);
-  const [users] = useAtom(allUsersAtom, projectScope);
-  const [updateUser] = useAtom(updateUserAtom, projectScope);
-  const { enqueueSnackbar, closeSnackbar } = useSnackbar();
-  useScrollToHash();
-
-  return (
-    <Container maxWidth="sm" sx={{ px: 1, pt: 1, pb: 7 + 3 + 3 }}>
-      <UserManagementSourceFirebase />
-
-      <Stack spacing={4}>
-        <SettingsSection title="Reset table filters">
-          <Button
-            onClick={async () => {
-              if (!updateUser)
-                enqueueSnackbar("Could not update user settings", {
-                  variant: "error",
-                });
-
-              const loadingSnackbar = enqueueSnackbar(
-                "Resetting all user filters…",
-                {
-                  persist: true,
-                }
-              );
-              try {
-                const promises = users.map((user) =>
-                  updateUser!(`${USERS}/${user._rowy_ref!.id}`, {
-                    tables: Object.entries(user.tables ?? {}).reduce(
-                      (a, [key, table]) => {
-                        a[key] = { ...table, filters: [] };
-                        return a;
-                      },
-                      {} as Record<string, any>
-                    ),
-                  })
-                );
-
-                await Promise.all(promises);
-
-                closeSnackbar(loadingSnackbar);
-                enqueueSnackbar("Reset all user filters", {
-                  variant: "success",
-                });
-              } catch (e) {
-                enqueueSnackbar((e as Error).message, { variant: "error" });
-                closeSnackbar(loadingSnackbar);
-              }
-            }}
-            color="error"
-            style={{ display: "flex" }}
-          >
-            Reset all user filters
-          </Button>
-          <Button
-            onClick={async () => {
-              if (!projectSettings.tables) {
-                enqueueSnackbar("No tables to update");
-                return;
-              }
-
-              const loadingSnackbar = enqueueSnackbar(
-                "Resetting all table-level filters…",
-                { persist: true }
-              );
-              try {
-                const promises = projectSettings.tables.map((table) =>
-                  updateDoc(
-                    doc(firebaseDb, getTableSchemaPath(table)),
-                    "filters",
-                    []
-                  )
-                );
-
-                await Promise.all(promises);
-
-                closeSnackbar(loadingSnackbar);
-                enqueueSnackbar("Reset all table-level filters", {
-                  variant: "success",
-                });
-              } catch (e) {
-                enqueueSnackbar((e as Error).message, { variant: "error" });
-                closeSnackbar(loadingSnackbar);
-              }
-            }}
-            color="error"
-            style={{ display: "flex" }}
-          >
-            Reset all table-level filters
-          </Button>
-        </SettingsSection>
-
-        <SettingsSection
-          title="Local Firestore instance"
-          transitionTimeout={1 * 100}
-        >
-          <Button
-            onClick={async () => {
-              enqueueSnackbar("Clearing cache. Page will reload…", {
-                persist: true,
-              });
-              await terminate(firebaseDb);
-              await clearIndexedDbPersistence(firebaseDb);
-              window.location.href = "/";
-            }}
-            color="error"
-            style={{ display: "flex" }}
-          >
-            Reset local Firestore cache
-          </Button>
-        </SettingsSection>
-      </Stack>
-    </Container>
-  );
-}

From b80c08a2f538df7c55d594052bb478d39cda9975 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 11 Oct 2022 12:18:46 +1100
Subject: [PATCH 165/309] fix table name not in tab name

---
 src/pages/Table/ProvidedTablePage.tsx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/pages/Table/ProvidedTablePage.tsx b/src/pages/Table/ProvidedTablePage.tsx
index f609ac4c..35a1c887 100644
--- a/src/pages/Table/ProvidedTablePage.tsx
+++ b/src/pages/Table/ProvidedTablePage.tsx
@@ -15,6 +15,7 @@ import TableSkeleton from "@src/components/Table/TableSkeleton";
 
 import {
   projectScope,
+  projectIdAtom,
   currentUserAtom,
   projectSettingsAtom,
   tablesAtom,
@@ -24,6 +25,7 @@ import {
   tableIdAtom,
   tableSettingsAtom,
 } from "@src/atoms/tableScope";
+import useDocumentTitle from "@src/hooks/useDocumentTitle";
 
 /**
  * Wraps `TablePage` with the data for a top-level table.
@@ -32,11 +34,14 @@ import {
 export default function ProvidedTablePage() {
   const { id } = useParams();
   const outlet = useOutlet();
+  const [projectId] = useAtom(projectIdAtom, projectScope);
   const [currentUser] = useAtom(currentUserAtom, projectScope);
   const [projectSettings] = useAtom(projectSettingsAtom, projectScope);
   const [tables] = useAtom(tablesAtom, projectScope);
 
   const tableSettings = useMemo(() => find(tables, ["id", id]), [tables, id]);
+  useDocumentTitle(projectId, tableSettings ? tableSettings.name : "Not found");
+
   if (!tableSettings) {
     if (isEmpty(projectSettings)) {
       return (

From c2d7bb6527deff0ccdc8de141d0a62ba5bac6cac Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 11 Oct 2022 13:01:28 +1100
Subject: [PATCH 166/309] fix menus appearing darker when appearing inside a
 dialog

---
 src/theme/components.tsx | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/theme/components.tsx b/src/theme/components.tsx
index 6c0770c1..4b4f9a0d 100644
--- a/src/theme/components.tsx
+++ b/src/theme/components.tsx
@@ -566,6 +566,13 @@ export const components = (theme: Theme): ThemeOptions => {
 
       MuiMenu: {
         styleOverrides: {
+          root: {
+            ".MuiDialog-root + & .MuiMenu-paper, form:has(.MuiDialog-root) + & .MuiMenu-paper, .MuiDialog-root & .MuiMenu-paper":
+              {
+                backgroundImage:
+                  "linear-gradient(rgba(255, 255, 255, 0.2), rgba(255, 255, 255, 0.2))", // elevation 50
+              },
+          },
           list: { padding: theme.spacing(0.5, 0) },
         },
       },

From 63d5bc0d22a840ab911b8d7b8581fca205490ba9 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 11 Oct 2022 13:28:11 +1100
Subject: [PATCH 167/309] Table page: fix tableSettings not updating

---
 src/atoms/utils.ts                    | 27 +++++++++++++++++++++++++++
 src/pages/Table/ProvidedTablePage.tsx | 11 +++++++++--
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/atoms/utils.ts b/src/atoms/utils.ts
index 2c1458ab..609ad8a7 100644
--- a/src/atoms/utils.ts
+++ b/src/atoms/utils.ts
@@ -1,4 +1,8 @@
+import { useEffect } from "react";
+import { useSetAtom } from "jotai";
 import { useAtomsDebugValue } from "jotai/devtools";
+import useMemoValue from "use-memo-value";
+import { isEqual } from "lodash-es";
 
 export function DebugAtoms(
   options: NonNullable<Parameters<typeof useAtomsDebugValue>[0]>
@@ -6,3 +10,26 @@ export function DebugAtoms(
   useAtomsDebugValue(options);
   return null;
 }
+
+/**
+ * Sets an atom’s value when the `value` prop changes.
+ * Useful when setting an atom’s initialValue and you want to keep it in sync.
+ */
+export function SyncAtomValue<T>({
+  atom,
+  scope,
+  value,
+}: {
+  atom: Parameters<typeof useSetAtom>[0];
+  scope: Parameters<typeof useSetAtom>[1];
+  value: T;
+}) {
+  const memoized = useMemoValue(value, isEqual);
+  const setAtom = useSetAtom(atom, scope);
+
+  useEffect(() => {
+    setAtom(memoized);
+  }, [setAtom, memoized]);
+
+  return null;
+}
diff --git a/src/pages/Table/ProvidedTablePage.tsx b/src/pages/Table/ProvidedTablePage.tsx
index 35a1c887..d2e5cb17 100644
--- a/src/pages/Table/ProvidedTablePage.tsx
+++ b/src/pages/Table/ProvidedTablePage.tsx
@@ -1,4 +1,4 @@
-import { Suspense, useMemo } from "react";
+import { Suspense } from "react";
 import { useAtom, Provider } from "jotai";
 import { DebugAtoms } from "@src/atoms/utils";
 import { useParams, useOutlet } from "react-router-dom";
@@ -25,6 +25,7 @@ import {
   tableIdAtom,
   tableSettingsAtom,
 } from "@src/atoms/tableScope";
+import { SyncAtomValue } from "@src/atoms/utils";
 import useDocumentTitle from "@src/hooks/useDocumentTitle";
 
 /**
@@ -39,7 +40,7 @@ export default function ProvidedTablePage() {
   const [projectSettings] = useAtom(projectSettingsAtom, projectScope);
   const [tables] = useAtom(tablesAtom, projectScope);
 
-  const tableSettings = useMemo(() => find(tables, ["id", id]), [tables, id]);
+  const tableSettings = find(tables, ["id", id]);
   useDocumentTitle(projectId, tableSettings ? tableSettings.name : "Not found");
 
   if (!tableSettings) {
@@ -75,6 +76,12 @@ export default function ProvidedTablePage() {
           ]}
         >
           <DebugAtoms scope={tableScope} />
+          <SyncAtomValue
+            atom={tableSettingsAtom}
+            scope={tableScope}
+            value={tableSettings}
+          />
+
           <TableSourceFirestore />
           <Suspense
             fallback={

From db122ea7fa4b5b962f6a3564ab460a0c533ee884 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 11 Oct 2022 13:29:02 +1100
Subject: [PATCH 168/309] fix "Something went wrong - t.roles is not iterable"
 #858

---
 src/atoms/projectScope/project.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/atoms/projectScope/project.ts b/src/atoms/projectScope/project.ts
index 9a5810cb..0d9518ac 100644
--- a/src/atoms/projectScope/project.ts
+++ b/src/atoms/projectScope/project.ts
@@ -46,10 +46,10 @@ export const tablesAtom = atom<TableSettings[]>((get) => {
   const tables = get(projectSettingsAtom).tables || [];
 
   return sortBy(tables, "name")
-    .filter(
-      (table) =>
-        userRoles.includes("ADMIN") ||
-        table.roles.some((role) => userRoles.includes(role))
+    .filter((table) =>
+      userRoles.includes("ADMIN") || Array.isArray(table.roles)
+        ? table.roles.some((role) => userRoles.includes(role))
+        : false
     )
     .map((table) => ({
       ...table,

From 124baf10c949bb1c35ceccce017e94aa836043dc Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 11 Oct 2022 16:58:50 +1100
Subject: [PATCH 169/309] remove @mui/styles

---
 package.json |   1 -
 yarn.lock    | 118 +--------------------------------------------------
 2 files changed, 1 insertion(+), 118 deletions(-)

diff --git a/package.json b/package.json
index f0051f54..63284107 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,6 @@
     "@mui/icons-material": "5.6.0",
     "@mui/lab": "^5.0.0-alpha.76",
     "@mui/material": "5.6.0",
-    "@mui/styles": "5.6.0",
     "@mui/x-date-pickers": "^5.0.0-alpha.4",
     "@rowy/form-builder": "^0.7.0",
     "@rowy/multiselect": "^0.4.0",
diff --git a/yarn.lock b/yarn.lock
index 5bf216e0..b25db533 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1823,7 +1823,7 @@
     core-js-pure "^3.20.2"
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.10.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
+"@babel/runtime@^7.10.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
   version "7.17.9"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.9.tgz#d19fbf802d01a8cb6cf053a64e472d42c434ba72"
   integrity sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==
@@ -3064,29 +3064,6 @@
     csstype "^3.1.0"
     prop-types "^15.8.1"
 
-"@mui/styles@5.6.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@mui/styles/-/styles-5.6.0.tgz#c57b80974ca31c980acdd58d13b21d46fbcd81cf"
-  integrity sha512-1rnQ/fDQ+EtBy3eo6VI1M7EkSjeEyB4NoTaetVUGMYv9tM7qkqnr6XN7TiuB2gtAsTDfdrAABrhmYrTTTf77cw==
-  dependencies:
-    "@babel/runtime" "^7.17.2"
-    "@emotion/hash" "^0.8.0"
-    "@mui/private-theming" "^5.6.0"
-    "@mui/types" "^7.1.3"
-    "@mui/utils" "^5.6.0"
-    clsx "^1.1.1"
-    csstype "^3.0.11"
-    hoist-non-react-statics "^3.3.2"
-    jss "^10.8.2"
-    jss-plugin-camel-case "^10.8.2"
-    jss-plugin-default-unit "^10.8.2"
-    jss-plugin-global "^10.8.2"
-    jss-plugin-nested "^10.8.2"
-    jss-plugin-props-sort "^10.8.2"
-    jss-plugin-rule-value-function "^10.8.2"
-    jss-plugin-vendor-prefixer "^10.8.2"
-    prop-types "^15.7.2"
-
 "@mui/system@^5.6.0":
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.6.0.tgz#4d6db0db6a8daf90acd7fcaab3a353aa127987ce"
@@ -5875,14 +5852,6 @@ css-tree@^1.1.3:
     mdn-data "2.0.14"
     source-map "^0.6.1"
 
-css-vendor@^2.0.8:
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/css-vendor/-/css-vendor-2.0.8.tgz#e47f91d3bd3117d49180a3c935e62e3d9f7f449d"
-  integrity sha512-x9Aq0XTInxrkuFeHKbYC7zWY8ai7qJ04Kxd9MnvbC1uO5DagxoHQjm4JvG+vCdXOoFtCjbL2XSZfxmoYa9uQVQ==
-  dependencies:
-    "@babel/runtime" "^7.8.3"
-    is-in-browser "^1.0.2"
-
 css-what@^3.2.1:
   version "3.4.2"
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4"
@@ -7827,11 +7796,6 @@ husky@>=7.0.4:
   resolved "https://registry.yarnpkg.com/husky/-/husky-7.0.4.tgz#242048245dc49c8fb1bf0cc7cfb98dd722531535"
   integrity sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ==
 
-hyphenate-style-name@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz#691879af8e220aea5750e8827db4ef62a54e361d"
-  integrity sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ==
-
 iconv-lite@0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
@@ -8093,11 +8057,6 @@ is-hexadecimal@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-2.0.1.tgz#86b5bf668fca307498d319dfc03289d781a90027"
   integrity sha512-DgZQp241c8oO6cA1SbTEWiXeoxV42vlcJxgH+B3hi1AiqqKruZR3ZGF8In3fj4+/y/7rHvlOZLZtgJ/4ttYGZg==
 
-is-in-browser@^1.0.2, is-in-browser@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/is-in-browser/-/is-in-browser-1.1.3.tgz#56ff4db683a078c6082eb95dad7dc62e1d04f835"
-  integrity sha1-Vv9NtoOgeMYILrldrX3GLh0E+DU=
-
 is-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
@@ -8907,76 +8866,6 @@ jsonpointer@^5.0.0:
   resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-5.0.0.tgz#f802669a524ec4805fa7389eadbc9921d5dc8072"
   integrity sha512-PNYZIdMjVIvVgDSYKTT63Y+KZ6IZvGRNNWcxwD+GNnUz1MKPfv30J8ueCjdwcN0nDx2SlshgyB7Oy0epAzVRRg==
 
-jss-plugin-camel-case@^10.8.2:
-  version "10.9.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.9.0.tgz#4921b568b38d893f39736ee8c4c5f1c64670aaf7"
-  integrity sha512-UH6uPpnDk413/r/2Olmw4+y54yEF2lRIV8XIZyuYpgPYTITLlPOsq6XB9qeqv+75SQSg3KLocq5jUBXW8qWWww==
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    hyphenate-style-name "^1.0.3"
-    jss "10.9.0"
-
-jss-plugin-default-unit@^10.8.2:
-  version "10.9.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.9.0.tgz#bb23a48f075bc0ce852b4b4d3f7582bc002df991"
-  integrity sha512-7Ju4Q9wJ/MZPsxfu4T84mzdn7pLHWeqoGd/D8O3eDNNJ93Xc8PxnLmV8s8ZPNRYkLdxZqKtm1nPQ0BM4JRlq2w==
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    jss "10.9.0"
-
-jss-plugin-global@^10.8.2:
-  version "10.9.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.9.0.tgz#fc07a0086ac97aca174e37edb480b69277f3931f"
-  integrity sha512-4G8PHNJ0x6nwAFsEzcuVDiBlyMsj2y3VjmFAx/uHk/R/gzJV+yRHICjT4MKGGu1cJq2hfowFWCyrr/Gg37FbgQ==
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    jss "10.9.0"
-
-jss-plugin-nested@^10.8.2:
-  version "10.9.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.9.0.tgz#cc1c7d63ad542c3ccc6e2c66c8328c6b6b00f4b3"
-  integrity sha512-2UJnDrfCZpMYcpPYR16oZB7VAC6b/1QLsRiAutOt7wJaaqwCBvNsosLEu/fUyKNQNGdvg2PPJFDO5AX7dwxtoA==
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    jss "10.9.0"
-    tiny-warning "^1.0.2"
-
-jss-plugin-props-sort@^10.8.2:
-  version "10.9.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.9.0.tgz#30e9567ef9479043feb6e5e59db09b4de687c47d"
-  integrity sha512-7A76HI8bzwqrsMOJTWKx/uD5v+U8piLnp5bvru7g/3ZEQOu1+PjHvv7bFdNO3DwNPC9oM0a//KwIJsIcDCjDzw==
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    jss "10.9.0"
-
-jss-plugin-rule-value-function@^10.8.2:
-  version "10.9.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.9.0.tgz#379fd2732c0746fe45168011fe25544c1a295d67"
-  integrity sha512-IHJv6YrEf8pRzkY207cPmdbBstBaE+z8pazhPShfz0tZSDtRdQua5jjg6NMz3IbTasVx9FdnmptxPqSWL5tyJg==
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    jss "10.9.0"
-    tiny-warning "^1.0.2"
-
-jss-plugin-vendor-prefixer@^10.8.2:
-  version "10.9.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.9.0.tgz#aa9df98abfb3f75f7ed59a3ec50a5452461a206a"
-  integrity sha512-MbvsaXP7iiVdYVSEoi+blrW+AYnTDvHTW6I6zqi7JcwXdc6I9Kbm234nEblayhF38EftoenbM+5218pidmC5gA==
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    css-vendor "^2.0.8"
-    jss "10.9.0"
-
-jss@10.9.0, jss@^10.8.2:
-  version "10.9.0"
-  resolved "https://registry.yarnpkg.com/jss/-/jss-10.9.0.tgz#7583ee2cdc904a83c872ba695d1baab4b59c141b"
-  integrity sha512-YpzpreB6kUunQBbrlArlsMpXYyndt9JATbt95tajx0t4MTJJcCJdd4hdNpHmOIDiUJrF/oX5wtVFrS3uofWfGw==
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    csstype "^3.0.2"
-    is-in-browser "^1.1.3"
-    tiny-warning "^1.0.2"
-
 "jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.2.1:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.2.tgz#6ab1e52c71dfc0c0707008a91729a9491fe9f76c"
@@ -13098,11 +12987,6 @@ tiny-invariant@^1.0.6:
   resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.2.0.tgz#a1141f86b672a9148c72e978a19a73b9b94a15a9"
   integrity sha512-1Uhn/aqw5C6RI4KejVeTg6mIS7IqxnLJ8Mv2tV5rTc0qWobay7pDUz6Wi392Cnc8ak1H0F2cjoRzb2/AW4+Fvg==
 
-tiny-warning@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"
-  integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
-
 tinymce@^5, tinymce@^5.5.1:
   version "5.10.4"
   resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-5.10.4.tgz#24ee843c7648ade708605dec15d8dad07809f7db"

From cd29d8fd441c158fc266d633d90dd512981a6efe Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 11 Oct 2022 17:05:38 +1100
Subject: [PATCH 170/309] run yarn-deduplicate

---
 yarn.lock | 1642 ++++++-----------------------------------------------
 1 file changed, 162 insertions(+), 1480 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index b25db533..22973d01 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -122,52 +122,19 @@
     jsonpointer "^5.0.0"
     leven "^3.1.0"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.8.3":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.8.3":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
   integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
   dependencies:
     "@babel/highlight" "^7.16.7"
 
-"@babel/code-frame@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658"
-  integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==
-  dependencies:
-    "@babel/highlight" "^7.12.13"
-
-"@babel/compat-data@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.13.tgz#27e19e0ed3726ccf54067ced4109501765e7e2e8"
-  integrity sha512-U/hshG5R+SIoW7HVWIdmy1cB7s3ki+r3FpyEZiCgpi4tFgPnX/vynY80ZGSASOIrUM6O7VxOgCZgdt7h97bUGg==
-
-"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.8", "@babel/compat-data@^7.17.0", "@babel/compat-data@^7.17.7":
+"@babel/compat-data@^7.12.13", "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.8", "@babel/compat-data@^7.17.0", "@babel/compat-data@^7.17.7":
   version "7.17.7"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.7.tgz#078d8b833fbbcc95286613be8c716cef2b519fa2"
   integrity sha512-p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ==
 
-"@babel/core@^7.1.0", "@babel/core@^7.12.3":
-  version "7.12.17"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.17.tgz#993c5e893333107a2815d8e0d73a2c3755e280b2"
-  integrity sha512-V3CuX1aBywbJvV2yzJScRxeiiw0v2KZZYYE3giywxzFJL13RiyPjaaDwhDnxmgFTTS7FgvM2ijr4QmKNIu0AtQ==
-  dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@babel/generator" "^7.12.17"
-    "@babel/helper-module-transforms" "^7.12.17"
-    "@babel/helpers" "^7.12.17"
-    "@babel/parser" "^7.12.17"
-    "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.12.17"
-    "@babel/types" "^7.12.17"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.1"
-    json5 "^2.1.2"
-    lodash "^4.17.19"
-    semver "^5.4.1"
-    source-map "^0.5.0"
-
-"@babel/core@^7.11.1", "@babel/core@^7.16.0", "@babel/core@^7.7.2", "@babel/core@^7.8.0":
+"@babel/core@^7.1.0", "@babel/core@^7.11.1", "@babel/core@^7.12.3", "@babel/core@^7.16.0", "@babel/core@^7.7.2", "@babel/core@^7.8.0":
   version "7.17.9"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.9.tgz#6bae81a06d95f4d0dec5bb9d74bbc1f58babdcfe"
   integrity sha512-5ug+SfZCpDAkVp9SFIZAzlW18rlzsOcJGaetCjkySnrXXDUw9AR8cDUm1iByTmdWM6yxX6/zycaV76w3YTF2gw==
@@ -197,16 +164,7 @@
     eslint-visitor-keys "^2.1.0"
     semver "^6.3.0"
 
-"@babel/generator@^7.12.17":
-  version "7.12.17"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.17.tgz#9ef1dd792d778b32284411df63f4f668a9957287"
-  integrity sha512-DSA7ruZrY4WI8VxuS1jWSRezFnghEoYEFrZcw9BizQRmOZiUsiHl59+qEARGPqPikwA/GPTyRCi7isuCK/oyqg==
-  dependencies:
-    "@babel/types" "^7.12.17"
-    jsesc "^2.5.1"
-    source-map "^0.5.0"
-
-"@babel/generator@^7.17.9", "@babel/generator@^7.7.2":
+"@babel/generator@^7.12.17", "@babel/generator@^7.17.9", "@babel/generator@^7.7.2":
   version "7.17.9"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.9.tgz#f4af9fd38fa8de143c29fce3f71852406fc1e2fc"
   integrity sha512-rAdDousTwxbIxbz5I7GEQ3lUip+xVCXooZNbsydCWs3xA7ZsYOv+CFRdzGxRX78BmQHu9B1Eso59AOZQOJDEdQ==
@@ -215,29 +173,14 @@
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
-"@babel/helper-annotate-as-pure@^7.10.4":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz#0f58e86dfc4bb3b1fcd7db806570e177d439b6ab"
-  integrity sha512-7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw==
-  dependencies:
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-annotate-as-pure@^7.12.13", "@babel/helper-annotate-as-pure@^7.16.7":
+"@babel/helper-annotate-as-pure@^7.10.4", "@babel/helper-annotate-as-pure@^7.12.13", "@babel/helper-annotate-as-pure@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862"
   integrity sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz#6bc20361c88b0a74d05137a65cac8d3cbf6f61fc"
-  integrity sha512-CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA==
-  dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.12.13"
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.16.7":
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.12.13", "@babel/helper-builder-binary-assignment-operator-visitor@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz#38d138561ea207f0f69eb1626a418e4f7e6a580b"
   integrity sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==
@@ -245,17 +188,7 @@
     "@babel/helper-explode-assignable-expression" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/helper-compilation-targets@^7.12.17":
-  version "7.12.17"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.17.tgz#91d83fae61ef390d39c3f0507cb83979bab837c7"
-  integrity sha512-5EkibqLVYOuZ89BSg2lv+GG8feywLuvMXNYgf0Im4MssE0mFWPztSpJbildNnUgw0bLI2EsIN4MpSHC2iUJkQA==
-  dependencies:
-    "@babel/compat-data" "^7.12.13"
-    "@babel/helper-validator-option" "^7.12.17"
-    browserslist "^4.14.5"
-    semver "^5.5.0"
-
-"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7", "@babel/helper-compilation-targets@^7.17.7":
+"@babel/helper-compilation-targets@^7.12.17", "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7", "@babel/helper-compilation-targets@^7.17.7":
   version "7.17.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz#a3c2924f5e5f0379b356d4cfb313d1414dc30e46"
   integrity sha512-UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w==
@@ -265,18 +198,7 @@
     browserslist "^4.17.5"
     semver "^6.3.0"
 
-"@babel/helper-create-class-features-plugin@^7.12.13":
-  version "7.12.17"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.17.tgz#704b69c8a78d03fb1c5fcc2e7b593f8a65628944"
-  integrity sha512-I/nurmTxIxHV0M+rIpfQBF1oN342+yvl2kwZUrQuOClMamHF1w5tknfZubgNOLRoA73SzBFAdFcpb4M9HwOeWQ==
-  dependencies:
-    "@babel/helper-function-name" "^7.12.13"
-    "@babel/helper-member-expression-to-functions" "^7.12.17"
-    "@babel/helper-optimise-call-expression" "^7.12.13"
-    "@babel/helper-replace-supers" "^7.12.13"
-    "@babel/helper-split-export-declaration" "^7.12.13"
-
-"@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.6", "@babel/helper-create-class-features-plugin@^7.17.9":
+"@babel/helper-create-class-features-plugin@^7.12.13", "@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.6", "@babel/helper-create-class-features-plugin@^7.17.9":
   version "7.17.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.9.tgz#71835d7fb9f38bd9f1378e40a4c0902fdc2ea49d"
   integrity sha512-kUjip3gruz6AJKOq5i3nC6CoCEEF/oHH3cp6tOZhB+IyyyPyW0g1Gfsxn3mkk6S08pIA2y8GQh609v9G/5sHVQ==
@@ -318,30 +240,14 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-explode-assignable-expression@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.13.tgz#0e46990da9e271502f77507efa4c9918d3d8634a"
-  integrity sha512-5loeRNvMo9mx1dA/d6yNi+YiKziJZFylZnCo1nmFF4qPU4yJ14abhWESuSMQSlQxWdxdOFzxXjk/PpfudTtYyw==
-  dependencies:
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-explode-assignable-expression@^7.16.7":
+"@babel/helper-explode-assignable-expression@^7.12.13", "@babel/helper-explode-assignable-expression@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz#12a6d8522fdd834f194e868af6354e8650242b7a"
   integrity sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-function-name@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz#93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a"
-  integrity sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==
-  dependencies:
-    "@babel/helper-get-function-arity" "^7.12.13"
-    "@babel/template" "^7.12.13"
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-function-name@^7.16.7", "@babel/helper-function-name@^7.17.9":
+"@babel/helper-function-name@^7.12.13", "@babel/helper-function-name@^7.16.7", "@babel/helper-function-name@^7.17.9":
   version "7.17.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz#136fcd54bc1da82fcb47565cf16fd8e444b1ff12"
   integrity sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==
@@ -356,28 +262,14 @@
   dependencies:
     "@babel/types" "^7.12.13"
 
-"@babel/helper-hoist-variables@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.12.13.tgz#13aba58b7480b502362316ea02f52cca0e9796cd"
-  integrity sha512-KSC5XSj5HreRhYQtZ3cnSnQwDzgnbdUDEFsxkN0m6Q3WrCRt72xrnZ8+h+pX7YxM7hr87zIO3a/v5p/H3TrnVw==
-  dependencies:
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-hoist-variables@^7.16.7":
+"@babel/helper-hoist-variables@^7.12.13", "@babel/helper-hoist-variables@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246"
   integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-member-expression-to-functions@^7.12.13", "@babel/helper-member-expression-to-functions@^7.12.17":
-  version "7.12.17"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.17.tgz#f82838eb06e1235307b6d71457b6670ff71ee5ac"
-  integrity sha512-Bzv4p3ODgS/qpBE0DiJ9qf5WxSmrQ8gVTe8ClMfwwsY2x/rhykxxy3bXzG7AGTnPB2ij37zGJ/Q/6FruxHxsxg==
-  dependencies:
-    "@babel/types" "^7.12.17"
-
-"@babel/helper-member-expression-to-functions@^7.16.7", "@babel/helper-member-expression-to-functions@^7.17.7":
+"@babel/helper-member-expression-to-functions@^7.12.13", "@babel/helper-member-expression-to-functions@^7.12.17", "@babel/helper-member-expression-to-functions@^7.16.7", "@babel/helper-member-expression-to-functions@^7.17.7":
   version "7.17.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz#a34013b57d8542a8c4ff8ba3f747c02452a4d8c4"
   integrity sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==
@@ -391,22 +283,7 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-module-transforms@^7.12.13", "@babel/helper-module-transforms@^7.12.17":
-  version "7.12.17"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.17.tgz#7c75b987d6dfd5b48e575648f81eaac891539509"
-  integrity sha512-sFL+p6zOCQMm9vilo06M4VHuTxUAwa6IxgL56Tq1DVtA0ziAGTH1ThmJq7xwPqdQlgAbKX3fb0oZNbtRIyA5KQ==
-  dependencies:
-    "@babel/helper-module-imports" "^7.12.13"
-    "@babel/helper-replace-supers" "^7.12.13"
-    "@babel/helper-simple-access" "^7.12.13"
-    "@babel/helper-split-export-declaration" "^7.12.13"
-    "@babel/helper-validator-identifier" "^7.12.11"
-    "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.12.17"
-    "@babel/types" "^7.12.17"
-    lodash "^4.17.19"
-
-"@babel/helper-module-transforms@^7.16.7", "@babel/helper-module-transforms@^7.17.7":
+"@babel/helper-module-transforms@^7.12.13", "@babel/helper-module-transforms@^7.12.17", "@babel/helper-module-transforms@^7.16.7", "@babel/helper-module-transforms@^7.17.7":
   version "7.17.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz#3943c7f777139e7954a5355c815263741a9c1cbd"
   integrity sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw==
@@ -420,14 +297,7 @@
     "@babel/traverse" "^7.17.3"
     "@babel/types" "^7.17.0"
 
-"@babel/helper-optimise-call-expression@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz#5c02d171b4c8615b1e7163f888c1c81c30a2aaea"
-  integrity sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==
-  dependencies:
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-optimise-call-expression@^7.16.7":
+"@babel/helper-optimise-call-expression@^7.12.13", "@babel/helper-optimise-call-expression@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz#a34e3560605abbd31a18546bd2aad3e6d9a174f2"
   integrity sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==
@@ -439,16 +309,7 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5"
   integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==
 
-"@babel/helper-remap-async-to-generator@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.13.tgz#170365f4140e2d20e5c88f8ba23c24468c296878"
-  integrity sha512-Qa6PU9vNcj1NZacZZI1Mvwt+gXDH6CTfgAkSjeRMLE8HxtDK76+YDId6NQR+z7Rgd5arhD2cIbS74r0SxD6PDA==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.12.13"
-    "@babel/helper-wrap-function" "^7.12.13"
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-remap-async-to-generator@^7.16.8":
+"@babel/helper-remap-async-to-generator@^7.12.13", "@babel/helper-remap-async-to-generator@^7.16.8":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz#29ffaade68a367e2ed09c90901986918d25e57e3"
   integrity sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==
@@ -457,17 +318,7 @@
     "@babel/helper-wrap-function" "^7.16.8"
     "@babel/types" "^7.16.8"
 
-"@babel/helper-replace-supers@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.13.tgz#00ec4fb6862546bd3d0aff9aac56074277173121"
-  integrity sha512-pctAOIAMVStI2TMLhozPKbf5yTEXc0OJa0eENheb4w09SrgOWEs+P4nTOZYJQCqs8JlErGLDPDJTiGIp3ygbLg==
-  dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.12.13"
-    "@babel/helper-optimise-call-expression" "^7.12.13"
-    "@babel/traverse" "^7.12.13"
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-replace-supers@^7.16.7":
+"@babel/helper-replace-supers@^7.12.13", "@babel/helper-replace-supers@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz#e9f5f5f32ac90429c1a4bdec0f231ef0c2838ab1"
   integrity sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==
@@ -478,42 +329,21 @@
     "@babel/traverse" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/helper-simple-access@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz#8478bcc5cacf6aa1672b251c1d2dde5ccd61a6c4"
-  integrity sha512-0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA==
-  dependencies:
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-simple-access@^7.17.7":
+"@babel/helper-simple-access@^7.12.13", "@babel/helper-simple-access@^7.17.7":
   version "7.17.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz#aaa473de92b7987c6dfa7ce9a7d9674724823367"
   integrity sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==
   dependencies:
     "@babel/types" "^7.17.0"
 
-"@babel/helper-skip-transparent-expression-wrappers@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz#462dc63a7e435ade8468385c63d2b84cce4b3cbf"
-  integrity sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==
-  dependencies:
-    "@babel/types" "^7.12.1"
-
-"@babel/helper-skip-transparent-expression-wrappers@^7.16.0":
+"@babel/helper-skip-transparent-expression-wrappers@^7.12.1", "@babel/helper-skip-transparent-expression-wrappers@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09"
   integrity sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==
   dependencies:
     "@babel/types" "^7.16.0"
 
-"@babel/helper-split-export-declaration@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05"
-  integrity sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==
-  dependencies:
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-split-export-declaration@^7.16.7":
+"@babel/helper-split-export-declaration@^7.12.13", "@babel/helper-split-export-declaration@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b"
   integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==
@@ -525,27 +355,12 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad"
   integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==
 
-"@babel/helper-validator-option@^7.12.17":
-  version "7.12.17"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"
-  integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==
-
-"@babel/helper-validator-option@^7.16.7":
+"@babel/helper-validator-option@^7.12.17", "@babel/helper-validator-option@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23"
   integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==
 
-"@babel/helper-wrap-function@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.12.13.tgz#e3ea8cb3ee0a16911f9c1b50d9e99fe8fe30f9ff"
-  integrity sha512-t0aZFEmBJ1LojdtJnhOaQEVejnzYhyjWHSsNSNo8vOYRbAJNh6r6GQF7pd36SqG7OKGbn+AewVQ/0IfYfIuGdw==
-  dependencies:
-    "@babel/helper-function-name" "^7.12.13"
-    "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.12.13"
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-wrap-function@^7.16.8":
+"@babel/helper-wrap-function@^7.12.13", "@babel/helper-wrap-function@^7.16.8":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz#58afda087c4cd235de92f7ceedebca2c41274200"
   integrity sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==
@@ -555,16 +370,7 @@
     "@babel/traverse" "^7.16.8"
     "@babel/types" "^7.16.8"
 
-"@babel/helpers@^7.12.17":
-  version "7.12.17"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.17.tgz#71e03d2981a6b5ee16899964f4101dc8471d60bc"
-  integrity sha512-tEpjqSBGt/SFEsFikKds1sLNChKKGGR17flIgQKXH4fG6m9gTgl3gnOC1giHNyaBCSKuTfxaSzHi7UnvqiVKxg==
-  dependencies:
-    "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.12.17"
-    "@babel/types" "^7.12.17"
-
-"@babel/helpers@^7.17.9":
+"@babel/helpers@^7.12.17", "@babel/helpers@^7.17.9":
   version "7.17.9"
   resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.9.tgz#b2af120821bfbe44f9907b1826e168e819375a1a"
   integrity sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q==
@@ -582,12 +388,7 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.12.17":
-  version "7.12.17"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.17.tgz#bc85d2d47db38094e5bb268fc761716e7d693848"
-  integrity sha512-r1yKkiUTYMQ8LiEI0UcQx5ETw5dpTLn9wijn9hk6KkTtOK95FndDN10M+8/s6k/Ymlbivw0Av9q4SlgF80PtHg==
-
-"@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.17.9":
+"@babel/parser@^7.1.0", "@babel/parser@^7.12.17", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.17.9":
   version "7.17.9"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.9.tgz#9c94189a6062f0291418ca021077983058e171ef"
   integrity sha512-vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg==
@@ -608,16 +409,7 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
     "@babel/plugin-proposal-optional-chaining" "^7.16.7"
 
-"@babel/plugin-proposal-async-generator-functions@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.13.tgz#d1c6d841802ffb88c64a2413e311f7345b9e66b5"
-  integrity sha512-1KH46Hx4WqP77f978+5Ye/VUbuwQld2hph70yaw2hXS2v7ER2f3nlpNMu909HO2rbvP0NKLlMVDPh9KXklVMhA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-    "@babel/helper-remap-async-to-generator" "^7.12.13"
-    "@babel/plugin-syntax-async-generators" "^7.8.0"
-
-"@babel/plugin-proposal-async-generator-functions@^7.16.8":
+"@babel/plugin-proposal-async-generator-functions@^7.12.13", "@babel/plugin-proposal-async-generator-functions@^7.16.8":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz#3bdd1ebbe620804ea9416706cd67d60787504bc8"
   integrity sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==
@@ -626,15 +418,7 @@
     "@babel/helper-remap-async-to-generator" "^7.16.8"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
-"@babel/plugin-proposal-class-properties@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.13.tgz#3d2ce350367058033c93c098e348161d6dc0d8c8"
-  integrity sha512-8SCJ0Ddrpwv4T7Gwb33EmW1V9PY5lggTO+A8WjyIwxrSHDUyBw4MtF96ifn1n8H806YlxbVCoKXbbmzD6RD+cA==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-proposal-class-properties@^7.16.0", "@babel/plugin-proposal-class-properties@^7.16.7":
+"@babel/plugin-proposal-class-properties@^7.12.13", "@babel/plugin-proposal-class-properties@^7.16.0", "@babel/plugin-proposal-class-properties@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0"
   integrity sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==
@@ -663,15 +447,7 @@
     "@babel/plugin-syntax-decorators" "^7.17.0"
     charcodes "^0.2.0"
 
-"@babel/plugin-proposal-dynamic-import@^7.12.17":
-  version "7.12.17"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.17.tgz#e0ebd8db65acc37eac518fa17bead2174e224512"
-  integrity sha512-ZNGoFZqrnuy9H2izB2jLlnNDAfVPlGl5NhFEiFe4D84ix9GQGygF+CWMGHKuE+bpyS/AOuDQCnkiRNqW2IzS1Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
-
-"@babel/plugin-proposal-dynamic-import@^7.16.7":
+"@babel/plugin-proposal-dynamic-import@^7.12.17", "@babel/plugin-proposal-dynamic-import@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz#c19c897eaa46b27634a00fee9fb7d829158704b2"
   integrity sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==
@@ -679,15 +455,7 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
-"@babel/plugin-proposal-export-namespace-from@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz#393be47a4acd03fa2af6e3cde9b06e33de1b446d"
-  integrity sha512-INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-
-"@babel/plugin-proposal-export-namespace-from@^7.16.7":
+"@babel/plugin-proposal-export-namespace-from@^7.12.13", "@babel/plugin-proposal-export-namespace-from@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz#09de09df18445a5786a305681423ae63507a6163"
   integrity sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==
@@ -695,15 +463,7 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
-"@babel/plugin-proposal-json-strings@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.13.tgz#ced7888a2db92a3d520a2e35eb421fdb7fcc9b5d"
-  integrity sha512-v9eEi4GiORDg8x+Dmi5r8ibOe0VXoKDeNPYcTTxdGN4eOWikrJfDJCJrr1l5gKGvsNyGJbrfMftC2dTL6oz7pg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-    "@babel/plugin-syntax-json-strings" "^7.8.0"
-
-"@babel/plugin-proposal-json-strings@^7.16.7":
+"@babel/plugin-proposal-json-strings@^7.12.13", "@babel/plugin-proposal-json-strings@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz#9732cb1d17d9a2626a08c5be25186c195b6fa6e8"
   integrity sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ==
@@ -711,15 +471,7 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
 
-"@babel/plugin-proposal-logical-assignment-operators@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.13.tgz#575b5d9a08d8299eeb4db6430da6e16e5cf14350"
-  integrity sha512-fqmiD3Lz7jVdK6kabeSr1PZlWSUVqSitmHEe3Z00dtGTKieWnX9beafvavc32kjORa5Bai4QNHgFDwWJP+WtSQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-
-"@babel/plugin-proposal-logical-assignment-operators@^7.16.7":
+"@babel/plugin-proposal-logical-assignment-operators@^7.12.13", "@babel/plugin-proposal-logical-assignment-operators@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz#be23c0ba74deec1922e639832904be0bea73cdea"
   integrity sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==
@@ -727,15 +479,7 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.13.tgz#24867307285cee4e1031170efd8a7ac807deefde"
-  integrity sha512-Qoxpy+OxhDBI5kRqliJFAl4uWXk3Bn24WeFstPH0iLymFehSAUR8MHpqU7njyXv/qbo7oN6yTy5bfCmXdKpo1Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
-
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.16.0", "@babel/plugin-proposal-nullish-coalescing-operator@^7.16.7":
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.12.13", "@babel/plugin-proposal-nullish-coalescing-operator@^7.16.0", "@babel/plugin-proposal-nullish-coalescing-operator@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz#141fc20b6857e59459d430c850a0011e36561d99"
   integrity sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==
@@ -743,15 +487,7 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
-"@babel/plugin-proposal-numeric-separator@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz#bd9da3188e787b5120b4f9d465a8261ce67ed1db"
-  integrity sha512-O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
-
-"@babel/plugin-proposal-numeric-separator@^7.16.0", "@babel/plugin-proposal-numeric-separator@^7.16.7":
+"@babel/plugin-proposal-numeric-separator@^7.12.13", "@babel/plugin-proposal-numeric-separator@^7.16.0", "@babel/plugin-proposal-numeric-separator@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz#d6b69f4af63fb38b6ca2558442a7fb191236eba9"
   integrity sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==
@@ -759,16 +495,7 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.13.tgz#f93f3116381ff94bc676fdcb29d71045cd1ec011"
-  integrity sha512-WvA1okB/0OS/N3Ldb3sziSrXg6sRphsBgqiccfcQq7woEn5wQLNX82Oc4PlaFcdwcWHuQXAtb8ftbS8Fbsg/sg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
-    "@babel/plugin-transform-parameters" "^7.12.13"
-
-"@babel/plugin-proposal-object-rest-spread@^7.16.7":
+"@babel/plugin-proposal-object-rest-spread@^7.12.13", "@babel/plugin-proposal-object-rest-spread@^7.16.7":
   version "7.17.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.17.3.tgz#d9eb649a54628a51701aef7e0ea3d17e2b9dd390"
   integrity sha512-yuL5iQA/TbZn+RGAfxQXfi7CNLmKi1f8zInn4IgobuCWcAb7i+zj4TYzQ9l8cEzVyJ89PDGuqxK1xZpUDISesw==
@@ -779,15 +506,7 @@
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
     "@babel/plugin-transform-parameters" "^7.16.7"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.13.tgz#4640520afe57728af14b4d1574ba844f263bcae5"
-  integrity sha512-9+MIm6msl9sHWg58NvqpNpLtuFbmpFYk37x8kgnGzAHvX35E1FyAwSUt5hIkSoWJFSAH+iwU8bJ4fcD1zKXOzg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
-
-"@babel/plugin-proposal-optional-catch-binding@^7.16.7":
+"@babel/plugin-proposal-optional-catch-binding@^7.12.13", "@babel/plugin-proposal-optional-catch-binding@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz#c623a430674ffc4ab732fd0a0ae7722b67cb74cf"
   integrity sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==
@@ -795,16 +514,7 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-proposal-optional-chaining@^7.12.17":
-  version "7.12.17"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.17.tgz#e382becadc2cb16b7913b6c672d92e4b33385b5c"
-  integrity sha512-TvxwI80pWftrGPKHNfkvX/HnoeSTR7gC4ezWnAL39PuktYUe6r8kEpOLTYnkBTsaoeazXm2jHJ22EQ81sdgfcA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
-
-"@babel/plugin-proposal-optional-chaining@^7.16.0", "@babel/plugin-proposal-optional-chaining@^7.16.7":
+"@babel/plugin-proposal-optional-chaining@^7.12.17", "@babel/plugin-proposal-optional-chaining@^7.16.0", "@babel/plugin-proposal-optional-chaining@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz#7cd629564724816c0e8a969535551f943c64c39a"
   integrity sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==
@@ -813,15 +523,7 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-proposal-private-methods@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.13.tgz#ea78a12554d784ecf7fc55950b752d469d9c4a71"
-  integrity sha512-sV0V57uUwpauixvR7s2o75LmwJI6JECwm5oPUY5beZB1nBl2i37hc7CJGqB5G+58fur5Y6ugvl3LRONk5x34rg==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-proposal-private-methods@^7.16.0", "@babel/plugin-proposal-private-methods@^7.16.11":
+"@babel/plugin-proposal-private-methods@^7.12.13", "@babel/plugin-proposal-private-methods@^7.16.0", "@babel/plugin-proposal-private-methods@^7.16.11":
   version "7.16.11"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz#e8df108288555ff259f4527dbe84813aac3a1c50"
   integrity sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==
@@ -839,15 +541,7 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz#bebde51339be829c17aaaaced18641deb62b39ba"
-  integrity sha512-XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-proposal-unicode-property-regex@^7.16.7", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+"@babel/plugin-proposal-unicode-property-regex@^7.12.13", "@babel/plugin-proposal-unicode-property-regex@^7.16.7", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz#635d18eb10c6214210ffc5ff4932552de08188a2"
   integrity sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg==
@@ -925,14 +619,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-jsx@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.13.tgz#044fb81ebad6698fe62c478875575bcbb9b70f15"
-  integrity sha512-d4HM23Q1K7oq/SLNmG6mRt85l2csmQ0cHRaxRXjKW0YFdEXqlZ5kzFQKH5Uc3rDJECgu+yCRgPkG04Mm98R/1g==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-syntax-jsx@^7.16.7":
+"@babel/plugin-syntax-jsx@^7.12.13", "@babel/plugin-syntax-jsx@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.7.tgz#50b6571d13f764266a113d77c82b4a6508bbe665"
   integrity sha512-Esxmk7YjA8QysKeT3VhTXvF6y77f/a91SIs4pWb4H2eWGQkCKFgQaG6hdoEVZtGsrAcb2K5BW66XsOErD4WU3Q==
@@ -988,14 +675,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-top-level-await@^7.12.13", "@babel/plugin-syntax-top-level-await@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz#c5f0fa6e249f5b739727f923540cf7a806130178"
-  integrity sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-syntax-top-level-await@^7.14.5":
+"@babel/plugin-syntax-top-level-await@^7.12.13", "@babel/plugin-syntax-top-level-await@^7.14.5", "@babel/plugin-syntax-top-level-await@^7.8.3":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
   integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
@@ -1009,30 +689,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-arrow-functions@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.13.tgz#eda5670b282952100c229f8a3bd49e0f6a72e9fe"
-  integrity sha512-tBtuN6qtCTd+iHzVZVOMNp+L04iIJBpqkdY42tWbmjIT5wvR2kx7gxMBsyhQtFzHwBbyGi9h8J8r9HgnOpQHxg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-arrow-functions@^7.16.7":
+"@babel/plugin-transform-arrow-functions@^7.12.13", "@babel/plugin-transform-arrow-functions@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz#44125e653d94b98db76369de9c396dc14bef4154"
   integrity sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-async-to-generator@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.13.tgz#fed8c69eebf187a535bfa4ee97a614009b24f7ae"
-  integrity sha512-psM9QHcHaDr+HZpRuJcE1PXESuGWSCcbiGFFhhwfzdbTxaGDVzuVtdNYliAwcRo3GFg0Bc8MmI+AvIGYIJG04A==
-  dependencies:
-    "@babel/helper-module-imports" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.12.13"
-    "@babel/helper-remap-async-to-generator" "^7.12.13"
-
-"@babel/plugin-transform-async-to-generator@^7.16.8":
+"@babel/plugin-transform-async-to-generator@^7.12.13", "@babel/plugin-transform-async-to-generator@^7.16.8":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz#b83dff4b970cf41f1b819f8b49cc0cfbaa53a808"
   integrity sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg==
@@ -1041,48 +705,21 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/helper-remap-async-to-generator" "^7.16.8"
 
-"@babel/plugin-transform-block-scoped-functions@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz#a9bf1836f2a39b4eb6cf09967739de29ea4bf4c4"
-  integrity sha512-zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-block-scoped-functions@^7.16.7":
+"@babel/plugin-transform-block-scoped-functions@^7.12.13", "@babel/plugin-transform-block-scoped-functions@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz#4d0d57d9632ef6062cdf354bb717102ee042a620"
   integrity sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-block-scoping@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.13.tgz#f36e55076d06f41dfd78557ea039c1b581642e61"
-  integrity sha512-Pxwe0iqWJX4fOOM2kEZeUuAxHMWb9nK+9oh5d11bsLoB0xMg+mkDpt0eYuDZB7ETrY9bbcVlKUGTOGWy7BHsMQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-block-scoping@^7.16.7":
+"@babel/plugin-transform-block-scoping@^7.12.13", "@babel/plugin-transform-block-scoping@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz#f50664ab99ddeaee5bc681b8f3a6ea9d72ab4f87"
   integrity sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-classes@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.13.tgz#9728edc1838b5d62fc93ad830bd523b1fcb0e1f6"
-  integrity sha512-cqZlMlhCC1rVnxE5ZGMtIb896ijL90xppMiuWXcwcOAuFczynpd3KYemb91XFFPi3wJSe/OcrX9lXoowatkkxA==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.12.13"
-    "@babel/helper-function-name" "^7.12.13"
-    "@babel/helper-optimise-call-expression" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.12.13"
-    "@babel/helper-replace-supers" "^7.12.13"
-    "@babel/helper-split-export-declaration" "^7.12.13"
-    globals "^11.1.0"
-
-"@babel/plugin-transform-classes@^7.16.7":
+"@babel/plugin-transform-classes@^7.12.13", "@babel/plugin-transform-classes@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz#8f4b9562850cd973de3b498f1218796eb181ce00"
   integrity sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ==
@@ -1096,43 +733,21 @@
     "@babel/helper-split-export-declaration" "^7.16.7"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.13.tgz#6a210647a3d67f21f699cfd2a01333803b27339d"
-  integrity sha512-dDfuROUPGK1mTtLKyDPUavmj2b6kFu82SmgpztBFEO974KMjJT+Ytj3/oWsTUMBmgPcp9J5Pc1SlcAYRpJ2hRA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-computed-properties@^7.16.7":
+"@babel/plugin-transform-computed-properties@^7.12.13", "@babel/plugin-transform-computed-properties@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz#66dee12e46f61d2aae7a73710f591eb3df616470"
   integrity sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-destructuring@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.13.tgz#fc56c5176940c5b41735c677124d1d20cecc9aeb"
-  integrity sha512-Dn83KykIFzjhA3FDPA1z4N+yfF3btDGhjnJwxIj0T43tP0flCujnU8fKgEkf0C1biIpSv9NZegPBQ1J6jYkwvQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-destructuring@^7.16.7":
+"@babel/plugin-transform-destructuring@^7.12.13", "@babel/plugin-transform-destructuring@^7.16.7":
   version "7.17.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.7.tgz#49dc2675a7afa9a5e4c6bdee636061136c3408d1"
   integrity sha512-XVh0r5yq9sLR4vZ6eVZe8FKfIcSgaTBxVBRSYokRj2qksf6QerYnTxz9/GTuKTH/n/HwLP7t6gtlybHetJ/6hQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-dotall-regex@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz#3f1601cc29905bfcb67f53910f197aeafebb25ad"
-  integrity sha512-foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-dotall-regex@^7.16.7", "@babel/plugin-transform-dotall-regex@^7.4.4":
+"@babel/plugin-transform-dotall-regex@^7.12.13", "@babel/plugin-transform-dotall-regex@^7.16.7", "@babel/plugin-transform-dotall-regex@^7.4.4":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz#6b2d67686fab15fb6a7fd4bd895d5982cfc81241"
   integrity sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==
@@ -1140,29 +755,14 @@
     "@babel/helper-create-regexp-features-plugin" "^7.16.7"
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-duplicate-keys@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz#6f06b87a8b803fd928e54b81c258f0a0033904de"
-  integrity sha512-NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-duplicate-keys@^7.16.7":
+"@babel/plugin-transform-duplicate-keys@^7.12.13", "@babel/plugin-transform-duplicate-keys@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz#2207e9ca8f82a0d36a5a67b6536e7ef8b08823c9"
   integrity sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-exponentiation-operator@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz#4d52390b9a273e651e4aba6aee49ef40e80cd0a1"
-  integrity sha512-fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA==
-  dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-exponentiation-operator@^7.16.7":
+"@babel/plugin-transform-exponentiation-operator@^7.12.13", "@babel/plugin-transform-exponentiation-operator@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz#efa9862ef97e9e9e5f653f6ddc7b665e8536fe9b"
   integrity sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==
@@ -1178,29 +778,14 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-flow" "^7.16.7"
 
-"@babel/plugin-transform-for-of@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.13.tgz#561ff6d74d9e1c8879cb12dbaf4a14cd29d15cf6"
-  integrity sha512-xCbdgSzXYmHGyVX3+BsQjcd4hv4vA/FDy7Kc8eOpzKmBBPEOTurt0w5fCRQaGl+GSBORKgJdstQ1rHl4jbNseQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-for-of@^7.16.7":
+"@babel/plugin-transform-for-of@^7.12.13", "@babel/plugin-transform-for-of@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz#649d639d4617dff502a9a158c479b3b556728d8c"
   integrity sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-function-name@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz#bb024452f9aaed861d374c8e7a24252ce3a50051"
-  integrity sha512-6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ==
-  dependencies:
-    "@babel/helper-function-name" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-function-name@^7.16.7":
+"@babel/plugin-transform-function-name@^7.12.13", "@babel/plugin-transform-function-name@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz#5ab34375c64d61d083d7d2f05c38d90b97ec65cf"
   integrity sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==
@@ -1209,44 +794,21 @@
     "@babel/helper-function-name" "^7.16.7"
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-literals@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz#2ca45bafe4a820197cf315794a4d26560fe4bdb9"
-  integrity sha512-FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-literals@^7.16.7":
+"@babel/plugin-transform-literals@^7.12.13", "@babel/plugin-transform-literals@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz#254c9618c5ff749e87cb0c0cef1a0a050c0bdab1"
   integrity sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-member-expression-literals@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz#5ffa66cd59b9e191314c9f1f803b938e8c081e40"
-  integrity sha512-kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-member-expression-literals@^7.16.7":
+"@babel/plugin-transform-member-expression-literals@^7.12.13", "@babel/plugin-transform-member-expression-literals@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz#6e5dcf906ef8a098e630149d14c867dd28f92384"
   integrity sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-modules-amd@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.13.tgz#43db16249b274ee2e551e2422090aa1c47692d56"
-  integrity sha512-JHLOU0o81m5UqG0Ulz/fPC68/v+UTuGTWaZBUwpEk1fYQ1D9LfKV6MPn4ttJKqRo5Lm460fkzjLTL4EHvCprvA==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.12.13"
-    babel-plugin-dynamic-import-node "^2.3.3"
-
-"@babel/plugin-transform-modules-amd@^7.16.7":
+"@babel/plugin-transform-modules-amd@^7.12.13", "@babel/plugin-transform-modules-amd@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz#b28d323016a7daaae8609781d1f8c9da42b13186"
   integrity sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==
@@ -1255,17 +817,7 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-commonjs@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.13.tgz#5043b870a784a8421fa1fd9136a24f294da13e50"
-  integrity sha512-OGQoeVXVi1259HjuoDnsQMlMkT9UkZT9TpXAsqWplS/M0N1g3TJAn/ByOCeQu7mfjc5WpSsRU+jV1Hd89ts0kQ==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.12.13"
-    "@babel/helper-simple-access" "^7.12.13"
-    babel-plugin-dynamic-import-node "^2.3.3"
-
-"@babel/plugin-transform-modules-commonjs@^7.16.8":
+"@babel/plugin-transform-modules-commonjs@^7.12.13", "@babel/plugin-transform-modules-commonjs@^7.16.8":
   version "7.17.9"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.9.tgz#274be1a2087beec0254d4abd4d86e52442e1e5b6"
   integrity sha512-2TBFd/r2I6VlYn0YRTz2JdazS+FoUuQ2rIFHoAxtyP/0G3D82SBLaRq9rnUkpqlLg03Byfl/+M32mpxjO6KaPw==
@@ -1275,18 +827,7 @@
     "@babel/helper-simple-access" "^7.17.7"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-systemjs@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.13.tgz#351937f392c7f07493fc79b2118201d50404a3c5"
-  integrity sha512-aHfVjhZ8QekaNF/5aNdStCGzwTbU7SI5hUybBKlMzqIMC7w7Ho8hx5a4R/DkTHfRfLwHGGxSpFt9BfxKCoXKoA==
-  dependencies:
-    "@babel/helper-hoist-variables" "^7.12.13"
-    "@babel/helper-module-transforms" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.12.13"
-    "@babel/helper-validator-identifier" "^7.12.11"
-    babel-plugin-dynamic-import-node "^2.3.3"
-
-"@babel/plugin-transform-modules-systemjs@^7.16.7":
+"@babel/plugin-transform-modules-systemjs@^7.12.13", "@babel/plugin-transform-modules-systemjs@^7.16.7":
   version "7.17.8"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.17.8.tgz#81fd834024fae14ea78fbe34168b042f38703859"
   integrity sha512-39reIkMTUVagzgA5x88zDYXPCMT6lcaRKs1+S9K6NKBPErbgO/w/kP8GlNQTC87b412ZTlmNgr3k2JrWgHH+Bw==
@@ -1297,15 +838,7 @@
     "@babel/helper-validator-identifier" "^7.16.7"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-umd@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.13.tgz#26c66f161d3456674e344b4b1255de4d530cfb37"
-  integrity sha512-BgZndyABRML4z6ibpi7Z98m4EVLFI9tVsZDADC14AElFaNHHBcJIovflJ6wtCqFxwy2YJ1tJhGRsr0yLPKoN+w==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-modules-umd@^7.16.7":
+"@babel/plugin-transform-modules-umd@^7.12.13", "@babel/plugin-transform-modules-umd@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz#23dad479fa585283dbd22215bff12719171e7618"
   integrity sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ==
@@ -1313,43 +846,21 @@
     "@babel/helper-module-transforms" "^7.16.7"
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz#2213725a5f5bbbe364b50c3ba5998c9599c5c9d9"
-  integrity sha512-Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
-
-"@babel/plugin-transform-named-capturing-groups-regex@^7.16.8":
+"@babel/plugin-transform-named-capturing-groups-regex@^7.12.13", "@babel/plugin-transform-named-capturing-groups-regex@^7.16.8":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz#7f860e0e40d844a02c9dcf9d84965e7dfd666252"
   integrity sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw==
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.16.7"
 
-"@babel/plugin-transform-new-target@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz#e22d8c3af24b150dd528cbd6e685e799bf1c351c"
-  integrity sha512-/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-new-target@^7.16.7":
+"@babel/plugin-transform-new-target@^7.12.13", "@babel/plugin-transform-new-target@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz#9967d89a5c243818e0800fdad89db22c5f514244"
   integrity sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-object-super@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz#b4416a2d63b8f7be314f3d349bd55a9c1b5171f7"
-  integrity sha512-JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-    "@babel/helper-replace-supers" "^7.12.13"
-
-"@babel/plugin-transform-object-super@^7.16.7":
+"@babel/plugin-transform-object-super@^7.12.13", "@babel/plugin-transform-object-super@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz#ac359cf8d32cf4354d27a46867999490b6c32a94"
   integrity sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==
@@ -1357,28 +868,14 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/helper-replace-supers" "^7.16.7"
 
-"@babel/plugin-transform-parameters@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.13.tgz#461e76dfb63c2dfd327b8a008a9e802818ce9853"
-  integrity sha512-e7QqwZalNiBRHCpJg/P8s/VJeSRYgmtWySs1JwvfwPqhBbiWfOcHDKdeAi6oAyIimoKWBlwc8oTgbZHdhCoVZA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-parameters@^7.16.7":
+"@babel/plugin-transform-parameters@^7.12.13", "@babel/plugin-transform-parameters@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz#a1721f55b99b736511cb7e0152f61f17688f331f"
   integrity sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-property-literals@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz#4e6a9e37864d8f1b3bc0e2dce7bf8857db8b1a81"
-  integrity sha512-nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-property-literals@^7.16.7":
+"@babel/plugin-transform-property-literals@^7.12.13", "@babel/plugin-transform-property-literals@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz#2dadac85155436f22c696c4827730e0fe1057a55"
   integrity sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==
@@ -1392,46 +889,21 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
-"@babel/plugin-transform-react-display-name@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.13.tgz#c28effd771b276f4647411c9733dbb2d2da954bd"
-  integrity sha512-MprESJzI9O5VnJZrL7gg1MpdqmiFcUv41Jc7SahxYsNP2kDkFqClxxTZq+1Qv4AFCamm+GXMRDQINNn+qrxmiA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-react-display-name@^7.16.0", "@babel/plugin-transform-react-display-name@^7.16.7":
+"@babel/plugin-transform-react-display-name@^7.12.13", "@babel/plugin-transform-react-display-name@^7.16.0", "@babel/plugin-transform-react-display-name@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.7.tgz#7b6d40d232f4c0f550ea348593db3b21e2404340"
   integrity sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-react-jsx-development@^7.12.12":
-  version "7.12.17"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.17.tgz#f510c0fa7cd7234153539f9a362ced41a5ca1447"
-  integrity sha512-BPjYV86SVuOaudFhsJR1zjgxxOhJDt6JHNoD48DxWEIxUCAMjV1ys6DYw4SDYZh0b1QsS2vfIA9t/ZsQGsDOUQ==
-  dependencies:
-    "@babel/plugin-transform-react-jsx" "^7.12.17"
-
-"@babel/plugin-transform-react-jsx-development@^7.16.7":
+"@babel/plugin-transform-react-jsx-development@^7.12.12", "@babel/plugin-transform-react-jsx-development@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.7.tgz#43a00724a3ed2557ed3f276a01a929e6686ac7b8"
   integrity sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A==
   dependencies:
     "@babel/plugin-transform-react-jsx" "^7.16.7"
 
-"@babel/plugin-transform-react-jsx@^7.12.13", "@babel/plugin-transform-react-jsx@^7.12.17":
-  version "7.12.17"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.17.tgz#dd2c1299f5e26de584939892de3cfc1807a38f24"
-  integrity sha512-mwaVNcXV+l6qJOuRhpdTEj8sT/Z0owAVWf9QujTZ0d2ye9X/K+MTOTSizcgKOj18PGnTc/7g1I4+cIUjsKhBcw==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.12.13"
-    "@babel/helper-module-imports" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.12.13"
-    "@babel/plugin-syntax-jsx" "^7.12.13"
-    "@babel/types" "^7.12.17"
-
-"@babel/plugin-transform-react-jsx@^7.16.7":
+"@babel/plugin-transform-react-jsx@^7.12.13", "@babel/plugin-transform-react-jsx@^7.12.17", "@babel/plugin-transform-react-jsx@^7.16.7":
   version "7.17.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.17.3.tgz#eac1565da176ccb1a715dae0b4609858808008c1"
   integrity sha512-9tjBm4O07f7mzKSIlEmPdiE6ub7kfIe6Cd+w+oQebpATfTQMAgW+YOuWxogbKVTulA+MEO7byMeIUtQ1z+z+ZQ==
@@ -1442,15 +914,7 @@
     "@babel/plugin-syntax-jsx" "^7.16.7"
     "@babel/types" "^7.17.0"
 
-"@babel/plugin-transform-react-pure-annotations@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.12.1.tgz#05d46f0ab4d1339ac59adf20a1462c91b37a1a42"
-  integrity sha512-RqeaHiwZtphSIUZ5I85PEH19LOSzxfuEazoY7/pWASCAIBuATQzpSVD+eT6MebeeZT2F4eSL0u4vw6n4Nm0Mjg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.4"
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-transform-react-pure-annotations@^7.16.7":
+"@babel/plugin-transform-react-pure-annotations@^7.12.1", "@babel/plugin-transform-react-pure-annotations@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.7.tgz#232bfd2f12eb551d6d7d01d13fe3f86b45eb9c67"
   integrity sha512-hs71ToC97k3QWxswh2ElzMFABXHvGiJ01IB1TbYQDGeWRKWz/MPUTh5jGExdHvosYKpnJW5Pm3S4+TA3FyX+GA==
@@ -1458,28 +922,14 @@
     "@babel/helper-annotate-as-pure" "^7.16.7"
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-regenerator@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.13.tgz#b628bcc9c85260ac1aeb05b45bde25210194a2f5"
-  integrity sha512-lxb2ZAvSLyJ2PEe47hoGWPmW22v7CtSl9jW8mingV4H2sEX/JOcrAj2nPuGWi56ERUm2bUpjKzONAuT6HCn2EA==
-  dependencies:
-    regenerator-transform "^0.14.2"
-
-"@babel/plugin-transform-regenerator@^7.16.7":
+"@babel/plugin-transform-regenerator@^7.12.13", "@babel/plugin-transform-regenerator@^7.16.7":
   version "7.17.9"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.17.9.tgz#0a33c3a61cf47f45ed3232903683a0afd2d3460c"
   integrity sha512-Lc2TfbxR1HOyn/c6b4Y/b6NHoTb67n/IoWLxTu4kC7h4KQnWlhCq2S8Tx0t2SVvv5Uu87Hs+6JEJ5kt2tYGylQ==
   dependencies:
     regenerator-transform "^0.15.0"
 
-"@babel/plugin-transform-reserved-words@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz#7d9988d4f06e0fe697ea1d9803188aa18b472695"
-  integrity sha512-xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-reserved-words@^7.16.7":
+"@babel/plugin-transform-reserved-words@^7.12.13", "@babel/plugin-transform-reserved-words@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz#1d798e078f7c5958eec952059c460b220a63f586"
   integrity sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg==
@@ -1498,29 +948,14 @@
     babel-plugin-polyfill-regenerator "^0.3.0"
     semver "^6.3.0"
 
-"@babel/plugin-transform-shorthand-properties@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz#db755732b70c539d504c6390d9ce90fe64aff7ad"
-  integrity sha512-xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-shorthand-properties@^7.16.7":
+"@babel/plugin-transform-shorthand-properties@^7.12.13", "@babel/plugin-transform-shorthand-properties@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz#e8549ae4afcf8382f711794c0c7b6b934c5fbd2a"
   integrity sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-spread@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.13.tgz#ca0d5645abbd560719c354451b849f14df4a7949"
-  integrity sha512-dUCrqPIowjqk5pXsx1zPftSq4sT0aCeZVAxhdgs3AMgyaDmoUT0G+5h3Dzja27t76aUEIJWlFgPJqJ/d4dbTtg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
-
-"@babel/plugin-transform-spread@^7.16.7":
+"@babel/plugin-transform-spread@^7.12.13", "@babel/plugin-transform-spread@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz#a303e2122f9f12e0105daeedd0f30fb197d8ff44"
   integrity sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg==
@@ -1528,42 +963,21 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
 
-"@babel/plugin-transform-sticky-regex@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz#760ffd936face73f860ae646fb86ee82f3d06d1f"
-  integrity sha512-Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-sticky-regex@^7.16.7":
+"@babel/plugin-transform-sticky-regex@^7.12.13", "@babel/plugin-transform-sticky-regex@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz#c84741d4f4a38072b9a1e2e3fd56d359552e8660"
   integrity sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-template-literals@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.13.tgz#655037b07ebbddaf3b7752f55d15c2fd6f5aa865"
-  integrity sha512-arIKlWYUgmNsF28EyfmiQHJLJFlAJNYkuQO10jL46ggjBpeb2re1P9K9YGxNJB45BqTbaslVysXDYm/g3sN/Qg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-template-literals@^7.16.7":
+"@babel/plugin-transform-template-literals@^7.12.13", "@babel/plugin-transform-template-literals@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz#f3d1c45d28967c8e80f53666fc9c3e50618217ab"
   integrity sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-typeof-symbol@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz#785dd67a1f2ea579d9c2be722de8c84cb85f5a7f"
-  integrity sha512-eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-typeof-symbol@^7.16.7":
+"@babel/plugin-transform-typeof-symbol@^7.12.13", "@babel/plugin-transform-typeof-symbol@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz#9cdbe622582c21368bd482b660ba87d5545d4f7e"
   integrity sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ==
@@ -1579,29 +993,14 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-typescript" "^7.16.7"
 
-"@babel/plugin-transform-unicode-escapes@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz#840ced3b816d3b5127dd1d12dcedc5dead1a5e74"
-  integrity sha512-0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-unicode-escapes@^7.16.7":
+"@babel/plugin-transform-unicode-escapes@^7.12.13", "@babel/plugin-transform-unicode-escapes@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz#da8717de7b3287a2c6d659750c964f302b31ece3"
   integrity sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-unicode-regex@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz#b52521685804e155b1202e83fc188d34bb70f5ac"
-  integrity sha512-mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-unicode-regex@^7.16.7":
+"@babel/plugin-transform-unicode-regex@^7.12.13", "@babel/plugin-transform-unicode-regex@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz#0f7aa4a501198976e25e82702574c34cfebe9ef2"
   integrity sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==
@@ -1609,7 +1008,7 @@
     "@babel/helper-create-regexp-features-plugin" "^7.16.7"
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/preset-env@^7.11.0", "@babel/preset-env@^7.16.4":
+"@babel/preset-env@^7.11.0", "@babel/preset-env@^7.12.1", "@babel/preset-env@^7.16.4":
   version "7.16.11"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.11.tgz#5dd88fd885fae36f88fd7c8342475c9f0abe2982"
   integrity sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==
@@ -1689,90 +1088,7 @@
     core-js-compat "^3.20.2"
     semver "^6.3.0"
 
-"@babel/preset-env@^7.12.1":
-  version "7.12.17"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.17.tgz#94a3793ff089c32ee74d76a3c03a7597693ebaaa"
-  integrity sha512-9PMijx8zFbCwTHrd2P4PJR5nWGH3zWebx2OcpTjqQrHhCiL2ssSR2Sc9ko2BsI2VmVBfoaQmPrlMTCui4LmXQg==
-  dependencies:
-    "@babel/compat-data" "^7.12.13"
-    "@babel/helper-compilation-targets" "^7.12.17"
-    "@babel/helper-module-imports" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.12.13"
-    "@babel/helper-validator-option" "^7.12.17"
-    "@babel/plugin-proposal-async-generator-functions" "^7.12.13"
-    "@babel/plugin-proposal-class-properties" "^7.12.13"
-    "@babel/plugin-proposal-dynamic-import" "^7.12.17"
-    "@babel/plugin-proposal-export-namespace-from" "^7.12.13"
-    "@babel/plugin-proposal-json-strings" "^7.12.13"
-    "@babel/plugin-proposal-logical-assignment-operators" "^7.12.13"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.13"
-    "@babel/plugin-proposal-numeric-separator" "^7.12.13"
-    "@babel/plugin-proposal-object-rest-spread" "^7.12.13"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.12.13"
-    "@babel/plugin-proposal-optional-chaining" "^7.12.17"
-    "@babel/plugin-proposal-private-methods" "^7.12.13"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.12.13"
-    "@babel/plugin-syntax-async-generators" "^7.8.0"
-    "@babel/plugin-syntax-class-properties" "^7.12.13"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
-    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-    "@babel/plugin-syntax-json-strings" "^7.8.0"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
-    "@babel/plugin-syntax-top-level-await" "^7.12.13"
-    "@babel/plugin-transform-arrow-functions" "^7.12.13"
-    "@babel/plugin-transform-async-to-generator" "^7.12.13"
-    "@babel/plugin-transform-block-scoped-functions" "^7.12.13"
-    "@babel/plugin-transform-block-scoping" "^7.12.13"
-    "@babel/plugin-transform-classes" "^7.12.13"
-    "@babel/plugin-transform-computed-properties" "^7.12.13"
-    "@babel/plugin-transform-destructuring" "^7.12.13"
-    "@babel/plugin-transform-dotall-regex" "^7.12.13"
-    "@babel/plugin-transform-duplicate-keys" "^7.12.13"
-    "@babel/plugin-transform-exponentiation-operator" "^7.12.13"
-    "@babel/plugin-transform-for-of" "^7.12.13"
-    "@babel/plugin-transform-function-name" "^7.12.13"
-    "@babel/plugin-transform-literals" "^7.12.13"
-    "@babel/plugin-transform-member-expression-literals" "^7.12.13"
-    "@babel/plugin-transform-modules-amd" "^7.12.13"
-    "@babel/plugin-transform-modules-commonjs" "^7.12.13"
-    "@babel/plugin-transform-modules-systemjs" "^7.12.13"
-    "@babel/plugin-transform-modules-umd" "^7.12.13"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.12.13"
-    "@babel/plugin-transform-new-target" "^7.12.13"
-    "@babel/plugin-transform-object-super" "^7.12.13"
-    "@babel/plugin-transform-parameters" "^7.12.13"
-    "@babel/plugin-transform-property-literals" "^7.12.13"
-    "@babel/plugin-transform-regenerator" "^7.12.13"
-    "@babel/plugin-transform-reserved-words" "^7.12.13"
-    "@babel/plugin-transform-shorthand-properties" "^7.12.13"
-    "@babel/plugin-transform-spread" "^7.12.13"
-    "@babel/plugin-transform-sticky-regex" "^7.12.13"
-    "@babel/plugin-transform-template-literals" "^7.12.13"
-    "@babel/plugin-transform-typeof-symbol" "^7.12.13"
-    "@babel/plugin-transform-unicode-escapes" "^7.12.13"
-    "@babel/plugin-transform-unicode-regex" "^7.12.13"
-    "@babel/preset-modules" "^0.1.3"
-    "@babel/types" "^7.12.17"
-    core-js-compat "^3.8.0"
-    semver "^5.5.0"
-
-"@babel/preset-modules@^0.1.3":
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz#362f2b68c662842970fdb5e254ffc8fc1c2e415e"
-  integrity sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
-    "@babel/plugin-transform-dotall-regex" "^7.4.4"
-    "@babel/types" "^7.4.4"
-    esutils "^2.0.2"
-
-"@babel/preset-modules@^0.1.5":
+"@babel/preset-modules@^0.1.3", "@babel/preset-modules@^0.1.5":
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9"
   integrity sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==
@@ -1783,18 +1099,7 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
-"@babel/preset-react@^7.12.5":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.13.tgz#5f911b2eb24277fa686820d5bd81cad9a0602a0a"
-  integrity sha512-TYM0V9z6Abb6dj1K7i5NrEhA13oS5ujUYQYDfqIBXYHOc2c2VkFgc+q9kyssIyUfy4/hEwqrgSlJ/Qgv8zJLsA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-    "@babel/plugin-transform-react-display-name" "^7.12.13"
-    "@babel/plugin-transform-react-jsx" "^7.12.13"
-    "@babel/plugin-transform-react-jsx-development" "^7.12.12"
-    "@babel/plugin-transform-react-pure-annotations" "^7.12.1"
-
-"@babel/preset-react@^7.16.0":
+"@babel/preset-react@^7.12.5", "@babel/preset-react@^7.16.0":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.16.7.tgz#4c18150491edc69c183ff818f9f2aecbe5d93852"
   integrity sha512-fWpyI8UM/HE6DfPBzD8LnhQ/OcH8AgTaqcqP2nGOXEUV+VKBR5JRN9hCk9ai+zQQ57vtm9oWeXguBCPNUjytgA==
@@ -1823,28 +1128,7 @@
     core-js-pure "^3.20.2"
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.10.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
-  version "7.17.9"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.9.tgz#d19fbf802d01a8cb6cf053a64e472d42c434ba72"
-  integrity sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==
-  dependencies:
-    regenerator-runtime "^0.13.4"
-
-"@babel/runtime@^7.11.2", "@babel/runtime@^7.7.2":
-  version "7.12.18"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.18.tgz#af137bd7e7d9705a412b3caaf991fe6aaa97831b"
-  integrity sha512-BogPQ7ciE6SYAUPtlm9tWbgI9+2AgqSam6QivMgXgAT+fKbgppaj4ZX15MHeLC1PVF5sNk70huBu20XxWOs8Cg==
-  dependencies:
-    regenerator-runtime "^0.13.4"
-
-"@babel/runtime@^7.13.10", "@babel/runtime@^7.9.2":
-  version "7.14.8"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.8.tgz#7119a56f421018852694290b9f9148097391b446"
-  integrity sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg==
-  dependencies:
-    regenerator-runtime "^0.13.4"
-
-"@babel/runtime@^7.14.6":
+"@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.14.6", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
   version "7.18.3"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.3.tgz#c7b654b57f6f63cf7f8b418ac9ca04408c4579f4"
   integrity sha512-38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug==
@@ -1860,22 +1144,7 @@
     "@babel/parser" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/traverse@^7.12.13", "@babel/traverse@^7.12.17":
-  version "7.12.17"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.17.tgz#40ec8c7ffb502c4e54c7f95492dc11b88d718619"
-  integrity sha512-LGkTqDqdiwC6Q7fWSwQoas/oyiEYw6Hqjve5KOSykXkmFJFqzvGMb9niaUEag3Rlve492Mkye3gLw9FTv94fdQ==
-  dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@babel/generator" "^7.12.17"
-    "@babel/helper-function-name" "^7.12.13"
-    "@babel/helper-split-export-declaration" "^7.12.13"
-    "@babel/parser" "^7.12.17"
-    "@babel/types" "^7.12.17"
-    debug "^4.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.19"
-
-"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.3", "@babel/traverse@^7.17.9", "@babel/traverse@^7.7.2":
+"@babel/traverse@^7.12.13", "@babel/traverse@^7.12.17", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.3", "@babel/traverse@^7.17.9", "@babel/traverse@^7.7.2":
   version "7.17.9"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.9.tgz#1f9b207435d9ae4a8ed6998b2b82300d83c37a0d"
   integrity sha512-PQO8sDIJ8SIwipTPiR71kJQCKQYB5NGImbOviK8K+kg5xkNSYXLBupuX9QhatFowrsvo9Hj8WgArg3W7ijNAQw==
@@ -1891,16 +1160,7 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.17", "@babel/types@^7.12.6", "@babel/types@^7.3.0", "@babel/types@^7.3.3":
-  version "7.12.17"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.17.tgz#9d711eb807e0934c90b8b1ca0eb1f7230d150963"
-  integrity sha512-tNMDjcv/4DIcHxErTgwB9q2ZcYyN0sUfgGKUK/mm1FJK7Wz+KstoEekxrl/tBiNDgLK1HGi+sppj1An/1DR4fQ==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.12.11"
-    lodash "^4.17.19"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.12.13", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.4.4":
+"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.12.17", "@babel/types@^7.12.6", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
   version "7.17.0"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b"
   integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==
@@ -2001,66 +1261,33 @@
   dependencies:
     postcss-value-parser "^4.2.0"
 
-"@date-io/core@^2.13.1":
-  version "2.13.1"
-  resolved "https://registry.yarnpkg.com/@date-io/core/-/core-2.13.1.tgz#f041765aff5c55fbc7e37fdd75fc1792733426d6"
-  integrity sha512-pVI9nfkf2qClb2Cxdq0Q4zJhdawMG4ybWZUVGifT78FDwzRMX2SwXBb55s5NRJk0HcIicDuxktmCtemZqMH1Zg==
-
-"@date-io/core@^2.14.0":
+"@date-io/core@^2.13.1", "@date-io/core@^2.14.0":
   version "2.14.0"
   resolved "https://registry.yarnpkg.com/@date-io/core/-/core-2.14.0.tgz#03e9b9b9fc8e4d561c32dd324df0f3ccd967ef14"
   integrity sha512-qFN64hiFjmlDHJhu+9xMkdfDG2jLsggNxKXglnekUpXSq8faiqZgtHm2lsHCUuaPDTV6wuXHcCl8J1GQ5wLmPw==
 
-"@date-io/date-fns@^2.11.0":
-  version "2.13.1"
-  resolved "https://registry.yarnpkg.com/@date-io/date-fns/-/date-fns-2.13.1.tgz#19d8a245dab61c03c95ba492d679d98d2b0b4af5"
-  integrity sha512-8fmfwjiLMpFLD+t4NBwDx0eblWnNcgt4NgfT/uiiQTGI81fnPu9tpBMYdAcuWxaV7LLpXgzLBx1SYWAMDVUDQQ==
-  dependencies:
-    "@date-io/core" "^2.13.1"
-
-"@date-io/date-fns@^2.14.0":
+"@date-io/date-fns@^2.11.0", "@date-io/date-fns@^2.14.0":
   version "2.14.0"
   resolved "https://registry.yarnpkg.com/@date-io/date-fns/-/date-fns-2.14.0.tgz#92ab150f488f294c135c873350d154803cebdbea"
   integrity sha512-4fJctdVyOd5cKIKGaWUM+s3MUXMuzkZaHuTY15PH70kU1YTMrCoauA7hgQVx9qj0ZEbGrH9VSPYJYnYro7nKiA==
   dependencies:
     "@date-io/core" "^2.14.0"
 
-"@date-io/dayjs@^2.11.0":
-  version "2.13.1"
-  resolved "https://registry.yarnpkg.com/@date-io/dayjs/-/dayjs-2.13.1.tgz#98461d22ee98179b9f2dca3b36f1b618704ae593"
-  integrity sha512-5bL4WWWmlI4uGZVScANhHJV7Mjp93ec2gNeUHDqqLaMZhp51S0NgD25oqj/k0LqBn1cdU2MvzNpk/ObMmVv5cQ==
-  dependencies:
-    "@date-io/core" "^2.13.1"
-
-"@date-io/dayjs@^2.14.0":
+"@date-io/dayjs@^2.11.0", "@date-io/dayjs@^2.14.0":
   version "2.14.0"
   resolved "https://registry.yarnpkg.com/@date-io/dayjs/-/dayjs-2.14.0.tgz#8d4e93e1d473bb5f25210866204dc33384ca4c20"
   integrity sha512-4fRvNWaOh7AjvOyJ4h6FYMS7VHLQnIEeAV5ahv6sKYWx+1g1UwYup8h7+gPuoF+sW2hTScxi7PVaba2Jk/U8Og==
   dependencies:
     "@date-io/core" "^2.14.0"
 
-"@date-io/luxon@^2.11.1":
-  version "2.13.1"
-  resolved "https://registry.yarnpkg.com/@date-io/luxon/-/luxon-2.13.1.tgz#3701b3cabfffda5102af302979aa6e58acfda91a"
-  integrity sha512-yG+uM7lXfwLyKKEwjvP8oZ7qblpmfl9gxQYae55ifbwiTs0CoCTkYkxEaQHGkYtTqGTzLqcb0O9Pzx6vgWg+yg==
-  dependencies:
-    "@date-io/core" "^2.13.1"
-
-"@date-io/luxon@^2.14.0":
+"@date-io/luxon@^2.11.1", "@date-io/luxon@^2.14.0":
   version "2.14.0"
   resolved "https://registry.yarnpkg.com/@date-io/luxon/-/luxon-2.14.0.tgz#cd1641229e00a899625895de3a31e3aaaf66629f"
   integrity sha512-KmpBKkQFJ/YwZgVd0T3h+br/O0uL9ZdE7mn903VPAG2ZZncEmaUfUdYKFT7v7GyIKJ4KzCp379CRthEbxevEVg==
   dependencies:
     "@date-io/core" "^2.14.0"
 
-"@date-io/moment@^2.11.0":
-  version "2.13.1"
-  resolved "https://registry.yarnpkg.com/@date-io/moment/-/moment-2.13.1.tgz#122a51e4bdedf71ff3babb264427737dc022c1e6"
-  integrity sha512-XX1X/Tlvl3TdqQy2j0ZUtEJV6Rl8tOyc5WOS3ki52He28Uzme4Ro/JuPWTMBDH63weSWIZDlbR7zBgp3ZA2y1A==
-  dependencies:
-    "@date-io/core" "^2.13.1"
-
-"@date-io/moment@^2.14.0":
+"@date-io/moment@^2.11.0", "@date-io/moment@^2.14.0":
   version "2.14.0"
   resolved "https://registry.yarnpkg.com/@date-io/moment/-/moment-2.14.0.tgz#8300abd6ae8c55d8edee90d118db3cef0b1d4f58"
   integrity sha512-VsoLXs94GsZ49ecWuvFbsa081zEv2xxG7d+izJsqGa2L8RPZLlwk27ANh87+SNnOUpp+qy2AoCAf0mx4XXhioA==
@@ -2085,18 +1312,7 @@
     source-map "^0.5.7"
     stylis "4.0.13"
 
-"@emotion/cache@*", "@emotion/cache@^11.7.1":
-  version "11.7.1"
-  resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.7.1.tgz#08d080e396a42e0037848214e8aa7bf879065539"
-  integrity sha512-r65Zy4Iljb8oyjtLeCuBH8Qjiy107dOYC6SJq7g7GV5UCQWMObY4SJDPGFjiiVpPrOJ2hmJOoBiYTC7hwx9E2A==
-  dependencies:
-    "@emotion/memoize" "^0.7.4"
-    "@emotion/sheet" "^1.1.0"
-    "@emotion/utils" "^1.0.0"
-    "@emotion/weak-memoize" "^0.2.5"
-    stylis "4.0.13"
-
-"@emotion/cache@^11.9.3":
+"@emotion/cache@*", "@emotion/cache@^11.7.1", "@emotion/cache@^11.9.3":
   version "11.9.3"
   resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.9.3.tgz#96638449f6929fd18062cfe04d79b29b44c0d6cb"
   integrity sha512-0dgkI/JKlCXa+lEXviaMtGBL0ynpx4osh7rjOXE71q9bIF8G+XhJgvi+wDu0B0IdCVx37BffiwXlN9I3UuzFvg==
@@ -2112,14 +1328,7 @@
   resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413"
   integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==
 
-"@emotion/is-prop-valid@^1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.1.2.tgz#34ad6e98e871aa6f7a20469b602911b8b11b3a95"
-  integrity sha512-3QnhqeL+WW88YjYbQL5gUIkthuMw7a0NGbZ7wfFVk2kg/CK5w8w5FFa0RzWjyY1+sujN0NWbtSHH6OJmWHtJpQ==
-  dependencies:
-    "@emotion/memoize" "^0.7.4"
-
-"@emotion/is-prop-valid@^1.1.3":
+"@emotion/is-prop-valid@^1.1.2", "@emotion/is-prop-valid@^1.1.3":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.1.3.tgz#f0907a416368cf8df9e410117068e20fe87c0a3a"
   integrity sha512-RFg04p6C+1uO19uG8N+vqanzKqiM9eeV1LDOG3bmkYmuOj7NbKNlFC/4EZq5gnwAIlcC/jOT24f8Td0iax2SXA==
@@ -2144,7 +1353,7 @@
     "@emotion/weak-memoize" "^0.2.5"
     hoist-non-react-statics "^3.3.1"
 
-"@emotion/serialize@*", "@emotion/serialize@^1.0.3":
+"@emotion/serialize@*", "@emotion/serialize@^1.0.2", "@emotion/serialize@^1.0.3":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.0.3.tgz#99e2060c26c6292469fb30db41f4690e1c8fea63"
   integrity sha512-2mSSvgLfyV3q+iVh3YWgNlUc2a9ZlDU7DjuP5MjK3AXRR0dYigCrP99aeFtaB2L/hjfEZdSThn5dsZ0ufqbvsA==
@@ -2155,23 +1364,7 @@
     "@emotion/utils" "^1.0.0"
     csstype "^3.0.2"
 
-"@emotion/serialize@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.0.2.tgz#77cb21a0571c9f68eb66087754a65fa97bfcd965"
-  integrity sha512-95MgNJ9+/ajxU7QIAruiOAdYNjxZX7G2mhgrtDWswA21VviYIRP1R5QilZ/bDY42xiKsaktP4egJb3QdYQZi1A==
-  dependencies:
-    "@emotion/hash" "^0.8.0"
-    "@emotion/memoize" "^0.7.4"
-    "@emotion/unitless" "^0.7.5"
-    "@emotion/utils" "^1.0.0"
-    csstype "^3.0.2"
-
-"@emotion/sheet@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.1.0.tgz#56d99c41f0a1cda2726a05aa6a20afd4c63e58d2"
-  integrity sha512-u0AX4aSo25sMAygCuQTzS+HsImZFuS8llY8O7b9MDRzbJM0kVJlAz6KNDqcG7pOuQZJmj/8X/rAW+66kMnMW+g==
-
-"@emotion/sheet@^1.1.1":
+"@emotion/sheet@^1.1.0", "@emotion/sheet@^1.1.1":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.1.1.tgz#015756e2a9a3c7c5f11d8ec22966a8dbfbfac787"
   integrity sha512-J3YPccVRMiTZxYAY0IOq3kd+hUP8idY8Kz6B/Cyo+JuXq52Ek+zbPbSQUrVQp95aJ+lsAW7DPL1P2Z+U1jGkKA==
@@ -2192,16 +1385,11 @@
   resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed"
   integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==
 
-"@emotion/utils@*", "@emotion/utils@^1.1.0":
+"@emotion/utils@*", "@emotion/utils@^1.0.0", "@emotion/utils@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.1.0.tgz#86b0b297f3f1a0f2bdb08eeac9a2f49afd40d0cf"
   integrity sha512-iRLa/Y4Rs5H/f2nimczYmS5kFJEbpiVvgN3XVfZ022IYhuNA1IRSHEizcof88LtCTXtl9S2Cxt32KgaXEu72JQ==
 
-"@emotion/utils@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.0.0.tgz#abe06a83160b10570816c913990245813a2fd6af"
-  integrity sha512-mQC2b3XLDs6QCW+pDQDiyO/EdGZYOygE8s5N5rrzjSI4M3IejPE/JPndCBwRT9z982aqQNi6beWs1UeayrQxxA==
-
 "@emotion/weak-memoize@^0.2.5":
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46"
@@ -2877,15 +2065,7 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
   integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
 
-"@jridgewell/trace-mapping@^0.3.0":
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz#f6a0832dffd5b8a6aaa633b7d9f8e8e94c83a0c3"
-  integrity sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==
-  dependencies:
-    "@jridgewell/resolve-uri" "^3.0.3"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-
-"@jridgewell/trace-mapping@^0.3.9":
+"@jridgewell/trace-mapping@^0.3.0", "@jridgewell/trace-mapping@^0.3.9":
   version "0.3.14"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz#b231a081d8f66796e475ad588a1ef473112701ed"
   integrity sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==
@@ -3027,16 +2207,7 @@
     react-is "^18.2.0"
     react-transition-group "^4.4.2"
 
-"@mui/private-theming@^5.6.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.6.0.tgz#b907e055a0a19caf554d5b43209a143edaa9b398"
-  integrity sha512-62jUFaMGfW3nvq/worcOAEiY++rWd44tpWShq4o97DybWmmWvEFYlBIuHEcXrtBIK/cloaQw8jqelQIFZeiVdw==
-  dependencies:
-    "@babel/runtime" "^7.17.2"
-    "@mui/utils" "^5.6.0"
-    prop-types "^15.7.2"
-
-"@mui/private-theming@^5.9.1":
+"@mui/private-theming@^5.6.0", "@mui/private-theming@^5.9.1":
   version "5.9.1"
   resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.9.1.tgz#4f714ed9ebd587373dc77b3fc69e9f3e720f0190"
   integrity sha512-eIh2IZJInNTdgPLMo9cruzm8UDX5amBBxxsSoNre7lRj3wcsu3TG5OKjIbzkf4VxHHEhdPeNNQyt92k7L78u2A==
@@ -3045,16 +2216,7 @@
     "@mui/utils" "^5.9.1"
     prop-types "^15.8.1"
 
-"@mui/styled-engine@^5.6.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.6.0.tgz#c7c34d2e319158559cef49b796457a4e6a4c58f7"
-  integrity sha512-K1WPKTruJTPA49cub0HtDCBBvosPKizqgZ4RenAfWz/ldlFtM4p7e7Mt3YEnNWTOJMHvDGcEke1tCuELkVAMyA==
-  dependencies:
-    "@babel/runtime" "^7.17.2"
-    "@emotion/cache" "^11.7.1"
-    prop-types "^15.7.2"
-
-"@mui/styled-engine@^5.8.7":
+"@mui/styled-engine@^5.6.0", "@mui/styled-engine@^5.8.7":
   version "5.8.7"
   resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.8.7.tgz#63d0779c07677fe76d4705a02c7ae99f89b50780"
   integrity sha512-tVqtowjbYmiRq+qcqXK731L9eWoL9H8xTRhuTgaDGKdch1zlt4I2UwInUe1w2N9N/u3/jHsFbLcl1Un3uOwpQg==
@@ -3064,21 +2226,7 @@
     csstype "^3.1.0"
     prop-types "^15.8.1"
 
-"@mui/system@^5.6.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.6.0.tgz#4d6db0db6a8daf90acd7fcaab3a353aa127987ce"
-  integrity sha512-FoytH73hY78Dll6F0fg7AI/hnpplygbFeW0HsqBfwFWrt2PMc2YSq2ICqHzd2CZPIhzEgRHDTSI8bMTLtG9W7A==
-  dependencies:
-    "@babel/runtime" "^7.17.2"
-    "@mui/private-theming" "^5.6.0"
-    "@mui/styled-engine" "^5.6.0"
-    "@mui/types" "^7.1.3"
-    "@mui/utils" "^5.6.0"
-    clsx "^1.1.1"
-    csstype "^3.0.11"
-    prop-types "^15.7.2"
-
-"@mui/system@^5.9.1":
+"@mui/system@^5.6.0", "@mui/system@^5.9.1":
   version "5.9.1"
   resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.9.1.tgz#dadd1094b1582781cc524b112a0a126f60b23c25"
   integrity sha512-ZixTmc2+sYp++avoYJ38eM70nfwwudN06vYCU4kfwa4nQPiH+bhLYZnfYkcXRKiDR/hfT0dptbOOfQGZqBYczQ==
@@ -3092,39 +2240,12 @@
     csstype "^3.1.0"
     prop-types "^15.8.1"
 
-"@mui/types@^7.1.3":
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.1.3.tgz#d7636f3046110bcccc63e6acfd100e2ad9ca712a"
-  integrity sha512-DDF0UhMBo4Uezlk+6QxrlDbchF79XG6Zs0zIewlR4c0Dt6GKVFfUtzPtHCH1tTbcSlq/L2bGEdiaoHBJ9Y1gSA==
-
-"@mui/types@^7.1.4":
+"@mui/types@^7.1.3", "@mui/types@^7.1.4":
   version "7.1.4"
   resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.1.4.tgz#4185c05d6df63ec673cda15feab80440abadc764"
   integrity sha512-uveM3byMbthO+6tXZ1n2zm0W3uJCQYtwt/v5zV5I77v2v18u0ITkb8xwhsDD2i3V2Kye7SaNR6FFJ6lMuY/WqQ==
 
-"@mui/utils@^5.2.3", "@mui/utils@^5.6.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.6.0.tgz#0ec741f5ac7c89ac76054832bed2d6e17ab1c011"
-  integrity sha512-LbZKkCOn4243vbEVGbaKV7t6eN6kz7t95DR6AcUCRk4daH3l7CXPYkWsyzysRWdXgSzHmIyrgg4FZKzTy0dTHQ==
-  dependencies:
-    "@babel/runtime" "^7.17.2"
-    "@types/prop-types" "^15.7.4"
-    "@types/react-is" "^16.7.1 || ^17.0.0"
-    prop-types "^15.7.2"
-    react-is "^17.0.2"
-
-"@mui/utils@^5.7.0":
-  version "5.8.0"
-  resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.8.0.tgz#4b1d19cbcf70773283375e763b7b3552b84cb58f"
-  integrity sha512-7LgUtCvz78676iC0wpTH7HizMdCrTphhBmRWimIMFrp5Ph6JbDFVuKS1CwYnWWxRyYKL0QzXrDL0lptAU90EXg==
-  dependencies:
-    "@babel/runtime" "^7.17.2"
-    "@types/prop-types" "^15.7.5"
-    "@types/react-is" "^16.7.1 || ^17.0.0"
-    prop-types "^15.8.1"
-    react-is "^17.0.2"
-
-"@mui/utils@^5.9.1":
+"@mui/utils@^5.2.3", "@mui/utils@^5.6.0", "@mui/utils@^5.7.0", "@mui/utils@^5.9.1":
   version "5.9.1"
   resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.9.1.tgz#2b2c9dadbf8ba6561e145b5688fb7df5ef15a934"
   integrity sha512-8+4adOR3xusyJwvbnZxcjqcmbWvl7Og+260ZKIrSvwnFs0aLubL+8MhiceeDDGcmb0bTKxfUgRJ96j32Jb7P+A==
@@ -3671,18 +2792,7 @@
   resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.2.tgz#ed4e0ad92306a704f9fb132a0cfcf77486dbe2bc"
   integrity sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==
 
-"@types/babel__core@^7.0.0":
-  version "7.1.12"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.12.tgz#4d8e9e51eb265552a7e4f1ff2219ab6133bdfb2d"
-  integrity sha512-wMTHiiTiBAAPebqaPiPDLFA4LYPKr6Ph0Xq/6rq1Ur3v66HXyG+clfR9CNETkD7MQS8ZHvpQOtA53DLws5WAEQ==
-  dependencies:
-    "@babel/parser" "^7.1.0"
-    "@babel/types" "^7.0.0"
-    "@types/babel__generator" "*"
-    "@types/babel__template" "*"
-    "@types/babel__traverse" "*"
-
-"@types/babel__core@^7.1.14":
+"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.14":
   version "7.1.19"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.19.tgz#7b497495b7d1b4812bdb9d02804d0576f43ee460"
   integrity sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==
@@ -3783,21 +2893,16 @@
     "@types/estree" "*"
     "@types/json-schema" "*"
 
-"@types/estree@*":
-  version "0.0.46"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.46.tgz#0fb6bfbbeabd7a30880504993369c4bf1deab1fe"
-  integrity sha512-laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg==
+"@types/estree@*", "@types/estree@^0.0.51":
+  version "0.0.51"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40"
+  integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==
 
 "@types/estree@0.0.39":
   version "0.0.39"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
   integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
 
-"@types/estree@^0.0.51":
-  version "0.0.51"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40"
-  integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==
-
 "@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18":
   version "4.17.28"
   resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz#c47def9f34ec81dc6328d0b1b5303d1ec98d86b8"
@@ -3836,12 +2941,7 @@
   dependencies:
     "@types/unist" "*"
 
-"@types/history@*":
-  version "4.7.9"
-  resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.9.tgz#1cfb6d60ef3822c589f18e70f8b12f9a28ce8724"
-  integrity sha512-MUc6zSmU3tEVnkQ78q0peeEjKWPUADMlC/t++2bI8WnAG2tvYRPIgHG8lWkXwqc8MsUF6Z2MOf+Mh5sazOmhiQ==
-
-"@types/history@^4.7.11":
+"@types/history@*", "@types/history@^4.7.11":
   version "4.7.11"
   resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.11.tgz#56588b17ae8f50c53983a524fc3cc47437969d64"
   integrity sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA==
@@ -3866,16 +2966,11 @@
   dependencies:
     "@types/node" "*"
 
-"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
+"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz#8467d4b3c087805d63580480890791277ce35c44"
   integrity sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==
 
-"@types/istanbul-lib-coverage@^2.0.1":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762"
-  integrity sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==
-
 "@types/istanbul-lib-report@*":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686"
@@ -3890,15 +2985,7 @@
   dependencies:
     "@types/istanbul-lib-report" "*"
 
-"@types/jest@*":
-  version "26.0.24"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.24.tgz#943d11976b16739185913a1936e0de0c4a7d595a"
-  integrity sha512-E/X5Vib8BWqZNRlDxj9vYXhsDwPYbPINqKF9BsnSoon4RQ0D9moEuLD8txgyypFLH7J4+Lho9Nr/c8H0Fi+17w==
-  dependencies:
-    jest-diff "^26.0.0"
-    pretty-format "^26.0.0"
-
-"@types/jest@^27.4.1":
+"@types/jest@*", "@types/jest@^27.4.1":
   version "27.4.1"
   resolved "https://registry.yarnpkg.com/@types/jest/-/jest-27.4.1.tgz#185cbe2926eaaf9662d340cc02e548ce9e11ab6d"
   integrity sha512-23iPJADSmicDVrWk+HT58LMJtzLAnB2AgIzplQuq/bSrGaxCrlvRFjGbXmamnnk/mAmCdLStiGqggu28ocUyiw==
@@ -3906,12 +2993,7 @@
     jest-matcher-utils "^27.0.0"
     pretty-format "^27.0.0"
 
-"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6":
-  version "7.0.7"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad"
-  integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==
-
-"@types/json-schema@^7.0.4", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
+"@types/json-schema@*", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
   version "7.0.11"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
   integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
@@ -3935,12 +3017,7 @@
   dependencies:
     "@types/lodash" "*"
 
-"@types/lodash@*":
-  version "4.14.181"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.181.tgz#d1d3740c379fda17ab175165ba04e2d03389385d"
-  integrity sha512-n3tyKthHJbkiWhDZs3DkhkCzt2MexYHXlX0td5iMplyfwketaOeKboEVBqzceH7juqvEg3q5oUoBFxSLu7zFag==
-
-"@types/lodash@^4.14.175":
+"@types/lodash@*", "@types/lodash@^4.14.175":
   version "4.14.182"
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.182.tgz#05301a4d5e62963227eaafe0ce04dd77c54ea5c2"
   integrity sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==
@@ -4093,14 +3170,7 @@
     "@types/history" "*"
     "@types/react" "*"
 
-"@types/react-transition-group@^4.4.4":
-  version "4.4.4"
-  resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.4.tgz#acd4cceaa2be6b757db61ed7b432e103242d163e"
-  integrity sha512-7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug==
-  dependencies:
-    "@types/react" "*"
-
-"@types/react-transition-group@^4.4.5":
+"@types/react-transition-group@^4.4.4", "@types/react-transition-group@^4.4.5":
   version "4.4.5"
   resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.5.tgz#aae20dcf773c5aa275d5b9f7cdbca638abc5e416"
   integrity sha512-juKD/eiSM3/xZYzjuzH6ZwpP+/lejltmiS3QEzV/vmb/Q8+HfDmxu+Baga8UEMGBqV88Nbg4l2hY/K2DkyaLLA==
@@ -4469,15 +3539,7 @@ abab@^2.0.3, abab@^2.0.5:
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
   integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==
 
-accepts@~1.3.4, accepts@~1.3.5:
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
-  integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
-  dependencies:
-    mime-types "~2.1.24"
-    negotiator "0.6.2"
-
-accepts@~1.3.8:
+accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
   integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==
@@ -4624,14 +3686,7 @@ anser@^1.4.1:
   resolved "https://registry.yarnpkg.com/anser/-/anser-1.4.10.tgz#befa3eddf282684bd03b63dcda3927aef8c2e35b"
   integrity sha512-hCv9AqTQ8ycjpSd3upOJd7vFwW1JaoYQ7tpham03GJ1ca8/65rqn0RpaWpItOAd6ylW9wAw6luXYPJIyPFVOww==
 
-ansi-escapes@^4.2.1, ansi-escapes@^4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61"
-  integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==
-  dependencies:
-    type-fest "^0.11.0"
-
-ansi-escapes@^4.3.0:
+ansi-escapes@^4.2.1, ansi-escapes@^4.3.0, ansi-escapes@^4.3.1:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
   integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
@@ -4685,15 +3740,7 @@ ansi-to-react@^6.1.6:
     anser "^1.4.1"
     escape-carriage "^1.3.0"
 
-anymatch@^3.0.3:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
-  integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==
-  dependencies:
-    normalize-path "^3.0.0"
-    picomatch "^2.0.4"
-
-anymatch@~3.1.2:
+anymatch@^3.0.3, anymatch@~3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
   integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
@@ -5134,18 +4181,7 @@ browser-process-hrtime@^1.0.0:
   resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
   integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
 
-browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.3:
-  version "4.16.3"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.3.tgz#340aa46940d7db878748567c5dea24a48ddf3717"
-  integrity sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==
-  dependencies:
-    caniuse-lite "^1.0.30001181"
-    colorette "^1.2.1"
-    electron-to-chromium "^1.3.649"
-    escalade "^3.1.1"
-    node-releases "^1.1.70"
-
-browserslist@^4.16.6, browserslist@^4.17.5, browserslist@^4.18.1, browserslist@^4.19.1, browserslist@^4.20.2:
+browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.3, browserslist@^4.16.6, browserslist@^4.17.5, browserslist@^4.18.1, browserslist@^4.19.1, browserslist@^4.20.2:
   version "4.20.2"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.2.tgz#567b41508757ecd904dab4d1c646c612cd3d4f88"
   integrity sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA==
@@ -5239,12 +4275,7 @@ camelcase@^5.3.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-camelcase@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809"
-  integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==
-
-camelcase@^6.2.1:
+camelcase@^6.2.0, camelcase@^6.2.1:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
@@ -5420,12 +4451,7 @@ cliui@^7.0.2:
     strip-ansi "^6.0.0"
     wrap-ansi "^7.0.0"
 
-clsx@^1.1.0, clsx@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188"
-  integrity sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA==
-
-clsx@^1.2.1:
+clsx@^1.1.0, clsx@^1.1.1, clsx@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12"
   integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==
@@ -5602,14 +4628,7 @@ content-type@~1.0.4:
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
   integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
-convert-source-map@^1.4.0, convert-source-map@^1.6.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
-  integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
-  dependencies:
-    safe-buffer "~5.1.1"
-
-convert-source-map@^1.5.0, convert-source-map@^1.5.1, convert-source-map@^1.7.0:
+convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
   integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==
@@ -5626,7 +4645,7 @@ cookie@0.4.2:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
   integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
 
-core-js-compat@^3.20.2, core-js-compat@^3.21.0:
+core-js-compat@^3.20.2, core-js-compat@^3.21.0, core-js-compat@^3.8.0:
   version "3.21.1"
   resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.21.1.tgz#cac369f67c8d134ff8f9bd1623e3bc2c42068c82"
   integrity sha512-gbgX5AUvMb8gwxC7FLVWYT7Kkgu/y7+h/h1X43yJkNqhlK2fuYyQimqvKGNZFAY6CKii/GFKJ2cp/1/42TN36g==
@@ -5634,14 +4653,6 @@ core-js-compat@^3.20.2, core-js-compat@^3.21.0:
     browserslist "^4.19.1"
     semver "7.0.0"
 
-core-js-compat@^3.8.0:
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.9.0.tgz#29da39385f16b71e1915565aa0385c4e0963ad56"
-  integrity sha512-YK6fwFjCOKWwGnjFUR3c544YsnA/7DoLL0ysncuOJ4pwbriAtOpvM2bygdlcXbvQCQZ7bBU9CL4t7tGl7ETRpQ==
-  dependencies:
-    browserslist "^4.16.3"
-    semver "7.0.0"
-
 core-js-pure@^3.20.2, core-js-pure@^3.8.1:
   version "3.21.1"
   resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.21.1.tgz#8c4d1e78839f5f46208de7230cebfb72bc3bdb51"
@@ -5836,15 +4847,7 @@ css-tree@1.0.0-alpha.37:
     mdn-data "2.0.4"
     source-map "^0.6.1"
 
-css-tree@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.2.tgz#9ae393b5dafd7dae8a622475caec78d3d8fbd7b5"
-  integrity sha512-wCoWush5Aeo48GLhfHPbmvZs59Z+M7k5+B1xDnXbdWNcEF423DoFdqSWE0PM5aNk5nI5cp1q7ms36zGApY/sKQ==
-  dependencies:
-    mdn-data "2.0.14"
-    source-map "^0.6.1"
-
-css-tree@^1.1.3:
+css-tree@^1.1.2, css-tree@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d"
   integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==
@@ -5959,12 +4962,7 @@ cssstyle@^2.3.0:
   dependencies:
     cssom "~0.3.6"
 
-csstype@^3.0.11, csstype@^3.0.2:
-  version "3.0.11"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.11.tgz#d66700c5eacfac1940deb4e3ee5642792d85cd33"
-  integrity sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw==
-
-csstype@^3.1.0:
+csstype@^3.0.11, csstype@^3.0.2, csstype@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.0.tgz#4ddcac3718d787cf9df0d1b7d15033925c8f29f2"
   integrity sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA==
@@ -6208,12 +5206,7 @@ doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
-dom-accessibility-api@^0.5.6:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.7.tgz#8c2aa6325968f2933160a0b7dbb380893ddf3e7d"
-  integrity sha512-ml3lJIq9YjUfM9TUnEPvEYWFSwivwIGBPKpewX7tii7fwCazA8yCioGdqQcNsItPpfFvSJ3VIdMQPj60LJhcQA==
-
-dom-accessibility-api@^0.5.9:
+dom-accessibility-api@^0.5.6, dom-accessibility-api@^0.5.9:
   version "0.5.14"
   resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.14.tgz#56082f71b1dc7aac69d83c4285eef39c15d93f56"
   integrity sha512-NMt+m9zFMPZe0JcY9gN224Qvk6qLIdqex29clBvc/y75ZBX9YA9wNK3frsYvu2DI1xcCIwxwnX+TlsJ2DSOADg==
@@ -6255,12 +5248,7 @@ domelementtype@1:
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
   integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
 
-domelementtype@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.1.0.tgz#a851c080a6d1c3d94344aed151d99f669edf585e"
-  integrity sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w==
-
-domelementtype@^2.2.0:
+domelementtype@^2.0.1, domelementtype@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
   integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
@@ -6348,12 +5336,7 @@ ejs@^3.1.5, ejs@^3.1.6:
   dependencies:
     jake "^10.8.5"
 
-electron-to-chromium@^1.3.649:
-  version "1.3.671"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.671.tgz#8feaed6eae42d279fa4611f58c42a5a1eb81b2a0"
-  integrity sha512-RTD97QkdrJKaKwRv9h/wGAaoR2lGxNXEcBXS31vjitgTPwTWAbLdS7cEsBK68eEQy7p6YyT8D5BxBEYHu2SuwQ==
-
-electron-to-chromium@^1.4.84:
+electron-to-chromium@^1.3.649, electron-to-chromium@^1.4.84:
   version "1.4.106"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.106.tgz#e7a3bfa9d745dd9b9e597616cb17283cc349781a"
   integrity sha512-ZYfpVLULm67K7CaaGP7DmjyeMY4naxsbTy+syVVxT6QHI1Ww8XbJjmr9fDckrhq44WzCrcC5kH3zGpdusxwwqg==
@@ -6417,44 +5400,7 @@ error-stack-parser@^2.0.6:
   dependencies:
     stackframe "^1.1.1"
 
-es-abstract@^1.17.2:
-  version "1.17.7"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz#a4de61b2f66989fc7421676c1cb9787573ace54c"
-  integrity sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==
-  dependencies:
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-    is-callable "^1.2.2"
-    is-regex "^1.1.1"
-    object-inspect "^1.8.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.1"
-    string.prototype.trimend "^1.0.1"
-    string.prototype.trimstart "^1.0.1"
-
-es-abstract@^1.18.0-next.1:
-  version "1.18.0-next.2"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.2.tgz#088101a55f0541f595e7e057199e27ddc8f3a5c2"
-  integrity sha512-Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw==
-  dependencies:
-    call-bind "^1.0.2"
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    get-intrinsic "^1.0.2"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-    is-callable "^1.2.2"
-    is-negative-zero "^2.0.1"
-    is-regex "^1.1.1"
-    object-inspect "^1.9.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.2"
-    string.prototype.trimend "^1.0.3"
-    string.prototype.trimstart "^1.0.3"
-
-es-abstract@^1.18.0-next.2, es-abstract@^1.19.0, es-abstract@^1.19.1:
+es-abstract@^1.17.2, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es-abstract@^1.19.0, es-abstract@^1.19.1:
   version "1.19.2"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.2.tgz#8f7b696d8f15b167ae3640b4060670f3d054143f"
   integrity sha512-gfSBJoZdlL2xRiOCy0g8gLMryhoe1TlimjzU99L/31Z8QEGIhVQI+EWwt5lT+AuU9SnorVupXFqqOGqGfsyO6w==
@@ -6831,12 +5777,7 @@ estraverse@^4.1.1, estraverse@^4.2.0:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
-estraverse@^5.1.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
-  integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
-
-estraverse@^5.2.0, estraverse@^5.3.0:
+estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
   integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
@@ -6980,20 +5921,13 @@ fastq@^1.6.0:
   dependencies:
     reusify "^1.0.4"
 
-faye-websocket@0.11.4:
+faye-websocket@0.11.4, faye-websocket@^0.11.3:
   version "0.11.4"
   resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da"
   integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==
   dependencies:
     websocket-driver ">=0.5.1"
 
-faye-websocket@^0.11.3:
-  version "0.11.3"
-  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.3.tgz#5c0e9a8968e8912c286639fde977a8b209f2508e"
-  integrity sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==
-  dependencies:
-    websocket-driver ">=0.5.1"
-
 fb-watchman@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85"
@@ -7416,12 +6350,7 @@ globby@^11.0.4:
     merge2 "^1.4.1"
     slash "^3.0.0"
 
-graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4:
-  version "4.2.6"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
-  integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==
-
-graceful-fs@^4.2.6, graceful-fs@^4.2.9:
+graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
   version "4.2.10"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
@@ -7982,20 +6911,13 @@ is-callable@^1.1.4, is-callable@^1.2.2, is-callable@^1.2.4:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
   integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
 
-is-core-module@^2.1.0:
+is-core-module@^2.1.0, is-core-module@^2.2.0, is-core-module@^2.8.1:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69"
   integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==
   dependencies:
     has "^1.0.3"
 
-is-core-module@^2.2.0, is-core-module@^2.8.1:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211"
-  integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==
-  dependencies:
-    has "^1.0.3"
-
 is-date-object@^1.0.1:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
@@ -8008,12 +6930,7 @@ is-decimal@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-2.0.1.tgz#9469d2dc190d0214fd87d78b78caecc0cc14eef7"
   integrity sha512-AAB9hiomQs5DXWcRB1rqsxGUstbRroFOPPVAomNk/3XHR5JyEZChOyTWe2oayKnsSsr/kcGqF+z6yuH6HHpN0A==
 
-is-docker@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156"
-  integrity sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==
-
-is-docker@^2.1.1:
+is-docker@^2.0.0, is-docker@^2.1.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
   integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
@@ -8038,14 +6955,7 @@ is-generator-fn@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
   integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
 
-is-glob@^4.0.0, is-glob@~4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
-  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
-  dependencies:
-    is-extglob "^2.1.1"
-
-is-glob@^4.0.1, is-glob@^4.0.3:
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
   integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
@@ -8195,12 +7105,7 @@ isomorphic-fetch@^2.2.1:
     node-fetch "^1.0.1"
     whatwg-fetch ">=0.10.0"
 
-istanbul-lib-coverage@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec"
-  integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==
-
-istanbul-lib-coverage@^3.2.0:
+istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3"
   integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==
@@ -8823,7 +7728,7 @@ json2csv@^5.0.7:
     jsonparse "^1.3.1"
     lodash.get "^4.4.2"
 
-json5@2.x, json5@^2.2.0, json5@^2.2.1:
+json5@2.x, json5@^2.1.2, json5@^2.2.0, json5@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
   integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
@@ -8835,13 +7740,6 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.2:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
-  integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
-  dependencies:
-    minimist "^1.2.5"
-
 jsonc-parser@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.0.0.tgz#abdd785701c7e7eaca8a9ec8cf070ca51a745a22"
@@ -8874,7 +7772,7 @@ jsonpointer@^5.0.0:
     array-includes "^3.1.4"
     object.assign "^4.1.2"
 
-jszip@^3.10.0:
+jszip@^3.10.0, jszip@^3.6.0:
   version "3.10.0"
   resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.10.0.tgz#faf3db2b4b8515425e34effcdbb086750a346061"
   integrity sha512-LDfVtOLtOxb9RXkYOwPyNBTQDL4eUbqahtoY6x07GiDJHwSYvn8sHHIw8wINImV3MqbMNve2gSuM1DDqEKk09Q==
@@ -8884,16 +7782,6 @@ jszip@^3.10.0:
     readable-stream "~2.3.6"
     setimmediate "^1.0.5"
 
-jszip@^3.6.0:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.7.1.tgz#bd63401221c15625a1228c556ca8a68da6fda3d9"
-  integrity sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==
-  dependencies:
-    lie "~3.3.0"
-    pako "~1.0.2"
-    readable-stream "~2.3.6"
-    set-immediate-shim "~1.0.1"
-
 kind-of@^6.0.2:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
@@ -8909,12 +7797,7 @@ kleur@^4.0.3:
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-4.1.4.tgz#8c202987d7e577766d039a8cd461934c01cda04d"
   integrity sha512-8QADVssbrFjivHWQU7KkMgptGTl6WAcSdlbBPY4uNF+mWr6DGcKrvY2w4FQJoXch7+fKMjj0dRrL75vk3k23OA==
 
-klona@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz#7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0"
-  integrity sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==
-
-klona@^2.0.5:
+klona@^2.0.4, klona@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc"
   integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==
@@ -9361,12 +8244,7 @@ mdast-util-to-string@^3.0.0, mdast-util-to-string@^3.1.0:
   resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-3.1.0.tgz#56c506d065fbf769515235e577b5a261552d56e9"
   integrity sha512-n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA==
 
-mdi-material-ui@^7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/mdi-material-ui/-/mdi-material-ui-7.2.0.tgz#e4746b123fd3a438b1cde39eb44329a4c761162d"
-  integrity sha512-tJnT4fY+gJmlq/wt4GYCV5qezOs/cuSysg6N3KRkl2/8dSpyZsL/P5lN4UWZ2ayViwhoRUHns/FCKFnMngJd0g==
-
-mdi-material-ui@^7.3.0:
+mdi-material-ui@^7.2.0, mdi-material-ui@^7.3.0:
   version "7.3.0"
   resolved "https://registry.yarnpkg.com/mdi-material-ui/-/mdi-material-ui-7.3.0.tgz#db3ed681d35ae12c37fb1c95bcfe679a1be80c0b"
   integrity sha512-BJ4JF+LlO/aYcOg9wrgbzRiInyRH6padgfBdJpoPNc3CoZDaik9ARTP3PWzgMjRSQQZ2KvxtFVpOHDkHfrc2Fw==
@@ -9705,15 +8583,7 @@ micromark@^3.0.0:
     micromark-util-types "^1.0.1"
     uvu "^0.5.0"
 
-micromatch@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
-  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
-  dependencies:
-    braces "^3.0.1"
-    picomatch "^2.0.5"
-
-micromatch@^4.0.4:
+micromatch@^4.0.2, micromatch@^4.0.4:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
   integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
@@ -9721,24 +8591,17 @@ micromatch@^4.0.4:
     braces "^3.0.2"
     picomatch "^2.3.1"
 
-mime-db@1.46.0, "mime-db@>= 1.43.0 < 2":
+mime-db@1.46.0:
   version "1.46.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.46.0.tgz#6267748a7f799594de3cbc8cde91def349661cee"
   integrity sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ==
 
-mime-db@1.52.0:
+mime-db@1.52.0, "mime-db@>= 1.43.0 < 2":
   version "1.52.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
-mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.17, mime-types@~2.1.24:
-  version "2.1.29"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.29.tgz#1d4ab77da64b91f5f72489df29236563754bb1b2"
-  integrity sha512-Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ==
-  dependencies:
-    mime-db "1.46.0"
-
-mime-types@^2.1.31, mime-types@~2.1.34:
+mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24, mime-types@~2.1.34:
   version "2.1.35"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
   integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
@@ -9798,20 +8661,13 @@ minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5, minimist@^1.
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
   integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
 
-mkdirp@^0.5.1:
+mkdirp@^0.5.1, mkdirp@^0.5.5, mkdirp@~0.5.1:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
   integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
   dependencies:
     minimist "^1.2.6"
 
-mkdirp@^0.5.5, mkdirp@~0.5.1:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
-  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
-  dependencies:
-    minimist "^1.2.5"
-
 monaco-editor-auto-typings@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/monaco-editor-auto-typings/-/monaco-editor-auto-typings-0.4.0.tgz#52c0b1c74086fbf23568a0322a505808ecd95566"
@@ -9965,20 +8821,13 @@ nth-check@^1.0.2:
   dependencies:
     boolbase "~1.0.0"
 
-nth-check@^2.0.0:
+nth-check@^2.0.0, nth-check@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d"
   integrity sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==
   dependencies:
     boolbase "^1.0.0"
 
-nth-check@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2"
-  integrity sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==
-  dependencies:
-    boolbase "^1.0.0"
-
 nwsapi@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
@@ -9994,16 +8843,11 @@ object-hash@^2.2.0:
   resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.2.0.tgz#5ad518581eefc443bd763472b8ff2e9c2c0d54a5"
   integrity sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==
 
-object-inspect@^1.12.0, object-inspect@^1.9.0:
+object-inspect@^1.12.0, object-inspect@^1.8.0, object-inspect@^1.9.0:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0"
   integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==
 
-object-inspect@^1.8.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a"
-  integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==
-
 object-inspect@~1.4.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.4.1.tgz#37ffb10e71adaf3748d05f713b4c9452f402cbc4"
@@ -10059,17 +8903,7 @@ object.hasown@^1.1.0:
     define-properties "^1.1.3"
     es-abstract "^1.19.1"
 
-object.values@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.2.tgz#7a2015e06fcb0f546bd652486ce8583a4731c731"
-  integrity sha512-MYC0jvJopr8EK6dPBiO8Nb9mvjdypOachO5REGk6MXzujbBrAisKo3HmdEI6kZDL6fC31Mwee/5YbtMebixeag==
-  dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.1"
-    has "^1.0.3"
-
-object.values@^1.1.5:
+object.values@^1.1.0, object.values@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac"
   integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==
@@ -10356,12 +9190,7 @@ picocolors@^1.0.0:
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
-picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1, picomatch@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
-  integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
-
-picomatch@^2.2.3, picomatch@^2.3.1:
+picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
@@ -10890,7 +9719,7 @@ postcss-selector-not@^5.0.0:
   dependencies:
     balanced-match "^1.0.0"
 
-postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.6, postcss-selector-parser@^6.0.9:
+postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.6, postcss-selector-parser@^6.0.9:
   version "6.0.10"
   resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz#79b61e2c0d1bfc2602d549e11d0876256f8df88d"
   integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==
@@ -10898,16 +9727,6 @@ postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.4, postcss-selecto
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
 
-postcss-selector-parser@^6.0.2:
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz#56075a1380a04604c38b063ea7767a129af5c2b3"
-  integrity sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==
-  dependencies:
-    cssesc "^3.0.0"
-    indexes-of "^1.0.1"
-    uniq "^1.0.1"
-    util-deprecate "^1.0.2"
-
 postcss-svgo@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.1.0.tgz#0a317400ced789f233a28826e77523f15857d80d"
@@ -10923,12 +9742,7 @@ postcss-unique-selectors@^5.1.1:
   dependencies:
     postcss-selector-parser "^6.0.5"
 
-postcss-value-parser@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
-  integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
-
-postcss-value-parser@^4.2.0:
+postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
@@ -10988,17 +9802,7 @@ pretty-format@^26.0.0, pretty-format@^26.6.2:
     ansi-styles "^4.0.0"
     react-is "^17.0.1"
 
-pretty-format@^27.0.0:
-  version "27.0.6"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.0.6.tgz#ab770c47b2c6f893a21aefc57b75da63ef49a11f"
-  integrity sha512-8tGD7gBIENgzqA+UBzObyWqQ5B778VIFZA/S66cclyd5YkFLYs2Js7gxDKf0MXtTc9zcS7t1xhdfcElJ3YIvkQ==
-  dependencies:
-    "@jest/types" "^27.0.6"
-    ansi-regex "^5.0.0"
-    ansi-styles "^5.0.0"
-    react-is "^17.0.1"
-
-pretty-format@^27.0.2, pretty-format@^27.5.1:
+pretty-format@^27.0.0, pretty-format@^27.0.2, pretty-format@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.1.tgz#2181879fdea51a7a5851fb39d920faa63f01d88e"
   integrity sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==
@@ -11036,15 +9840,7 @@ promise@^8.1.0:
   dependencies:
     asap "~2.0.6"
 
-prompts@^2.0.1:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.0.tgz#4aa5de0723a231d1ee9121c40fdf663df73f61d7"
-  integrity sha512-awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ==
-  dependencies:
-    kleur "^3.0.3"
-    sisteransi "^1.0.5"
-
-prompts@^2.4.2:
+prompts@^2.0.1, prompts@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069"
   integrity sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==
@@ -11052,7 +9848,7 @@ prompts@^2.4.2:
     kleur "^3.0.3"
     sisteransi "^1.0.5"
 
-prop-types@^15.0.0, prop-types@^15.7.2, prop-types@^15.8.1:
+prop-types@^15.0.0, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
   version "15.8.1"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
   integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
@@ -11061,15 +9857,6 @@ prop-types@^15.0.0, prop-types@^15.7.2, prop-types@^15.8.1:
     object-assign "^4.1.1"
     react-is "^16.13.1"
 
-prop-types@^15.6.2:
-  version "15.7.2"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
-  integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
-  dependencies:
-    loose-envify "^1.4.0"
-    object-assign "^4.1.1"
-    react-is "^16.8.1"
-
 property-expr@^2.0.4:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-2.0.5.tgz#278bdb15308ae16af3e3b9640024524f4dc02cb4"
@@ -11404,12 +10191,7 @@ react-is@^17.0.1, react-is@^17.0.2:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
   integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
 
-react-is@^18.0.0:
-  version "18.1.0"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.1.0.tgz#61aaed3096d30eacf2a2127118b5b41387d32a67"
-  integrity sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==
-
-react-is@^18.2.0:
+react-is@^18.0.0, react-is@^18.2.0:
   version "18.2.0"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
   integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
@@ -11922,7 +10704,7 @@ resolve.exports@^1.1.0:
   resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9"
   integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==
 
-resolve@^1.1.5, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.0:
+resolve@^1.1.5, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.0:
   version "1.22.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
   integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
@@ -11931,14 +10713,6 @@ resolve@^1.1.5, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
-resolve@^1.12.0:
-  version "1.20.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
-  integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
-  dependencies:
-    is-core-module "^2.2.0"
-    path-parse "^1.0.6"
-
 resolve@^2.0.0-next.3:
   version "2.0.0-next.3"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.3.tgz#d41016293d4a8586a39ca5d9b5f15cbea1f55e46"
@@ -12100,16 +10874,7 @@ schema-utils@^2.6.5:
     ajv "^6.12.4"
     ajv-keywords "^3.5.2"
 
-schema-utils@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz#67502f6aa2b66a2d4032b4279a2944978a0913ef"
-  integrity sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==
-  dependencies:
-    "@types/json-schema" "^7.0.6"
-    ajv "^6.12.5"
-    ajv-keywords "^3.5.2"
-
-schema-utils@^3.1.0, schema-utils@^3.1.1:
+schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
   integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
@@ -12138,7 +10903,7 @@ select-hose@^2.0.0:
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
   integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
 
-selenium-webdriver@4.0.0-rc-1:
+selenium-webdriver@4.0.0-rc-1, selenium-webdriver@^4.0.0-beta.2:
   version "4.0.0-rc-1"
   resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-4.0.0-rc-1.tgz#b1e7e5821298c8a071e988518dd6b759f0c41281"
   integrity sha512-bcrwFPRax8fifRP60p7xkWDGSJJoMkPAzufMlk5K2NyLPht/YZzR2WcIk1+3gR8VOCLlst1P2PI+MXACaFzpIw==
@@ -12148,16 +10913,6 @@ selenium-webdriver@4.0.0-rc-1:
     tmp "^0.2.1"
     ws ">=7.4.6"
 
-selenium-webdriver@^4.0.0-beta.2:
-  version "4.0.0-beta.4"
-  resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-4.0.0-beta.4.tgz#db4fc7505a515ea3b4a95ded031b738a1544eddd"
-  integrity sha512-+s/CIYkWzmnC9WASBxxVj7Lm0dcyl6OaFxwIJaFCT5WCuACiimEEr4lUnOOFP/QlKfkDQ56m+aRczaq2EvJEJg==
-  dependencies:
-    jszip "^3.6.0"
-    rimraf "^3.0.2"
-    tmp "^0.2.1"
-    ws ">=7.4.6"
-
 selfsigned@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.0.1.tgz#8b2df7fa56bf014d19b6007655fff209c0ef0a56"
@@ -12170,7 +10925,7 @@ semver@7.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-semver@7.x:
+semver@7.x, semver@^7.3.2, semver@^7.3.5:
   version "7.3.7"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
   integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
@@ -12187,20 +10942,6 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.3.2:
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
-  integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
-  dependencies:
-    lru-cache "^6.0.0"
-
-semver@^7.3.5:
-  version "7.3.6"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.6.tgz#5d73886fb9c0c6602e79440b97165c29581cbb2b"
-  integrity sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==
-  dependencies:
-    lru-cache "^7.4.0"
-
 send@0.17.2:
   version "0.17.2"
   resolved "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz#926622f76601c41808012c8bf1688fe3906f7820"
@@ -12610,15 +11351,7 @@ string.prototype.matchall@^4.0.6:
     regexp.prototype.flags "^1.4.1"
     side-channel "^1.0.4"
 
-string.prototype.trimend@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz#a22bd53cca5c7cf44d7c9d5c732118873d6cd18b"
-  integrity sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==
-  dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-
-string.prototype.trimend@^1.0.3, string.prototype.trimend@^1.0.4:
+string.prototype.trimend@^1.0.1, string.prototype.trimend@^1.0.3, string.prototype.trimend@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
   integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==
@@ -12626,15 +11359,7 @@ string.prototype.trimend@^1.0.3, string.prototype.trimend@^1.0.4:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
 
-string.prototype.trimstart@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz#9b4cb590e123bb36564401d59824298de50fd5aa"
-  integrity sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==
-  dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-
-string.prototype.trimstart@^1.0.3, string.prototype.trimstart@^1.0.4:
+string.prototype.trimstart@^1.0.1, string.prototype.trimstart@^1.0.3, string.prototype.trimstart@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"
   integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==
@@ -12680,14 +11405,7 @@ stringify-object@^3.3.0:
     is-obj "^1.0.1"
     is-regexp "^1.0.0"
 
-strip-ansi@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
-  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
-  dependencies:
-    ansi-regex "^5.0.0"
-
-strip-ansi@^6.0.1:
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -13042,14 +11760,7 @@ tr46@^1.0.1:
   dependencies:
     punycode "^2.1.0"
 
-tr46@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz#03273586def1595ae08fedb38d7733cee91d2479"
-  integrity sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==
-  dependencies:
-    punycode "^2.1.1"
-
-tr46@^2.1.0:
+tr46@^2.0.2, tr46@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240"
   integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==
@@ -13119,21 +11830,11 @@ tslib@^1.8.1, tslib@^1.9.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.0.1:
+tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
   integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
 
-tslib@^2.0.3:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a"
-  integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==
-
-tslib@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
-  integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
-
 tss-react@^3.6.2:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/tss-react/-/tss-react-3.6.2.tgz#5e995d8b82ca730ba04a21203ae68f1c5372a85e"
@@ -13787,16 +12488,7 @@ whatwg-url@^7.0.0:
     tr46 "^1.0.1"
     webidl-conversions "^4.0.2"
 
-whatwg-url@^8.0.0:
-  version "8.4.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.4.0.tgz#50fb9615b05469591d2b2bd6dfaed2942ed72837"
-  integrity sha512-vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw==
-  dependencies:
-    lodash.sortby "^4.7.0"
-    tr46 "^2.0.2"
-    webidl-conversions "^6.1.0"
-
-whatwg-url@^8.5.0:
+whatwg-url@^8.0.0, whatwg-url@^8.5.0:
   version "8.7.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77"
   integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==
@@ -14042,21 +12734,16 @@ write-file-atomic@^3.0.0:
     signal-exit "^3.0.2"
     typedarray-to-buffer "^3.1.5"
 
-ws@>=7.4.6:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.0.tgz#0b738cd484bfc9303421914b11bb4011e07615bb"
-  integrity sha512-uYhVJ/m9oXwEI04iIVmgLmugh2qrZihkywG9y5FfZV2ATeLIzHf93qs+tUNqlttbQK957/VX3mtwAS+UfIwA4g==
+ws@>=7.4.6, ws@^8.4.2:
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f"
+  integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==
 
 ws@^7.4.6:
   version "7.5.7"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67"
   integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==
 
-ws@^8.4.2:
-  version "8.5.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f"
-  integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==
-
 xml-name-validator@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
@@ -14082,16 +12769,11 @@ yallist@^4.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-yaml@^1.10.0, yaml@^1.10.2, yaml@^1.5.0:
+yaml@^1.10.0, yaml@^1.10.2, yaml@^1.5.0, yaml@^1.7.2:
   version "1.10.2"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
-yaml@^1.7.2:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e"
-  integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==
-
 yargs-parser@^20.2.2, yargs-parser@^20.x:
   version "20.2.9"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"

From 8abe5f9636f8efc698f6b45c9a99705eb9486737 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 11 Oct 2022 17:23:58 +1100
Subject: [PATCH 171/309] ROWY-710 NewColumnModal: remove short text as default
 field type

---
 package.json                                  |   2 +-
 .../ColumnModals/NewColumnModal.tsx           |   2 +-
 yarn.lock                                     | 344 ++++++------------
 3 files changed, 118 insertions(+), 230 deletions(-)

diff --git a/package.json b/package.json
index 63284107..fb029fc7 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "@mui/material": "5.6.0",
     "@mui/x-date-pickers": "^5.0.0-alpha.4",
     "@rowy/form-builder": "^0.7.0",
-    "@rowy/multiselect": "^0.4.0",
+    "@rowy/multiselect": "^0.4.1",
     "@tinymce/tinymce-react": "^3",
     "@uiw/react-md-editor": "^3.14.1",
     "algoliasearch": "^4.13.1",
diff --git a/src/components/ColumnModals/NewColumnModal.tsx b/src/components/ColumnModals/NewColumnModal.tsx
index 7bbe8003..9f3a8aba 100644
--- a/src/components/ColumnModals/NewColumnModal.tsx
+++ b/src/components/ColumnModals/NewColumnModal.tsx
@@ -36,7 +36,7 @@ export default function NewColumnModal({
 
   const [columnLabel, setColumnLabel] = useState("");
   const [fieldKey, setFieldKey] = useState("");
-  const [type, setType] = useState(FieldType.shortText);
+  const [type, setType] = useState("" as any);
   const requireConfiguration = getFieldProp("requireConfiguration", type);
 
   const isAuditField = AUDIT_FIELD_TYPES.includes(type);
diff --git a/yarn.lock b/yarn.lock
index 22973d01..4d281370 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -129,7 +129,7 @@
   dependencies:
     "@babel/highlight" "^7.16.7"
 
-"@babel/compat-data@^7.12.13", "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.8", "@babel/compat-data@^7.17.0", "@babel/compat-data@^7.17.7":
+"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.8", "@babel/compat-data@^7.17.0", "@babel/compat-data@^7.17.7":
   version "7.17.7"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.7.tgz#078d8b833fbbcc95286613be8c716cef2b519fa2"
   integrity sha512-p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ==
@@ -164,7 +164,7 @@
     eslint-visitor-keys "^2.1.0"
     semver "^6.3.0"
 
-"@babel/generator@^7.12.17", "@babel/generator@^7.17.9", "@babel/generator@^7.7.2":
+"@babel/generator@^7.17.9", "@babel/generator@^7.7.2":
   version "7.17.9"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.9.tgz#f4af9fd38fa8de143c29fce3f71852406fc1e2fc"
   integrity sha512-rAdDousTwxbIxbz5I7GEQ3lUip+xVCXooZNbsydCWs3xA7ZsYOv+CFRdzGxRX78BmQHu9B1Eso59AOZQOJDEdQ==
@@ -173,14 +173,14 @@
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
-"@babel/helper-annotate-as-pure@^7.10.4", "@babel/helper-annotate-as-pure@^7.12.13", "@babel/helper-annotate-as-pure@^7.16.7":
+"@babel/helper-annotate-as-pure@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862"
   integrity sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.12.13", "@babel/helper-builder-binary-assignment-operator-visitor@^7.16.7":
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz#38d138561ea207f0f69eb1626a418e4f7e6a580b"
   integrity sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==
@@ -188,7 +188,7 @@
     "@babel/helper-explode-assignable-expression" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/helper-compilation-targets@^7.12.17", "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7", "@babel/helper-compilation-targets@^7.17.7":
+"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7", "@babel/helper-compilation-targets@^7.17.7":
   version "7.17.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz#a3c2924f5e5f0379b356d4cfb313d1414dc30e46"
   integrity sha512-UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w==
@@ -198,7 +198,7 @@
     browserslist "^4.17.5"
     semver "^6.3.0"
 
-"@babel/helper-create-class-features-plugin@^7.12.13", "@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.6", "@babel/helper-create-class-features-plugin@^7.17.9":
+"@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.6", "@babel/helper-create-class-features-plugin@^7.17.9":
   version "7.17.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.9.tgz#71835d7fb9f38bd9f1378e40a4c0902fdc2ea49d"
   integrity sha512-kUjip3gruz6AJKOq5i3nC6CoCEEF/oHH3cp6tOZhB+IyyyPyW0g1Gfsxn3mkk6S08pIA2y8GQh609v9G/5sHVQ==
@@ -211,7 +211,7 @@
     "@babel/helper-replace-supers" "^7.16.7"
     "@babel/helper-split-export-declaration" "^7.16.7"
 
-"@babel/helper-create-regexp-features-plugin@^7.12.13", "@babel/helper-create-regexp-features-plugin@^7.16.7":
+"@babel/helper-create-regexp-features-plugin@^7.16.7":
   version "7.17.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz#1dcc7d40ba0c6b6b25618997c5dbfd310f186fe1"
   integrity sha512-awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA==
@@ -240,14 +240,14 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-explode-assignable-expression@^7.12.13", "@babel/helper-explode-assignable-expression@^7.16.7":
+"@babel/helper-explode-assignable-expression@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz#12a6d8522fdd834f194e868af6354e8650242b7a"
   integrity sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-function-name@^7.12.13", "@babel/helper-function-name@^7.16.7", "@babel/helper-function-name@^7.17.9":
+"@babel/helper-function-name@^7.16.7", "@babel/helper-function-name@^7.17.9":
   version "7.17.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz#136fcd54bc1da82fcb47565cf16fd8e444b1ff12"
   integrity sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==
@@ -255,21 +255,14 @@
     "@babel/template" "^7.16.7"
     "@babel/types" "^7.17.0"
 
-"@babel/helper-get-function-arity@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583"
-  integrity sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==
-  dependencies:
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-hoist-variables@^7.12.13", "@babel/helper-hoist-variables@^7.16.7":
+"@babel/helper-hoist-variables@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246"
   integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-member-expression-to-functions@^7.12.13", "@babel/helper-member-expression-to-functions@^7.12.17", "@babel/helper-member-expression-to-functions@^7.16.7", "@babel/helper-member-expression-to-functions@^7.17.7":
+"@babel/helper-member-expression-to-functions@^7.16.7", "@babel/helper-member-expression-to-functions@^7.17.7":
   version "7.17.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz#a34013b57d8542a8c4ff8ba3f747c02452a4d8c4"
   integrity sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==
@@ -283,7 +276,7 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-module-transforms@^7.12.13", "@babel/helper-module-transforms@^7.12.17", "@babel/helper-module-transforms@^7.16.7", "@babel/helper-module-transforms@^7.17.7":
+"@babel/helper-module-transforms@^7.16.7", "@babel/helper-module-transforms@^7.17.7":
   version "7.17.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz#3943c7f777139e7954a5355c815263741a9c1cbd"
   integrity sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw==
@@ -297,7 +290,7 @@
     "@babel/traverse" "^7.17.3"
     "@babel/types" "^7.17.0"
 
-"@babel/helper-optimise-call-expression@^7.12.13", "@babel/helper-optimise-call-expression@^7.16.7":
+"@babel/helper-optimise-call-expression@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz#a34e3560605abbd31a18546bd2aad3e6d9a174f2"
   integrity sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==
@@ -309,7 +302,7 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5"
   integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==
 
-"@babel/helper-remap-async-to-generator@^7.12.13", "@babel/helper-remap-async-to-generator@^7.16.8":
+"@babel/helper-remap-async-to-generator@^7.16.8":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz#29ffaade68a367e2ed09c90901986918d25e57e3"
   integrity sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==
@@ -318,7 +311,7 @@
     "@babel/helper-wrap-function" "^7.16.8"
     "@babel/types" "^7.16.8"
 
-"@babel/helper-replace-supers@^7.12.13", "@babel/helper-replace-supers@^7.16.7":
+"@babel/helper-replace-supers@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz#e9f5f5f32ac90429c1a4bdec0f231ef0c2838ab1"
   integrity sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==
@@ -329,38 +322,38 @@
     "@babel/traverse" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/helper-simple-access@^7.12.13", "@babel/helper-simple-access@^7.17.7":
+"@babel/helper-simple-access@^7.17.7":
   version "7.17.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz#aaa473de92b7987c6dfa7ce9a7d9674724823367"
   integrity sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==
   dependencies:
     "@babel/types" "^7.17.0"
 
-"@babel/helper-skip-transparent-expression-wrappers@^7.12.1", "@babel/helper-skip-transparent-expression-wrappers@^7.16.0":
+"@babel/helper-skip-transparent-expression-wrappers@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09"
   integrity sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==
   dependencies:
     "@babel/types" "^7.16.0"
 
-"@babel/helper-split-export-declaration@^7.12.13", "@babel/helper-split-export-declaration@^7.16.7":
+"@babel/helper-split-export-declaration@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b"
   integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-validator-identifier@^7.12.11", "@babel/helper-validator-identifier@^7.16.7":
+"@babel/helper-validator-identifier@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad"
   integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==
 
-"@babel/helper-validator-option@^7.12.17", "@babel/helper-validator-option@^7.16.7":
+"@babel/helper-validator-option@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23"
   integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==
 
-"@babel/helper-wrap-function@^7.12.13", "@babel/helper-wrap-function@^7.16.8":
+"@babel/helper-wrap-function@^7.16.8":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz#58afda087c4cd235de92f7ceedebca2c41274200"
   integrity sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==
@@ -370,7 +363,7 @@
     "@babel/traverse" "^7.16.8"
     "@babel/types" "^7.16.8"
 
-"@babel/helpers@^7.12.17", "@babel/helpers@^7.17.9":
+"@babel/helpers@^7.17.9":
   version "7.17.9"
   resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.9.tgz#b2af120821bfbe44f9907b1826e168e819375a1a"
   integrity sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q==
@@ -379,7 +372,7 @@
     "@babel/traverse" "^7.17.9"
     "@babel/types" "^7.17.0"
 
-"@babel/highlight@^7.12.13", "@babel/highlight@^7.16.7":
+"@babel/highlight@^7.16.7":
   version "7.17.9"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.17.9.tgz#61b2ee7f32ea0454612def4fccdae0de232b73e3"
   integrity sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==
@@ -388,7 +381,7 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.12.17", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.17.9":
+"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.17.9":
   version "7.17.9"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.9.tgz#9c94189a6062f0291418ca021077983058e171ef"
   integrity sha512-vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg==
@@ -409,7 +402,7 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
     "@babel/plugin-proposal-optional-chaining" "^7.16.7"
 
-"@babel/plugin-proposal-async-generator-functions@^7.12.13", "@babel/plugin-proposal-async-generator-functions@^7.16.8":
+"@babel/plugin-proposal-async-generator-functions@^7.16.8":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz#3bdd1ebbe620804ea9416706cd67d60787504bc8"
   integrity sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==
@@ -418,7 +411,7 @@
     "@babel/helper-remap-async-to-generator" "^7.16.8"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
-"@babel/plugin-proposal-class-properties@^7.12.13", "@babel/plugin-proposal-class-properties@^7.16.0", "@babel/plugin-proposal-class-properties@^7.16.7":
+"@babel/plugin-proposal-class-properties@^7.16.0", "@babel/plugin-proposal-class-properties@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0"
   integrity sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==
@@ -447,7 +440,7 @@
     "@babel/plugin-syntax-decorators" "^7.17.0"
     charcodes "^0.2.0"
 
-"@babel/plugin-proposal-dynamic-import@^7.12.17", "@babel/plugin-proposal-dynamic-import@^7.16.7":
+"@babel/plugin-proposal-dynamic-import@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz#c19c897eaa46b27634a00fee9fb7d829158704b2"
   integrity sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==
@@ -455,7 +448,7 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
-"@babel/plugin-proposal-export-namespace-from@^7.12.13", "@babel/plugin-proposal-export-namespace-from@^7.16.7":
+"@babel/plugin-proposal-export-namespace-from@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz#09de09df18445a5786a305681423ae63507a6163"
   integrity sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==
@@ -463,7 +456,7 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
-"@babel/plugin-proposal-json-strings@^7.12.13", "@babel/plugin-proposal-json-strings@^7.16.7":
+"@babel/plugin-proposal-json-strings@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz#9732cb1d17d9a2626a08c5be25186c195b6fa6e8"
   integrity sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ==
@@ -471,7 +464,7 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
 
-"@babel/plugin-proposal-logical-assignment-operators@^7.12.13", "@babel/plugin-proposal-logical-assignment-operators@^7.16.7":
+"@babel/plugin-proposal-logical-assignment-operators@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz#be23c0ba74deec1922e639832904be0bea73cdea"
   integrity sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==
@@ -479,7 +472,7 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.12.13", "@babel/plugin-proposal-nullish-coalescing-operator@^7.16.0", "@babel/plugin-proposal-nullish-coalescing-operator@^7.16.7":
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.16.0", "@babel/plugin-proposal-nullish-coalescing-operator@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz#141fc20b6857e59459d430c850a0011e36561d99"
   integrity sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==
@@ -487,7 +480,7 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
-"@babel/plugin-proposal-numeric-separator@^7.12.13", "@babel/plugin-proposal-numeric-separator@^7.16.0", "@babel/plugin-proposal-numeric-separator@^7.16.7":
+"@babel/plugin-proposal-numeric-separator@^7.16.0", "@babel/plugin-proposal-numeric-separator@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz#d6b69f4af63fb38b6ca2558442a7fb191236eba9"
   integrity sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==
@@ -495,7 +488,7 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.12.13", "@babel/plugin-proposal-object-rest-spread@^7.16.7":
+"@babel/plugin-proposal-object-rest-spread@^7.16.7":
   version "7.17.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.17.3.tgz#d9eb649a54628a51701aef7e0ea3d17e2b9dd390"
   integrity sha512-yuL5iQA/TbZn+RGAfxQXfi7CNLmKi1f8zInn4IgobuCWcAb7i+zj4TYzQ9l8cEzVyJ89PDGuqxK1xZpUDISesw==
@@ -506,7 +499,7 @@
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
     "@babel/plugin-transform-parameters" "^7.16.7"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.12.13", "@babel/plugin-proposal-optional-catch-binding@^7.16.7":
+"@babel/plugin-proposal-optional-catch-binding@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz#c623a430674ffc4ab732fd0a0ae7722b67cb74cf"
   integrity sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==
@@ -514,7 +507,7 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-proposal-optional-chaining@^7.12.17", "@babel/plugin-proposal-optional-chaining@^7.16.0", "@babel/plugin-proposal-optional-chaining@^7.16.7":
+"@babel/plugin-proposal-optional-chaining@^7.16.0", "@babel/plugin-proposal-optional-chaining@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz#7cd629564724816c0e8a969535551f943c64c39a"
   integrity sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==
@@ -523,7 +516,7 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-proposal-private-methods@^7.12.13", "@babel/plugin-proposal-private-methods@^7.16.0", "@babel/plugin-proposal-private-methods@^7.16.11":
+"@babel/plugin-proposal-private-methods@^7.16.0", "@babel/plugin-proposal-private-methods@^7.16.11":
   version "7.16.11"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz#e8df108288555ff259f4527dbe84813aac3a1c50"
   integrity sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==
@@ -541,7 +534,7 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.12.13", "@babel/plugin-proposal-unicode-property-regex@^7.16.7", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+"@babel/plugin-proposal-unicode-property-regex@^7.16.7", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz#635d18eb10c6214210ffc5ff4932552de08188a2"
   integrity sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg==
@@ -549,7 +542,7 @@
     "@babel/helper-create-regexp-features-plugin" "^7.16.7"
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-syntax-async-generators@^7.8.0", "@babel/plugin-syntax-async-generators@^7.8.4":
+"@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
   integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
@@ -584,7 +577,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-syntax-dynamic-import@^7.8.0", "@babel/plugin-syntax-dynamic-import@^7.8.3":
+"@babel/plugin-syntax-dynamic-import@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
   integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==
@@ -612,7 +605,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-json-strings@^7.8.0", "@babel/plugin-syntax-json-strings@^7.8.3":
+"@babel/plugin-syntax-json-strings@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
   integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
@@ -633,7 +626,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0", "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
+"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
   integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
@@ -647,21 +640,21 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-object-rest-spread@^7.8.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3":
+"@babel/plugin-syntax-object-rest-spread@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
   integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-optional-catch-binding@^7.8.0", "@babel/plugin-syntax-optional-catch-binding@^7.8.3":
+"@babel/plugin-syntax-optional-catch-binding@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
   integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-optional-chaining@^7.8.0", "@babel/plugin-syntax-optional-chaining@^7.8.3":
+"@babel/plugin-syntax-optional-chaining@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
   integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
@@ -675,7 +668,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-top-level-await@^7.12.13", "@babel/plugin-syntax-top-level-await@^7.14.5", "@babel/plugin-syntax-top-level-await@^7.8.3":
+"@babel/plugin-syntax-top-level-await@^7.14.5", "@babel/plugin-syntax-top-level-await@^7.8.3":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
   integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
@@ -689,14 +682,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-arrow-functions@^7.12.13", "@babel/plugin-transform-arrow-functions@^7.16.7":
+"@babel/plugin-transform-arrow-functions@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz#44125e653d94b98db76369de9c396dc14bef4154"
   integrity sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-async-to-generator@^7.12.13", "@babel/plugin-transform-async-to-generator@^7.16.8":
+"@babel/plugin-transform-async-to-generator@^7.16.8":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz#b83dff4b970cf41f1b819f8b49cc0cfbaa53a808"
   integrity sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg==
@@ -705,21 +698,21 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/helper-remap-async-to-generator" "^7.16.8"
 
-"@babel/plugin-transform-block-scoped-functions@^7.12.13", "@babel/plugin-transform-block-scoped-functions@^7.16.7":
+"@babel/plugin-transform-block-scoped-functions@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz#4d0d57d9632ef6062cdf354bb717102ee042a620"
   integrity sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-block-scoping@^7.12.13", "@babel/plugin-transform-block-scoping@^7.16.7":
+"@babel/plugin-transform-block-scoping@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz#f50664ab99ddeaee5bc681b8f3a6ea9d72ab4f87"
   integrity sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-classes@^7.12.13", "@babel/plugin-transform-classes@^7.16.7":
+"@babel/plugin-transform-classes@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz#8f4b9562850cd973de3b498f1218796eb181ce00"
   integrity sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ==
@@ -733,21 +726,21 @@
     "@babel/helper-split-export-declaration" "^7.16.7"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.12.13", "@babel/plugin-transform-computed-properties@^7.16.7":
+"@babel/plugin-transform-computed-properties@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz#66dee12e46f61d2aae7a73710f591eb3df616470"
   integrity sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-destructuring@^7.12.13", "@babel/plugin-transform-destructuring@^7.16.7":
+"@babel/plugin-transform-destructuring@^7.16.7":
   version "7.17.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.7.tgz#49dc2675a7afa9a5e4c6bdee636061136c3408d1"
   integrity sha512-XVh0r5yq9sLR4vZ6eVZe8FKfIcSgaTBxVBRSYokRj2qksf6QerYnTxz9/GTuKTH/n/HwLP7t6gtlybHetJ/6hQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-dotall-regex@^7.12.13", "@babel/plugin-transform-dotall-regex@^7.16.7", "@babel/plugin-transform-dotall-regex@^7.4.4":
+"@babel/plugin-transform-dotall-regex@^7.16.7", "@babel/plugin-transform-dotall-regex@^7.4.4":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz#6b2d67686fab15fb6a7fd4bd895d5982cfc81241"
   integrity sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==
@@ -755,14 +748,14 @@
     "@babel/helper-create-regexp-features-plugin" "^7.16.7"
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-duplicate-keys@^7.12.13", "@babel/plugin-transform-duplicate-keys@^7.16.7":
+"@babel/plugin-transform-duplicate-keys@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz#2207e9ca8f82a0d36a5a67b6536e7ef8b08823c9"
   integrity sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-exponentiation-operator@^7.12.13", "@babel/plugin-transform-exponentiation-operator@^7.16.7":
+"@babel/plugin-transform-exponentiation-operator@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz#efa9862ef97e9e9e5f653f6ddc7b665e8536fe9b"
   integrity sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==
@@ -778,14 +771,14 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-flow" "^7.16.7"
 
-"@babel/plugin-transform-for-of@^7.12.13", "@babel/plugin-transform-for-of@^7.16.7":
+"@babel/plugin-transform-for-of@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz#649d639d4617dff502a9a158c479b3b556728d8c"
   integrity sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-function-name@^7.12.13", "@babel/plugin-transform-function-name@^7.16.7":
+"@babel/plugin-transform-function-name@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz#5ab34375c64d61d083d7d2f05c38d90b97ec65cf"
   integrity sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==
@@ -794,21 +787,21 @@
     "@babel/helper-function-name" "^7.16.7"
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-literals@^7.12.13", "@babel/plugin-transform-literals@^7.16.7":
+"@babel/plugin-transform-literals@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz#254c9618c5ff749e87cb0c0cef1a0a050c0bdab1"
   integrity sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-member-expression-literals@^7.12.13", "@babel/plugin-transform-member-expression-literals@^7.16.7":
+"@babel/plugin-transform-member-expression-literals@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz#6e5dcf906ef8a098e630149d14c867dd28f92384"
   integrity sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-modules-amd@^7.12.13", "@babel/plugin-transform-modules-amd@^7.16.7":
+"@babel/plugin-transform-modules-amd@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz#b28d323016a7daaae8609781d1f8c9da42b13186"
   integrity sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==
@@ -817,7 +810,7 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-commonjs@^7.12.13", "@babel/plugin-transform-modules-commonjs@^7.16.8":
+"@babel/plugin-transform-modules-commonjs@^7.16.8":
   version "7.17.9"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.9.tgz#274be1a2087beec0254d4abd4d86e52442e1e5b6"
   integrity sha512-2TBFd/r2I6VlYn0YRTz2JdazS+FoUuQ2rIFHoAxtyP/0G3D82SBLaRq9rnUkpqlLg03Byfl/+M32mpxjO6KaPw==
@@ -827,7 +820,7 @@
     "@babel/helper-simple-access" "^7.17.7"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-systemjs@^7.12.13", "@babel/plugin-transform-modules-systemjs@^7.16.7":
+"@babel/plugin-transform-modules-systemjs@^7.16.7":
   version "7.17.8"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.17.8.tgz#81fd834024fae14ea78fbe34168b042f38703859"
   integrity sha512-39reIkMTUVagzgA5x88zDYXPCMT6lcaRKs1+S9K6NKBPErbgO/w/kP8GlNQTC87b412ZTlmNgr3k2JrWgHH+Bw==
@@ -838,7 +831,7 @@
     "@babel/helper-validator-identifier" "^7.16.7"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-umd@^7.12.13", "@babel/plugin-transform-modules-umd@^7.16.7":
+"@babel/plugin-transform-modules-umd@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz#23dad479fa585283dbd22215bff12719171e7618"
   integrity sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ==
@@ -846,21 +839,21 @@
     "@babel/helper-module-transforms" "^7.16.7"
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.12.13", "@babel/plugin-transform-named-capturing-groups-regex@^7.16.8":
+"@babel/plugin-transform-named-capturing-groups-regex@^7.16.8":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz#7f860e0e40d844a02c9dcf9d84965e7dfd666252"
   integrity sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw==
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.16.7"
 
-"@babel/plugin-transform-new-target@^7.12.13", "@babel/plugin-transform-new-target@^7.16.7":
+"@babel/plugin-transform-new-target@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz#9967d89a5c243818e0800fdad89db22c5f514244"
   integrity sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-object-super@^7.12.13", "@babel/plugin-transform-object-super@^7.16.7":
+"@babel/plugin-transform-object-super@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz#ac359cf8d32cf4354d27a46867999490b6c32a94"
   integrity sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==
@@ -868,14 +861,14 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/helper-replace-supers" "^7.16.7"
 
-"@babel/plugin-transform-parameters@^7.12.13", "@babel/plugin-transform-parameters@^7.16.7":
+"@babel/plugin-transform-parameters@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz#a1721f55b99b736511cb7e0152f61f17688f331f"
   integrity sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-property-literals@^7.12.13", "@babel/plugin-transform-property-literals@^7.16.7":
+"@babel/plugin-transform-property-literals@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz#2dadac85155436f22c696c4827730e0fe1057a55"
   integrity sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==
@@ -889,21 +882,21 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
-"@babel/plugin-transform-react-display-name@^7.12.13", "@babel/plugin-transform-react-display-name@^7.16.0", "@babel/plugin-transform-react-display-name@^7.16.7":
+"@babel/plugin-transform-react-display-name@^7.16.0", "@babel/plugin-transform-react-display-name@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.7.tgz#7b6d40d232f4c0f550ea348593db3b21e2404340"
   integrity sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-react-jsx-development@^7.12.12", "@babel/plugin-transform-react-jsx-development@^7.16.7":
+"@babel/plugin-transform-react-jsx-development@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.7.tgz#43a00724a3ed2557ed3f276a01a929e6686ac7b8"
   integrity sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A==
   dependencies:
     "@babel/plugin-transform-react-jsx" "^7.16.7"
 
-"@babel/plugin-transform-react-jsx@^7.12.13", "@babel/plugin-transform-react-jsx@^7.12.17", "@babel/plugin-transform-react-jsx@^7.16.7":
+"@babel/plugin-transform-react-jsx@^7.16.7":
   version "7.17.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.17.3.tgz#eac1565da176ccb1a715dae0b4609858808008c1"
   integrity sha512-9tjBm4O07f7mzKSIlEmPdiE6ub7kfIe6Cd+w+oQebpATfTQMAgW+YOuWxogbKVTulA+MEO7byMeIUtQ1z+z+ZQ==
@@ -914,7 +907,7 @@
     "@babel/plugin-syntax-jsx" "^7.16.7"
     "@babel/types" "^7.17.0"
 
-"@babel/plugin-transform-react-pure-annotations@^7.12.1", "@babel/plugin-transform-react-pure-annotations@^7.16.7":
+"@babel/plugin-transform-react-pure-annotations@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.7.tgz#232bfd2f12eb551d6d7d01d13fe3f86b45eb9c67"
   integrity sha512-hs71ToC97k3QWxswh2ElzMFABXHvGiJ01IB1TbYQDGeWRKWz/MPUTh5jGExdHvosYKpnJW5Pm3S4+TA3FyX+GA==
@@ -922,14 +915,14 @@
     "@babel/helper-annotate-as-pure" "^7.16.7"
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-regenerator@^7.12.13", "@babel/plugin-transform-regenerator@^7.16.7":
+"@babel/plugin-transform-regenerator@^7.16.7":
   version "7.17.9"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.17.9.tgz#0a33c3a61cf47f45ed3232903683a0afd2d3460c"
   integrity sha512-Lc2TfbxR1HOyn/c6b4Y/b6NHoTb67n/IoWLxTu4kC7h4KQnWlhCq2S8Tx0t2SVvv5Uu87Hs+6JEJ5kt2tYGylQ==
   dependencies:
     regenerator-transform "^0.15.0"
 
-"@babel/plugin-transform-reserved-words@^7.12.13", "@babel/plugin-transform-reserved-words@^7.16.7":
+"@babel/plugin-transform-reserved-words@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz#1d798e078f7c5958eec952059c460b220a63f586"
   integrity sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg==
@@ -948,14 +941,14 @@
     babel-plugin-polyfill-regenerator "^0.3.0"
     semver "^6.3.0"
 
-"@babel/plugin-transform-shorthand-properties@^7.12.13", "@babel/plugin-transform-shorthand-properties@^7.16.7":
+"@babel/plugin-transform-shorthand-properties@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz#e8549ae4afcf8382f711794c0c7b6b934c5fbd2a"
   integrity sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-spread@^7.12.13", "@babel/plugin-transform-spread@^7.16.7":
+"@babel/plugin-transform-spread@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz#a303e2122f9f12e0105daeedd0f30fb197d8ff44"
   integrity sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg==
@@ -963,21 +956,21 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
 
-"@babel/plugin-transform-sticky-regex@^7.12.13", "@babel/plugin-transform-sticky-regex@^7.16.7":
+"@babel/plugin-transform-sticky-regex@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz#c84741d4f4a38072b9a1e2e3fd56d359552e8660"
   integrity sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-template-literals@^7.12.13", "@babel/plugin-transform-template-literals@^7.16.7":
+"@babel/plugin-transform-template-literals@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz#f3d1c45d28967c8e80f53666fc9c3e50618217ab"
   integrity sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-typeof-symbol@^7.12.13", "@babel/plugin-transform-typeof-symbol@^7.16.7":
+"@babel/plugin-transform-typeof-symbol@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz#9cdbe622582c21368bd482b660ba87d5545d4f7e"
   integrity sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ==
@@ -993,14 +986,14 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-typescript" "^7.16.7"
 
-"@babel/plugin-transform-unicode-escapes@^7.12.13", "@babel/plugin-transform-unicode-escapes@^7.16.7":
+"@babel/plugin-transform-unicode-escapes@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz#da8717de7b3287a2c6d659750c964f302b31ece3"
   integrity sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-unicode-regex@^7.12.13", "@babel/plugin-transform-unicode-regex@^7.16.7":
+"@babel/plugin-transform-unicode-regex@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz#0f7aa4a501198976e25e82702574c34cfebe9ef2"
   integrity sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==
@@ -1088,7 +1081,7 @@
     core-js-compat "^3.20.2"
     semver "^6.3.0"
 
-"@babel/preset-modules@^0.1.3", "@babel/preset-modules@^0.1.5":
+"@babel/preset-modules@^0.1.5":
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9"
   integrity sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==
@@ -1135,7 +1128,7 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.12.13", "@babel/template@^7.16.7", "@babel/template@^7.3.3":
+"@babel/template@^7.16.7", "@babel/template@^7.3.3":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155"
   integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==
@@ -1144,7 +1137,7 @@
     "@babel/parser" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/traverse@^7.12.13", "@babel/traverse@^7.12.17", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.3", "@babel/traverse@^7.17.9", "@babel/traverse@^7.7.2":
+"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.3", "@babel/traverse@^7.17.9", "@babel/traverse@^7.7.2":
   version "7.17.9"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.9.tgz#1f9b207435d9ae4a8ed6998b2b82300d83c37a0d"
   integrity sha512-PQO8sDIJ8SIwipTPiR71kJQCKQYB5NGImbOviK8K+kg5xkNSYXLBupuX9QhatFowrsvo9Hj8WgArg3W7ijNAQw==
@@ -1160,7 +1153,7 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.12.17", "@babel/types@^7.12.6", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
+"@babel/types@^7.0.0", "@babel/types@^7.12.6", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
   version "7.17.0"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b"
   integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==
@@ -1261,7 +1254,7 @@
   dependencies:
     postcss-value-parser "^4.2.0"
 
-"@date-io/core@^2.13.1", "@date-io/core@^2.14.0":
+"@date-io/core@^2.14.0":
   version "2.14.0"
   resolved "https://registry.yarnpkg.com/@date-io/core/-/core-2.14.0.tgz#03e9b9b9fc8e4d561c32dd324df0f3ccd967ef14"
   integrity sha512-qFN64hiFjmlDHJhu+9xMkdfDG2jLsggNxKXglnekUpXSq8faiqZgtHm2lsHCUuaPDTV6wuXHcCl8J1GQ5wLmPw==
@@ -1364,7 +1357,7 @@
     "@emotion/utils" "^1.0.0"
     csstype "^3.0.2"
 
-"@emotion/sheet@^1.1.0", "@emotion/sheet@^1.1.1":
+"@emotion/sheet@^1.1.1":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.1.1.tgz#015756e2a9a3c7c5f11d8ec22966a8dbfbfac787"
   integrity sha512-J3YPccVRMiTZxYAY0IOq3kd+hUP8idY8Kz6B/Cyo+JuXq52Ek+zbPbSQUrVQp95aJ+lsAW7DPL1P2Z+U1jGkKA==
@@ -1999,18 +1992,7 @@
     source-map "^0.6.1"
     write-file-atomic "^3.0.0"
 
-"@jest/types@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz#bef5a532030e1d88a2f5a6d933f84e97226ed48e"
-  integrity sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==
-  dependencies:
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^3.0.0"
-    "@types/node" "*"
-    "@types/yargs" "^15.0.0"
-    chalk "^4.0.0"
-
-"@jest/types@^27.0.6", "@jest/types@^27.5.1":
+"@jest/types@^27.5.1":
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.5.1.tgz#3c79ec4a8ba61c170bf937bcf9e98a9df175ec80"
   integrity sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==
@@ -2207,7 +2189,7 @@
     react-is "^18.2.0"
     react-transition-group "^4.4.2"
 
-"@mui/private-theming@^5.6.0", "@mui/private-theming@^5.9.1":
+"@mui/private-theming@^5.9.1":
   version "5.9.1"
   resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.9.1.tgz#4f714ed9ebd587373dc77b3fc69e9f3e720f0190"
   integrity sha512-eIh2IZJInNTdgPLMo9cruzm8UDX5amBBxxsSoNre7lRj3wcsu3TG5OKjIbzkf4VxHHEhdPeNNQyt92k7L78u2A==
@@ -2216,7 +2198,7 @@
     "@mui/utils" "^5.9.1"
     prop-types "^15.8.1"
 
-"@mui/styled-engine@^5.6.0", "@mui/styled-engine@^5.8.7":
+"@mui/styled-engine@^5.8.7":
   version "5.8.7"
   resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.8.7.tgz#63d0779c07677fe76d4705a02c7ae99f89b50780"
   integrity sha512-tVqtowjbYmiRq+qcqXK731L9eWoL9H8xTRhuTgaDGKdch1zlt4I2UwInUe1w2N9N/u3/jHsFbLcl1Un3uOwpQg==
@@ -2468,10 +2450,10 @@
     use-debounce "^8.0.0"
     yup "^0.32.9"
 
-"@rowy/multiselect@^0.4.0":
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/@rowy/multiselect/-/multiselect-0.4.0.tgz#0fe8b19e294a7c458f1610548f04ad36d00c290c"
-  integrity sha512-I441p29hwA99N9nlz1nckZqd7Br3/0vaIBsdR+UfCHUieQXvh19Awup1xOAi46i/ofKSWuYslhXncvGkyuEeIg==
+"@rowy/multiselect@^0.4.1":
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/@rowy/multiselect/-/multiselect-0.4.1.tgz#6a590dde5c7ab588c74c9188c1bb7547b4223fa6"
+  integrity sha512-XAHWKDeZjHWelNqjIRzS+RdAOXqWiQSv9dcWJAmwheLdhqRym2IjTEux41cy3OWyAKupAJkWacGDQmhLaRh1Lg==
 
 "@rushstack/eslint-patch@^1.1.0":
   version "1.1.1"
@@ -2993,7 +2975,7 @@
     jest-matcher-utils "^27.0.0"
     pretty-format "^27.0.0"
 
-"@types/json-schema@*", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
+"@types/json-schema@*", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
   version "7.0.11"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
   integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
@@ -3079,7 +3061,7 @@
   resolved "https://registry.yarnpkg.com/@types/prismjs/-/prismjs-1.26.0.tgz#a1c3809b0ad61c62cac6d4e0c56d610c910b7654"
   integrity sha512-ZTaqn/qSqUuAq1YwvOFQfVW1AR/oQJlLSZVustdjwI+GZ8kr0MSHBj0tsXPW1EqHubx50gtBEjbPGsdZwQwCjQ==
 
-"@types/prop-types@*", "@types/prop-types@^15.0.0", "@types/prop-types@^15.7.4", "@types/prop-types@^15.7.5":
+"@types/prop-types@*", "@types/prop-types@^15.0.0", "@types/prop-types@^15.7.5":
   version "15.7.5"
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf"
   integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==
@@ -3264,13 +3246,6 @@
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b"
   integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==
 
-"@types/yargs@^15.0.0":
-  version "15.0.13"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.13.tgz#34f7fec8b389d7f3c1fd08026a5763e072d3c6dc"
-  integrity sha512-kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ==
-  dependencies:
-    "@types/yargs-parser" "*"
-
 "@types/yargs@^16.0.0":
   version "16.0.4"
   resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.4.tgz#26aad98dd2c2a38e421086ea9ad42b9e51642977"
@@ -3698,7 +3673,7 @@ ansi-html-community@^0.0.8:
   resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41"
   integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==
 
-ansi-regex@^5.0.0, ansi-regex@^5.0.1:
+ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
@@ -4154,7 +4129,7 @@ brace-expansion@^2.0.1:
   dependencies:
     balanced-match "^1.0.0"
 
-braces@^3.0.1, braces@^3.0.2, braces@~3.0.2:
+braces@^3.0.2, braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
@@ -4181,7 +4156,7 @@ browser-process-hrtime@^1.0.0:
   resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
   integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
 
-browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.3, browserslist@^4.16.6, browserslist@^4.17.5, browserslist@^4.18.1, browserslist@^4.19.1, browserslist@^4.20.2:
+browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4.17.5, browserslist@^4.18.1, browserslist@^4.19.1, browserslist@^4.20.2:
   version "4.20.2"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.2.tgz#567b41508757ecd904dab4d1c646c612cd3d4f88"
   integrity sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA==
@@ -4290,7 +4265,7 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001181, caniuse-lite@^1.0.30001317:
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001317:
   version "1.0.30001328"
   resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001328.tgz"
   integrity sha512-Ue55jHkR/s4r00FLNiX+hGMMuwml/QGqqzVeMQ5thUewznU2EdULFvI3JR7JJid6OrjJNfFvHY2G2dIjmRaDDQ==
@@ -4509,11 +4484,6 @@ colord@^2.9.1:
   resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.2.tgz#25e2bacbbaa65991422c07ea209e2089428effb1"
   integrity sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ==
 
-colorette@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b"
-  integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==
-
 colorette@^2.0.10, colorette@^2.0.16:
   version "2.0.16"
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da"
@@ -4645,7 +4615,7 @@ cookie@0.4.2:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
   integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
 
-core-js-compat@^3.20.2, core-js-compat@^3.21.0, core-js-compat@^3.8.0:
+core-js-compat@^3.20.2, core-js-compat@^3.21.0:
   version "3.21.1"
   resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.21.1.tgz#cac369f67c8d134ff8f9bd1623e3bc2c42068c82"
   integrity sha512-gbgX5AUvMb8gwxC7FLVWYT7Kkgu/y7+h/h1X43yJkNqhlK2fuYyQimqvKGNZFAY6CKii/GFKJ2cp/1/42TN36g==
@@ -5125,11 +5095,6 @@ didyoumean@^1.2.2:
   resolved "https://registry.yarnpkg.com/didyoumean/-/didyoumean-1.2.2.tgz#989346ffe9e839b4555ecf5666edea0d3e8ad037"
   integrity sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==
 
-diff-sequences@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1"
-  integrity sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==
-
 diff-sequences@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.5.1.tgz#eaecc0d327fd68c8d9672a1e64ab8dccb2ef5327"
@@ -5336,7 +5301,7 @@ ejs@^3.1.5, ejs@^3.1.6:
   dependencies:
     jake "^10.8.5"
 
-electron-to-chromium@^1.3.649, electron-to-chromium@^1.4.84:
+electron-to-chromium@^1.4.84:
   version "1.4.106"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.106.tgz#e7a3bfa9d745dd9b9e597616cb17283cc349781a"
   integrity sha512-ZYfpVLULm67K7CaaGP7DmjyeMY4naxsbTy+syVVxT6QHI1Ww8XbJjmr9fDckrhq44WzCrcC5kH3zGpdusxwwqg==
@@ -5400,7 +5365,7 @@ error-stack-parser@^2.0.6:
   dependencies:
     stackframe "^1.1.1"
 
-es-abstract@^1.17.2, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es-abstract@^1.19.0, es-abstract@^1.19.1:
+es-abstract@^1.17.2, es-abstract@^1.18.0-next.2, es-abstract@^1.19.0, es-abstract@^1.19.1:
   version "1.19.2"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.2.tgz#8f7b696d8f15b167ae3640b4060670f3d054143f"
   integrity sha512-gfSBJoZdlL2xRiOCy0g8gLMryhoe1TlimjzU99L/31Z8QEGIhVQI+EWwt5lT+AuU9SnorVupXFqqOGqGfsyO6w==
@@ -6221,7 +6186,7 @@ functional-red-black-tree@^1.0.1:
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
   integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
 
-gensync@^1.0.0-beta.1, gensync@^1.0.0-beta.2:
+gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
@@ -6802,11 +6767,6 @@ indent-string@^4.0.0:
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
   integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
 
-indexes-of@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
-  integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc=
-
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -6906,7 +6866,7 @@ is-buffer@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191"
   integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==
 
-is-callable@^1.1.4, is-callable@^1.2.2, is-callable@^1.2.4:
+is-callable@^1.1.4, is-callable@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
   integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
@@ -6972,7 +6932,7 @@ is-module@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
   integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=
 
-is-negative-zero@^2.0.1, is-negative-zero@^2.0.2:
+is-negative-zero@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
   integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
@@ -7009,7 +6969,7 @@ is-potential-custom-element-name@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
   integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
 
-is-regex@^1.1.1, is-regex@^1.1.4:
+is-regex@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
   integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
@@ -7239,16 +7199,6 @@ jest-config@^27.5.1:
     slash "^3.0.0"
     strip-json-comments "^3.1.1"
 
-jest-diff@^26.0.0:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz#1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394"
-  integrity sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==
-  dependencies:
-    chalk "^4.0.0"
-    diff-sequences "^26.6.2"
-    jest-get-type "^26.3.0"
-    pretty-format "^26.6.2"
-
 jest-diff@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.5.1.tgz#a07f5011ac9e6643cf8a95a462b7b1ecf6680def"
@@ -7302,11 +7252,6 @@ jest-environment-node@^27.5.1:
     jest-mock "^27.5.1"
     jest-util "^27.5.1"
 
-jest-get-type@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0"
-  integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==
-
 jest-get-type@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.5.1.tgz#3cd613c507b0f7ace013df407a1c1cd578bcb4f1"
@@ -7990,7 +7935,7 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0:
+lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -8036,11 +7981,6 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-lru-cache@^7.4.0:
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.8.0.tgz#649aaeb294a56297b5cbc5d70f198dcc5ebe5747"
-  integrity sha512-AmXqneQZL3KZMIgBpaPTeI6pfwh+xQ2vutMsyqOu1TBdEXFZgpG/80wuJ531w2ZN7TI0/oc8CPxzh/DKQudZqg==
-
 lunr@^2.3.9:
   version "2.3.9"
   resolved "https://registry.yarnpkg.com/lunr/-/lunr-2.3.9.tgz#18b123142832337dd6e964df1a5a7707b25d35e1"
@@ -8591,11 +8531,6 @@ micromatch@^4.0.2, micromatch@^4.0.4:
     braces "^3.0.2"
     picomatch "^2.3.1"
 
-mime-db@1.46.0:
-  version "1.46.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.46.0.tgz#6267748a7f799594de3cbc8cde91def349661cee"
-  integrity sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ==
-
 mime-db@1.52.0, "mime-db@>= 1.43.0 < 2":
   version "1.52.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
@@ -8656,7 +8591,7 @@ minimatch@^5.0.1, minimatch@^5.1.0:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
+minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.6:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
   integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
@@ -8721,11 +8656,6 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
-negotiator@0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
-  integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
-
 negotiator@0.6.3:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
@@ -8769,11 +8699,6 @@ node-int64@^0.4.0:
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
   integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
 
-node-releases@^1.1.70:
-  version "1.1.70"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.70.tgz#66e0ed0273aa65666d7fe78febe7634875426a08"
-  integrity sha512-Slf2s69+2/uAD79pVVQo8uSiC34+g8GWY8UH2Qtqv34ZfhYrxpYpfzs9Js9d6O0mbDmALuxaTlplnBTnSELcrw==
-
 node-releases@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.2.tgz#7139fe71e2f4f11b47d4d2986aaf8c48699e0c01"
@@ -8843,7 +8768,7 @@ object-hash@^2.2.0:
   resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.2.0.tgz#5ad518581eefc443bd763472b8ff2e9c2c0d54a5"
   integrity sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==
 
-object-inspect@^1.12.0, object-inspect@^1.8.0, object-inspect@^1.9.0:
+object-inspect@^1.12.0, object-inspect@^1.9.0:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0"
   integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==
@@ -8858,7 +8783,7 @@ object-keys@^1.0.12, object-keys@^1.0.6, object-keys@^1.1.1:
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
-object.assign@^4.1.0, object.assign@^4.1.1, object.assign@^4.1.2:
+object.assign@^4.1.0, object.assign@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
   integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
@@ -9190,7 +9115,7 @@ picocolors@^1.0.0:
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
-picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3, picomatch@^2.3.1:
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
@@ -9792,16 +9717,6 @@ pretty-error@^4.0.0:
     lodash "^4.17.20"
     renderkid "^3.0.0"
 
-pretty-format@^26.0.0, pretty-format@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93"
-  integrity sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==
-  dependencies:
-    "@jest/types" "^26.6.2"
-    ansi-regex "^5.0.0"
-    ansi-styles "^4.0.0"
-    react-is "^17.0.1"
-
 pretty-format@^27.0.0, pretty-format@^27.0.2, pretty-format@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.1.tgz#2181879fdea51a7a5851fb39d920faa63f01d88e"
@@ -10181,7 +10096,7 @@ react-image@^4:
   resolved "https://registry.yarnpkg.com/react-image/-/react-image-4.0.3.tgz#6fa722877660b67295298a914bff1ed87ad2cf83"
   integrity sha512-19MUK9u1qaw9xys8XEsVkSpVhHctEBUeYFvrLTe1PN+4w5Co13AN2WA7xtBshPM6SthsOj77SlDrEAeOaJpf7g==
 
-react-is@^16.13.1, react-is@^16.7.0, react-is@^16.8.1:
+react-is@^16.13.1, react-is@^16.7.0:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
@@ -10448,13 +10363,6 @@ regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.9:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
   integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
 
-regenerator-transform@^0.14.2:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4"
-  integrity sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==
-  dependencies:
-    "@babel/runtime" "^7.8.4"
-
 regenerator-transform@^0.15.0:
   version "0.15.0"
   resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.0.tgz#cbd9ead5d77fae1a48d957cf889ad0586adb6537"
@@ -10932,11 +10840,6 @@ semver@7.x, semver@^7.3.2, semver@^7.3.5:
   dependencies:
     lru-cache "^6.0.0"
 
-semver@^5.4.1, semver@^5.5.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
-
 semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
@@ -10998,11 +10901,6 @@ serve-static@1.14.2:
     parseurl "~1.3.3"
     send "0.17.2"
 
-set-immediate-shim@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
-  integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=
-
 setimmediate@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
@@ -11351,7 +11249,7 @@ string.prototype.matchall@^4.0.6:
     regexp.prototype.flags "^1.4.1"
     side-channel "^1.0.4"
 
-string.prototype.trimend@^1.0.1, string.prototype.trimend@^1.0.3, string.prototype.trimend@^1.0.4:
+string.prototype.trimend@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
   integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==
@@ -11359,7 +11257,7 @@ string.prototype.trimend@^1.0.1, string.prototype.trimend@^1.0.3, string.prototy
     call-bind "^1.0.2"
     define-properties "^1.1.3"
 
-string.prototype.trimstart@^1.0.1, string.prototype.trimstart@^1.0.3, string.prototype.trimstart@^1.0.4:
+string.prototype.trimstart@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"
   integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==
@@ -11760,7 +11658,7 @@ tr46@^1.0.1:
   dependencies:
     punycode "^2.1.0"
 
-tr46@^2.0.2, tr46@^2.1.0:
+tr46@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240"
   integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==
@@ -11870,11 +11768,6 @@ type-detect@4.0.8:
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
   integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
 
-type-fest@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1"
-  integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==
-
 type-fest@^0.16.0:
   version "0.16.0"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.16.0.tgz#3240b891a78b0deae910dbeb86553e552a148860"
@@ -11985,11 +11878,6 @@ unified@^10.0.0, unified@~10.1.1:
     trough "^2.0.0"
     vfile "^5.0.0"
 
-uniq@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
-  integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=
-
 unique-string@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d"

From 293df99c0a46e6653e55ed53a9eae39647f34b62 Mon Sep 17 00:00:00 2001
From: shamsmosowi <shams.mosowi@gmail.com>
Date: Tue, 11 Oct 2022 19:14:31 +0200
Subject: [PATCH 172/309] enable multi file upload

---
 .../fields/File/SideDrawerField.tsx           | 41 ++++++------
 src/components/fields/File/TableCell.tsx      | 33 ++++++----
 .../fields/Image/SideDrawerField.tsx          | 66 +++++++++----------
 src/components/fields/Image/TableCell.tsx     | 49 +++++++-------
 src/hooks/useFirebaseStorageUploader.tsx      | 31 +++------
 5 files changed, 109 insertions(+), 111 deletions(-)

diff --git a/src/components/fields/File/SideDrawerField.tsx b/src/components/fields/File/SideDrawerField.tsx
index c28e0866..94fe90b2 100644
--- a/src/components/fields/File/SideDrawerField.tsx
+++ b/src/components/fields/File/SideDrawerField.tsx
@@ -23,6 +23,7 @@ import { DATE_TIME_FORMAT } from "@src/constants/dates";
 import { fieldSx, getFieldId } from "@src/components/SideDrawer/utils";
 import { projectScope, confirmDialogAtom } from "@src/atoms/projectScope";
 import { FileValue } from "@src/types/table";
+import { arrayUnion } from "firebase/firestore";
 
 export default function File_({
   column,
@@ -37,25 +38,22 @@ export default function File_({
   const { uploaderState, upload, deleteUpload } = useUploader();
 
   // Store a preview image locally while uploading
-  const [localFile, setLocalFile] = useState<string>("");
+  const [localFiles, setLocalFiles] = useState<string[]>([]);
 
   const onDrop = useCallback(
     (acceptedFiles: File[]) => {
-      const file = acceptedFiles[0];
-
-      if (_rowy_ref && file) {
+      if (acceptedFiles.length > 0) {
         upload({
           docRef: _rowy_ref! as any,
           fieldName: column.key,
-          files: [file],
-          previousValue: value ?? [],
-          onComplete: (newValue) => {
-            onChange(newValue);
+          files: acceptedFiles,
+          onComplete: (newUploads) => {
+            onChange(arrayUnion(newUploads));
             onSubmit();
-            setLocalFile("");
+            setLocalFiles([]);
           },
         });
-        setLocalFile(file.name);
+        setLocalFiles(acceptedFiles.map((file) => file.name));
       }
     },
     [_rowy_ref, value]
@@ -71,7 +69,7 @@ export default function File_({
 
   const { getRootProps, getInputProps, isDragActive } = useDropzone({
     onDrop,
-    multiple: false,
+    multiple: true,
   });
 
   return (
@@ -138,15 +136,18 @@ export default function File_({
             </Grid>
           ))}
 
-        {localFile && (
-          <Grid item>
-            <Chip
-              icon={<FileIcon />}
-              label={localFile}
-              deleteIcon={<CircularProgressOptical size={20} color="inherit" />}
-            />
-          </Grid>
-        )}
+        {localFiles &&
+          localFiles.map((fileName) => (
+            <Grid item>
+              <Chip
+                icon={<FileIcon />}
+                label={fileName}
+                deleteIcon={
+                  <CircularProgressOptical size={20} color="inherit" />
+                }
+              />
+            </Grid>
+          ))}
       </Grid>
     </>
   );
diff --git a/src/components/fields/File/TableCell.tsx b/src/components/fields/File/TableCell.tsx
index 685cf62e..a4f96c0a 100644
--- a/src/components/fields/File/TableCell.tsx
+++ b/src/components/fields/File/TableCell.tsx
@@ -1,4 +1,4 @@
-import { useCallback } from "react";
+import { useCallback, useState } from "react";
 import { IHeavyCellProps } from "@src/components/fields/types";
 import { useSetAtom } from "jotai";
 import { findIndex } from "lodash-es";
@@ -17,6 +17,7 @@ import useUploader from "@src/hooks/useFirebaseStorageUploader";
 import { FileIcon } from ".";
 import { DATE_TIME_FORMAT } from "@src/constants/dates";
 import { FileValue } from "@src/types/table";
+import { arrayUnion } from "firebase/firestore";
 
 export default function File_({
   column,
@@ -28,28 +29,26 @@ export default function File_({
 }: IHeavyCellProps) {
   const confirm = useSetAtom(confirmDialogAtom, projectScope);
   const updateField = useSetAtom(updateFieldAtom, tableScope);
-
+  const [localFiles, setLocalFiles] = useState<string[]>([]);
   const { uploaderState, upload, deleteUpload } = useUploader();
   const { progress, isLoading } = uploaderState;
-
   const onDrop = useCallback(
     (acceptedFiles: File[]) => {
-      const file = acceptedFiles[0];
-
-      if (file) {
+      if (acceptedFiles.length > 0) {
         upload({
           docRef: docRef! as any,
           fieldName: column.key,
-          files: [file],
-          previousValue: value,
-          onComplete: (newValue) => {
+          files: acceptedFiles,
+          onComplete: (newUploads) => {
             updateField({
               path: docRef.path,
               fieldName: column.key,
-              value: newValue,
+              value: arrayUnion(newUploads),
             });
+            setLocalFiles([]);
           },
         });
+        setLocalFiles(acceptedFiles.map((file) => file.name));
       }
     },
     [value]
@@ -65,7 +64,7 @@ export default function File_({
 
   const { getRootProps, getInputProps, isDragActive } = useDropzone({
     onDrop,
-    multiple: false,
+    multiple: true,
   });
 
   const dropzoneProps = getRootProps();
@@ -135,6 +134,18 @@ export default function File_({
               </Tooltip>
             </Grid>
           ))}
+        {localFiles &&
+          localFiles.map((fileName) => (
+            <Grid item>
+              <Chip
+                icon={<FileIcon />}
+                label={fileName}
+                deleteIcon={
+                  <CircularProgressOptical size={20} color="inherit" />
+                }
+              />
+            </Grid>
+          ))}
       </ChipList>
 
       {!isLoading ? (
diff --git a/src/components/fields/Image/SideDrawerField.tsx b/src/components/fields/Image/SideDrawerField.tsx
index 9780b831..76d87a1d 100644
--- a/src/components/fields/Image/SideDrawerField.tsx
+++ b/src/components/fields/Image/SideDrawerField.tsx
@@ -26,6 +26,7 @@ import CircularProgressOptical from "@src/components/CircularProgressOptical";
 import { projectScope, confirmDialogAtom } from "@src/atoms/projectScope";
 import { IMAGE_MIME_TYPES } from ".";
 import { fieldSx, getFieldId } from "@src/components/SideDrawer/utils";
+import { arrayUnion } from "firebase/firestore";
 
 const imgSx = {
   position: "relative",
@@ -93,25 +94,21 @@ export default function Image_({
   const { progress } = uploaderState;
 
   // Store a preview image locally while uploading
-  const [localImage, setLocalImage] = useState<string>("");
+  const [localImages, setLocalImages] = useState<string[]>([]);
 
   const onDrop = useCallback(
     (acceptedFiles: File[]) => {
-      const imageFile = acceptedFiles[0];
-
-      if (_rowy_ref && imageFile) {
+      if (_rowy_ref && acceptedFiles.length > 0) {
         upload({
           docRef: _rowy_ref! as any,
           fieldName: column.key,
-          files: [imageFile],
-          previousValue: value ?? [],
-          onComplete: (newValue) => {
-            onChange(newValue);
-            onSubmit();
-            setLocalImage("");
+          files: acceptedFiles,
+          onComplete: (newUploads) => {
+            onChange(arrayUnion(newUploads));
+            setLocalImages([]);
           },
         });
-        setLocalImage(URL.createObjectURL(imageFile));
+        setLocalImages(acceptedFiles.map((file) => URL.createObjectURL(file)));
       }
     },
     [_rowy_ref, value]
@@ -127,7 +124,7 @@ export default function Image_({
 
   const { getRootProps, getInputProps, isDragActive } = useDropzone({
     onDrop,
-    multiple: false,
+    multiple: true,
     accept: IMAGE_MIME_TYPES,
   });
 
@@ -237,29 +234,30 @@ export default function Image_({
             </Grid>
           ))}
 
-        {localImage && (
-          <Grid item>
-            <ButtonBase
-              sx={imgSx}
-              style={{ backgroundImage: `url("${localImage}")` }}
-              className="img"
-            >
-              <Grid
-                container
-                justifyContent="center"
-                alignItems="center"
-                sx={overlaySx}
+        {localImages &&
+          localImages.map((image, i) => (
+            <Grid item>
+              <ButtonBase
+                sx={imgSx}
+                style={{ backgroundImage: `url("${image}")` }}
+                className="img"
               >
-                <CircularProgressOptical
-                  color="inherit"
-                  size={48}
-                  variant={progress === 0 ? "indeterminate" : "determinate"}
-                  value={progress}
-                />
-              </Grid>
-            </ButtonBase>
-          </Grid>
-        )}
+                <Grid
+                  container
+                  justifyContent="center"
+                  alignItems="center"
+                  sx={overlaySx}
+                >
+                  <CircularProgressOptical
+                    color="inherit"
+                    size={48}
+                    variant={progress === 0 ? "indeterminate" : "determinate"}
+                    value={progress}
+                  />
+                </Grid>
+              </ButtonBase>
+            </Grid>
+          ))}
       </Grid>
     </>
   );
diff --git a/src/components/fields/Image/TableCell.tsx b/src/components/fields/Image/TableCell.tsx
index 84a44904..5a1cbc13 100644
--- a/src/components/fields/Image/TableCell.tsx
+++ b/src/components/fields/Image/TableCell.tsx
@@ -32,6 +32,7 @@ import useUploader from "@src/hooks/useFirebaseStorageUploader";
 import { IMAGE_MIME_TYPES } from "./index";
 import { DEFAULT_ROW_HEIGHT } from "@src/components/Table";
 import { FileValue } from "@src/types/table";
+import { arrayUnion } from "firebase/firestore";
 
 // MULTIPLE
 const imgSx = (rowHeight: number) => ({
@@ -99,28 +100,25 @@ export default function Image_({
   const { progress, isLoading } = uploaderState;
 
   // Store a preview image locally while uploading
-  const [localImage, setLocalImage] = useState<string>("");
+  const [localImages, setLocalImages] = useState<string[]>([]);
 
   const onDrop = useCallback(
     (acceptedFiles: File[]) => {
-      const imageFile = acceptedFiles[0];
-
-      if (imageFile) {
+      if (acceptedFiles.length > 0) {
         upload({
           docRef: docRef! as any,
           fieldName: column.key,
-          files: [imageFile],
-          previousValue: value,
-          onComplete: (newValue) => {
+          files: acceptedFiles,
+          onComplete: (newUploads) => {
             updateField({
               path: docRef.path,
               fieldName: column.key,
-              value: newValue,
+              value: arrayUnion(newUploads),
             });
-            setLocalImage("");
+            setLocalImages([]);
           },
         });
-        setLocalImage(URL.createObjectURL(imageFile));
+        setLocalImages(acceptedFiles.map((file) => URL.createObjectURL(file)));
       }
     },
     [value]
@@ -136,7 +134,7 @@ export default function Image_({
 
   const { getRootProps, getInputProps, isDragActive } = useDropzone({
     onDrop,
-    multiple: false,
+    multiple: true,
     accept: IMAGE_MIME_TYPES,
   });
 
@@ -250,20 +248,21 @@ export default function Image_({
               </Grid>
             ))}
 
-          {localImage && (
-            <Grid item>
-              <Box
-                sx={[
-                  imgSx(rowHeight),
-                  {
-                    boxShadow: (theme) =>
-                      `0 0 0 1px ${theme.palette.divider} inset`,
-                  },
-                ]}
-                style={{ backgroundImage: `url("${localImage}")` }}
-              />
-            </Grid>
-          )}
+          {localImages &&
+            localImages.map((url) => (
+              <Grid item>
+                <Box
+                  sx={[
+                    imgSx(rowHeight),
+                    {
+                      boxShadow: (theme) =>
+                        `0 0 0 1px ${theme.palette.divider} inset`,
+                    },
+                  ]}
+                  style={{ backgroundImage: `url("${url}")` }}
+                />
+              </Grid>
+            ))}
         </Grid>
       </div>
 
diff --git a/src/hooks/useFirebaseStorageUploader.tsx b/src/hooks/useFirebaseStorageUploader.tsx
index 16fbd521..bb108af3 100644
--- a/src/hooks/useFirebaseStorageUploader.tsx
+++ b/src/hooks/useFirebaseStorageUploader.tsx
@@ -33,8 +33,7 @@ export type UploadProps = {
   docRef: DocumentReference;
   fieldName: string;
   files: File[];
-  previousValue?: FileValue[];
-  onComplete?: (values: FileValue[]) => void;
+  onComplete?: (value: FileValue) => void;
 };
 
 // TODO: GENERALIZE INTO ATOM
@@ -46,13 +45,7 @@ const useFirebaseStorageUploader = () => {
     ...initialState,
   });
 
-  const upload = ({
-    docRef,
-    fieldName,
-    files,
-    previousValue,
-    onComplete,
-  }: UploadProps) => {
+  const upload = ({ docRef, fieldName, files, onComplete }: UploadProps) => {
     uploaderDispatch({ isLoading: true });
 
     files.forEach((file) => {
@@ -139,24 +132,20 @@ const useFirebaseStorageUploader = () => {
           // Upload completed successfully, now we can get the download URL
           getDownloadURL(uploadTask.snapshot.ref).then(
             (downloadURL: string) => {
-              const newValue: FileValue[] = Array.isArray(previousValue)
-                ? [...previousValue]
-                : [];
-
-              newValue.push({
-                ref: uploadTask.snapshot.ref.fullPath,
-                downloadURL,
-                name: file.name,
-                type: file.type,
-                lastModifiedTS: file.lastModified,
-              });
               // STore in the document if docRef provided
               // if (docRef && docRef.update)docRef.update({ [fieldName]: newValue });
               // Also call callback if it exists
               // IMPORTANT: SideDrawer form may not update its local values after this
               // function updates the doc, so you MUST update it manually
               // using this callback
-              if (onComplete) onComplete(newValue);
+              const obj = {
+                ref: uploadTask.snapshot.ref.fullPath,
+                downloadURL,
+                name: file.name,
+                type: file.type,
+                lastModifiedTS: file.lastModified,
+              };
+              if (onComplete) onComplete(obj);
             }
           );
         }

From 40600dabaac41dd9baaa771206b04baac5191fa4 Mon Sep 17 00:00:00 2001
From: shamsmosowi <shams.mosowi@gmail.com>
Date: Tue, 11 Oct 2022 23:13:48 +0200
Subject: [PATCH 173/309] fix sidedrawer image uploader

---
 src/components/fields/File/SideDrawerField.tsx  | 2 +-
 src/components/fields/Image/SideDrawerField.tsx | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/fields/File/SideDrawerField.tsx b/src/components/fields/File/SideDrawerField.tsx
index 94fe90b2..cad34d9b 100644
--- a/src/components/fields/File/SideDrawerField.tsx
+++ b/src/components/fields/File/SideDrawerField.tsx
@@ -42,7 +42,7 @@ export default function File_({
 
   const onDrop = useCallback(
     (acceptedFiles: File[]) => {
-      if (acceptedFiles.length > 0) {
+      if (_rowy_ref && acceptedFiles.length > 0) {
         upload({
           docRef: _rowy_ref! as any,
           fieldName: column.key,
diff --git a/src/components/fields/Image/SideDrawerField.tsx b/src/components/fields/Image/SideDrawerField.tsx
index 76d87a1d..304e0555 100644
--- a/src/components/fields/Image/SideDrawerField.tsx
+++ b/src/components/fields/Image/SideDrawerField.tsx
@@ -105,6 +105,7 @@ export default function Image_({
           files: acceptedFiles,
           onComplete: (newUploads) => {
             onChange(arrayUnion(newUploads));
+            onSubmit();
             setLocalImages([]);
           },
         });

From 3e606607adaf668c9edaecd209c8dcbef5b99279 Mon Sep 17 00:00:00 2001
From: shamsmosowi <shams.mosowi@gmail.com>
Date: Tue, 11 Oct 2022 23:17:43 +0200
Subject: [PATCH 174/309] add caching metadata

---
 src/hooks/useFirebaseStorageUploader.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/hooks/useFirebaseStorageUploader.tsx b/src/hooks/useFirebaseStorageUploader.tsx
index bb108af3..97c1ff2b 100644
--- a/src/hooks/useFirebaseStorageUploader.tsx
+++ b/src/hooks/useFirebaseStorageUploader.tsx
@@ -53,8 +53,9 @@ const useFirebaseStorageUploader = () => {
         firebaseStorage,
         `${docRef.path}/${fieldName}/${file.name}`
       );
-      const uploadTask = uploadBytesResumable(storageRef, file);
-
+      const uploadTask = uploadBytesResumable(storageRef, file, {
+        cacheControl: "public, max-age=31536000",
+      });
       uploadTask.on(
         // event
         "state_changed",

From 17a585e6295d651ae26ee01ecdb104d292712260 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 12 Oct 2022 10:45:18 +1100
Subject: [PATCH 175/309] clarify subTable url structure

---
 src/components/fields/SubTable/utils.ts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/components/fields/SubTable/utils.ts b/src/components/fields/SubTable/utils.ts
index 1c1dcae0..e62e0a45 100644
--- a/src/components/fields/SubTable/utils.ts
+++ b/src/components/fields/SubTable/utils.ts
@@ -20,8 +20,7 @@ export const useSubTableData = (
     location.pathname.split("/" + ROUTES.subTable)[0]
   );
 
-  // const [searchParams] = useSearchParams();
-  // const parentLabels = searchParams.get("parentLabel");
+  // Get params from URL: /table/:tableId/subTable/:docPath/:subTableKey
   let subTablePath = [
     rootTablePath,
     ROUTES.subTable,
@@ -29,8 +28,6 @@ export const useSubTableData = (
     column.key,
   ].join("/");
 
-  // if (parentLabels) subTablePath += `${parentLabels ?? ""},${label ?? ""}`;
-  // else
   subTablePath += "?parentLabel=" + encodeURIComponent(label ?? "");
 
   return { documentCount, label, subTablePath };

From bebde59147d807b272e3a184c4a46050422f1dad Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 12 Oct 2022 10:45:41 +1100
Subject: [PATCH 176/309] =?UTF-8?q?fix=20useOffline=20having=20incorrect?=
 =?UTF-8?q?=20state=20when=20listener=20isn=E2=80=99t=20fired?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/useOffline.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/hooks/useOffline.ts b/src/hooks/useOffline.ts
index f5f09ce3..ad5cb199 100644
--- a/src/hooks/useOffline.ts
+++ b/src/hooks/useOffline.ts
@@ -1,11 +1,14 @@
 import { useState, useEffect } from "react";
 
 export default function useOffline() {
-  const [isOffline, setIsOffline] = useState(true);
+  const [isOffline, setIsOffline] = useState(false);
   const handleOffline = () => setIsOffline(true);
   const handleOnline = () => setIsOffline(false);
 
   useEffect(() => {
+    // Need to set here because the listener doesn’t fire on initial load
+    setIsOffline(!window.navigator.onLine);
+
     window.addEventListener("offline", handleOffline);
     window.addEventListener("online", handleOnline);
 

From a24f2bd227a617d031ff0df684bcb147d76b9b17 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 12 Oct 2022 10:46:48 +1100
Subject: [PATCH 177/309] DebugPage: fix animations

---
 src/pages/Settings/DebugPage.tsx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/pages/Settings/DebugPage.tsx b/src/pages/Settings/DebugPage.tsx
index d3ec7ad1..e5c64fa6 100644
--- a/src/pages/Settings/DebugPage.tsx
+++ b/src/pages/Settings/DebugPage.tsx
@@ -41,7 +41,7 @@ export default function DebugPage() {
       {userRoles.includes("ADMIN") && <UserManagementSourceFirebase />}
 
       <Stack spacing={4}>
-        <SettingsSection title="Firestore config">
+        <SettingsSection title="Firestore config" transitionTimeout={0 * 100}>
           <Button
             href={`https://console.firebase.google.com/project/${projectId}/firestore/data/~2F${CONFIG.replace(
               /\//g,
@@ -83,7 +83,10 @@ export default function DebugPage() {
         </SettingsSection>
 
         {userRoles.includes("ADMIN") && (
-          <SettingsSection title="Reset table filters">
+          <SettingsSection
+            title="Reset table filters"
+            transitionTimeout={1 * 100}
+          >
             <Button
               onClick={async () => {
                 if (!updateUser)
@@ -167,7 +170,7 @@ export default function DebugPage() {
 
         <SettingsSection
           title="Local Firestore instance"
-          transitionTimeout={1 * 100}
+          transitionTimeout={2 * 100}
         >
           <Button
             onClick={async () => {

From a2dacd9f9830dfa8807b0c016f44c9775bb910dd Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 12 Oct 2022 10:47:52 +1100
Subject: [PATCH 178/309] show error when table has no collection set (#857,
 #858)

---
 src/sources/TableSourceFirestore/TableSourceFirestore.tsx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/sources/TableSourceFirestore/TableSourceFirestore.tsx b/src/sources/TableSourceFirestore/TableSourceFirestore.tsx
index 7d8a5470..f028ab26 100644
--- a/src/sources/TableSourceFirestore/TableSourceFirestore.tsx
+++ b/src/sources/TableSourceFirestore/TableSourceFirestore.tsx
@@ -32,7 +32,11 @@ import { getTableSchemaPath } from "@src/utils/table";
 export const TableSourceFirestore = memo(function TableSourceFirestore() {
   // Get tableSettings from tableId and tables in projectScope
   const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
-  const isCollectionGroup = tableSettings?.tableType === "collectionGroup";
+  if (!tableSettings) throw new Error("No table config");
+  if (!tableSettings.collection)
+    throw new Error("Invalid table config: no collection");
+
+  const isCollectionGroup = tableSettings.tableType === "collectionGroup";
 
   // Get tableSchema and store in tableSchemaAtom.
   // If it doesn’t exist, initialize columns
@@ -63,7 +67,7 @@ export const TableSourceFirestore = memo(function TableSourceFirestore() {
   useFirestoreCollectionWithAtom(
     tableRowsDbAtom,
     tableScope,
-    tableSettings?.collection,
+    tableSettings.collection,
     {
       filters,
       sorts,

From 72f7e4e9b5a9d813cc1a2e647900521b4ff0ba3d Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 12 Oct 2022 10:48:03 +1100
Subject: [PATCH 179/309] prevent user creating table with / in ID (#857, #858)

---
 src/components/TableSettingsDialog/form.tsx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/TableSettingsDialog/form.tsx b/src/components/TableSettingsDialog/form.tsx
index d26e83d8..7b62176b 100644
--- a/src/components/TableSettingsDialog/form.tsx
+++ b/src/components/TableSettingsDialog/form.tsx
@@ -215,8 +215,9 @@ export const tableSettings = (
       }.`,
       disabled: mode === "update",
       gridCols: { xs: 12, sm: 6 },
-      validation:
-        mode === "create"
+      validation: [
+        ["matches", /^[^/]+$/g, "ID cannot have /"],
+        ...(mode === "create"
           ? [
               [
                 "test",
@@ -225,7 +226,8 @@ export const tableSettings = (
                 (value: any) => !find(tables, ["value", value]),
               ],
             ]
-          : [],
+          : []),
+      ],
     },
     {
       step: "display",

From 107f743acf72e70e5a8b68b5c82232468aaef977 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 12 Oct 2022 16:29:19 +1100
Subject: [PATCH 180/309] ErrorFallback: show fetch response status

---
 src/components/ErrorFallback.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/ErrorFallback.tsx b/src/components/ErrorFallback.tsx
index ba3b8b97..83f8fb7a 100644
--- a/src/components/ErrorFallback.tsx
+++ b/src/components/ErrorFallback.tsx
@@ -37,6 +37,7 @@ export function ErrorFallbackContents({
       <>
         <Typography variant="inherit" style={{ whiteSpace: "pre-line" }}>
           {(error as any).code && <b>{(error as any).code}: </b>}
+          {(error as any).status && <b>{(error as any).status}: </b>}
           {error.message}
         </Typography>
         <Button

From 047a718bd4b0588320d549f3ffacaa537dd910d6 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Thu, 13 Oct 2022 12:24:01 +1100
Subject: [PATCH 181/309] add optional fallback to AdminRoute

---
 src/layouts/AdminRoute.tsx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/layouts/AdminRoute.tsx b/src/layouts/AdminRoute.tsx
index 79cf2bcf..4b5f039d 100644
--- a/src/layouts/AdminRoute.tsx
+++ b/src/layouts/AdminRoute.tsx
@@ -15,10 +15,15 @@ import { TOP_BAR_HEIGHT } from "@src/layouts/Navigation/TopBar";
 /**
  * Lock pages for admins only
  */
-export default function AdminRoute({ children }: PropsWithChildren<{}>) {
+export default function AdminRoute({
+  children,
+  fallback,
+}: PropsWithChildren<{ fallback?: React.ReactNode }>) {
   const [userRoles] = useAtom(userRolesAtom, projectScope);
 
-  if (!userRoles.includes("ADMIN"))
+  if (!userRoles.includes("ADMIN")) {
+    if (fallback) return fallback as JSX.Element;
+
     return (
       <EmptyState
         role="alert"
@@ -39,6 +44,7 @@ export default function AdminRoute({ children }: PropsWithChildren<{}>) {
         style={{ marginTop: -TOP_BAR_HEIGHT, marginBottom: -TOP_BAR_HEIGHT }}
       />
     );
+  }
 
   return children as JSX.Element;
 }

From 625f735a8a67c4a73315b42ae82883d205a80a88 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Thu, 13 Oct 2022 13:04:22 +1100
Subject: [PATCH 182/309] fix ConfirmDialog state persisting

---
 src/atoms/projectScope/ui.ts     |   3 +-
 src/components/ConfirmDialog.tsx | 111 ++++++++++++++++---------------
 2 files changed, 59 insertions(+), 55 deletions(-)

diff --git a/src/atoms/projectScope/ui.ts b/src/atoms/projectScope/ui.ts
index 9d7c8281..6d1abbc1 100644
--- a/src/atoms/projectScope/ui.ts
+++ b/src/atoms/projectScope/ui.ts
@@ -59,9 +59,8 @@ export type ConfirmDialogProps = {
  */
 export const confirmDialogAtom = atom(
   { open: false } as ConfirmDialogProps,
-  (get, set, update: Partial<ConfirmDialogProps>) => {
+  (_, set, update: Partial<ConfirmDialogProps>) => {
     set(confirmDialogAtom, {
-      ...get(confirmDialogAtom),
       open: true, // Don’t require this to be set explicitly
       ...update,
     });
diff --git a/src/components/ConfirmDialog.tsx b/src/components/ConfirmDialog.tsx
index 5bb298ef..e9e210df 100644
--- a/src/components/ConfirmDialog.tsx
+++ b/src/components/ConfirmDialog.tsx
@@ -10,6 +10,7 @@ import {
   TextField,
   Button,
 } from "@mui/material";
+import MemoizedText from "@src/components/Modal/MemoizedText";
 
 import { projectScope, confirmDialogAtom } from "@src/atoms/projectScope";
 
@@ -63,62 +64,66 @@ export default function ConfirmDialog({
       maxWidth={maxWidth}
       sx={{ cursor: "default", zIndex: (theme) => theme.zIndex.modal + 50 }}
     >
-      <DialogTitle>{title}</DialogTitle>
+      <MemoizedText>
+        <>
+          <DialogTitle>{title}</DialogTitle>
 
-      <DialogContent>
-        {typeof body === "string" ? (
-          <DialogContentText>{body}</DialogContentText>
-        ) : (
-          body
-        )}
-        {confirmationCommand && (
-          <TextField
-            value={dryText}
-            onChange={(e) => setDryText(e.target.value)}
-            autoFocus
-            label={`Type “${confirmationCommand}” below to continue:`}
-            placeholder={confirmationCommand}
-            fullWidth
-            id="dryText"
-            sx={{ mt: 3 }}
-          />
-        )}
-      </DialogContent>
+          <DialogContent>
+            {typeof body === "string" ? (
+              <DialogContentText>{body}</DialogContentText>
+            ) : (
+              body
+            )}
+            {confirmationCommand && (
+              <TextField
+                value={dryText}
+                onChange={(e) => setDryText(e.target.value)}
+                autoFocus
+                label={`Type “${confirmationCommand}” below to continue:`}
+                placeholder={confirmationCommand}
+                fullWidth
+                id="dryText"
+                sx={{ mt: 3 }}
+              />
+            )}
+          </DialogContent>
 
-      <DialogActions
-        sx={[
-          buttonLayout === "vertical" && {
-            flexDirection: "column",
-            alignItems: "stretch",
-            "& > :not(:first-of-type)": { ml: 0, mt: 1 },
-          },
-        ]}
-      >
-        {!hideCancel && (
-          <Button
-            onClick={() => {
-              if (handleCancel) handleCancel();
-              handleClose();
-            }}
+          <DialogActions
+            sx={[
+              buttonLayout === "vertical" && {
+                flexDirection: "column",
+                alignItems: "stretch",
+                "& > :not(:first-of-type)": { ml: 0, mt: 1 },
+              },
+            ]}
           >
-            {cancel}
-          </Button>
-        )}
-        <Button
-          onClick={() => {
-            if (handleConfirm) handleConfirm();
-            handleClose();
-          }}
-          color={confirmColor || "primary"}
-          variant="contained"
-          autoFocus
-          disabled={
-            confirmationCommand ? dryText !== confirmationCommand : false
-          }
-        >
-          {confirm}
-        </Button>
-      </DialogActions>
+            {!hideCancel && (
+              <Button
+                onClick={() => {
+                  if (handleCancel) handleCancel();
+                  handleClose();
+                }}
+              >
+                {cancel}
+              </Button>
+            )}
+            <Button
+              onClick={() => {
+                if (handleConfirm) handleConfirm();
+                handleClose();
+              }}
+              color={confirmColor || "primary"}
+              variant="contained"
+              autoFocus
+              disabled={
+                confirmationCommand ? dryText !== confirmationCommand : false
+              }
+            >
+              {confirm}
+            </Button>
+          </DialogActions>
+        </>
+      </MemoizedText>
     </Dialog>
   );
 }

From 8dddfcd5335f5bd68a9053ff14c57f5c4690e051 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Fri, 14 Oct 2022 16:15:41 +1100
Subject: [PATCH 183/309] add basic read-only table

---
 package.json                                  |   1 +
 src/components/Table/Styled/StyledCell.tsx    |  18 +
 src/components/Table/Styled/StyledRow.tsx     |  11 +
 src/components/Table/Styled/StyledTable.tsx   |   7 +
 src/components/Table/Table.tsx                | 409 +++++++-----------
 .../fields/SingleSelect/Settings.tsx          |   2 +-
 src/layouts/Navigation/Navigation.tsx         |   2 +-
 src/pages/Table/TablePage.tsx                 |  26 +-
 yarn.lock                                     |  12 +
 9 files changed, 221 insertions(+), 267 deletions(-)
 create mode 100644 src/components/Table/Styled/StyledCell.tsx
 create mode 100644 src/components/Table/Styled/StyledRow.tsx
 create mode 100644 src/components/Table/Styled/StyledTable.tsx

diff --git a/package.json b/package.json
index fb029fc7..e743edda 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "@mui/x-date-pickers": "^5.0.0-alpha.4",
     "@rowy/form-builder": "^0.7.0",
     "@rowy/multiselect": "^0.4.1",
+    "@tanstack/react-table": "^8.5.15",
     "@tinymce/tinymce-react": "^3",
     "@uiw/react-md-editor": "^3.14.1",
     "algoliasearch": "^4.13.1",
diff --git a/src/components/Table/Styled/StyledCell.tsx b/src/components/Table/Styled/StyledCell.tsx
new file mode 100644
index 00000000..0676daa2
--- /dev/null
+++ b/src/components/Table/Styled/StyledCell.tsx
@@ -0,0 +1,18 @@
+import { styled } from "@mui/material";
+
+export const StyledCell = styled("div")(({ theme }) => ({
+  display: "flex",
+  alignItems: "center",
+  "--cell-padding": theme.spacing(1.5),
+  padding: "0 var(--cell-padding)",
+
+  overflow: "visible",
+  contain: "none",
+  position: "relative",
+
+  lineHeight: "calc(var(--row-height) - 1px)",
+
+  borderBottom: `1px solid ${theme.palette.divider}`,
+  borderLeft: `1px solid ${theme.palette.divider}`,
+}));
+StyledCell.displayName = "StyledCell";
diff --git a/src/components/Table/Styled/StyledRow.tsx b/src/components/Table/Styled/StyledRow.tsx
new file mode 100644
index 00000000..4e76b1d8
--- /dev/null
+++ b/src/components/Table/Styled/StyledRow.tsx
@@ -0,0 +1,11 @@
+import { styled } from "@mui/material";
+
+import { DEFAULT_ROW_HEIGHT } from "@src/components/Table";
+
+export const StyledRow = styled("div")(({ theme }) => ({
+  display: "flex",
+  height: DEFAULT_ROW_HEIGHT,
+
+  backgroundColor: theme.palette.background.paper,
+}));
+StyledRow.displayName = "StyledRow";
diff --git a/src/components/Table/Styled/StyledTable.tsx b/src/components/Table/Styled/StyledTable.tsx
new file mode 100644
index 00000000..fc855036
--- /dev/null
+++ b/src/components/Table/Styled/StyledTable.tsx
@@ -0,0 +1,7 @@
+import { styled } from "@mui/material";
+
+export const StyledTable = styled("div")(({ theme }) => ({
+  ...(theme.typography.caption as any),
+  lineHeight: "inherit !important",
+}));
+StyledTable.displayName = "StyledTable";
diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index 308e8767..6dbddcaf 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -5,19 +5,26 @@ import { DndProvider } from "react-dnd";
 import { HTML5Backend } from "react-dnd-html5-backend";
 import { findIndex } from "lodash-es";
 
-// import "react-data-grid/dist/react-data-grid.css";
-import DataGrid, {
-  Column,
-  DataGridHandle,
-  //  SelectColumn as _SelectColumn,
-} from "react-data-grid";
+import {
+  createColumnHelper,
+  flexRender,
+  getCoreRowModel,
+  useReactTable,
+} from "@tanstack/react-table";
+
+import { TOP_BAR_HEIGHT } from "@src/layouts/Navigation/TopBar";
+import { TABLE_TOOLBAR_HEIGHT } from "@src/components/TableToolbar";
+import { StyledTable } from "./Styled/StyledTable";
+import { StyledRow } from "./Styled/StyledRow";
+import ColumnHeaderComponent from "./Column";
+
 import { LinearProgress } from "@mui/material";
 
 import TableContainer, { OUT_OF_ORDER_MARGIN } from "./TableContainer";
 import ColumnHeader, { COLUMN_HEADER_HEIGHT } from "./ColumnHeader";
 import FinalColumnHeader from "./FinalColumnHeader";
 import FinalColumn from "./formatters/FinalColumn";
-import TableRow from "./TableRow";
+// import TableRow from "./TableRow";
 import EmptyState from "@src/components/EmptyState";
 // import BulkActions from "./BulkActions";
 import AddRow from "@src/components/TableToolbar/AddRow";
@@ -47,22 +54,21 @@ import {
 import { getFieldType, getFieldProp } from "@src/components/fields";
 import { FieldType } from "@src/constants/fields";
 import { formatSubTableName } from "@src/utils/table";
-import { ColumnConfig } from "@src/types/table";
+import { TableRow, ColumnConfig } from "@src/types/table";
+import { StyledCell } from "./Styled/StyledCell";
 
-export type DataGridColumn = ColumnConfig & Column<any> & { isNew?: true };
 export const DEFAULT_ROW_HEIGHT = 41;
 export const DEFAULT_COL_WIDTH = 150;
 export const MAX_COL_WIDTH = 380;
 
-const rowKeyGetter = (row: any) => row.id;
-const rowClass = (row: any) => (row._rowy_outOfOrder ? "out-of-order" : "");
-//const SelectColumn = { ..._SelectColumn, width: 42, maxWidth: 42 };
+declare module "@tanstack/table-core" {
+  interface ColumnMeta<TData, TValue> extends ColumnConfig {}
+}
 
-export default function Table({
-  dataGridRef,
-}: {
-  dataGridRef?: React.MutableRefObject<DataGridHandle | null>;
-}) {
+const columnHelper = createColumnHelper<TableRow>();
+const getRowId = (row: TableRow) => row._rowy_ref.path || row._rowy_ref.id;
+
+export default function TableComponent() {
   const [userRoles] = useAtom(userRolesAtom, projectScope);
   const [userSettings] = useAtom(userSettingsAtom, projectScope);
 
@@ -78,266 +84,143 @@ export default function Table({
   const updateColumn = useSetAtom(updateColumnAtom, tableScope);
   const updateField = useSetAtom(updateFieldAtom, tableScope);
 
+  const canAddColumn = userRoles.includes("ADMIN");
   const userDocHiddenFields =
     userSettings.tables?.[formatSubTableName(tableId)]?.hiddenFields;
 
-  // Get column configs from table schema and map them to DataGridColumns
-  // Also filter out hidden columns and add end column
+  // Get column defs from table schema
+  // Also add end column for admins
   const columns = useMemo(() => {
-    const _columns: DataGridColumn[] = tableColumnsOrdered
-      .filter((column) => {
-        if (column.hidden) return false;
-        if (
-          Array.isArray(userDocHiddenFields) &&
-          userDocHiddenFields.includes(column.key)
-        )
-          return false;
-        return true;
-      })
-      .map((column: any) => ({
-        draggable: true,
-        resizable: true,
-        frozen: column.fixed,
-        headerRenderer: ColumnHeader,
-        formatter:
-          getFieldProp("TableCell", getFieldType(column)) ??
-          function InDev() {
-            return null;
-          },
-        editor:
-          getFieldProp("TableEditor", getFieldType(column)) ??
-          function InDev() {
-            return null;
-          },
-        ...column,
-        editable:
-          tableSettings.readOnly && !userRoles.includes("ADMIN")
-            ? false
-            : column.editable ?? true,
-        width: column.width ?? DEFAULT_COL_WIDTH,
-      }));
+    const _columns = tableColumnsOrdered
+      // .filter((column) => {
+      //   if (column.hidden) return false;
+      //   if (
+      //     Array.isArray(userDocHiddenFields) &&
+      //     userDocHiddenFields.includes(column.key)
+      //   )
+      //     return false;
+      //   return true;
+      // })
+      .map((columnConfig) =>
+        columnHelper.accessor(columnConfig.fieldName, {
+          meta: columnConfig,
+          // draggable: true,
+          // resizable: true,
+          // frozen: columnConfig.fixed,
+          // headerRenderer: ColumnHeader,
+          // formatter:
+          //   getFieldProp("TableCell", getFieldType(columnConfig)) ??
+          //   function InDev() {
+          //     return null;
+          //   },
+          // editor:
+          //   getFieldProp("TableEditor", getFieldType(columnConfig)) ??
+          //   function InDev() {
+          //     return null;
+          //   },
+          // ...columnConfig,
+          // editable:
+          //   tableSettings.readOnly && !userRoles.includes("ADMIN")
+          //     ? false
+          //     : columnConfig.editable ?? true,
+          // width: columnConfig.width ?? DEFAULT_COL_WIDTH,
+        })
+      );
 
-    if (userRoles.includes("ADMIN") || !tableSettings.readOnly) {
-      _columns.push({
-        isNew: true,
-        key: "new",
-        fieldName: "_rowy_new",
-        name: "Add column",
-        type: FieldType.last,
-        index: _columns.length ?? 0,
-        width: 154,
-        headerRenderer: FinalColumnHeader,
-        headerCellClass: "final-column-header",
-        cellClass: "final-column-cell",
-        formatter: FinalColumn,
-        editable: false,
-      });
-    }
+    // if (canAddColumn || !tableSettings.readOnly) {
+    //   _columns.push({
+    //     isNew: true,
+    //     key: "new",
+    //     fieldName: "_rowy_new",
+    //     name: "Add column",
+    //     type: FieldType.last,
+    //     index: _columns.length ?? 0,
+    //     width: 154,
+    //     headerRenderer: FinalColumnHeader,
+    //     headerCellClass: "final-column-header",
+    //     cellClass: "final-column-cell",
+    //     formatter: FinalColumn,
+    //     editable: false,
+    //   });
+    // }
 
     return _columns;
   }, [
     tableColumnsOrdered,
-    userDocHiddenFields,
-    tableSettings.readOnly,
-    userRoles,
+    // userDocHiddenFields,
+    // tableSettings.readOnly,
+    // canAddColumn,
   ]);
-  const selectedColumnIndex = useMemo(() => {
-    if (!selectedCell?.columnKey) return -1;
-    return findIndex(columns, ["key", selectedCell.columnKey]);
-  }, [selectedCell?.columnKey, columns]);
 
-  // Handle columns with field names that use dot notation (nested fields)
-  const rows =
-    useMemo(() => {
-      // const columnsWithNestedFieldNames = columns
-      //   .map((col) => col.fieldName)
-      //   .filter((fieldName) => fieldName.includes("."));
+  const table = useReactTable({
+    data: tableRows,
+    columns,
+    getCoreRowModel: getCoreRowModel(),
+    getRowId,
+    columnResizeMode: "onChange",
+    // debugRows: true,
+  });
+  console.log(table);
 
-      // if (columnsWithNestedFieldNames.length === 0)
-      return tableRows;
-
-      // return tableRows.map((row) =>
-      //   columnsWithNestedFieldNames.reduce(
-      //     (acc, fieldName) => ({
-      //       ...acc,
-      //       [fieldName]: get(row, fieldName),
-      //     }),
-      //     { ...row }
-      //   )
-      // );
-    }, [tableRows]) ?? [];
-
-  // const [selectedRowsSet, setSelectedRowsSet] = useState<Set<React.Key>>();
-  // const [selectedRows, setSelectedRows] = useState<any[]>([]);
-
-  // Gets more rows when scrolled down.
-  // https://github.com/adazzle/react-data-grid/blob/ead05032da79d7e2b86e37cdb9af27f2a4d80b90/stories/demos/AllFeatures.tsx#L60
-  const handleScroll = useThrottledCallback(
-    (event: React.UIEvent<HTMLDivElement>) => {
-      // Select corresponding header cell when scrolled to prevent jumping
-      dataGridRef?.current?.selectCell({
-        idx:
-          selectedColumnIndex > -1 ? selectedColumnIndex : columns.length - 1,
-        rowIdx: -1,
-      });
-      // console.log(
-      //   "scroll",
-      //   dataGridRef?.current,
-      //   selectedColumnIndex,
-      //   columns.length
-      // );
-
-      const target = event.target as HTMLDivElement;
-
-      // TODO:
-      // if (navPinned && !columns[0].fixed)
-      //   setShowLeftScrollDivider(target.scrollLeft > 16);
-
-      const offset = 800;
-      const isAtBottom =
-        target.clientHeight + target.scrollTop >= target.scrollHeight - offset;
-      if (!isAtBottom) return;
-      // Call for the next page
-      setTablePage((p) => p + 1);
-    },
-    250
-  );
-
-  const [showLeftScrollDivider, setShowLeftScrollDivider] = useState(false);
-
-  const rowHeight = tableSchema.rowHeight ?? DEFAULT_ROW_HEIGHT;
-  const handleResize = useDebouncedCallback(
-    (colIndex: number, width: number) => {
-      const column = columns[colIndex];
-      if (!column.key) return;
-      updateColumn({ key: column.key, config: { width } });
-    },
-    1000
-  );
+  const handleKeyDown = (e: React.KeyboardEvent<HTMLDivElement>) => {};
 
   return (
-    <Suspense fallback={<Loading message="Loading fields" />}>
-      {/* <Hotkeys selectedCell={selectedCell} /> */}
-      <TableContainer rowHeight={rowHeight} className="table-container">
-        <DndProvider backend={HTML5Backend}>
-          {showLeftScrollDivider && <div className="left-scroll-divider" />}
+    <>
+      <StyledTable
+        role="grid"
+        style={{ width: table.getTotalSize(), userSelect: "none" }}
+        onKeyDown={handleKeyDown}
+      >
+        <div className="thead" style={{ position: "sticky", top: 0 }}>
+          {table.getHeaderGroups().map((headerGroup) => (
+            <StyledRow key={headerGroup.id} role="row">
+              {headerGroup.headers.map((header) => (
+                <ColumnHeaderComponent
+                  key={header.id}
+                  label={header.column.columnDef.meta?.name || header.id}
+                  type={header.column.columnDef.meta?.type}
+                  style={{ width: header.getSize() }}
+                >
+                  {/* <div
+                    {...{
+                      onMouseDown: header.getResizeHandler(),
+                      onTouchStart: header.getResizeHandler(),
+                      className: `resizer ${
+                        header.column.getIsResizing() ? "isResizing" : ""
+                      }`,
+                      // style: {
+                      //   transform:
+                      //     columnResizeMode === 'onEnd' &&
+                      //     header.column.getIsResizing()
+                      //       ? `translateX(${
+                      //           table.getState().columnSizingInfo.deltaOffset
+                      //         }px)`
+                      //       : '',
+                      // },
+                    }}
+                  /> */}
+                </ColumnHeaderComponent>
+              ))}
+            </StyledRow>
+          ))}
+        </div>
 
-          <DataGrid
-            onColumnResize={handleResize}
-            onScroll={handleScroll}
-            ref={(handle) => {
-              if (dataGridRef) dataGridRef.current = handle;
-            }}
-            rows={rows}
-            columns={columns}
-            // Increase row height of out of order rows to add margins
-            rowHeight={({ row }) => {
-              if (row._rowy_outOfOrder)
-                return rowHeight + OUT_OF_ORDER_MARGIN + 1;
-
-              return rowHeight;
-            }}
-            headerRowHeight={DEFAULT_ROW_HEIGHT + 1}
-            className="rdg-light" // Handle dark mode in MUI theme
-            cellNavigationMode="LOOP_OVER_ROW"
-            rowRenderer={TableRow}
-            rowKeyGetter={rowKeyGetter}
-            rowClass={rowClass}
-            // selectedRows={selectedRowsSet}
-            // onSelectedRowsChange={(newSelectedSet) => {
-            //   const newSelectedArray = newSelectedSet
-            //     ? [...newSelectedSet]
-            //     : [];
-            //   const prevSelectedRowsArray = selectedRowsSet
-            //     ? [...selectedRowsSet]
-            //     : [];
-            //   const addedSelections = difference(
-            //     newSelectedArray,
-            //     prevSelectedRowsArray
-            //   );
-            //   const removedSelections = difference(
-            //     prevSelectedRowsArray,
-            //     newSelectedArray
-            //   );
-            //   addedSelections.forEach((id) => {
-            //     const newRow = find(rows, { id });
-            //     setSelectedRows([...selectedRows, newRow]);
-            //   });
-            //   removedSelections.forEach((rowId) => {
-            //     setSelectedRows(selectedRows.filter((row) => row.id !== rowId));
-            //   });
-            //   setSelectedRowsSet(newSelectedSet);
-            // }}
-            // onRowsChange={() => {
-            //console.log('onRowsChange',rows)
-            // }}
-            // TODO: onFill={(e) => {
-            //   console.log("onFill", e);
-            //   const { columnKey, sourceRow, targetRows } = e;
-            //   if (updateCell)
-            //     targetRows.forEach((row) =>
-            //       updateCell(row._rowy_ref, columnKey, sourceRow[columnKey])
-            //     );
-            //   return [];
-            // }}
-            onPaste={(e, ...args) => {
-              console.log("onPaste", e, ...args);
-              const value = e.sourceRow[e.sourceColumnKey];
-              updateField({
-                path: e.targetRow._rowy_ref.path,
-                fieldName: e.targetColumnKey,
-                value,
-              });
-            }}
-            onSelectedCellChange={({ rowIdx, idx }) => {
-              if (!rows[rowIdx]?._rowy_ref) return; // May be the header row
-
-              const path = rows[rowIdx]._rowy_ref.path;
-              if (!path) return;
-
-              const columnKey = tableColumnsOrdered.filter((col) =>
-                userDocHiddenFields
-                  ? !userDocHiddenFields.includes(col.key)
-                  : true
-              )[idx]?.key;
-              if (!columnKey) return; // May be the final column
-
-              setSelectedCell({ path, columnKey });
-            }}
-          />
-        </DndProvider>
-
-        {tableRows.length === 0 && (
-          <EmptyState
-            Icon={AddRowIcon}
-            message="Add a row to get started"
-            description={
-              <div>
-                <br />
-                <AddRow />
-              </div>
-            }
-            style={{
-              position: "absolute",
-              inset: 0,
-              top: COLUMN_HEADER_HEIGHT,
-              height: "auto",
-            }}
-          />
-        )}
-        {tableNextPage.loading && <LinearProgress />}
-      </TableContainer>
-
-      <ContextMenu />
-      {/* 
-      <BulkActions
-        selectedRows={selectedRows}
-        columns={columns}
-        clearSelection={() => {
-          setSelectedRowsSet(new Set());
-          setSelectedRows([]);
-        }}
-      /> */}
-    </Suspense>
+        <div className="tbody">
+          {table.getRowModel().rows.map((row) => (
+            <StyledRow key={row.id} role="row">
+              {row.getVisibleCells().map((cell) => (
+                <StyledCell
+                  key={cell.id}
+                  style={{ width: cell.column.getSize() }}
+                >
+                  {flexRender(cell.column.columnDef.cell, cell.getContext())}
+                  <button>f</button>
+                </StyledCell>
+              ))}
+            </StyledRow>
+          ))}
+        </div>
+      </StyledTable>
+    </>
   );
 }
diff --git a/src/components/fields/SingleSelect/Settings.tsx b/src/components/fields/SingleSelect/Settings.tsx
index 103bb2cd..2fc908b9 100644
--- a/src/components/fields/SingleSelect/Settings.tsx
+++ b/src/components/fields/SingleSelect/Settings.tsx
@@ -93,7 +93,7 @@ export default function Settings({ onChange, config }: ISettingsProps) {
             onChange={(e) => {
               setNewOption(e.target.value);
             }}
-            onKeyPress={(e: any) => {
+            onKeyDown={(e: any) => {
               if (e.key === "Enter") {
                 handleAdd();
               }
diff --git a/src/layouts/Navigation/Navigation.tsx b/src/layouts/Navigation/Navigation.tsx
index f17053a1..3f967301 100644
--- a/src/layouts/Navigation/Navigation.tsx
+++ b/src/layouts/Navigation/Navigation.tsx
@@ -62,7 +62,7 @@ export default function Navigation({ children }: React.PropsWithChildren<{}>) {
               <Loading fullScreen style={{ marginTop: -TOP_BAR_HEIGHT }} />
             }
           >
-            <div style={{ flexGrow: 1, maxWidth: "100%" }}>
+            <div style={{ flexGrow: 1, minWidth: 0 }}>
               <Outlet />
               {children}
             </div>
diff --git a/src/pages/Table/TablePage.tsx b/src/pages/Table/TablePage.tsx
index 4d682fc3..17e8213a 100644
--- a/src/pages/Table/TablePage.tsx
+++ b/src/pages/Table/TablePage.tsx
@@ -4,7 +4,7 @@ import { DataGridHandle } from "react-data-grid";
 import { ErrorBoundary } from "react-error-boundary";
 import { isEmpty } from "lodash-es";
 
-import { Fade } from "@mui/material";
+import { Box, Fade } from "@mui/material";
 import ErrorFallback, {
   InlineErrorFallback,
 } from "@src/components/ErrorFallback";
@@ -27,6 +27,12 @@ import {
 import useBeforeUnload from "@src/hooks/useBeforeUnload";
 import ActionParamsProvider from "@src/components/fields/Action/FormDialog/Provider";
 import { useSnackLogContext } from "@src/contexts/SnackLogContext";
+import { TOP_BAR_HEIGHT } from "@src/layouts/Navigation/TopBar";
+import { TABLE_TOOLBAR_HEIGHT } from "@src/components/TableToolbar";
+import {
+  DRAWER_COLLAPSED_WIDTH,
+  DRAWER_WIDTH,
+} from "@src/components/SideDrawer";
 
 // prettier-ignore
 const BuildLogsSnack = lazy(() => import("@src/components/TableModals/CloudLogsModal/BuildLogs/BuildLogsSnack" /* webpackChunkName: "TableModals-BuildLogsSnack" */));
@@ -93,7 +99,23 @@ export default function TablePage({
 
       <ErrorBoundary FallbackComponent={ErrorFallback}>
         <Suspense fallback={<TableSkeleton />}>
-          <Table dataGridRef={dataGridRef} />
+          <Box
+            sx={{
+              overflow: "auto",
+              height: `calc(100vh - ${TOP_BAR_HEIGHT}px - ${TABLE_TOOLBAR_HEIGHT}px)`,
+              width: {
+                xs: "100%",
+                sm: `calc(100% - ${DRAWER_COLLAPSED_WIDTH}px)`,
+              },
+
+              '& [role="grid"]': {
+                paddingBottom: (theme) =>
+                  `max(env(safe-area-inset-bottom), ${theme.spacing(2)})`,
+              },
+            }}
+          >
+            <Table />
+          </Box>
         </Suspense>
       </ErrorBoundary>
 
diff --git a/yarn.lock b/yarn.lock
index 4d281370..b6e7cfa3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2688,6 +2688,18 @@
   dependencies:
     "@jest/create-cache-key-function" "^27.4.2"
 
+"@tanstack/react-table@^8.5.15":
+  version "8.5.15"
+  resolved "https://registry.yarnpkg.com/@tanstack/react-table/-/react-table-8.5.15.tgz#8179d24d7fdf909799a517e8897501c44e51284d"
+  integrity sha512-9rSvhIFeMpfXksFgQNTWnVoJbkae/U8CkHnHYGWAIB/O0Ca51IKap0Rjp5WkIUVBWxJ7Wfl2y13oY+aWcyM6Rg==
+  dependencies:
+    "@tanstack/table-core" "8.5.15"
+
+"@tanstack/table-core@8.5.15":
+  version "8.5.15"
+  resolved "https://registry.yarnpkg.com/@tanstack/table-core/-/table-core-8.5.15.tgz#e1e674135cd6c36f29a1562a2b846f824861149b"
+  integrity sha512-k+BcCOAYD610Cij6p1BPyEqjMQjZIdAnVDoIUKVnA/tfHbF4JlDP7pKAftXPBxyyX5Z1yQPurPnOdEY007Snyg==
+
 "@testing-library/dom@^8.5.0":
   version "8.13.0"
   resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.13.0.tgz#bc00bdd64c7d8b40841e27a70211399ad3af46f5"

From 4f49503e7a20bd54649b6b8fface6aeb88f26747 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 17 Oct 2022 17:57:26 +1100
Subject: [PATCH 184/309] add cell navigation

---
 src/atoms/tableScope/ui.ts                  |   5 +-
 src/components/Table/Styled/StyledTable.tsx |  11 +
 src/components/Table/Table.tsx              | 218 +++++++++++++++++---
 3 files changed, 207 insertions(+), 27 deletions(-)

diff --git a/src/atoms/tableScope/ui.ts b/src/atoms/tableScope/ui.ts
index fa987118..a26ea065 100644
--- a/src/atoms/tableScope/ui.ts
+++ b/src/atoms/tableScope/ui.ts
@@ -124,7 +124,10 @@ export const importAirtableAtom = atom<{
 /** Store side drawer open state */
 export const sideDrawerOpenAtom = atom(false);
 
-export type SelectedCell = { path: string; columnKey: string };
+export type SelectedCell = {
+  path: string | "_rowy_header";
+  columnKey: string | "_rowy_row_actions";
+};
 /** Store selected cell in table. Used in side drawer and context menu */
 export const selectedCellAtom = atom<SelectedCell | null>(null);
 
diff --git a/src/components/Table/Styled/StyledTable.tsx b/src/components/Table/Styled/StyledTable.tsx
index fc855036..ab65a84c 100644
--- a/src/components/Table/Styled/StyledTable.tsx
+++ b/src/components/Table/Styled/StyledTable.tsx
@@ -3,5 +3,16 @@ import { styled } from "@mui/material";
 export const StyledTable = styled("div")(({ theme }) => ({
   ...(theme.typography.caption as any),
   lineHeight: "inherit !important",
+
+  "& [role='columnheader'], & [role='gridcell']": {
+    "&[aria-selected='true']": {
+      outline: `1px solid ${theme.palette.primary.main}`,
+      outlineOffset: "-1px",
+    },
+    "&:focus": {
+      outline: `2px solid ${theme.palette.primary.main}`,
+      outlineOffset: "-2px",
+    },
+  },
 }));
 StyledTable.displayName = "StyledTable";
diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index 6dbddcaf..547016a7 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo, useState, Suspense } from "react";
+import React, { useMemo, useState, Suspense, useRef } from "react";
 import { useAtom, useSetAtom } from "jotai";
 import { useDebouncedCallback, useThrottledCallback } from "use-debounce";
 import { DndProvider } from "react-dnd";
@@ -49,7 +49,9 @@ import {
   updateColumnAtom,
   updateFieldAtom,
   selectedCellAtom,
+  SelectedCell,
 } from "@src/atoms/tableScope";
+import { COLLECTION_PAGE_SIZE } from "@src/config/db";
 
 import { getFieldType, getFieldProp } from "@src/components/fields";
 import { FieldType } from "@src/constants/fields";
@@ -84,7 +86,11 @@ export default function TableComponent() {
   const updateColumn = useSetAtom(updateColumnAtom, tableScope);
   const updateField = useSetAtom(updateFieldAtom, tableScope);
 
+  const gridRef = useRef<HTMLDivElement>(null);
+  const [focusInsideCell, setFocusInsideCell] = useState(false);
+
   const canAddColumn = userRoles.includes("ADMIN");
+  const canEditColumn = userRoles.includes("ADMIN");
   const userDocHiddenFields =
     userSettings.tables?.[formatSubTableName(tableId)]?.hiddenFields;
 
@@ -103,6 +109,7 @@ export default function TableComponent() {
       // })
       .map((columnConfig) =>
         columnHelper.accessor(columnConfig.fieldName, {
+          id: columnConfig.fieldName,
           meta: columnConfig,
           // draggable: true,
           // resizable: true,
@@ -160,28 +167,162 @@ export default function TableComponent() {
     columnResizeMode: "onChange",
     // debugRows: true,
   });
-  console.log(table);
+  console.log(table, selectedCell);
 
-  const handleKeyDown = (e: React.KeyboardEvent<HTMLDivElement>) => {};
+  const handleKeyDown = (e: React.KeyboardEvent<HTMLDivElement>) => {
+    console.log(
+      "keydown",
+      // e.target,
+      e.key,
+      e.ctrlKey ? "ctrl" : "",
+      e.altKey ? "alt" : "",
+      e.metaKey ? "meta" : "",
+      e.shiftKey ? "shift" : ""
+    );
+    const LISTENED_KEYS = [
+      "ArrowUp",
+      "ArrowDown",
+      "ArrowLeft",
+      "ArrowRight",
+      "Enter",
+      "Escape",
+      "Home",
+      "End",
+      "PageUp",
+      "PageDown",
+    ];
+    if (LISTENED_KEYS.includes(e.key)) e.preventDefault();
+
+    const target = e.target as HTMLDivElement;
+    if (
+      target.getAttribute("role") !== "columnheader" &&
+      target.getAttribute("role") !== "gridcell"
+    )
+      return;
+
+    const colIndex = Number(target.getAttribute("aria-colindex")) - 1;
+    const rowIndex =
+      Number(target.parentElement!.getAttribute("aria-rowindex")) - 2;
+
+    const rowId = target.getAttribute("data-rowId")!;
+    const colId = target.getAttribute("data-colId")!;
+
+    const isHeader = rowId === "_rowy_header";
+
+    let newColIndex = colIndex;
+    let newRowIndex = rowIndex;
+
+    // const newSelectedCell: SelectedCell = selectedCell
+    //   ? { ...selectedCell }
+    //   : { path: rowId, columnKey: colId };
+
+    switch (e.key) {
+      case "ArrowUp":
+        if (rowIndex > -1) newRowIndex = rowIndex - 1;
+        break;
+
+      case "ArrowDown":
+        if (rowIndex < tableRows.length - 1) newRowIndex = rowIndex + 1;
+        break;
+
+      case "ArrowLeft":
+        if (colIndex > 0) newColIndex = colIndex - 1;
+        break;
+
+      case "ArrowRight":
+        if (colIndex < columns.length - 1) newColIndex = colIndex + 1;
+        break;
+
+      case "PageUp":
+        newRowIndex = Math.max(0, rowIndex - COLLECTION_PAGE_SIZE);
+        break;
+
+      case "PageDown":
+        newRowIndex = Math.min(
+          tableRows.length - 1,
+          rowIndex + COLLECTION_PAGE_SIZE
+        );
+        break;
+
+      case "Home":
+        newColIndex = 0;
+        if (e.ctrlKey || e.metaKey) newRowIndex = -1;
+        break;
+
+      case "End":
+        newColIndex = columns.length - 1;
+        if (e.ctrlKey || e.metaKey) newRowIndex = tableRows.length - 1;
+        break;
+    }
+
+    const newSelectedCell = {
+      path:
+        newRowIndex > -1
+          ? tableRows[newRowIndex]._rowy_ref.path
+          : "_rowy_header",
+      columnKey: columns[newColIndex].id! || columns[0].id!,
+    };
+    console.log(newRowIndex, newColIndex, newSelectedCell);
+
+    setSelectedCell(newSelectedCell);
+
+    // Find matching DOM element for the cell
+    const newCellEl = gridRef.current?.querySelector(
+      `[aria-rowindex="${newRowIndex + 2}"] [aria-colindex="${
+        newColIndex + 1
+      }"]`
+    );
+    // Focus either the cell or the first focusable element in the cell
+    if (newCellEl) (newCellEl as HTMLDivElement).focus();
+  };
 
   return (
     <>
       <StyledTable
+        ref={gridRef}
         role="grid"
+        aria-readonly={tableSettings.readOnly}
+        aria-colcount={columns.length}
+        aria-rowcount={tableRows.length + 1}
         style={{ width: table.getTotalSize(), userSelect: "none" }}
         onKeyDown={handleKeyDown}
       >
-        <div className="thead" style={{ position: "sticky", top: 0 }}>
+        <div
+          className="thead"
+          role="rowgroup"
+          style={{ position: "sticky", top: 0 }}
+        >
           {table.getHeaderGroups().map((headerGroup) => (
-            <StyledRow key={headerGroup.id} role="row">
-              {headerGroup.headers.map((header) => (
-                <ColumnHeaderComponent
-                  key={header.id}
-                  label={header.column.columnDef.meta?.name || header.id}
-                  type={header.column.columnDef.meta?.type}
-                  style={{ width: header.getSize() }}
-                >
-                  {/* <div
+            <StyledRow key={headerGroup.id} role="row" aria-rowindex={1}>
+              {headerGroup.headers.map((header) => {
+                const isFocusable =
+                  (!selectedCell && header.index === 0) ||
+                  (selectedCell?.path === "_rowy_header" &&
+                    selectedCell?.columnKey === header.id);
+
+                return (
+                  <ColumnHeaderComponent
+                    key={header.id}
+                    data-rowId={"_rowy_header"}
+                    data-colId={header.id}
+                    role="columnheader"
+                    tabIndex={isFocusable ? 0 : -1}
+                    aria-colindex={header.index + 1}
+                    aria-readonly={canEditColumn}
+                    // TODO: aria-sort={"none" | "ascending" | "descending" | "other" | undefined}
+                    aria-selected={isFocusable}
+                    label={header.column.columnDef.meta?.name || header.id}
+                    type={header.column.columnDef.meta?.type}
+                    style={{ width: header.getSize() }}
+                    onClick={(e) => {
+                      setSelectedCell({
+                        path: "_rowy_header",
+                        columnKey: header.id,
+                      });
+                      (e.target as HTMLDivElement).focus();
+                    }}
+                  >
+                    {/* <div
                     {...{
                       onMouseDown: header.getResizeHandler(),
                       onTouchStart: header.getResizeHandler(),
@@ -199,24 +340,49 @@ export default function TableComponent() {
                       // },
                     }}
                   /> */}
-                </ColumnHeaderComponent>
-              ))}
+                  </ColumnHeaderComponent>
+                );
+              })}
             </StyledRow>
           ))}
         </div>
 
-        <div className="tbody">
+        <div className="tbody" role="rowgroup">
           {table.getRowModel().rows.map((row) => (
-            <StyledRow key={row.id} role="row">
-              {row.getVisibleCells().map((cell) => (
-                <StyledCell
-                  key={cell.id}
-                  style={{ width: cell.column.getSize() }}
-                >
-                  {flexRender(cell.column.columnDef.cell, cell.getContext())}
-                  <button>f</button>
-                </StyledCell>
-              ))}
+            <StyledRow key={row.id} role="row" aria-rowindex={row.index + 2}>
+              {row.getVisibleCells().map((cell, cellIndex) => {
+                const isFocusable =
+                  selectedCell?.path === row.original._rowy_ref.path &&
+                  selectedCell?.columnKey === cell.column.id;
+
+                return (
+                  <StyledCell
+                    key={cell.id}
+                    data-rowId={row.id}
+                    data-colId={cell.column.id}
+                    role="gridcell"
+                    tabIndex={isFocusable ? 0 : -1}
+                    aria-colindex={cellIndex + 1}
+                    aria-readonly={
+                      cell.column.columnDef.meta?.editable === false
+                    }
+                    aria-selected={isFocusable}
+                    style={{ width: cell.column.getSize() }}
+                    onClick={(e) => {
+                      setSelectedCell({
+                        path: row.original._rowy_ref.path,
+                        columnKey: cell.column.id,
+                      });
+                      (e.target as HTMLDivElement).focus();
+                    }}
+                  >
+                    {flexRender(cell.column.columnDef.cell, cell.getContext())}
+                    <button tabIndex={isFocusable && focusInsideCell ? 0 : -1}>
+                      {isFocusable ? "f" : "x"}
+                    </button>
+                  </StyledCell>
+                );
+              })}
             </StyledRow>
           ))}
         </div>

From 0e7a02bf08717030d699e930e4fad319dd7be718 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 18 Oct 2022 14:49:17 +1100
Subject: [PATCH 185/309] add in-cell focus with Enter/Esc

---
 src/components/Table/Styled/StyledTable.tsx |  8 ++--
 src/components/Table/Table.tsx              | 49 +++++++++++++++------
 2 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/src/components/Table/Styled/StyledTable.tsx b/src/components/Table/Styled/StyledTable.tsx
index ab65a84c..2f08622b 100644
--- a/src/components/Table/Styled/StyledTable.tsx
+++ b/src/components/Table/Styled/StyledTable.tsx
@@ -6,13 +6,13 @@ export const StyledTable = styled("div")(({ theme }) => ({
 
   "& [role='columnheader'], & [role='gridcell']": {
     "&[aria-selected='true']": {
-      outline: `1px solid ${theme.palette.primary.main}`,
-      outlineOffset: "-1px",
-    },
-    "&:focus": {
       outline: `2px solid ${theme.palette.primary.main}`,
       outlineOffset: "-2px",
     },
+    "&:focus": {
+      outlineWidth: "3px",
+      outlineOffset: "-3px",
+    },
   },
 }));
 StyledTable.displayName = "StyledTable";
diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index 547016a7..ecca81de 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -167,7 +167,7 @@ export default function TableComponent() {
     columnResizeMode: "onChange",
     // debugRows: true,
   });
-  console.log(table, selectedCell);
+  // console.log(table, selectedCell);
 
   const handleKeyDown = (e: React.KeyboardEvent<HTMLDivElement>) => {
     console.log(
@@ -193,6 +193,14 @@ export default function TableComponent() {
     ];
     if (LISTENED_KEYS.includes(e.key)) e.preventDefault();
 
+    if (e.key === "Escape") {
+      setFocusInsideCell(false);
+      (
+        gridRef.current?.querySelector("[aria-selected=true]") as HTMLDivElement
+      )?.focus();
+      return;
+    }
+
     const target = e.target as HTMLDivElement;
     if (
       target.getAttribute("role") !== "columnheader" &&
@@ -200,6 +208,12 @@ export default function TableComponent() {
     )
       return;
 
+    if (e.key === "Enter") {
+      setFocusInsideCell(true);
+      (target.querySelector("[tabindex]") as HTMLElement)?.focus();
+      return;
+    }
+
     const colIndex = Number(target.getAttribute("aria-colindex")) - 1;
     const rowIndex =
       Number(target.parentElement!.getAttribute("aria-rowindex")) - 2;
@@ -218,19 +232,23 @@ export default function TableComponent() {
 
     switch (e.key) {
       case "ArrowUp":
-        if (rowIndex > -1) newRowIndex = rowIndex - 1;
+        if (e.ctrlKey || e.metaKey) newRowIndex = -1;
+        else if (rowIndex > -1) newRowIndex = rowIndex - 1;
         break;
 
       case "ArrowDown":
-        if (rowIndex < tableRows.length - 1) newRowIndex = rowIndex + 1;
+        if (e.ctrlKey || e.metaKey) newRowIndex = tableRows.length - 1;
+        else if (rowIndex < tableRows.length - 1) newRowIndex = rowIndex + 1;
         break;
 
       case "ArrowLeft":
-        if (colIndex > 0) newColIndex = colIndex - 1;
+        if (e.ctrlKey || e.metaKey) newColIndex = 0;
+        else if (colIndex > 0) newColIndex = colIndex - 1;
         break;
 
       case "ArrowRight":
-        if (colIndex < columns.length - 1) newColIndex = colIndex + 1;
+        if (e.ctrlKey || e.metaKey) newColIndex = columns.length - 1;
+        else if (colIndex < columns.length - 1) newColIndex = colIndex + 1;
         break;
 
       case "PageUp":
@@ -272,8 +290,9 @@ export default function TableComponent() {
         newColIndex + 1
       }"]`
     );
-    // Focus either the cell or the first focusable element in the cell
+    // Focus the cell
     if (newCellEl) (newCellEl as HTMLDivElement).focus();
+    setFocusInsideCell(false);
   };
 
   return (
@@ -295,7 +314,7 @@ export default function TableComponent() {
           {table.getHeaderGroups().map((headerGroup) => (
             <StyledRow key={headerGroup.id} role="row" aria-rowindex={1}>
               {headerGroup.headers.map((header) => {
-                const isFocusable =
+                const isSelectedCell =
                   (!selectedCell && header.index === 0) ||
                   (selectedCell?.path === "_rowy_header" &&
                     selectedCell?.columnKey === header.id);
@@ -306,11 +325,11 @@ export default function TableComponent() {
                     data-rowId={"_rowy_header"}
                     data-colId={header.id}
                     role="columnheader"
-                    tabIndex={isFocusable ? 0 : -1}
+                    tabIndex={isSelectedCell ? 0 : -1}
                     aria-colindex={header.index + 1}
                     aria-readonly={canEditColumn}
                     // TODO: aria-sort={"none" | "ascending" | "descending" | "other" | undefined}
-                    aria-selected={isFocusable}
+                    aria-selected={isSelectedCell}
                     label={header.column.columnDef.meta?.name || header.id}
                     type={header.column.columnDef.meta?.type}
                     style={{ width: header.getSize() }}
@@ -351,7 +370,7 @@ export default function TableComponent() {
           {table.getRowModel().rows.map((row) => (
             <StyledRow key={row.id} role="row" aria-rowindex={row.index + 2}>
               {row.getVisibleCells().map((cell, cellIndex) => {
-                const isFocusable =
+                const isSelectedCell =
                   selectedCell?.path === row.original._rowy_ref.path &&
                   selectedCell?.columnKey === cell.column.id;
 
@@ -361,12 +380,12 @@ export default function TableComponent() {
                     data-rowId={row.id}
                     data-colId={cell.column.id}
                     role="gridcell"
-                    tabIndex={isFocusable ? 0 : -1}
+                    tabIndex={isSelectedCell && !focusInsideCell ? 0 : -1}
                     aria-colindex={cellIndex + 1}
                     aria-readonly={
                       cell.column.columnDef.meta?.editable === false
                     }
-                    aria-selected={isFocusable}
+                    aria-selected={isSelectedCell}
                     style={{ width: cell.column.getSize() }}
                     onClick={(e) => {
                       setSelectedCell({
@@ -377,8 +396,10 @@ export default function TableComponent() {
                     }}
                   >
                     {flexRender(cell.column.columnDef.cell, cell.getContext())}
-                    <button tabIndex={isFocusable && focusInsideCell ? 0 : -1}>
-                      {isFocusable ? "f" : "x"}
+                    <button
+                      tabIndex={isSelectedCell && focusInsideCell ? 0 : -1}
+                    >
+                      {isSelectedCell ? "f" : "x"}
                     </button>
                   </StyledCell>
                 );

From bc23b93b428af17cb84afbd2b806e1e8159f7369 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 18 Oct 2022 15:05:11 +1100
Subject: [PATCH 186/309] SideDrawer: add aria-labels to buttons

---
 src/components/SideDrawer/SideDrawer.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/SideDrawer/SideDrawer.tsx b/src/components/SideDrawer/SideDrawer.tsx
index eafdcdfa..c4a02119 100644
--- a/src/components/SideDrawer/SideDrawer.tsx
+++ b/src/components/SideDrawer/SideDrawer.tsx
@@ -141,6 +141,7 @@ export default function SideDrawer({
       {!!cell && (
         <div className="sidedrawer-nav-fab-container">
           <Fab
+            aria-label="Previous row"
             style={{ borderBottomLeftRadius: 0, borderBottomRightRadius: 0 }}
             size="small"
             disabled={disabled || !cell || selectedCellRowIndex <= 0}
@@ -150,6 +151,7 @@ export default function SideDrawer({
           </Fab>
 
           <Fab
+            aria-label="Next row"
             style={{ borderTopLeftRadius: 0, borderTopRightRadius: 0 }}
             size="small"
             disabled={
@@ -164,6 +166,7 @@ export default function SideDrawer({
 
       <div className="sidedrawer-open-fab-container">
         <Fab
+          aria-label={open ? "Close side drawer" : "Open side drawer"}
           disabled={disabled}
           onClick={() => {
             if (setOpen)

From c7d97d26986eed19bb00d57b38e27747a793467b Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 18 Oct 2022 17:53:47 +1100
Subject: [PATCH 187/309] add virtualization + infinite scrolll

---
 package.json                                  |   1 +
 src/components/Table/Table.tsx                | 320 +++++++++---------
 .../Table/useKeyboardNavigation.tsx           | 140 ++++++++
 src/pages/Table/TablePage.tsx                 |  10 +-
 yarn.lock                                     |  12 +
 5 files changed, 316 insertions(+), 167 deletions(-)
 create mode 100644 src/components/Table/useKeyboardNavigation.tsx

diff --git a/package.json b/package.json
index e743edda..baf6cda0 100644
--- a/package.json
+++ b/package.json
@@ -65,6 +65,7 @@
     "react-router-hash-link": "^2.4.3",
     "react-scripts": "^5.0.0",
     "react-usestateref": "^1.0.8",
+    "react-virtual": "^2.10.4",
     "remark-gfm": "^3.0.1",
     "seedrandom": "^3.0.5",
     "stream-browserify": "^3.0.0",
diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index ecca81de..153b5576 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo, useState, Suspense, useRef } from "react";
+import { useMemo, useRef, useCallback, Suspense, useEffect } from "react";
 import { useAtom, useSetAtom } from "jotai";
 import { useDebouncedCallback, useThrottledCallback } from "use-debounce";
 import { DndProvider } from "react-dnd";
@@ -11,6 +11,7 @@ import {
   getCoreRowModel,
   useReactTable,
 } from "@tanstack/react-table";
+import { useVirtual } from "react-virtual";
 
 import { TOP_BAR_HEIGHT } from "@src/layouts/Navigation/TopBar";
 import { TABLE_TOOLBAR_HEIGHT } from "@src/components/TableToolbar";
@@ -58,6 +59,7 @@ import { FieldType } from "@src/constants/fields";
 import { formatSubTableName } from "@src/utils/table";
 import { TableRow, ColumnConfig } from "@src/types/table";
 import { StyledCell } from "./Styled/StyledCell";
+import { useKeyboardNavigation } from "./useKeyboardNavigation";
 
 export const DEFAULT_ROW_HEIGHT = 41;
 export const DEFAULT_COL_WIDTH = 150;
@@ -86,8 +88,8 @@ export default function TableComponent() {
   const updateColumn = useSetAtom(updateColumnAtom, tableScope);
   const updateField = useSetAtom(updateFieldAtom, tableScope);
 
+  const containerRef = useRef<HTMLDivElement>(null);
   const gridRef = useRef<HTMLDivElement>(null);
-  const [focusInsideCell, setFocusInsideCell] = useState(false);
 
   const canAddColumn = userRoles.includes("ADMIN");
   const canEditColumn = userRoles.includes("ADMIN");
@@ -167,149 +169,111 @@ export default function TableComponent() {
     columnResizeMode: "onChange",
     // debugRows: true,
   });
+  const { rows } = table.getRowModel();
   // console.log(table, selectedCell);
 
-  const handleKeyDown = (e: React.KeyboardEvent<HTMLDivElement>) => {
-    console.log(
-      "keydown",
-      // e.target,
-      e.key,
-      e.ctrlKey ? "ctrl" : "",
-      e.altKey ? "alt" : "",
-      e.metaKey ? "meta" : "",
-      e.shiftKey ? "shift" : ""
-    );
-    const LISTENED_KEYS = [
-      "ArrowUp",
-      "ArrowDown",
-      "ArrowLeft",
-      "ArrowRight",
-      "Enter",
-      "Escape",
-      "Home",
-      "End",
-      "PageUp",
-      "PageDown",
-    ];
-    if (LISTENED_KEYS.includes(e.key)) e.preventDefault();
+  const {
+    virtualItems: virtualRows,
+    totalSize: totalHeight,
+    scrollToIndex: scrollToRowIndex,
+  } = useVirtual({
+    parentRef: containerRef,
+    size: tableRows.length,
+    overscan: 10,
+    estimateSize: useCallback(
+      () => tableSchema.rowHeight || DEFAULT_ROW_HEIGHT,
+      [tableSchema.rowHeight]
+    ),
+  });
 
-    if (e.key === "Escape") {
-      setFocusInsideCell(false);
-      (
-        gridRef.current?.querySelector("[aria-selected=true]") as HTMLDivElement
-      )?.focus();
-      return;
+  const {
+    virtualItems: virtualCols,
+    totalSize: totalWidth,
+    scrollToIndex: scrollToColIndex,
+  } = useVirtual({
+    parentRef: containerRef,
+    horizontal: true,
+    size: columns.length,
+    overscan: 1,
+    estimateSize: useCallback(
+      (index: number) => columns[index].size || DEFAULT_COL_WIDTH,
+      [columns]
+    ),
+  });
+
+  console.log(totalHeight);
+
+  useEffect(() => {
+    if (!selectedCell) return;
+    if (selectedCell.path) {
+      const rowIndex = tableRows.findIndex(
+        (row) => row._rowy_ref.path === selectedCell.path
+      );
+      if (rowIndex === -1) return;
+      scrollToRowIndex(rowIndex);
     }
-
-    const target = e.target as HTMLDivElement;
-    if (
-      target.getAttribute("role") !== "columnheader" &&
-      target.getAttribute("role") !== "gridcell"
-    )
-      return;
-
-    if (e.key === "Enter") {
-      setFocusInsideCell(true);
-      (target.querySelector("[tabindex]") as HTMLElement)?.focus();
-      return;
+    if (selectedCell.columnKey) {
+      const colIndex = columns.findIndex(
+        (col) => col.id === selectedCell.columnKey
+      );
+      if (colIndex === -1) return;
+      scrollToColIndex(colIndex);
     }
+  }, [selectedCell, tableRows, columns, scrollToRowIndex, scrollToColIndex]);
 
-    const colIndex = Number(target.getAttribute("aria-colindex")) - 1;
-    const rowIndex =
-      Number(target.parentElement!.getAttribute("aria-rowindex")) - 2;
+  const { handleKeyDown, focusInsideCell } = useKeyboardNavigation({
+    gridRef,
+    tableRows,
+    columns,
+  });
 
-    const rowId = target.getAttribute("data-rowId")!;
-    const colId = target.getAttribute("data-colId")!;
+  const paddingTop = virtualRows.length > 0 ? virtualRows?.[0]?.start || 0 : 0;
+  const paddingBottom =
+    virtualRows.length > 0
+      ? totalHeight - (virtualRows?.[virtualRows.length - 1]?.end || 0)
+      : 0;
 
-    const isHeader = rowId === "_rowy_header";
+  const paddingLeft = virtualCols.length > 0 ? virtualCols?.[0]?.start || 0 : 0;
+  const paddingRight =
+    virtualCols.length > 0
+      ? totalWidth - (virtualCols?.[virtualCols.length - 1]?.end || 0)
+      : 0;
 
-    let newColIndex = colIndex;
-    let newRowIndex = rowIndex;
+  const fetchMoreOnBottomReached = useThrottledCallback(
+    (containerElement?: HTMLDivElement | null) => {
+      console.log("fetchMoreOnBottomReached", containerElement);
+      if (!containerElement) return;
 
-    // const newSelectedCell: SelectedCell = selectedCell
-    //   ? { ...selectedCell }
-    //   : { path: rowId, columnKey: colId };
-
-    switch (e.key) {
-      case "ArrowUp":
-        if (e.ctrlKey || e.metaKey) newRowIndex = -1;
-        else if (rowIndex > -1) newRowIndex = rowIndex - 1;
-        break;
-
-      case "ArrowDown":
-        if (e.ctrlKey || e.metaKey) newRowIndex = tableRows.length - 1;
-        else if (rowIndex < tableRows.length - 1) newRowIndex = rowIndex + 1;
-        break;
-
-      case "ArrowLeft":
-        if (e.ctrlKey || e.metaKey) newColIndex = 0;
-        else if (colIndex > 0) newColIndex = colIndex - 1;
-        break;
-
-      case "ArrowRight":
-        if (e.ctrlKey || e.metaKey) newColIndex = columns.length - 1;
-        else if (colIndex < columns.length - 1) newColIndex = colIndex + 1;
-        break;
-
-      case "PageUp":
-        newRowIndex = Math.max(0, rowIndex - COLLECTION_PAGE_SIZE);
-        break;
-
-      case "PageDown":
-        newRowIndex = Math.min(
-          tableRows.length - 1,
-          rowIndex + COLLECTION_PAGE_SIZE
-        );
-        break;
-
-      case "Home":
-        newColIndex = 0;
-        if (e.ctrlKey || e.metaKey) newRowIndex = -1;
-        break;
-
-      case "End":
-        newColIndex = columns.length - 1;
-        if (e.ctrlKey || e.metaKey) newRowIndex = tableRows.length - 1;
-        break;
-    }
-
-    const newSelectedCell = {
-      path:
-        newRowIndex > -1
-          ? tableRows[newRowIndex]._rowy_ref.path
-          : "_rowy_header",
-      columnKey: columns[newColIndex].id! || columns[0].id!,
-    };
-    console.log(newRowIndex, newColIndex, newSelectedCell);
-
-    setSelectedCell(newSelectedCell);
-
-    // Find matching DOM element for the cell
-    const newCellEl = gridRef.current?.querySelector(
-      `[aria-rowindex="${newRowIndex + 2}"] [aria-colindex="${
-        newColIndex + 1
-      }"]`
-    );
-    // Focus the cell
-    if (newCellEl) (newCellEl as HTMLDivElement).focus();
-    setFocusInsideCell(false);
-  };
+      const { scrollHeight, scrollTop, clientHeight } = containerElement;
+      if (scrollHeight - scrollTop - clientHeight < 300) {
+        setTablePage((p) => p + 1);
+      }
+    },
+    250
+  );
 
   return (
-    <>
+    <div
+      ref={containerRef}
+      // onScroll={(e) => fetchMoreOnBottomReached(e.target as HTMLDivElement)}
+      style={{ overflow: "auto", width: "100%", height: "100%" }}
+    >
       <StyledTable
         ref={gridRef}
         role="grid"
         aria-readonly={tableSettings.readOnly}
         aria-colcount={columns.length}
         aria-rowcount={tableRows.length + 1}
-        style={{ width: table.getTotalSize(), userSelect: "none" }}
+        style={{
+          width: table.getTotalSize(),
+          userSelect: "none",
+        }}
         onKeyDown={handleKeyDown}
       >
         <div
           className="thead"
           role="rowgroup"
-          style={{ position: "sticky", top: 0 }}
+          style={{ position: "sticky", top: 0, zIndex: 1 }}
         >
           {table.getHeaderGroups().map((headerGroup) => (
             <StyledRow key={headerGroup.id} role="row" aria-rowindex={1}>
@@ -322,8 +286,8 @@ export default function TableComponent() {
                 return (
                   <ColumnHeaderComponent
                     key={header.id}
-                    data-rowId={"_rowy_header"}
-                    data-colId={header.id}
+                    data-rowid={"_rowy_header"}
+                    data-colid={header.id}
                     role="columnheader"
                     tabIndex={isSelectedCell ? 0 : -1}
                     aria-colindex={header.index + 1}
@@ -367,47 +331,79 @@ export default function TableComponent() {
         </div>
 
         <div className="tbody" role="rowgroup">
-          {table.getRowModel().rows.map((row) => (
-            <StyledRow key={row.id} role="row" aria-rowindex={row.index + 2}>
-              {row.getVisibleCells().map((cell, cellIndex) => {
-                const isSelectedCell =
-                  selectedCell?.path === row.original._rowy_ref.path &&
-                  selectedCell?.columnKey === cell.column.id;
+          {paddingTop > 0 && (
+            <div role="presentation" style={{ height: `${paddingTop}px` }} />
+          )}
 
-                return (
-                  <StyledCell
-                    key={cell.id}
-                    data-rowId={row.id}
-                    data-colId={cell.column.id}
-                    role="gridcell"
-                    tabIndex={isSelectedCell && !focusInsideCell ? 0 : -1}
-                    aria-colindex={cellIndex + 1}
-                    aria-readonly={
-                      cell.column.columnDef.meta?.editable === false
-                    }
-                    aria-selected={isSelectedCell}
-                    style={{ width: cell.column.getSize() }}
-                    onClick={(e) => {
-                      setSelectedCell({
-                        path: row.original._rowy_ref.path,
-                        columnKey: cell.column.id,
-                      });
-                      (e.target as HTMLDivElement).focus();
-                    }}
-                  >
-                    {flexRender(cell.column.columnDef.cell, cell.getContext())}
-                    <button
-                      tabIndex={isSelectedCell && focusInsideCell ? 0 : -1}
+          {virtualRows.map((virtualRow) => {
+            const row = rows[virtualRow.index];
+
+            return (
+              <StyledRow key={row.id} role="row" aria-rowindex={row.index + 2}>
+                {paddingLeft > 0 && (
+                  <div
+                    role="presentation"
+                    style={{ width: `${paddingLeft}px` }}
+                  />
+                )}
+
+                {virtualCols.map((virtualCell) => {
+                  const cellIndex = virtualCell.index;
+                  const cell = row.getVisibleCells()[cellIndex];
+
+                  const isSelectedCell =
+                    selectedCell?.path === row.original._rowy_ref.path &&
+                    selectedCell?.columnKey === cell.column.id;
+
+                  return (
+                    <StyledCell
+                      key={cell.id}
+                      data-rowid={row.id}
+                      data-colid={cell.column.id}
+                      role="gridcell"
+                      tabIndex={isSelectedCell && !focusInsideCell ? 0 : -1}
+                      aria-colindex={cellIndex + 1}
+                      aria-readonly={
+                        cell.column.columnDef.meta?.editable === false
+                      }
+                      aria-selected={isSelectedCell}
+                      style={{ width: cell.column.getSize() }}
+                      onClick={(e) => {
+                        setSelectedCell({
+                          path: row.original._rowy_ref.path,
+                          columnKey: cell.column.id,
+                        });
+                        (e.target as HTMLDivElement).focus();
+                      }}
                     >
-                      {isSelectedCell ? "f" : "x"}
-                    </button>
-                  </StyledCell>
-                );
-              })}
-            </StyledRow>
-          ))}
+                      {flexRender(
+                        cell.column.columnDef.cell,
+                        cell.getContext()
+                      )}
+                      <button
+                        tabIndex={isSelectedCell && focusInsideCell ? 0 : -1}
+                      >
+                        {isSelectedCell ? "f" : "x"}
+                      </button>
+                    </StyledCell>
+                  );
+                })}
+
+                {paddingRight > 0 && (
+                  <div
+                    role="presentation"
+                    style={{ width: `${paddingRight}px` }}
+                  />
+                )}
+              </StyledRow>
+            );
+          })}
+
+          {paddingBottom > 0 && (
+            <div role="presentation" style={{ height: `${paddingBottom}px` }} />
+          )}
         </div>
       </StyledTable>
-    </>
+    </div>
   );
 }
diff --git a/src/components/Table/useKeyboardNavigation.tsx b/src/components/Table/useKeyboardNavigation.tsx
new file mode 100644
index 00000000..be41e37f
--- /dev/null
+++ b/src/components/Table/useKeyboardNavigation.tsx
@@ -0,0 +1,140 @@
+import { useState } from "react";
+import { useSetAtom } from "jotai";
+import { ColumnDef } from "@tanstack/react-table";
+
+import { tableScope, selectedCellAtom } from "@src/atoms/tableScope";
+import { TableRow } from "@src/types/table";
+import { COLLECTION_PAGE_SIZE } from "@src/config/db";
+
+export interface IUseKeyboardNavigationProps {
+  gridRef: React.RefObject<HTMLDivElement>;
+  tableRows: TableRow[];
+  columns: ColumnDef<TableRow, any>[];
+}
+
+export function useKeyboardNavigation({
+  gridRef,
+  tableRows,
+  columns,
+}: IUseKeyboardNavigationProps) {
+  const setSelectedCell = useSetAtom(selectedCellAtom, tableScope);
+  const [focusInsideCell, setFocusInsideCell] = useState(false);
+
+  const handleKeyDown = (e: React.KeyboardEvent<HTMLDivElement>) => {
+    // Block default browser behavior for arrow keys (scroll) and other keys
+    const LISTENED_KEYS = [
+      "ArrowUp",
+      "ArrowDown",
+      "ArrowLeft",
+      "ArrowRight",
+      "Enter",
+      "Escape",
+      "Home",
+      "End",
+      "PageUp",
+      "PageDown",
+    ];
+    if (LISTENED_KEYS.includes(e.key)) e.preventDefault();
+
+    // Esc: exit cell
+    if (e.key === "Escape") {
+      setFocusInsideCell(false);
+      (
+        gridRef.current?.querySelector("[aria-selected=true]") as HTMLDivElement
+      )?.focus();
+      return;
+    }
+
+    // If event target is not a cell, ignore
+    const target = e.target as HTMLDivElement;
+    if (
+      target.getAttribute("role") !== "columnheader" &&
+      target.getAttribute("role") !== "gridcell"
+    )
+      return;
+
+    // Enter: enter cell
+    if (e.key === "Enter") {
+      setFocusInsideCell(true);
+      (target.querySelector("[tabindex]") as HTMLElement)?.focus();
+      return;
+    }
+
+    const colIndex = Number(target.getAttribute("aria-colindex")) - 1;
+    const rowIndex =
+      Number(target.parentElement!.getAttribute("aria-rowindex")) - 2;
+
+    let newColIndex = colIndex;
+    let newRowIndex = rowIndex;
+
+    switch (e.key) {
+      case "ArrowUp":
+        if (e.ctrlKey || e.metaKey) newRowIndex = -1;
+        else if (rowIndex > -1) newRowIndex = rowIndex - 1;
+        break;
+
+      case "ArrowDown":
+        if (e.ctrlKey || e.metaKey) newRowIndex = tableRows.length - 1;
+        else if (rowIndex < tableRows.length - 1) newRowIndex = rowIndex + 1;
+        break;
+
+      case "ArrowLeft":
+        if (e.ctrlKey || e.metaKey) newColIndex = 0;
+        else if (colIndex > 0) newColIndex = colIndex - 1;
+        break;
+
+      case "ArrowRight":
+        if (e.ctrlKey || e.metaKey) newColIndex = columns.length - 1;
+        else if (colIndex < columns.length - 1) newColIndex = colIndex + 1;
+        break;
+
+      case "PageUp":
+        newRowIndex = Math.max(0, rowIndex - COLLECTION_PAGE_SIZE);
+        break;
+
+      case "PageDown":
+        newRowIndex = Math.min(
+          tableRows.length - 1,
+          rowIndex + COLLECTION_PAGE_SIZE
+        );
+        break;
+
+      case "Home":
+        newColIndex = 0;
+        if (e.ctrlKey || e.metaKey) newRowIndex = -1;
+        break;
+
+      case "End":
+        newColIndex = columns.length - 1;
+        if (e.ctrlKey || e.metaKey) newRowIndex = tableRows.length - 1;
+        break;
+    }
+
+    // Get `path` and `columnKey` from `tableRows` and `columns` respectively
+    const newSelectedCell = {
+      path:
+        newRowIndex > -1
+          ? tableRows[newRowIndex]._rowy_ref.path
+          : "_rowy_header",
+      columnKey: columns[newColIndex].id! || columns[0].id!,
+    };
+
+    // Store in selectedCellAtom
+    setSelectedCell(newSelectedCell);
+
+    // Find matching DOM element for the cell
+    const newCellEl = gridRef.current?.querySelector(
+      `[aria-rowindex="${newRowIndex + 2}"] [aria-colindex="${
+        newColIndex + 1
+      }"]`
+    );
+
+    // Focus the cell
+    if (newCellEl) setTimeout(() => (newCellEl as HTMLDivElement).focus());
+
+    // When selected cell changes, exit current cell
+    setFocusInsideCell(false);
+  };
+
+  return { handleKeyDown, focusInsideCell } as const;
+}
diff --git a/src/pages/Table/TablePage.tsx b/src/pages/Table/TablePage.tsx
index 17e8213a..b82a411f 100644
--- a/src/pages/Table/TablePage.tsx
+++ b/src/pages/Table/TablePage.tsx
@@ -101,12 +101,12 @@ export default function TablePage({
         <Suspense fallback={<TableSkeleton />}>
           <Box
             sx={{
-              overflow: "auto",
               height: `calc(100vh - ${TOP_BAR_HEIGHT}px - ${TABLE_TOOLBAR_HEIGHT}px)`,
-              width: {
-                xs: "100%",
-                sm: `calc(100% - ${DRAWER_COLLAPSED_WIDTH}px)`,
-              },
+              width: `calc(100% - ${DRAWER_COLLAPSED_WIDTH}px)`,
+              // width: {
+              //   xs: "100%",
+              //   sm: `calc(100% - ${DRAWER_COLLAPSED_WIDTH}px)`,
+              // },
 
               '& [role="grid"]': {
                 paddingBottom: (theme) =>
diff --git a/yarn.lock b/yarn.lock
index b6e7cfa3..aa25b7ed 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2363,6 +2363,11 @@
   resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
   integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==
 
+"@reach/observe-rect@^1.1.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@reach/observe-rect/-/observe-rect-1.2.0.tgz#d7a6013b8aafcc64c778a0ccb83355a11204d3b2"
+  integrity sha512-Ba7HmkFgfQxZqqaeIWWkNK0rEhpxVQHIoVyW1YDSkGsGIXzcaW4deC8B0pZrNSSyLTdIk7y+5olKt5+g0GmFIQ==
+
 "@react-dnd/asap@^4.0.0":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@react-dnd/asap/-/asap-4.0.1.tgz#5291850a6b58ce6f2da25352a64f1b0674871aab"
@@ -10277,6 +10282,13 @@ react-usestateref@^1.0.8:
   resolved "https://registry.yarnpkg.com/react-usestateref/-/react-usestateref-1.0.8.tgz#b40519af0d6f3b3822c70eb5db80f7d47f1b1ff5"
   integrity sha512-whaE6H0XGarFKwZ3EYbpHBsRRCLZqdochzg/C7e+b6VFMTA3LS3K4ZfpI4NT40iy83jG89rGXrw70P9iDfOdsA==
 
+react-virtual@^2.10.4:
+  version "2.10.4"
+  resolved "https://registry.yarnpkg.com/react-virtual/-/react-virtual-2.10.4.tgz#08712f0acd79d7d6f7c4726f05651a13b24d8704"
+  integrity sha512-Ir6+oPQZTVHfa6+JL9M7cvMILstFZH/H3jqeYeKI4MSUX+rIruVwFC6nGVXw9wqAw8L0Kg2KvfXxI85OvYQdpQ==
+  dependencies:
+    "@reach/observe-rect" "^1.1.0"
+
 react@^18.0.0:
   version "18.0.0"
   resolved "https://registry.yarnpkg.com/react/-/react-18.0.0.tgz#b468736d1f4a5891f38585ba8e8fb29f91c3cb96"

From 94e8a46c253136744b618596b95b4d164c942bce Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 19 Oct 2022 12:03:05 +1100
Subject: [PATCH 188/309] fix main content causing horizontal scroll

---
 src/layouts/Navigation/Navigation.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/Navigation/Navigation.tsx b/src/layouts/Navigation/Navigation.tsx
index f17053a1..3f967301 100644
--- a/src/layouts/Navigation/Navigation.tsx
+++ b/src/layouts/Navigation/Navigation.tsx
@@ -62,7 +62,7 @@ export default function Navigation({ children }: React.PropsWithChildren<{}>) {
               <Loading fullScreen style={{ marginTop: -TOP_BAR_HEIGHT }} />
             }
           >
-            <div style={{ flexGrow: 1, maxWidth: "100%" }}>
+            <div style={{ flexGrow: 1, minWidth: 0 }}>
               <Outlet />
               {children}
             </div>

From c9b1cf98e05bcd6eec96acc32aee0621c8c50866 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 19 Oct 2022 12:41:20 +1100
Subject: [PATCH 189/309] support hidden columns

---
 src/components/Table/Table.tsx                | 92 ++++++++++---------
 .../Table/useKeyboardNavigation.tsx           | 16 ++--
 src/pages/Table/TablePage.tsx                 |  8 +-
 3 files changed, 62 insertions(+), 54 deletions(-)

diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index 153b5576..d3cbc0a6 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -93,22 +93,13 @@ export default function TableComponent() {
 
   const canAddColumn = userRoles.includes("ADMIN");
   const canEditColumn = userRoles.includes("ADMIN");
-  const userDocHiddenFields =
-    userSettings.tables?.[formatSubTableName(tableId)]?.hiddenFields;
 
   // Get column defs from table schema
   // Also add end column for admins
   const columns = useMemo(() => {
     const _columns = tableColumnsOrdered
-      // .filter((column) => {
-      //   if (column.hidden) return false;
-      //   if (
-      //     Array.isArray(userDocHiddenFields) &&
-      //     userDocHiddenFields.includes(column.key)
-      //   )
-      //     return false;
-      //   return true;
-      // })
+      // Hide column for all users using table schema
+      .filter((column) => !column.hidden)
       .map((columnConfig) =>
         columnHelper.accessor(columnConfig.fieldName, {
           id: columnConfig.fieldName,
@@ -136,30 +127,41 @@ export default function TableComponent() {
         })
       );
 
-    // if (canAddColumn || !tableSettings.readOnly) {
-    //   _columns.push({
-    //     isNew: true,
-    //     key: "new",
-    //     fieldName: "_rowy_new",
-    //     name: "Add column",
-    //     type: FieldType.last,
-    //     index: _columns.length ?? 0,
-    //     width: 154,
-    //     headerRenderer: FinalColumnHeader,
-    //     headerCellClass: "final-column-header",
-    //     cellClass: "final-column-cell",
-    //     formatter: FinalColumn,
-    //     editable: false,
-    //   });
-    // }
+    if (canAddColumn || !tableSettings.readOnly) {
+      _columns.push(
+        columnHelper.display({
+          id: "_rowy_column_actions",
+          header: () => "Actions",
+          cell: () => <>Menu | Duplicate | Delete</>,
+        })
+        //   {
+        //   isNew: true,
+        //   key: "new",
+        //   fieldName: "_rowy_new",
+        //   name: "Add column",
+        //   type: FieldType.last,
+        //   index: _columns.length ?? 0,
+        //   width: 154,
+        //   headerRenderer: FinalColumnHeader,
+        //   headerCellClass: "final-column-header",
+        //   cellClass: "final-column-cell",
+        //   formatter: FinalColumn,
+        //   editable: false,
+        // }
+      );
+    }
 
     return _columns;
-  }, [
-    tableColumnsOrdered,
-    // userDocHiddenFields,
-    // tableSettings.readOnly,
-    // canAddColumn,
-  ]);
+  }, [tableColumnsOrdered, canAddColumn, tableSettings.readOnly]);
+
+  // Get user’s hidden columns from user document
+  const userDocHiddenFields =
+    userSettings.tables?.[formatSubTableName(tableId)]?.hiddenFields;
+  // Memoize into a VisibilityState
+  const columnVisibility = useMemo(() => {
+    if (!Array.isArray(userDocHiddenFields)) return {};
+    return userDocHiddenFields.reduce((a, c) => ({ ...a, [c]: false }), {});
+  }, [userDocHiddenFields]);
 
   const table = useReactTable({
     data: tableRows,
@@ -167,9 +169,11 @@ export default function TableComponent() {
     getCoreRowModel: getCoreRowModel(),
     getRowId,
     columnResizeMode: "onChange",
+    state: { columnVisibility },
     // debugRows: true,
   });
   const { rows } = table.getRowModel();
+  const leafColumns = table.getVisibleLeafColumns();
   // console.log(table, selectedCell);
 
   const {
@@ -193,16 +197,14 @@ export default function TableComponent() {
   } = useVirtual({
     parentRef: containerRef,
     horizontal: true,
-    size: columns.length,
+    size: leafColumns.length,
     overscan: 1,
     estimateSize: useCallback(
-      (index: number) => columns[index].size || DEFAULT_COL_WIDTH,
-      [columns]
+      (index: number) => leafColumns[index].columnDef.size || DEFAULT_COL_WIDTH,
+      [leafColumns]
     ),
   });
 
-  console.log(totalHeight);
-
   useEffect(() => {
     if (!selectedCell) return;
     if (selectedCell.path) {
@@ -213,18 +215,24 @@ export default function TableComponent() {
       scrollToRowIndex(rowIndex);
     }
     if (selectedCell.columnKey) {
-      const colIndex = columns.findIndex(
+      const colIndex = leafColumns.findIndex(
         (col) => col.id === selectedCell.columnKey
       );
       if (colIndex === -1) return;
       scrollToColIndex(colIndex);
     }
-  }, [selectedCell, tableRows, columns, scrollToRowIndex, scrollToColIndex]);
+  }, [
+    selectedCell,
+    tableRows,
+    leafColumns,
+    scrollToRowIndex,
+    scrollToColIndex,
+  ]);
 
   const { handleKeyDown, focusInsideCell } = useKeyboardNavigation({
     gridRef,
     tableRows,
-    columns,
+    leafColumns,
   });
 
   const paddingTop = virtualRows.length > 0 ? virtualRows?.[0]?.start || 0 : 0;
@@ -296,7 +304,7 @@ export default function TableComponent() {
                     aria-selected={isSelectedCell}
                     label={header.column.columnDef.meta?.name || header.id}
                     type={header.column.columnDef.meta?.type}
-                    style={{ width: header.getSize() }}
+                    style={{ width: header.getSize(), borderRight: "none" }}
                     onClick={(e) => {
                       setSelectedCell({
                         path: "_rowy_header",
diff --git a/src/components/Table/useKeyboardNavigation.tsx b/src/components/Table/useKeyboardNavigation.tsx
index be41e37f..f814f15f 100644
--- a/src/components/Table/useKeyboardNavigation.tsx
+++ b/src/components/Table/useKeyboardNavigation.tsx
@@ -1,6 +1,6 @@
 import { useState } from "react";
 import { useSetAtom } from "jotai";
-import { ColumnDef } from "@tanstack/react-table";
+import { Column } from "@tanstack/react-table";
 
 import { tableScope, selectedCellAtom } from "@src/atoms/tableScope";
 import { TableRow } from "@src/types/table";
@@ -9,13 +9,13 @@ import { COLLECTION_PAGE_SIZE } from "@src/config/db";
 export interface IUseKeyboardNavigationProps {
   gridRef: React.RefObject<HTMLDivElement>;
   tableRows: TableRow[];
-  columns: ColumnDef<TableRow, any>[];
+  leafColumns: Column<TableRow, any>[];
 }
 
 export function useKeyboardNavigation({
   gridRef,
   tableRows,
-  columns,
+  leafColumns,
 }: IUseKeyboardNavigationProps) {
   const setSelectedCell = useSetAtom(selectedCellAtom, tableScope);
   const [focusInsideCell, setFocusInsideCell] = useState(false);
@@ -84,8 +84,8 @@ export function useKeyboardNavigation({
         break;
 
       case "ArrowRight":
-        if (e.ctrlKey || e.metaKey) newColIndex = columns.length - 1;
-        else if (colIndex < columns.length - 1) newColIndex = colIndex + 1;
+        if (e.ctrlKey || e.metaKey) newColIndex = leafColumns.length - 1;
+        else if (colIndex < leafColumns.length - 1) newColIndex = colIndex + 1;
         break;
 
       case "PageUp":
@@ -105,18 +105,18 @@ export function useKeyboardNavigation({
         break;
 
       case "End":
-        newColIndex = columns.length - 1;
+        newColIndex = leafColumns.length - 1;
         if (e.ctrlKey || e.metaKey) newRowIndex = tableRows.length - 1;
         break;
     }
 
-    // Get `path` and `columnKey` from `tableRows` and `columns` respectively
+    // Get `path` and `columnKey` from `tableRows` and `leafColumns` respectively
     const newSelectedCell = {
       path:
         newRowIndex > -1
           ? tableRows[newRowIndex]._rowy_ref.path
           : "_rowy_header",
-      columnKey: columns[newColIndex].id! || columns[0].id!,
+      columnKey: leafColumns[newColIndex].id! || leafColumns[0].id!,
     };
 
     // Store in selectedCellAtom
diff --git a/src/pages/Table/TablePage.tsx b/src/pages/Table/TablePage.tsx
index b82a411f..41d8c003 100644
--- a/src/pages/Table/TablePage.tsx
+++ b/src/pages/Table/TablePage.tsx
@@ -103,14 +103,14 @@ export default function TablePage({
             sx={{
               height: `calc(100vh - ${TOP_BAR_HEIGHT}px - ${TABLE_TOOLBAR_HEIGHT}px)`,
               width: `calc(100% - ${DRAWER_COLLAPSED_WIDTH}px)`,
-              // width: {
-              //   xs: "100%",
-              //   sm: `calc(100% - ${DRAWER_COLLAPSED_WIDTH}px)`,
-              // },
 
               '& [role="grid"]': {
                 paddingBottom: (theme) =>
                   `max(env(safe-area-inset-bottom), ${theme.spacing(2)})`,
+                paddingLeft: (theme) =>
+                  `max(env(safe-area-inset-left), ${theme.spacing(2)})`,
+                paddingRight: (theme) =>
+                  `max(env(safe-area-inset-right), ${theme.spacing(2)})`,
               },
             }}
           >

From f9b1a35445f5f653446760bd8863210c98b6b73e Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 19 Oct 2022 12:54:31 +1100
Subject: [PATCH 190/309] fix rowHeight & virtualized rows jumping

---
 src/components/Table/Table.tsx | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index d3cbc0a6..99fccb45 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -249,7 +249,6 @@ export default function TableComponent() {
 
   const fetchMoreOnBottomReached = useThrottledCallback(
     (containerElement?: HTMLDivElement | null) => {
-      console.log("fetchMoreOnBottomReached", containerElement);
       if (!containerElement) return;
 
       const { scrollHeight, scrollTop, clientHeight } = containerElement;
@@ -263,7 +262,7 @@ export default function TableComponent() {
   return (
     <div
       ref={containerRef}
-      // onScroll={(e) => fetchMoreOnBottomReached(e.target as HTMLDivElement)}
+      onScroll={(e) => fetchMoreOnBottomReached(e.target as HTMLDivElement)}
       style={{ overflow: "auto", width: "100%", height: "100%" }}
     >
       <StyledTable
@@ -272,10 +271,7 @@ export default function TableComponent() {
         aria-readonly={tableSettings.readOnly}
         aria-colcount={columns.length}
         aria-rowcount={tableRows.length + 1}
-        style={{
-          width: table.getTotalSize(),
-          userSelect: "none",
-        }}
+        style={{ width: table.getTotalSize(), userSelect: "none" }}
         onKeyDown={handleKeyDown}
       >
         <div
@@ -347,7 +343,12 @@ export default function TableComponent() {
             const row = rows[virtualRow.index];
 
             return (
-              <StyledRow key={row.id} role="row" aria-rowindex={row.index + 2}>
+              <StyledRow
+                key={row.id}
+                role="row"
+                aria-rowindex={row.index + 2}
+                style={{ height: tableSchema.rowHeight }}
+              >
                 {paddingLeft > 0 && (
                   <div
                     role="presentation"
@@ -388,11 +389,11 @@ export default function TableComponent() {
                         cell.column.columnDef.cell,
                         cell.getContext()
                       )}
-                      <button
+                      {/* <button
                         tabIndex={isSelectedCell && focusInsideCell ? 0 : -1}
                       >
                         {isSelectedCell ? "f" : "x"}
-                      </button>
+                      </button> */}
                     </StyledCell>
                   );
                 })}

From 23bf2876b25114ab9b57c6312bdcb64e404e91f8 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Thu, 20 Oct 2022 11:13:07 +1100
Subject: [PATCH 191/309] ConfirmDialog: fix command not typeable

---
 src/components/ConfirmDialog.tsx | 57 +++++++++++++++++++-------------
 1 file changed, 34 insertions(+), 23 deletions(-)

diff --git a/src/components/ConfirmDialog.tsx b/src/components/ConfirmDialog.tsx
index e9e210df..f7de2a03 100644
--- a/src/components/ConfirmDialog.tsx
+++ b/src/components/ConfirmDialog.tsx
@@ -1,4 +1,4 @@
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import { useAtom } from "jotai";
 
 import {
@@ -49,10 +49,15 @@ export default function ConfirmDialog({
 
   const handleClose = () => {
     setState({ open: false });
-    setDryText("");
+    setDisableConfirm(false);
   };
 
-  const [dryText, setDryText] = useState("");
+  const [disableConfirm, setDisableConfirm] = useState(
+    Boolean(confirmationCommand)
+  );
+  useEffect(() => {
+    setDisableConfirm(Boolean(confirmationCommand));
+  }, [confirmationCommand]);
 
   return (
     <Dialog
@@ -64,21 +69,24 @@ export default function ConfirmDialog({
       maxWidth={maxWidth}
       sx={{ cursor: "default", zIndex: (theme) => theme.zIndex.modal + 50 }}
     >
-      <MemoizedText>
-        <>
+      <>
+        <MemoizedText>
           <DialogTitle>{title}</DialogTitle>
+        </MemoizedText>
 
+        <MemoizedText>
           <DialogContent>
             {typeof body === "string" ? (
               <DialogContentText>{body}</DialogContentText>
             ) : (
               body
             )}
+
             {confirmationCommand && (
               <TextField
-                value={dryText}
-                onChange={(e) => setDryText(e.target.value)}
-                autoFocus
+                onChange={(e) =>
+                  setDisableConfirm(e.target.value !== confirmationCommand)
+                }
                 label={`Type “${confirmationCommand}” below to continue:`}
                 placeholder={confirmationCommand}
                 fullWidth
@@ -87,16 +95,18 @@ export default function ConfirmDialog({
               />
             )}
           </DialogContent>
+        </MemoizedText>
 
-          <DialogActions
-            sx={[
-              buttonLayout === "vertical" && {
-                flexDirection: "column",
-                alignItems: "stretch",
-                "& > :not(:first-of-type)": { ml: 0, mt: 1 },
-              },
-            ]}
-          >
+        <DialogActions
+          sx={[
+            buttonLayout === "vertical" && {
+              flexDirection: "column",
+              alignItems: "stretch",
+              "& > :not(:first-of-type)": { ml: 0, mt: 1 },
+            },
+          ]}
+        >
+          <MemoizedText>
             {!hideCancel && (
               <Button
                 onClick={() => {
@@ -107,6 +117,9 @@ export default function ConfirmDialog({
                 {cancel}
               </Button>
             )}
+          </MemoizedText>
+
+          <MemoizedText key={disableConfirm.toString()}>
             <Button
               onClick={() => {
                 if (handleConfirm) handleConfirm();
@@ -115,15 +128,13 @@ export default function ConfirmDialog({
               color={confirmColor || "primary"}
               variant="contained"
               autoFocus
-              disabled={
-                confirmationCommand ? dryText !== confirmationCommand : false
-              }
+              disabled={disableConfirm}
             >
               {confirm}
             </Button>
-          </DialogActions>
-        </>
-      </MemoizedText>
+          </MemoizedText>
+        </DialogActions>
+      </>
     </Dialog>
   );
 }

From 7a4bac367313e986d3f747d5c57a065e2579c805 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Thu, 20 Oct 2022 11:25:34 +1100
Subject: [PATCH 192/309] CircularProgressTimed: fix tick position in webkit

---
 src/components/CircularProgressTimed.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/CircularProgressTimed.tsx b/src/components/CircularProgressTimed.tsx
index 11959f37..109a0963 100644
--- a/src/components/CircularProgressTimed.tsx
+++ b/src/components/CircularProgressTimed.tsx
@@ -71,6 +71,8 @@ export default function CircularProgressTimed({
           sx={{
             position: "absolute",
             inset: size * 0.33 * 0.5,
+            width: size * 0.67,
+            height: size * 0.67,
 
             "& .tick": {
               stroke: (theme) => theme.palette.success.main,

From 7fa0955dce15001607d036e7989b4b1ab4011daf Mon Sep 17 00:00:00 2001
From: Shams <shams.mosowi@gmail.com>
Date: Thu, 20 Oct 2022 18:35:48 +1100
Subject: [PATCH 193/309] Merge pull request #10 from
 rowyio/feat/table-information

Feat: Table Information Drawer
---
 src/assets/icons/index.ts                     |   3 +
 src/atoms/tableScope/ui.ts                    |   6 +
 .../TableInformationDrawer/Details.tsx        | 178 ++++++++++++++++++
 .../TableInformationDrawer/SideDrawer.tsx     | 134 +++++++++++++
 .../TableInformationDrawer/index.ts           |   2 +
 .../TableInformationDrawer/withTemplate.tsx   |  61 ++++++
 .../TableSettingsDialog/TableDetails.tsx      |  43 +++++
 .../TableSettingsDialog.tsx                   |  26 ++-
 .../TableSettingsDialog/TableThumbnail.tsx    | 126 +++++++++++++
 src/components/TableSettingsDialog/form.tsx   |  18 +-
 src/components/TableSettingsDialog/utils.ts   |  14 ++
 .../TableToolbar/TableInformation.tsx         |  25 +++
 src/components/TableToolbar/TableToolbar.tsx  |   6 +
 src/components/Tables/TableGrid/TableCard.tsx |  63 ++++---
 src/pages/Table/TablePage.tsx                 |   7 +
 src/pages/TablesPage.tsx                      |  15 +-
 .../useTableFunctions.ts                      |   8 +-
 src/types/table.d.ts                          |  12 ++
 18 files changed, 719 insertions(+), 28 deletions(-)
 create mode 100644 src/components/TableInformationDrawer/Details.tsx
 create mode 100644 src/components/TableInformationDrawer/SideDrawer.tsx
 create mode 100644 src/components/TableInformationDrawer/index.ts
 create mode 100644 src/components/TableInformationDrawer/withTemplate.tsx
 create mode 100644 src/components/TableSettingsDialog/TableDetails.tsx
 create mode 100644 src/components/TableSettingsDialog/TableThumbnail.tsx
 create mode 100644 src/components/TableSettingsDialog/utils.ts
 create mode 100644 src/components/TableToolbar/TableInformation.tsx

diff --git a/src/assets/icons/index.ts b/src/assets/icons/index.ts
index 3503e99b..4e60591f 100644
--- a/src/assets/icons/index.ts
+++ b/src/assets/icons/index.ts
@@ -103,6 +103,9 @@ export { FileTableBoxOutline as Project };
 import { TableColumn } from "mdi-material-ui";
 export { TableColumn };
 
+import { InformationOutline } from "mdi-material-ui";
+export { InformationOutline as TableInformation };
+
 export * from "./AddRow";
 export * from "./AddRowTop";
 export * from "./ChevronDown";
diff --git a/src/atoms/tableScope/ui.ts b/src/atoms/tableScope/ui.ts
index fa987118..b5aaf882 100644
--- a/src/atoms/tableScope/ui.ts
+++ b/src/atoms/tableScope/ui.ts
@@ -121,6 +121,12 @@ export const importAirtableAtom = atom<{
   tableId: string;
 }>({ airtableData: null, apiKey: "", baseId: "", tableId: "" });
 
+/** Store side drawer open state */
+export const sideDrawerAtom = atomWithHash<"table-information" | null>(
+  "sideDrawer",
+  null,
+  { replaceState: true }
+);
 /** Store side drawer open state */
 export const sideDrawerOpenAtom = atom(false);
 
diff --git a/src/components/TableInformationDrawer/Details.tsx b/src/components/TableInformationDrawer/Details.tsx
new file mode 100644
index 00000000..a3d4640d
--- /dev/null
+++ b/src/components/TableInformationDrawer/Details.tsx
@@ -0,0 +1,178 @@
+import { useMemo } from "react";
+import { format } from "date-fns";
+import MDEditor from "@uiw/react-md-editor";
+
+import {
+  Box,
+  Grid,
+  IconButton,
+  Stack,
+  Typography,
+  useTheme,
+} from "@mui/material";
+
+import EditIcon from "@mui/icons-material/EditOutlined";
+
+import { tableScope, tableSettingsAtom } from "@src/atoms/tableScope";
+import { useAtom, useSetAtom } from "jotai";
+import {
+  projectScope,
+  tablesAtom,
+  tableSettingsDialogAtom,
+  userRolesAtom,
+} from "@src/atoms/projectScope";
+import { find } from "lodash-es";
+
+export interface IDetailsProps {
+  handleOpenTemplate?: any;
+}
+
+export default function Details({ handleOpenTemplate }: IDetailsProps) {
+  const [userRoles] = useAtom(userRolesAtom, projectScope);
+  const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
+  const [tables] = useAtom(tablesAtom, projectScope);
+  const openTableSettingsDialog = useSetAtom(
+    tableSettingsDialogAtom,
+    projectScope
+  );
+
+  const settings = useMemo(
+    () => find(tables, ["id", tableSettings.id]),
+    [tables, tableSettings.id]
+  );
+
+  const theme = useTheme();
+
+  if (!settings) {
+    return null;
+  }
+
+  const editButton = userRoles.includes("ADMIN") && (
+    <IconButton
+      sx={{
+        position: "absolute",
+        right: 0,
+      }}
+      onClick={() =>
+        openTableSettingsDialog({
+          mode: "update",
+          data: settings,
+        })
+      }
+      disabled={!openTableSettingsDialog || settings.id.includes("/")}
+    >
+      <EditIcon />
+    </IconButton>
+  );
+
+  const { description, details, _createdBy } = settings;
+
+  return (
+    <Grid
+      container
+      flexDirection="column"
+      gap={3}
+      sx={{
+        paddingTop: theme.spacing(3),
+        paddingRight: theme.spacing(3),
+        paddingBottom: theme.spacing(5),
+        "& > .MuiGrid-root": {
+          position: "relative",
+        },
+      }}
+    >
+      {/* Description */}
+      <Grid container direction="column" gap={1}>
+        <Stack
+          direction="row"
+          justifyContent="space-between"
+          alignItems="center"
+        >
+          <Typography variant="body1" sx={{ fontWeight: 500 }}>
+            Description
+          </Typography>
+          {editButton}
+        </Stack>
+        <Typography variant="body2" color="text.secondary">
+          {description ? description : "No description"}
+        </Typography>
+      </Grid>
+
+      {/* Details */}
+      <Grid container direction="column" gap={1}>
+        <Stack
+          direction="row"
+          justifyContent="space-between"
+          alignItems="center"
+        >
+          <Typography variant="body1" sx={{ fontWeight: 500 }}>
+            Details
+          </Typography>
+          {editButton}
+        </Stack>
+        {!details ? (
+          <Typography variant="body2" color="text.secondary">
+            No details
+          </Typography>
+        ) : (
+          <Box
+            sx={{
+              color: "text.secondary",
+            }}
+          >
+            <MDEditor.Markdown source={details} />
+          </Box>
+        )}
+      </Grid>
+
+      {/* Table Audits */}
+      {_createdBy && (
+        <Grid
+          container
+          sx={{
+            fontSize: theme.typography.body2,
+          }}
+        >
+          <Typography
+            variant="caption"
+            color="text.secondary"
+            component="div"
+            style={{ whiteSpace: "normal" }}
+          >
+            Created by{" "}
+            <Typography variant="caption" color="text.primary">
+              {_createdBy.displayName}
+            </Typography>{" "}
+            at{" "}
+            <Typography variant="caption" color="text.primary">
+              {format(_createdBy.timestamp.toDate(), "LLL d, yyyy · p")}
+            </Typography>
+          </Typography>
+        </Grid>
+      )}
+
+      {/* Template Settings */}
+      {/* {handleOpenTemplate && (
+        <Divider sx={{ my: 1.5 }} />
+         <Button
+      sx={{ width: "100%", boxShadow: "none", padding: 0 }}
+      onClick={handleOpenTemplate}
+      >
+      <Stack
+      direction="row"
+      justify-content="flex-start"
+      alignItems="center"
+      sx={{ width: "100%" }}
+      >
+      <ChevronLeft />
+      <ListItemText
+      primary="Template - Roadmap"
+      secondary={<StepsProgress steps={5} value={3} />}
+      sx={{ maxWidth: "188px" }}
+      />
+      </Stack
+    </Button> 
+      )} */}
+    </Grid>
+  );
+}
diff --git a/src/components/TableInformationDrawer/SideDrawer.tsx b/src/components/TableInformationDrawer/SideDrawer.tsx
new file mode 100644
index 00000000..2221230d
--- /dev/null
+++ b/src/components/TableInformationDrawer/SideDrawer.tsx
@@ -0,0 +1,134 @@
+import { useAtom } from "jotai";
+import { RESET } from "jotai/utils";
+import { ErrorBoundary } from "react-error-boundary";
+import clsx from "clsx";
+
+import {
+  Box,
+  Drawer,
+  drawerClasses,
+  IconButton,
+  Stack,
+  styled,
+  Typography,
+} from "@mui/material";
+import CloseIcon from "@mui/icons-material/Close";
+
+import { sideDrawerAtom, tableScope } from "@src/atoms/tableScope";
+
+import { TOP_BAR_HEIGHT } from "@src/layouts/Navigation/TopBar";
+import { TABLE_TOOLBAR_HEIGHT } from "@src/components/TableToolbar/TableToolbar";
+import ErrorFallback from "@src/components/ErrorFallback";
+import Details from "./Details";
+
+export const DRAWER_WIDTH = 450;
+
+export const StyledDrawer = styled(Drawer)(({ theme }) => ({
+  [`.${drawerClasses.root}`]: {
+    width: DRAWER_WIDTH,
+    flexShrink: 0,
+    whiteSpace: "nowrap",
+  },
+
+  [`.${drawerClasses.paper}`]: {
+    border: "none",
+    boxShadow: theme.shadows[4].replace(/, 0 (\d+px)/g, ", -$1 0"),
+    borderTopLeftRadius: `${(theme.shape.borderRadius as number) * 3}px`,
+    borderBottomLeftRadius: `${(theme.shape.borderRadius as number) * 3}px`,
+
+    width: DRAWER_WIDTH,
+    maxWidth: `calc(100% - 28px - ${theme.spacing(1)})`,
+
+    boxSizing: "content-box",
+
+    top: TOP_BAR_HEIGHT + TABLE_TOOLBAR_HEIGHT,
+    height: `calc(100% - ${TOP_BAR_HEIGHT + TABLE_TOOLBAR_HEIGHT}px)`,
+    ".MuiDialog-paperFullScreen &": {
+      top:
+        TOP_BAR_HEIGHT +
+        TABLE_TOOLBAR_HEIGHT +
+        Number(theme.spacing(2).replace("px", "")),
+      height: `calc(100% - ${
+        TOP_BAR_HEIGHT + TABLE_TOOLBAR_HEIGHT
+      }px - ${theme.spacing(2)})`,
+    },
+
+    transition: theme.transitions.create("transform", {
+      easing: theme.transitions.easing.easeInOut,
+      duration: theme.transitions.duration.standard,
+    }),
+
+    zIndex: theme.zIndex.drawer - 1,
+  },
+  [`:not(.sidedrawer-open) .${drawerClasses.paper}`]: {
+    transform: `translateX(calc(100% - env(safe-area-inset-right)))`,
+  },
+
+  ".sidedrawer-contents": {
+    height: "100%",
+    overflow: "hidden",
+    marginLeft: theme.spacing(5),
+    marginRight: `max(env(safe-area-inset-right), ${theme.spacing(1)})`,
+    marginTop: theme.spacing(2),
+    paddingBottom: theme.spacing(5),
+  },
+}));
+
+export default function SideDrawer() {
+  const [sideDrawer, setSideDrawer] = useAtom(sideDrawerAtom, tableScope);
+
+  // const DetailsComponent =
+  //   userRoles.includes("ADMIN") && tableSettings.templateSettings
+  //     ? withTemplate(Details)
+  //     : Details;
+  // const DetailsComponent = Details;
+  const open = sideDrawer === "table-information";
+
+  return (
+    <StyledDrawer
+      className={clsx(open && "sidedrawer-open")}
+      open={open}
+      variant="permanent"
+      anchor="right"
+      PaperProps={{ elevation: 4, component: "aside" } as any}
+    >
+      <ErrorBoundary FallbackComponent={ErrorFallback}>
+        {open && (
+          <div className="sidedrawer-contents">
+            <Stack
+              direction="row"
+              justifyContent="space-between"
+              alignItems="center"
+              pr={3}
+            >
+              <Stack
+                direction="row"
+                justifyContent="space-between"
+                alignItems="center"
+                py={1}
+              >
+                <Typography variant="h5" sx={{ fontWeight: "bold" }}>
+                  Information
+                </Typography>
+              </Stack>
+              <IconButton
+                onClick={() => setSideDrawer(RESET)}
+                aria-label="Close"
+              >
+                <CloseIcon />
+              </IconButton>
+            </Stack>
+            <Box
+              sx={{
+                height: "100%",
+                overflow: "auto",
+              }}
+            >
+              <Details />
+            </Box>
+          </div>
+        )}
+      </ErrorBoundary>
+    </StyledDrawer>
+  );
+}
diff --git a/src/components/TableInformationDrawer/index.ts b/src/components/TableInformationDrawer/index.ts
new file mode 100644
index 00000000..374e8a86
--- /dev/null
+++ b/src/components/TableInformationDrawer/index.ts
@@ -0,0 +1,2 @@
+export * from "../TableToolbar/TableInformation";
+export { default } from "../TableToolbar/TableInformation";
diff --git a/src/components/TableInformationDrawer/withTemplate.tsx b/src/components/TableInformationDrawer/withTemplate.tsx
new file mode 100644
index 00000000..a42bc9c5
--- /dev/null
+++ b/src/components/TableInformationDrawer/withTemplate.tsx
@@ -0,0 +1,61 @@
+// import {
+//   projectScope,
+//   tablesAtom,
+//   templateSettingsDialogAtom,
+// } from "@src/atoms/projectScope";
+// import { TemplateSettings } from "@src/components/Tables/Templates";
+// import { getTemplateById } from "@src/components/Tables/Templates/utills";
+// import { useAtom, useSetAtom } from "jotai";
+// import { useEffect, useState } from "react";
+import Details from "./Details";
+
+export default function withTemplate(DetailsComponent: typeof Details) {
+  //     const [tables] = useAtom(tablesAtom, projectScope);
+  //     const setTemplateSettingsDialog = useSetAtom(
+  //       templateSettingsDialogAtom,
+  //       projectScope
+  //     );
+  //     const [templateData, setTemplateData] = useState<TemplateSettings | null>(
+  //       null
+  //     );
+  //     const { templateSettings } = tableSettings;
+  //     const { draftId, templateId } = templateSettings || {};
+  //     useEffect(() => {
+  //       if (!templateId) {
+  //         throw Error("Template not found");
+  //       }
+  //       getTemplateById(templateId).then((template) => setTemplateData(template));
+  //     }, [templateId]);
+  //     const dialogStateInitializer = () => {
+  //       const matchingTables =
+  //         tables.filter((table) => table.templateSettings?.draftId === draftId) ||
+  //         [];
+  //       const templateTables = templateData!.tables.map((templateTable) => ({
+  //         ...templateTable,
+  //         ...matchingTables.find(
+  //           (matchingTable) =>
+  //             matchingTable.templateSettings?.tableId === templateTable.id
+  //         ),
+  //       }));
+  //       const steps = templateData?.steps.map((step) =>
+  //         step.type === "create_table" ? { ...step, completed: true } : step
+  //       );
+  //       return {
+  //         ...templateData,
+  //         tables: templateTables,
+  //         steps,
+  //       } as TemplateSettings;
+  //     };
+  //     const handleOpenTemplate = () => {
+  //       setTemplateSettingsDialog({
+  //         type: "set_open",
+  //         data: dialogStateInitializer(),
+  //       });
+  //     };
+  //     if (!templateData) {
+  //       return null;
+  //     }
+  return <DetailsComponent handleOpenTemplate={() => {}} />;
+}
+
+// export const DetailsWithTemplate = withTemplate(Details);
diff --git a/src/components/TableSettingsDialog/TableDetails.tsx b/src/components/TableSettingsDialog/TableDetails.tsx
new file mode 100644
index 00000000..705233b8
--- /dev/null
+++ b/src/components/TableSettingsDialog/TableDetails.tsx
@@ -0,0 +1,43 @@
+import { Box, InputLabel, useTheme } from "@mui/material";
+import MDEditor from "@uiw/react-md-editor";
+import { useState } from "react";
+
+export default function TableDetails({ ...props }) {
+  const {
+    field: { value, onChange },
+  } = props;
+  const theme = useTheme();
+  const [focused, setFocused] = useState(false);
+  return (
+    <>
+      <InputLabel htmlFor="table-details__md-text-area" focused={focused}>
+        {props.label ?? ""}
+      </InputLabel>
+      <Box
+        sx={{
+          "& .w-md-editor": {
+            backgroundColor: `${theme.palette.action.input} !important`,
+          },
+          "& .w-md-editor-fullscreen": {
+            backgroundColor: `${theme.palette.background.paper} !important`,
+          },
+        }}
+      >
+        <MDEditor
+          style={{ margin: 1 }}
+          preview="live"
+          toolbarHeight={52}
+          height={150}
+          value={value}
+          onChange={onChange}
+          textareaProps={{
+            id: "table-details__md-text-area",
+            onFocus: () => setFocused(true),
+            onBlur: () => setFocused(false),
+          }}
+          {...props}
+        />
+      </Box>
+    </>
+  );
+}
diff --git a/src/components/TableSettingsDialog/TableSettingsDialog.tsx b/src/components/TableSettingsDialog/TableSettingsDialog.tsx
index 79ea3971..d045739c 100644
--- a/src/components/TableSettingsDialog/TableSettingsDialog.tsx
+++ b/src/components/TableSettingsDialog/TableSettingsDialog.tsx
@@ -38,6 +38,10 @@ import {
   getTableSchemaPath,
   getTableBuildFunctionPathname,
 } from "@src/utils/table";
+import { firebaseStorageAtom } from "@src/sources/ProjectSourceFirebase";
+import { uploadTableThumbnail } from "./utils";
+import TableThumbnail from "./TableThumbnail";
+import TableDetails from "./TableDetails";
 
 const customComponents = {
   tableName: {
@@ -55,6 +59,12 @@ const customComponents = {
     defaultValue: "",
     validation: [["string"]],
   },
+  tableThumbnail: {
+    component: TableThumbnail,
+  },
+  tableDetails: {
+    component: TableDetails,
+  },
 };
 
 export default function TableSettingsDialog() {
@@ -67,6 +77,7 @@ export default function TableSettingsDialog() {
   const [projectRoles] = useAtom(projectRolesAtom, projectScope);
   const [tables] = useAtom(tablesAtom, projectScope);
   const [rowyRun] = useAtom(rowyRunAtom, projectScope);
+  const [firebaseStorage] = useAtom(firebaseStorageAtom, projectScope);
 
   const navigate = useNavigate();
   const confirm = useSetAtom(confirmDialogAtom, projectScope);
@@ -96,15 +107,26 @@ export default function TableSettingsDialog() {
 
   if (!open) return null;
 
-  const handleSubmit = async (v: TableSettings & AdditionalTableSettings) => {
+  const handleSubmit = async (
+    v: TableSettings & AdditionalTableSettings & { thumbnailFile: File }
+  ) => {
     const {
       _schemaSource,
       _initialColumns,
       _schema,
       _suggestedRules,
+      thumbnailFile,
       ...values
     } = v;
-    const data = { ...values };
+
+    let thumbnailURL = values.thumbnailURL;
+    if (thumbnailFile) {
+      thumbnailURL = await uploadTableThumbnail(firebaseStorage)(
+        values.id,
+        thumbnailFile
+      );
+    }
+    const data = { ...values, thumbnailURL };
 
     const hasExtensions = !isEmpty(get(data, "_schema.extensionObjects"));
     const hasWebhooks = !isEmpty(get(data, "_schema.webhooks"));
diff --git a/src/components/TableSettingsDialog/TableThumbnail.tsx b/src/components/TableSettingsDialog/TableThumbnail.tsx
new file mode 100644
index 00000000..41022fb6
--- /dev/null
+++ b/src/components/TableSettingsDialog/TableThumbnail.tsx
@@ -0,0 +1,126 @@
+import { useCallback, useState } from "react";
+import { useDropzone } from "react-dropzone";
+import { IFieldComponentProps } from "@rowy/form-builder";
+
+import { Button, Grid, IconButton, InputLabel, useTheme } from "@mui/material";
+
+import { Upload as UploadImageIcon } from "@src/assets/icons";
+import {
+  OpenInFull as ExpandIcon,
+  CloseFullscreen as CollapseIcon,
+  AddPhotoAlternateOutlined as NoImageIcon,
+} from "@mui/icons-material";
+
+import { IMAGE_MIME_TYPES } from "@src/components/fields/Image";
+
+export default function TableThumbnail({ ...props }: IFieldComponentProps) {
+  const {
+    name,
+    useFormMethods: { setValue, getValues },
+  } = props;
+
+  const theme = useTheme();
+  const [localImage, setLocalImage] = useState<string | undefined>(
+    () => getValues().thumbnailURL
+  );
+
+  const [expanded, setExpanded] = useState(false);
+
+  const onDrop = useCallback(
+    (acceptedFiles: File[]) => {
+      const imageFile = acceptedFiles[0];
+
+      if (imageFile) {
+        setLocalImage(URL.createObjectURL(imageFile));
+        setValue(name, imageFile);
+      }
+    },
+    [name, setLocalImage, setValue]
+  );
+
+  const { getInputProps } = useDropzone({
+    onDrop,
+    multiple: false,
+    accept: IMAGE_MIME_TYPES,
+  });
+
+  return (
+    <Grid container>
+      <Grid
+        container
+        alignItems="center"
+        xs={expanded ? 12 : 10.5}
+        sx={{
+          marginRight: "auto",
+          transition: "all 0.1s",
+        }}
+      >
+        <InputLabel htmlFor="thumbnail-image__input">{props.label}</InputLabel>
+        <IconButton
+          component="label"
+          sx={{
+            marginLeft: "auto",
+            marginRight: expanded ? 0 : theme.spacing(0.5),
+          }}
+        >
+          <UploadImageIcon />
+          <input
+            id="thumbnail-image__input"
+            type="file"
+            hidden
+            {...getInputProps()}
+          />
+        </IconButton>
+      </Grid>
+      <Grid
+        item
+        xs={expanded ? 12 : 1.5}
+        sx={{
+          marginLeft: "auto",
+          marginTop: expanded ? theme.spacing(1) : 0,
+          transition: "all 0.5s",
+        }}
+      >
+        <Grid
+          container
+          sx={{
+            position: "relative",
+            // 16:9 ratio
+            paddingBottom: "56.25%",
+          }}
+        >
+          <Button
+            disabled={!localImage}
+            sx={{
+              position: "absolute",
+              width: "100%",
+              height: "100%",
+              backgroundImage: `url("${localImage}")`,
+              backgroundSize: "cover",
+              backgroundPosition: "center center",
+              backgroundRepeat: "no-repeat",
+              "& > svg": {
+                display: localImage ? "none" : "block",
+              },
+              "&:hover": {
+                opacity: 0.75,
+              },
+              "&:hover > svg": {
+                display: "block",
+              },
+            }}
+            onClick={() => setExpanded(!expanded)}
+          >
+            {!localImage ? (
+              <NoImageIcon />
+            ) : expanded ? (
+              <CollapseIcon />
+            ) : (
+              <ExpandIcon />
+            )}
+          </Button>
+        </Grid>
+      </Grid>
+    </Grid>
+  );
+}
diff --git a/src/components/TableSettingsDialog/form.tsx b/src/components/TableSettingsDialog/form.tsx
index 7b62176b..190b02bf 100644
--- a/src/components/TableSettingsDialog/form.tsx
+++ b/src/components/TableSettingsDialog/form.tsx
@@ -244,7 +244,23 @@ export const tableSettings = (
       type: FieldType.paragraph,
       name: "description",
       label: "Description (optional)",
-      minRows: 2,
+    },
+    {
+      step: "display",
+      type: "tableDetails",
+      name: "details",
+      label: "Details (optional)",
+    },
+    {
+      step: "display",
+      type: "tableThumbnail",
+      name: "thumbnailFile",
+      label: "Thumbnail Image (optional)",
+    },
+    {
+      step: "display",
+      type: FieldType.hidden,
+      name: "thumbnailURL",
     },
 
     // Step 3: Access controls
diff --git a/src/components/TableSettingsDialog/utils.ts b/src/components/TableSettingsDialog/utils.ts
new file mode 100644
index 00000000..b70cfe07
--- /dev/null
+++ b/src/components/TableSettingsDialog/utils.ts
@@ -0,0 +1,14 @@
+import {
+  FirebaseStorage,
+  getDownloadURL,
+  ref,
+  uploadBytes,
+} from "firebase/storage";
+
+export const uploadTableThumbnail =
+  (storage: FirebaseStorage) => (tableId: string, imageFile: File) => {
+    const storageRef = ref(storage, `__thumbnails__/${tableId}`);
+    return uploadBytes(storageRef, imageFile).then(({ ref }) =>
+      getDownloadURL(ref)
+    );
+  };
diff --git a/src/components/TableToolbar/TableInformation.tsx b/src/components/TableToolbar/TableInformation.tsx
new file mode 100644
index 00000000..f53688f1
--- /dev/null
+++ b/src/components/TableToolbar/TableInformation.tsx
@@ -0,0 +1,25 @@
+import { useAtom } from "jotai";
+import { RESET } from "jotai/utils";
+
+import {
+  sideDrawerAtom,
+  tableScope,
+  tableSettingsAtom,
+} from "@src/atoms/tableScope";
+
+import TableToolbarButton from "@src/components/TableToolbar/TableToolbarButton";
+import { TableInformation as TableInformationIcon } from "@src/assets/icons";
+
+export default function TableInformation() {
+  const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
+  const [sideDrawer, setSideDrawer] = useAtom(sideDrawerAtom, tableScope);
+
+  return (
+    <TableToolbarButton
+      title="Table Information"
+      icon={<TableInformationIcon />}
+      onClick={() => setSideDrawer(sideDrawer ? RESET : "table-information")}
+      disabled={!setSideDrawer || tableSettings.id.includes("/")}
+    />
+  );
+}
diff --git a/src/components/TableToolbar/TableToolbar.tsx b/src/components/TableToolbar/TableToolbar.tsx
index e940e92b..3e288a88 100644
--- a/src/components/TableToolbar/TableToolbar.tsx
+++ b/src/components/TableToolbar/TableToolbar.tsx
@@ -36,6 +36,9 @@ import { FieldType } from "@src/constants/fields";
 const Filters = lazy(() => import("./Filters" /* webpackChunkName: "Filters" */));
 // prettier-ignore
 const ImportData = lazy(() => import("./ImportData/ImportData" /* webpackChunkName: "ImportData" */));
+// prettier-ignore
+const TableInformation = lazy(() => import("./TableInformation" /* webpackChunkName: "TableInformation" */));
+
 // prettier-ignore
 const ReExecute = lazy(() => import("./ReExecute" /* webpackChunkName: "ReExecute" */));
 
@@ -147,6 +150,9 @@ export default function TableToolbar() {
           <TableSettings />
         </>
       )}
+      <Suspense fallback={<ButtonSkeleton />}>
+        <TableInformation />
+      </Suspense>
       <div className="end-spacer" />
     </Stack>
   );
diff --git a/src/components/Tables/TableGrid/TableCard.tsx b/src/components/Tables/TableGrid/TableCard.tsx
index 21be4ece..b601b90a 100644
--- a/src/components/Tables/TableGrid/TableCard.tsx
+++ b/src/components/Tables/TableGrid/TableCard.tsx
@@ -7,10 +7,9 @@ import {
   Typography,
   CardActions,
   Button,
+  Box,
 } from "@mui/material";
 import { Go as GoIcon } from "@src/assets/icons";
-
-import RenderedMarkdown from "@src/components/RenderedMarkdown";
 import { TableSettings } from "@src/types/table";
 
 export interface ITableCardProps extends TableSettings {
@@ -19,6 +18,7 @@ export interface ITableCardProps extends TableSettings {
 }
 
 export default function TableCard({
+  thumbnailURL,
   section,
   name,
   description,
@@ -37,27 +37,46 @@ export default function TableCard({
           </Typography>
         </CardContent>
       </CardActionArea>
-
-      <CardContent style={{ flexGrow: 1, paddingTop: 0 }}>
-        <Typography
-          color="textSecondary"
-          sx={{
-            minHeight: (theme) =>
-              (theme.typography.body2.lineHeight as number) * 2 + "em",
-            display: "flex",
-            flexDirection: "column",
-            gap: 1,
-          }}
-          component="div"
-        >
-          {description && (
-            <RenderedMarkdown
-              children={description}
-              //restrictionPreset="singleLine"
+      {thumbnailURL && (
+        <CardContent style={{ flexGrow: 1, paddingTop: 0 }}>
+          <Box
+            sx={{
+              paddingBottom: "56.25%",
+              position: "relative",
+              backgroundColor: "action.input",
+              borderRadius: 1,
+              overflow: "hidden",
+            }}
+          >
+            <Box
+              sx={{
+                position: "absolute",
+                width: "100%",
+                height: "100%",
+                backgroundImage: `url("${thumbnailURL}")`,
+                backgroundSize: "cover",
+                backgroundPosition: "center center",
+                backgroundRepeat: "no-repeat",
+              }}
             />
-          )}
-        </Typography>
-      </CardContent>
+          </Box>
+        </CardContent>
+      )}
+      {description && (
+        <CardContent style={{ flexGrow: 1, paddingTop: 0, paddingBottom: 0 }}>
+          <Typography
+            color="textSecondary"
+            sx={{
+              whiteSpace: "nowrap",
+              overflow: "hidden",
+              textOverflow: "ellipsis",
+            }}
+            component="div"
+          >
+            {description}
+          </Typography>
+        </CardContent>
+      )}
 
       <CardActions>
         <Button
diff --git a/src/pages/Table/TablePage.tsx b/src/pages/Table/TablePage.tsx
index 4d682fc3..5f63201f 100644
--- a/src/pages/Table/TablePage.tsx
+++ b/src/pages/Table/TablePage.tsx
@@ -8,6 +8,7 @@ import { Fade } from "@mui/material";
 import ErrorFallback, {
   InlineErrorFallback,
 } from "@src/components/ErrorFallback";
+import TableInformationDrawer from "@src/components/TableInformationDrawer/SideDrawer";
 import TableToolbarSkeleton from "@src/components/TableToolbar/TableToolbarSkeleton";
 import TableSkeleton from "@src/components/Table/TableSkeleton";
 import EmptyTable from "@src/components/Table/EmptyTable";
@@ -103,6 +104,12 @@ export default function TablePage({
         </Suspense>
       </ErrorBoundary>
 
+      <ErrorBoundary FallbackComponent={InlineErrorFallback}>
+        <Suspense fallback={null}>
+          <TableInformationDrawer />
+        </Suspense>
+      </ErrorBoundary>
+
       {!disableModals && (
         <ErrorBoundary FallbackComponent={InlineErrorFallback}>
           <Suspense fallback={null}>
diff --git a/src/pages/TablesPage.tsx b/src/pages/TablesPage.tsx
index 060e46e5..757cdf23 100644
--- a/src/pages/TablesPage.tsx
+++ b/src/pages/TablesPage.tsx
@@ -1,5 +1,6 @@
 import { useAtom, useSetAtom } from "jotai";
 import { find, groupBy, sortBy } from "lodash-es";
+import { useNavigate } from "react-router-dom";
 
 import {
   Container,
@@ -13,12 +14,14 @@ import {
   IconButton,
   Zoom,
 } from "@mui/material";
+
 import ViewListIcon from "@mui/icons-material/ViewListOutlined";
 import ViewGridIcon from "@mui/icons-material/ViewModuleOutlined";
 import FavoriteBorderIcon from "@mui/icons-material/FavoriteBorder";
 import FavoriteIcon from "@mui/icons-material/Favorite";
 import EditIcon from "@mui/icons-material/EditOutlined";
 import AddIcon from "@mui/icons-material/Add";
+import { TableInformation as TableInformationIcon } from "@src/assets/icons";
 
 import FloatingSearch from "@src/components/FloatingSearch";
 import SlideTransition from "@src/components/Modal/SlideTransition";
@@ -54,7 +57,7 @@ export default function TablesPage() {
     tableSettingsDialogAtom,
     projectScope
   );
-
+  const navigate = useNavigate();
   useScrollToHash();
 
   const [results, query, handleQuery] = useBasicSearch(
@@ -159,6 +162,16 @@ export default function TablesPage() {
         sx={view === "list" ? { p: 1.5 } : undefined}
         color="secondary"
       />
+      <IconButton
+        aria-label="Table Information"
+        size={view === "list" ? "large" : undefined}
+        onClick={() => {
+          navigate(`${getLink(table)}#sideDrawer="table-information"`);
+        }}
+        style={{ marginLeft: 0 }}
+      >
+        <TableInformationIcon />
+      </IconButton>
     </>
   );
 
diff --git a/src/sources/ProjectSourceFirebase/useTableFunctions.ts b/src/sources/ProjectSourceFirebase/useTableFunctions.ts
index 379f55d2..95bbdcb5 100644
--- a/src/sources/ProjectSourceFirebase/useTableFunctions.ts
+++ b/src/sources/ProjectSourceFirebase/useTableFunctions.ts
@@ -13,6 +13,7 @@ import {
   getTableSchemaAtom,
   AdditionalTableSettings,
   MinimumTableSettings,
+  currentUserAtom,
 } from "@src/atoms/projectScope";
 import { firebaseDbAtom } from "./init";
 
@@ -21,12 +22,14 @@ import {
   TABLE_SCHEMAS,
   TABLE_GROUP_SCHEMAS,
 } from "@src/config/dbPaths";
+import { rowyUser } from "@src/utils/table";
 import { TableSettings, TableSchema } from "@src/types/table";
 import { FieldType } from "@src/constants/fields";
 import { getFieldProp } from "@src/components/fields";
 
 export function useTableFunctions() {
   const [firebaseDb] = useAtom(firebaseDbAtom, projectScope);
+  const [currentUser] = useAtom(currentUserAtom, projectScope);
 
   // Create a function to get the latest tables from project settings,
   // so we don’t create new functions when tables change
@@ -93,10 +96,11 @@ export function useTableFunctions() {
               };
           }
 
+          const _createdBy = currentUser && rowyUser(currentUser);
           // Appends table to settings doc
           const promiseUpdateSettings = setDoc(
             doc(firebaseDb, SETTINGS),
-            { tables: [...tables, settings] },
+            { tables: [...tables, { ...settings, _createdBy }] },
             { merge: true }
           );
 
@@ -120,7 +124,7 @@ export function useTableFunctions() {
           await Promise.all([promiseUpdateSettings, promiseAddSchema]);
         }
     );
-  }, [firebaseDb, readTables, setCreateTable]);
+  }, [currentUser, firebaseDb, readTables, setCreateTable]);
 
   // Set the createTable function
   const setUpdateTable = useSetAtom(updateTableAtom, projectScope);
diff --git a/src/types/table.d.ts b/src/types/table.d.ts
index c82ccd54..376cd3ea 100644
--- a/src/types/table.d.ts
+++ b/src/types/table.d.ts
@@ -70,6 +70,18 @@ export type TableSettings = {
 
   section: string;
   description?: string;
+  details?: string;
+  thumbnailURL?: string;
+
+  _createdBy?: {
+    displayName?: string;
+    email?: string;
+    emailVerified: boolean;
+    isAnonymous: boolean;
+    photoURL?: string;
+    uid: string;
+    timestamp: firebase.firestore.Timestamp;
+  };
 
   tableType: "primaryCollection" | "collectionGroup";
 

From 4c387fb5c911e075e39c82b66f796c0090d9a8f5 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Fri, 21 Oct 2022 11:39:25 +1100
Subject: [PATCH 194/309] implement requested changes in PR #10

---
 src/assets/icons/index.ts                     |  3 -
 .../TableInformationDrawer/Details.tsx        | 90 +++++--------------
 ...eDrawer.tsx => TableInformationDrawer.tsx} |  2 +-
 .../TableInformationDrawer/index.ts           |  4 +-
 .../TableInformationDrawer/withTemplate.tsx   | 61 -------------
 src/components/TableSettingsDialog/form.tsx   |  2 +-
 .../TableToolbar/TableInformation.tsx         | 10 +--
 src/components/TableToolbar/TableToolbar.tsx  |  7 +-
 src/components/Tables/TableGrid/TableCard.tsx | 14 ++-
 src/pages/Table/TablePage.tsx                 |  2 +-
 src/pages/TablesPage.tsx                      | 14 ++-
 11 files changed, 47 insertions(+), 162 deletions(-)
 rename src/components/TableInformationDrawer/{SideDrawer.tsx => TableInformationDrawer.tsx} (98%)
 delete mode 100644 src/components/TableInformationDrawer/withTemplate.tsx

diff --git a/src/assets/icons/index.ts b/src/assets/icons/index.ts
index 4e60591f..3503e99b 100644
--- a/src/assets/icons/index.ts
+++ b/src/assets/icons/index.ts
@@ -103,9 +103,6 @@ export { FileTableBoxOutline as Project };
 import { TableColumn } from "mdi-material-ui";
 export { TableColumn };
 
-import { InformationOutline } from "mdi-material-ui";
-export { InformationOutline as TableInformation };
-
 export * from "./AddRow";
 export * from "./AddRowTop";
 export * from "./ChevronDown";
diff --git a/src/components/TableInformationDrawer/Details.tsx b/src/components/TableInformationDrawer/Details.tsx
index a3d4640d..3f93721b 100644
--- a/src/components/TableInformationDrawer/Details.tsx
+++ b/src/components/TableInformationDrawer/Details.tsx
@@ -1,15 +1,9 @@
 import { useMemo } from "react";
 import { format } from "date-fns";
+import { find } from "lodash-es";
 import MDEditor from "@uiw/react-md-editor";
 
-import {
-  Box,
-  Grid,
-  IconButton,
-  Stack,
-  Typography,
-  useTheme,
-} from "@mui/material";
+import { Box, IconButton, Stack, Typography } from "@mui/material";
 
 import EditIcon from "@mui/icons-material/EditOutlined";
 
@@ -21,13 +15,9 @@ import {
   tableSettingsDialogAtom,
   userRolesAtom,
 } from "@src/atoms/projectScope";
-import { find } from "lodash-es";
+import { DATE_TIME_FORMAT } from "@src/constants/dates";
 
-export interface IDetailsProps {
-  handleOpenTemplate?: any;
-}
-
-export default function Details({ handleOpenTemplate }: IDetailsProps) {
+export default function Details() {
   const [userRoles] = useAtom(userRolesAtom, projectScope);
   const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
   const [tables] = useAtom(tablesAtom, projectScope);
@@ -41,18 +31,13 @@ export default function Details({ handleOpenTemplate }: IDetailsProps) {
     [tables, tableSettings.id]
   );
 
-  const theme = useTheme();
-
   if (!settings) {
     return null;
   }
 
   const editButton = userRoles.includes("ADMIN") && (
     <IconButton
-      sx={{
-        position: "absolute",
-        right: 0,
-      }}
+      aria-label="Edit"
       onClick={() =>
         openTableSettingsDialog({
           mode: "update",
@@ -68,27 +53,26 @@ export default function Details({ handleOpenTemplate }: IDetailsProps) {
   const { description, details, _createdBy } = settings;
 
   return (
-    <Grid
-      container
-      flexDirection="column"
+    <Stack
+      direction="column"
       gap={3}
       sx={{
-        paddingTop: theme.spacing(3),
-        paddingRight: theme.spacing(3),
-        paddingBottom: theme.spacing(5),
+        paddingTop: 3,
+        paddingRight: 3,
+        paddingBottom: 5,
         "& > .MuiGrid-root": {
           position: "relative",
         },
       }}
     >
       {/* Description */}
-      <Grid container direction="column" gap={1}>
+      <Stack direction="column" gap={1}>
         <Stack
           direction="row"
           justifyContent="space-between"
-          alignItems="center"
+          alignItems="flex-end"
         >
-          <Typography variant="body1" sx={{ fontWeight: 500 }}>
+          <Typography variant="subtitle1" component="h3">
             Description
           </Typography>
           {editButton}
@@ -96,16 +80,16 @@ export default function Details({ handleOpenTemplate }: IDetailsProps) {
         <Typography variant="body2" color="text.secondary">
           {description ? description : "No description"}
         </Typography>
-      </Grid>
+      </Stack>
 
       {/* Details */}
-      <Grid container direction="column" gap={1}>
+      <Stack direction="column" gap={1}>
         <Stack
           direction="row"
           justifyContent="space-between"
-          alignItems="center"
+          alignItems="flex-end"
         >
-          <Typography variant="body1" sx={{ fontWeight: 500 }}>
+          <Typography variant="subtitle1" component="h3">
             Details
           </Typography>
           {editButton}
@@ -123,16 +107,11 @@ export default function Details({ handleOpenTemplate }: IDetailsProps) {
             <MDEditor.Markdown source={details} />
           </Box>
         )}
-      </Grid>
+      </Stack>
 
       {/* Table Audits */}
       {_createdBy && (
-        <Grid
-          container
-          sx={{
-            fontSize: theme.typography.body2,
-          }}
-        >
+        <Stack>
           <Typography
             variant="caption"
             color="text.secondary"
@@ -143,36 +122,13 @@ export default function Details({ handleOpenTemplate }: IDetailsProps) {
             <Typography variant="caption" color="text.primary">
               {_createdBy.displayName}
             </Typography>{" "}
-            at{" "}
+            on{" "}
             <Typography variant="caption" color="text.primary">
-              {format(_createdBy.timestamp.toDate(), "LLL d, yyyy · p")}
+              {format(_createdBy.timestamp.toDate(), DATE_TIME_FORMAT)}
             </Typography>
           </Typography>
-        </Grid>
+        </Stack>
       )}
-
-      {/* Template Settings */}
-      {/* {handleOpenTemplate && (
-        <Divider sx={{ my: 1.5 }} />
-         <Button
-      sx={{ width: "100%", boxShadow: "none", padding: 0 }}
-      onClick={handleOpenTemplate}
-      >
-      <Stack
-      direction="row"
-      justify-content="flex-start"
-      alignItems="center"
-      sx={{ width: "100%" }}
-      >
-      <ChevronLeft />
-      <ListItemText
-      primary="Template - Roadmap"
-      secondary={<StepsProgress steps={5} value={3} />}
-      sx={{ maxWidth: "188px" }}
-      />
-      </Stack
-    </Button> 
-      )} */}
-    </Grid>
+    </Stack>
   );
 }
diff --git a/src/components/TableInformationDrawer/SideDrawer.tsx b/src/components/TableInformationDrawer/TableInformationDrawer.tsx
similarity index 98%
rename from src/components/TableInformationDrawer/SideDrawer.tsx
rename to src/components/TableInformationDrawer/TableInformationDrawer.tsx
index 2221230d..f2074049 100644
--- a/src/components/TableInformationDrawer/SideDrawer.tsx
+++ b/src/components/TableInformationDrawer/TableInformationDrawer.tsx
@@ -107,7 +107,7 @@ export default function SideDrawer() {
                 alignItems="center"
                 py={1}
               >
-                <Typography variant="h5" sx={{ fontWeight: "bold" }}>
+                <Typography variant="h5" component="h2">
                   Information
                 </Typography>
               </Stack>
diff --git a/src/components/TableInformationDrawer/index.ts b/src/components/TableInformationDrawer/index.ts
index 374e8a86..d2fbb0f2 100644
--- a/src/components/TableInformationDrawer/index.ts
+++ b/src/components/TableInformationDrawer/index.ts
@@ -1,2 +1,2 @@
-export * from "../TableToolbar/TableInformation";
-export { default } from "../TableToolbar/TableInformation";
+export * from "./TableInformationDrawer";
+export { default } from "./TableInformationDrawer";
diff --git a/src/components/TableInformationDrawer/withTemplate.tsx b/src/components/TableInformationDrawer/withTemplate.tsx
deleted file mode 100644
index a42bc9c5..00000000
--- a/src/components/TableInformationDrawer/withTemplate.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-// import {
-//   projectScope,
-//   tablesAtom,
-//   templateSettingsDialogAtom,
-// } from "@src/atoms/projectScope";
-// import { TemplateSettings } from "@src/components/Tables/Templates";
-// import { getTemplateById } from "@src/components/Tables/Templates/utills";
-// import { useAtom, useSetAtom } from "jotai";
-// import { useEffect, useState } from "react";
-import Details from "./Details";
-
-export default function withTemplate(DetailsComponent: typeof Details) {
-  //     const [tables] = useAtom(tablesAtom, projectScope);
-  //     const setTemplateSettingsDialog = useSetAtom(
-  //       templateSettingsDialogAtom,
-  //       projectScope
-  //     );
-  //     const [templateData, setTemplateData] = useState<TemplateSettings | null>(
-  //       null
-  //     );
-  //     const { templateSettings } = tableSettings;
-  //     const { draftId, templateId } = templateSettings || {};
-  //     useEffect(() => {
-  //       if (!templateId) {
-  //         throw Error("Template not found");
-  //       }
-  //       getTemplateById(templateId).then((template) => setTemplateData(template));
-  //     }, [templateId]);
-  //     const dialogStateInitializer = () => {
-  //       const matchingTables =
-  //         tables.filter((table) => table.templateSettings?.draftId === draftId) ||
-  //         [];
-  //       const templateTables = templateData!.tables.map((templateTable) => ({
-  //         ...templateTable,
-  //         ...matchingTables.find(
-  //           (matchingTable) =>
-  //             matchingTable.templateSettings?.tableId === templateTable.id
-  //         ),
-  //       }));
-  //       const steps = templateData?.steps.map((step) =>
-  //         step.type === "create_table" ? { ...step, completed: true } : step
-  //       );
-  //       return {
-  //         ...templateData,
-  //         tables: templateTables,
-  //         steps,
-  //       } as TemplateSettings;
-  //     };
-  //     const handleOpenTemplate = () => {
-  //       setTemplateSettingsDialog({
-  //         type: "set_open",
-  //         data: dialogStateInitializer(),
-  //       });
-  //     };
-  //     if (!templateData) {
-  //       return null;
-  //     }
-  return <DetailsComponent handleOpenTemplate={() => {}} />;
-}
-
-// export const DetailsWithTemplate = withTemplate(Details);
diff --git a/src/components/TableSettingsDialog/form.tsx b/src/components/TableSettingsDialog/form.tsx
index 190b02bf..0dddff69 100644
--- a/src/components/TableSettingsDialog/form.tsx
+++ b/src/components/TableSettingsDialog/form.tsx
@@ -255,7 +255,7 @@ export const tableSettings = (
       step: "display",
       type: "tableThumbnail",
       name: "thumbnailFile",
-      label: "Thumbnail Image (optional)",
+      label: "Thumbnail image (optional)",
     },
     {
       step: "display",
diff --git a/src/components/TableToolbar/TableInformation.tsx b/src/components/TableToolbar/TableInformation.tsx
index f53688f1..18169a7d 100644
--- a/src/components/TableToolbar/TableInformation.tsx
+++ b/src/components/TableToolbar/TableInformation.tsx
@@ -1,23 +1,23 @@
 import { useAtom } from "jotai";
 import { RESET } from "jotai/utils";
 
+import TableToolbarButton from "@src/components/TableToolbar/TableToolbarButton";
+import InfoIcon from "@mui/icons-material/InfoOutlined";
+
 import {
   sideDrawerAtom,
   tableScope,
   tableSettingsAtom,
 } from "@src/atoms/tableScope";
 
-import TableToolbarButton from "@src/components/TableToolbar/TableToolbarButton";
-import { TableInformation as TableInformationIcon } from "@src/assets/icons";
-
 export default function TableInformation() {
   const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
   const [sideDrawer, setSideDrawer] = useAtom(sideDrawerAtom, tableScope);
 
   return (
     <TableToolbarButton
-      title="Table Information"
-      icon={<TableInformationIcon />}
+      title="Table information"
+      icon={<InfoIcon />}
       onClick={() => setSideDrawer(sideDrawer ? RESET : "table-information")}
       disabled={!setSideDrawer || tableSettings.id.includes("/")}
     />
diff --git a/src/components/TableToolbar/TableToolbar.tsx b/src/components/TableToolbar/TableToolbar.tsx
index 3e288a88..7af0f6b9 100644
--- a/src/components/TableToolbar/TableToolbar.tsx
+++ b/src/components/TableToolbar/TableToolbar.tsx
@@ -16,6 +16,7 @@ import LoadedRowsStatus from "./LoadedRowsStatus";
 import TableSettings from "./TableSettings";
 import HiddenFields from "./HiddenFields";
 import RowHeight from "./RowHeight";
+import TableInformation from "./TableInformation";
 
 import {
   projectScope,
@@ -36,8 +37,6 @@ import { FieldType } from "@src/constants/fields";
 const Filters = lazy(() => import("./Filters" /* webpackChunkName: "Filters" */));
 // prettier-ignore
 const ImportData = lazy(() => import("./ImportData/ImportData" /* webpackChunkName: "ImportData" */));
-// prettier-ignore
-const TableInformation = lazy(() => import("./TableInformation" /* webpackChunkName: "TableInformation" */));
 
 // prettier-ignore
 const ReExecute = lazy(() => import("./ReExecute" /* webpackChunkName: "ReExecute" */));
@@ -150,9 +149,7 @@ export default function TableToolbar() {
           <TableSettings />
         </>
       )}
-      <Suspense fallback={<ButtonSkeleton />}>
-        <TableInformation />
-      </Suspense>
+      <TableInformation />
       <div className="end-spacer" />
     </Stack>
   );
diff --git a/src/components/Tables/TableGrid/TableCard.tsx b/src/components/Tables/TableGrid/TableCard.tsx
index b601b90a..dd5489a9 100644
--- a/src/components/Tables/TableGrid/TableCard.tsx
+++ b/src/components/Tables/TableGrid/TableCard.tsx
@@ -37,8 +37,8 @@ export default function TableCard({
           </Typography>
         </CardContent>
       </CardActionArea>
-      {thumbnailURL && (
-        <CardContent style={{ flexGrow: 1, paddingTop: 0 }}>
+      <CardContent style={{ flexGrow: 1, paddingTop: 0 }}>
+        {thumbnailURL && (
           <Box
             sx={{
               paddingBottom: "56.25%",
@@ -60,10 +60,8 @@ export default function TableCard({
               }}
             />
           </Box>
-        </CardContent>
-      )}
-      {description && (
-        <CardContent style={{ flexGrow: 1, paddingTop: 0, paddingBottom: 0 }}>
+        )}
+        {description && (
           <Typography
             color="textSecondary"
             sx={{
@@ -75,8 +73,8 @@ export default function TableCard({
           >
             {description}
           </Typography>
-        </CardContent>
-      )}
+        )}
+      </CardContent>
 
       <CardActions>
         <Button
diff --git a/src/pages/Table/TablePage.tsx b/src/pages/Table/TablePage.tsx
index 5f63201f..20671792 100644
--- a/src/pages/Table/TablePage.tsx
+++ b/src/pages/Table/TablePage.tsx
@@ -8,7 +8,7 @@ import { Fade } from "@mui/material";
 import ErrorFallback, {
   InlineErrorFallback,
 } from "@src/components/ErrorFallback";
-import TableInformationDrawer from "@src/components/TableInformationDrawer/SideDrawer";
+import TableInformationDrawer from "@src/components/TableInformationDrawer/TableInformationDrawer";
 import TableToolbarSkeleton from "@src/components/TableToolbar/TableToolbarSkeleton";
 import TableSkeleton from "@src/components/Table/TableSkeleton";
 import EmptyTable from "@src/components/Table/EmptyTable";
diff --git a/src/pages/TablesPage.tsx b/src/pages/TablesPage.tsx
index 757cdf23..e48ab4f3 100644
--- a/src/pages/TablesPage.tsx
+++ b/src/pages/TablesPage.tsx
@@ -1,6 +1,6 @@
 import { useAtom, useSetAtom } from "jotai";
 import { find, groupBy, sortBy } from "lodash-es";
-import { useNavigate } from "react-router-dom";
+import { Link } from "react-router-dom";
 
 import {
   Container,
@@ -21,7 +21,7 @@ import FavoriteBorderIcon from "@mui/icons-material/FavoriteBorder";
 import FavoriteIcon from "@mui/icons-material/Favorite";
 import EditIcon from "@mui/icons-material/EditOutlined";
 import AddIcon from "@mui/icons-material/Add";
-import { TableInformation as TableInformationIcon } from "@src/assets/icons";
+import InfoIcon from "@mui/icons-material/InfoOutlined";
 
 import FloatingSearch from "@src/components/FloatingSearch";
 import SlideTransition from "@src/components/Modal/SlideTransition";
@@ -57,7 +57,6 @@ export default function TablesPage() {
     tableSettingsDialogAtom,
     projectScope
   );
-  const navigate = useNavigate();
   useScrollToHash();
 
   const [results, query, handleQuery] = useBasicSearch(
@@ -163,14 +162,13 @@ export default function TablesPage() {
         color="secondary"
       />
       <IconButton
-        aria-label="Table Information"
+        aria-label="Table information"
         size={view === "list" ? "large" : undefined}
-        onClick={() => {
-          navigate(`${getLink(table)}#sideDrawer="table-information"`);
-        }}
+        component={Link}
+        to={`${getLink(table)}#sideDrawer="table-information"`}
         style={{ marginLeft: 0 }}
       >
-        <TableInformationIcon />
+        <InfoIcon />
       </IconButton>
     </>
   );

From f32a290345493fc50e868d6225bb51d23f037103 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Fri, 21 Oct 2022 14:58:25 +1100
Subject: [PATCH 195/309] add frozen columns

---
 src/components/Table/Column.tsx             |   2 +
 src/components/Table/Styled/StyledCell.tsx  |  17 +++-
 src/components/Table/Styled/StyledRow.tsx   |  24 ++++-
 src/components/Table/Styled/StyledTable.tsx |  15 +++
 src/components/Table/Table.tsx              | 100 ++++++++++++++------
 src/pages/Table/TablePage.tsx               |   9 +-
 6 files changed, 126 insertions(+), 41 deletions(-)

diff --git a/src/components/Table/Column.tsx b/src/components/Table/Column.tsx
index 71c73894..eb32c945 100644
--- a/src/components/Table/Column.tsx
+++ b/src/components/Table/Column.tsx
@@ -3,6 +3,7 @@ import { alpha } from "@mui/material/styles";
 
 import { FieldType } from "@src/constants/fields";
 import { getFieldProp } from "@src/components/fields";
+import { spreadSx } from "@src/utils/ui";
 
 export const COLUMN_HEADER_HEIGHT = 42;
 
@@ -68,6 +69,7 @@ export default function Column({
               },
             }
           : {},
+        ...spreadSx(props.sx),
       ]}
     >
       {type && <Grid item>{getFieldProp("icon", type)}</Grid>}
diff --git a/src/components/Table/Styled/StyledCell.tsx b/src/components/Table/Styled/StyledCell.tsx
index 0676daa2..af2e4646 100644
--- a/src/components/Table/Styled/StyledCell.tsx
+++ b/src/components/Table/Styled/StyledCell.tsx
@@ -1,9 +1,10 @@
+import { colord } from "colord";
 import { styled } from "@mui/material";
 
 export const StyledCell = styled("div")(({ theme }) => ({
   display: "flex",
   alignItems: "center",
-  "--cell-padding": theme.spacing(1.5),
+  "--cell-padding": theme.spacing(10 / 8),
   padding: "0 var(--cell-padding)",
 
   overflow: "visible",
@@ -12,7 +13,17 @@ export const StyledCell = styled("div")(({ theme }) => ({
 
   lineHeight: "calc(var(--row-height) - 1px)",
 
-  borderBottom: `1px solid ${theme.palette.divider}`,
-  borderLeft: `1px solid ${theme.palette.divider}`,
+  backgroundColor: theme.palette.background.paper,
+
+  border: `1px solid ${theme.palette.divider}`,
+  borderTop: "none",
+  "& + &": { borderLeft: "none" },
+
+  "[role='row']:hover &": {
+    backgroundColor: colord(theme.palette.background.paper)
+      .mix(theme.palette.action.hover, theme.palette.action.hoverOpacity)
+      .alpha(1)
+      .toHslString(),
+  },
 }));
 StyledCell.displayName = "StyledCell";
diff --git a/src/components/Table/Styled/StyledRow.tsx b/src/components/Table/Styled/StyledRow.tsx
index 4e76b1d8..e49abeb7 100644
--- a/src/components/Table/Styled/StyledRow.tsx
+++ b/src/components/Table/Styled/StyledRow.tsx
@@ -6,6 +6,28 @@ export const StyledRow = styled("div")(({ theme }) => ({
   display: "flex",
   height: DEFAULT_ROW_HEIGHT,
 
-  backgroundColor: theme.palette.background.paper,
+  "& > *": {
+    flexGrow: 0,
+    flexShrink: 0,
+    minWidth: 0,
+  },
+
+  "& [role='columnheader']": {
+    "&:first-of-type": {
+      borderTopLeftRadius: theme.shape.borderRadius,
+    },
+    "&:last-of-type": {
+      borderTopRightRadius: theme.shape.borderRadius,
+    },
+  },
+
+  "&:last-of-type": {
+    "& [role='gridcell']:first-of-type": {
+      borderBottomLeftRadius: theme.shape.borderRadius,
+    },
+    "& [role='gridcell']:last-of-type": {
+      borderBottomRightRadius: theme.shape.borderRadius,
+    },
+  },
 }));
 StyledRow.displayName = "StyledRow";
diff --git a/src/components/Table/Styled/StyledTable.tsx b/src/components/Table/Styled/StyledTable.tsx
index 2f08622b..0033ee68 100644
--- a/src/components/Table/Styled/StyledTable.tsx
+++ b/src/components/Table/Styled/StyledTable.tsx
@@ -14,5 +14,20 @@ export const StyledTable = styled("div")(({ theme }) => ({
       outlineOffset: "-3px",
     },
   },
+
+  "& [data-frozen='left']": {
+    position: "sticky",
+    left: 0,
+    zIndex: 2,
+
+    "&[data-frozen-last='true']": {
+      boxShadow: theme.shadows[2]
+        .replace(/, 0 (\d+px)/g, ", $1 0")
+        .split("),")
+        .slice(1)
+        .join("),"),
+      clipPath: "inset(0 -4px 0 0)",
+    },
+  },
 }));
 StyledTable.displayName = "StyledTable";
diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index 99fccb45..90359284 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -19,7 +19,7 @@ import { StyledTable } from "./Styled/StyledTable";
 import { StyledRow } from "./Styled/StyledRow";
 import ColumnHeaderComponent from "./Column";
 
-import { LinearProgress } from "@mui/material";
+import { IconButton, LinearProgress } from "@mui/material";
 
 import TableContainer, { OUT_OF_ORDER_MARGIN } from "./TableContainer";
 import ColumnHeader, { COLUMN_HEADER_HEIGHT } from "./ColumnHeader";
@@ -63,7 +63,8 @@ import { useKeyboardNavigation } from "./useKeyboardNavigation";
 
 export const DEFAULT_ROW_HEIGHT = 41;
 export const DEFAULT_COL_WIDTH = 150;
-export const MAX_COL_WIDTH = 380;
+export const TABLE_PADDING = 16;
+export const TABLE_GUTTER = 8;
 
 declare module "@tanstack/table-core" {
   interface ColumnMeta<TData, TValue> extends ColumnConfig {}
@@ -132,22 +133,14 @@ export default function TableComponent() {
         columnHelper.display({
           id: "_rowy_column_actions",
           header: () => "Actions",
-          cell: () => <>Menu | Duplicate | Delete</>,
+          cell: () => (
+            <>
+              <IconButton>M</IconButton>
+              <IconButton>D</IconButton>
+              <IconButton>X</IconButton>
+            </>
+          ),
         })
-        //   {
-        //   isNew: true,
-        //   key: "new",
-        //   fieldName: "_rowy_new",
-        //   name: "Add column",
-        //   type: FieldType.last,
-        //   index: _columns.length ?? 0,
-        //   width: 154,
-        //   headerRenderer: FinalColumnHeader,
-        //   headerCellClass: "final-column-header",
-        //   cellClass: "final-column-cell",
-        //   formatter: FinalColumn,
-        //   editable: false,
-        // }
       );
     }
 
@@ -163,13 +156,23 @@ export default function TableComponent() {
     return userDocHiddenFields.reduce((a, c) => ({ ...a, [c]: false }), {});
   }, [userDocHiddenFields]);
 
+  // Get frozen columns
+  const columnPinning = useMemo(
+    () => ({
+      left: columns.filter((c) => c.meta?.fixed && c.id).map((c) => c.id!),
+    }),
+    [columns]
+  );
+  const lastFrozen: string | undefined =
+    columnPinning.left[columnPinning.left.length - 1];
+
   const table = useReactTable({
     data: tableRows,
     columns,
     getCoreRowModel: getCoreRowModel(),
     getRowId,
     columnResizeMode: "onChange",
-    state: { columnVisibility },
+    state: { columnVisibility, columnPinning },
     // debugRows: true,
   });
   const { rows } = table.getRowModel();
@@ -184,6 +187,7 @@ export default function TableComponent() {
     parentRef: containerRef,
     size: tableRows.length,
     overscan: 10,
+    paddingEnd: TABLE_PADDING,
     estimateSize: useCallback(
       () => tableSchema.rowHeight || DEFAULT_ROW_HEIGHT,
       [tableSchema.rowHeight]
@@ -198,7 +202,9 @@ export default function TableComponent() {
     parentRef: containerRef,
     horizontal: true,
     size: leafColumns.length,
-    overscan: 1,
+    overscan: 10,
+    paddingStart: TABLE_PADDING,
+    paddingEnd: TABLE_PADDING,
     estimateSize: useCallback(
       (index: number) => leafColumns[index].columnDef.size || DEFAULT_COL_WIDTH,
       [leafColumns]
@@ -211,15 +217,13 @@ export default function TableComponent() {
       const rowIndex = tableRows.findIndex(
         (row) => row._rowy_ref.path === selectedCell.path
       );
-      if (rowIndex === -1) return;
-      scrollToRowIndex(rowIndex);
+      if (rowIndex > -1) scrollToRowIndex(rowIndex);
     }
     if (selectedCell.columnKey) {
       const colIndex = leafColumns.findIndex(
         (col) => col.id === selectedCell.columnKey
       );
-      if (colIndex === -1) return;
-      scrollToColIndex(colIndex);
+      if (colIndex > -1) scrollToColIndex(colIndex);
     }
   }, [
     selectedCell,
@@ -277,7 +281,12 @@ export default function TableComponent() {
         <div
           className="thead"
           role="rowgroup"
-          style={{ position: "sticky", top: 0, zIndex: 1 }}
+          style={{
+            position: "sticky",
+            top: 0,
+            zIndex: 10,
+            padding: `0 ${TABLE_PADDING}px`,
+          }}
         >
           {table.getHeaderGroups().map((headerGroup) => (
             <StyledRow key={headerGroup.id} role="row" aria-rowindex={1}>
@@ -290,17 +299,25 @@ export default function TableComponent() {
                 return (
                   <ColumnHeaderComponent
                     key={header.id}
-                    data-rowid={"_rowy_header"}
-                    data-colid={header.id}
+                    data-row-id={"_rowy_header"}
+                    data-col-id={header.id}
+                    data-frozen={header.column.getIsPinned() || undefined}
+                    data-frozen-last={lastFrozen === header.id || undefined}
                     role="columnheader"
                     tabIndex={isSelectedCell ? 0 : -1}
                     aria-colindex={header.index + 1}
-                    aria-readonly={canEditColumn}
+                    aria-readonly={!canEditColumn}
                     // TODO: aria-sort={"none" | "ascending" | "descending" | "other" | undefined}
                     aria-selected={isSelectedCell}
                     label={header.column.columnDef.meta?.name || header.id}
                     type={header.column.columnDef.meta?.type}
-                    style={{ width: header.getSize(), borderRight: "none" }}
+                    style={{
+                      width: header.getSize(),
+                      left: header.column.getIsPinned()
+                        ? virtualCols[header.index].start - TABLE_PADDING
+                        : undefined,
+                    }}
+                    sx={{ "& + &": { borderLeft: "none" } }}
                     onClick={(e) => {
                       setSelectedCell({
                         path: "_rowy_header",
@@ -367,8 +384,12 @@ export default function TableComponent() {
                   return (
                     <StyledCell
                       key={cell.id}
-                      data-rowid={row.id}
-                      data-colid={cell.column.id}
+                      data-row-id={row.id}
+                      data-col-id={cell.column.id}
+                      data-frozen={cell.column.getIsPinned() || undefined}
+                      data-frozen-last={
+                        lastFrozen === cell.column.id || undefined
+                      }
                       role="gridcell"
                       tabIndex={isSelectedCell && !focusInsideCell ? 0 : -1}
                       aria-colindex={cellIndex + 1}
@@ -376,7 +397,24 @@ export default function TableComponent() {
                         cell.column.columnDef.meta?.editable === false
                       }
                       aria-selected={isSelectedCell}
-                      style={{ width: cell.column.getSize() }}
+                      style={{
+                        width: cell.column.getSize(),
+                        left: cell.column.getIsPinned()
+                          ? virtualCell.start - TABLE_PADDING
+                          : undefined,
+                        backgroundColor:
+                          cell.column.id === "_rowy_column_actions"
+                            ? "transparent"
+                            : undefined,
+                        borderBottomWidth:
+                          cell.column.id === "_rowy_column_actions"
+                            ? 0
+                            : undefined,
+                        borderRightWidth:
+                          cell.column.id === "_rowy_column_actions"
+                            ? 0
+                            : undefined,
+                      }}
                       onClick={(e) => {
                         setSelectedCell({
                           path: row.original._rowy_ref.path,
diff --git a/src/pages/Table/TablePage.tsx b/src/pages/Table/TablePage.tsx
index 41d8c003..526f40fc 100644
--- a/src/pages/Table/TablePage.tsx
+++ b/src/pages/Table/TablePage.tsx
@@ -105,12 +105,9 @@ export default function TablePage({
               width: `calc(100% - ${DRAWER_COLLAPSED_WIDTH}px)`,
 
               '& [role="grid"]': {
-                paddingBottom: (theme) =>
-                  `max(env(safe-area-inset-bottom), ${theme.spacing(2)})`,
-                paddingLeft: (theme) =>
-                  `max(env(safe-area-inset-left), ${theme.spacing(2)})`,
-                paddingRight: (theme) =>
-                  `max(env(safe-area-inset-right), ${theme.spacing(2)})`,
+                marginBottom: `env(safe-area-inset-bottom)`,
+                marginLeft: `env(safe-area-inset-left)`,
+                marginRight: `env(safe-area-inset-right)`,
               },
             }}
           >

From 44e9b069eeda1ec3afaa681ac12bba9f430624b1 Mon Sep 17 00:00:00 2001
From: shamsmosowi <shams.mosowi@gmail.com>
Date: Sun, 23 Oct 2022 16:20:56 +0200
Subject: [PATCH 196/309] check if collection any rows with data

---
 src/components/Table/EmptyTable.tsx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/Table/EmptyTable.tsx b/src/components/Table/EmptyTable.tsx
index b9b3fadc..f07839b3 100644
--- a/src/components/Table/EmptyTable.tsx
+++ b/src/components/Table/EmptyTable.tsx
@@ -27,10 +27,14 @@ export default function EmptyTable() {
   const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
   const [tableRows] = useAtom(tableRowsAtom, tableScope);
   // const { tableState, importWizardRef, columnMenuRef } = useProjectContext();
-
+  // check if theres any rows, and if rows include fields other than rowy_ref
+  const hasData =
+    tableRows.length > 0
+      ? tableRows.some((row) => Object.keys(row).length > 1)
+      : false;
   let contents = <></>;
 
-  if (tableRows.length > 0) {
+  if (hasData) {
     contents = (
       <>
         <div>

From 202883e1fd462d697aaccd09b5d5c22582a95ebb Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 24 Oct 2022 13:12:53 +1100
Subject: [PATCH 197/309] add resize columns & ask admins if they want to save
 to scheam

---
 src/components/Table/Column.tsx               |   5 +
 src/components/Table/Styled/StyledResizer.tsx |  53 +++++++++
 src/components/Table/Table.tsx                | 101 +++++++++++++-----
 3 files changed, 134 insertions(+), 25 deletions(-)
 create mode 100644 src/components/Table/Styled/StyledResizer.tsx

diff --git a/src/components/Table/Column.tsx b/src/components/Table/Column.tsx
index eb32c945..35b42500 100644
--- a/src/components/Table/Column.tsx
+++ b/src/components/Table/Column.tsx
@@ -11,6 +11,7 @@ export interface IColumnProps extends Partial<GridProps> {
   label: string;
   type?: FieldType;
   secondaryItem?: React.ReactNode;
+  children?: React.ReactNode;
 
   active?: boolean;
 }
@@ -19,6 +20,7 @@ export default function Column({
   label,
   type,
   secondaryItem,
+  children,
 
   active,
   ...props
@@ -35,6 +37,7 @@ export default function Column({
           height: COLUMN_HEADER_HEIGHT,
           border: (theme) => `1px solid ${theme.palette.divider}`,
           backgroundColor: "background.default",
+          position: "relative",
 
           py: 0,
           px: 1,
@@ -106,6 +109,8 @@ export default function Column({
           {secondaryItem}
         </Grid>
       )}
+
+      {children}
     </Grid>
   );
 }
diff --git a/src/components/Table/Styled/StyledResizer.tsx b/src/components/Table/Styled/StyledResizer.tsx
new file mode 100644
index 00000000..526dd8b6
--- /dev/null
+++ b/src/components/Table/Styled/StyledResizer.tsx
@@ -0,0 +1,53 @@
+import { styled } from "@mui/material";
+
+export interface IStyledResizerProps {
+  isResizing: boolean;
+}
+
+export const StyledResizer = styled("div", {
+  name: "StyledResizer",
+  shouldForwardProp: (prop) => prop !== "isResizing",
+})<IStyledResizerProps>(({ theme, isResizing }) => ({
+  position: "absolute",
+  right: 0,
+  top: 0,
+  height: "100%",
+  width: 10,
+
+  cursor: "col-resize",
+  userSelect: "none",
+  touchAction: "none",
+
+  display: "flex",
+  justifyContent: "flex-end",
+  alignItems: "center",
+
+  transition: theme.transitions.create("opacity", {
+    duration: theme.transitions.duration.shortest,
+  }),
+  opacity: isResizing ? 1 : 0,
+  "[role='columnheader']:hover &": { opacity: 0.33 },
+  "[role='columnheader'] &:hover, [role='columnheader'] &:active": {
+    opacity: 1,
+    "&::before": { transform: "scaleY(1.25)" },
+  },
+
+  "&::before": {
+    content: "''",
+    display: "block",
+
+    height: "50%",
+    width: 4,
+    borderRadius: 2,
+    marginRight: 2,
+
+    background: isResizing
+      ? theme.palette.primary.main
+      : theme.palette.action.active,
+    transition: theme.transitions.create("transform", {
+      duration: theme.transitions.duration.shortest,
+    }),
+    transform: isResizing ? "scaleY(1.5) !important" : undefined,
+  },
+}));
+StyledResizer.displayName = "StyledResizer";
diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index 90359284..c922bfa9 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -1,9 +1,15 @@
-import { useMemo, useRef, useCallback, Suspense, useEffect } from "react";
+import { useMemo, useRef, useCallback, useState, useEffect } from "react";
 import { useAtom, useSetAtom } from "jotai";
-import { useDebouncedCallback, useThrottledCallback } from "use-debounce";
+import {
+  useDebounce,
+  useDebouncedCallback,
+  useThrottledCallback,
+} from "use-debounce";
+import { useSnackbar } from "notistack";
+import useMemoValue from "use-memo-value";
 import { DndProvider } from "react-dnd";
 import { HTML5Backend } from "react-dnd-html5-backend";
-import { findIndex } from "lodash-es";
+import { isEmpty, isEqual } from "lodash-es";
 
 import {
   createColumnHelper,
@@ -17,9 +23,11 @@ import { TOP_BAR_HEIGHT } from "@src/layouts/Navigation/TopBar";
 import { TABLE_TOOLBAR_HEIGHT } from "@src/components/TableToolbar";
 import { StyledTable } from "./Styled/StyledTable";
 import { StyledRow } from "./Styled/StyledRow";
+import { StyledResizer } from "./Styled/StyledResizer";
 import ColumnHeaderComponent from "./Column";
 
-import { IconButton, LinearProgress } from "@mui/material";
+import { IconButton, LinearProgress, Button } from "@mui/material";
+import { LoadingButton } from "@mui/lab";
 
 import TableContainer, { OUT_OF_ORDER_MARGIN } from "./TableContainer";
 import ColumnHeader, { COLUMN_HEADER_HEIGHT } from "./ColumnHeader";
@@ -63,8 +71,10 @@ import { useKeyboardNavigation } from "./useKeyboardNavigation";
 
 export const DEFAULT_ROW_HEIGHT = 41;
 export const DEFAULT_COL_WIDTH = 150;
+export const MIN_COL_WIDTH = 32;
 export const TABLE_PADDING = 16;
 export const TABLE_GUTTER = 8;
+export const DEBOUNCE_DELAY = 500;
 
 declare module "@tanstack/table-core" {
   interface ColumnMeta<TData, TValue> extends ColumnConfig {}
@@ -74,6 +84,8 @@ const columnHelper = createColumnHelper<TableRow>();
 const getRowId = (row: TableRow) => row._rowy_ref.path || row._rowy_ref.id;
 
 export default function TableComponent() {
+  const { enqueueSnackbar, closeSnackbar } = useSnackbar();
+
   const [userRoles] = useAtom(userRolesAtom, projectScope);
   const [userSettings] = useAtom(userSettingsAtom, projectScope);
 
@@ -105,6 +117,9 @@ export default function TableComponent() {
         columnHelper.accessor(columnConfig.fieldName, {
           id: columnConfig.fieldName,
           meta: columnConfig,
+          size: columnConfig.width,
+          enableResizing: columnConfig.resizable !== false,
+          minSize: MIN_COL_WIDTH,
           // draggable: true,
           // resizable: true,
           // frozen: columnConfig.fixed,
@@ -166,15 +181,62 @@ export default function TableComponent() {
   const lastFrozen: string | undefined =
     columnPinning.left[columnPinning.left.length - 1];
 
+  // Call TanStack Table
   const table = useReactTable({
     data: tableRows,
     columns,
     getCoreRowModel: getCoreRowModel(),
     getRowId,
     columnResizeMode: "onChange",
-    state: { columnVisibility, columnPinning },
-    // debugRows: true,
   });
+
+  const [columnSizing, setColumnSizing] = useState(
+    table.initialState.columnSizing
+  );
+  table.setOptions((prev) => ({
+    ...prev,
+    state: { ...prev.state, columnVisibility, columnPinning, columnSizing },
+    onColumnSizingChange: setColumnSizing,
+  }));
+
+  // Debounce for saving to schema
+  const [debouncedColumnSizing] = useDebounce(columnSizing, DEBOUNCE_DELAY, {
+    equalityFn: isEqual,
+  });
+  // Offer to save when column sizing changes
+  useEffect(() => {
+    if (!canEditColumn || isEmpty(debouncedColumnSizing)) return;
+
+    const snackbarId = enqueueSnackbar("Save column sizes for all users?", {
+      action: (
+        <LoadingButton
+          variant="contained"
+          color="primary"
+          onClick={handleSaveToSchema}
+        >
+          Save
+        </LoadingButton>
+      ),
+      anchorOrigin: { horizontal: "center", vertical: "top" },
+    });
+
+    async function handleSaveToSchema() {
+      const promises = Object.entries(debouncedColumnSizing).map(
+        ([key, value]) => updateColumn({ key, config: { width: value } })
+      );
+      await Promise.all(promises);
+      closeSnackbar(snackbarId);
+    }
+
+    return () => closeSnackbar(snackbarId);
+  }, [
+    debouncedColumnSizing,
+    canEditColumn,
+    enqueueSnackbar,
+    closeSnackbar,
+    updateColumn,
+  ]);
+
   const { rows } = table.getRowModel();
   const leafColumns = table.getVisibleLeafColumns();
   // console.log(table, selectedCell);
@@ -260,7 +322,7 @@ export default function TableComponent() {
         setTablePage((p) => p + 1);
       }
     },
-    250
+    DEBOUNCE_DELAY
   );
 
   return (
@@ -326,24 +388,13 @@ export default function TableComponent() {
                       (e.target as HTMLDivElement).focus();
                     }}
                   >
-                    {/* <div
-                    {...{
-                      onMouseDown: header.getResizeHandler(),
-                      onTouchStart: header.getResizeHandler(),
-                      className: `resizer ${
-                        header.column.getIsResizing() ? "isResizing" : ""
-                      }`,
-                      // style: {
-                      //   transform:
-                      //     columnResizeMode === 'onEnd' &&
-                      //     header.column.getIsResizing()
-                      //       ? `translateX(${
-                      //           table.getState().columnSizingInfo.deltaOffset
-                      //         }px)`
-                      //       : '',
-                      // },
-                    }}
-                  /> */}
+                    {header.column.getCanResize() && (
+                      <StyledResizer
+                        isResizing={header.column.getIsResizing()}
+                        onMouseDown={header.getResizeHandler()}
+                        onTouchStart={header.getResizeHandler()}
+                      />
+                    )}
                   </ColumnHeaderComponent>
                 );
               })}

From 6d1c6b01001f45920aba10b09a52976d4dede98a Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 24 Oct 2022 13:22:46 +1100
Subject: [PATCH 198/309] fix table not loading more pages when window height
 can show all of first page

---
 src/components/Table/Table.tsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index c922bfa9..8e1814cd 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -95,7 +95,7 @@ export default function TableComponent() {
   const [tableColumnsOrdered] = useAtom(tableColumnsOrderedAtom, tableScope);
   const [tableRows] = useAtom(tableRowsAtom, tableScope);
   const [tableNextPage] = useAtom(tableNextPageAtom, tableScope);
-  const setTablePage = useSetAtom(tablePageAtom, tableScope);
+  const [tablePage, setTablePage] = useAtom(tablePageAtom, tableScope);
   const [selectedCell, setSelectedCell] = useAtom(selectedCellAtom, tableScope);
 
   const updateColumn = useSetAtom(updateColumnAtom, tableScope);
@@ -324,6 +324,11 @@ export default function TableComponent() {
     },
     DEBOUNCE_DELAY
   );
+  // Check on mount and after fetch to see if the table is at the bottom
+  // for large screen heights
+  useEffect(() => {
+    fetchMoreOnBottomReached(containerRef.current);
+  }, [fetchMoreOnBottomReached, tablePage, tableNextPage.loading]);
 
   return (
     <div

From 918528fb6af2d220cd2e673f882e6b6aee8c045d Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 24 Oct 2022 14:59:29 +1100
Subject: [PATCH 199/309] show save state for column sizing

---
 src/components/Table/Table.tsx                |  43 +-------
 .../Table/useKeyboardNavigation.tsx           |   2 +
 src/components/Table/useSaveColumnSizing.tsx  | 102 ++++++++++++++++++
 3 files changed, 107 insertions(+), 40 deletions(-)
 create mode 100644 src/components/Table/useSaveColumnSizing.tsx

diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index 8e1814cd..04f5fb35 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -68,10 +68,11 @@ import { formatSubTableName } from "@src/utils/table";
 import { TableRow, ColumnConfig } from "@src/types/table";
 import { StyledCell } from "./Styled/StyledCell";
 import { useKeyboardNavigation } from "./useKeyboardNavigation";
+import { useSaveColumnSizing } from "./useSaveColumnSizing";
 
 export const DEFAULT_ROW_HEIGHT = 41;
 export const DEFAULT_COL_WIDTH = 150;
-export const MIN_COL_WIDTH = 32;
+export const MIN_COL_WIDTH = 80;
 export const TABLE_PADDING = 16;
 export const TABLE_GUTTER = 8;
 export const DEBOUNCE_DELAY = 500;
@@ -84,8 +85,6 @@ const columnHelper = createColumnHelper<TableRow>();
 const getRowId = (row: TableRow) => row._rowy_ref.path || row._rowy_ref.id;
 
 export default function TableComponent() {
-  const { enqueueSnackbar, closeSnackbar } = useSnackbar();
-
   const [userRoles] = useAtom(userRolesAtom, projectScope);
   const [userSettings] = useAtom(userSettingsAtom, projectScope);
 
@@ -199,43 +198,7 @@ export default function TableComponent() {
     onColumnSizingChange: setColumnSizing,
   }));
 
-  // Debounce for saving to schema
-  const [debouncedColumnSizing] = useDebounce(columnSizing, DEBOUNCE_DELAY, {
-    equalityFn: isEqual,
-  });
-  // Offer to save when column sizing changes
-  useEffect(() => {
-    if (!canEditColumn || isEmpty(debouncedColumnSizing)) return;
-
-    const snackbarId = enqueueSnackbar("Save column sizes for all users?", {
-      action: (
-        <LoadingButton
-          variant="contained"
-          color="primary"
-          onClick={handleSaveToSchema}
-        >
-          Save
-        </LoadingButton>
-      ),
-      anchorOrigin: { horizontal: "center", vertical: "top" },
-    });
-
-    async function handleSaveToSchema() {
-      const promises = Object.entries(debouncedColumnSizing).map(
-        ([key, value]) => updateColumn({ key, config: { width: value } })
-      );
-      await Promise.all(promises);
-      closeSnackbar(snackbarId);
-    }
-
-    return () => closeSnackbar(snackbarId);
-  }, [
-    debouncedColumnSizing,
-    canEditColumn,
-    enqueueSnackbar,
-    closeSnackbar,
-    updateColumn,
-  ]);
+  useSaveColumnSizing(columnSizing, canEditColumn);
 
   const { rows } = table.getRowModel();
   const leafColumns = table.getVisibleLeafColumns();
diff --git a/src/components/Table/useKeyboardNavigation.tsx b/src/components/Table/useKeyboardNavigation.tsx
index f814f15f..d71c9f8e 100644
--- a/src/components/Table/useKeyboardNavigation.tsx
+++ b/src/components/Table/useKeyboardNavigation.tsx
@@ -138,3 +138,5 @@ export function useKeyboardNavigation({
 
   return { handleKeyDown, focusInsideCell } as const;
 }
+
+export default useKeyboardNavigation;
diff --git a/src/components/Table/useSaveColumnSizing.tsx b/src/components/Table/useSaveColumnSizing.tsx
new file mode 100644
index 00000000..2ea940ac
--- /dev/null
+++ b/src/components/Table/useSaveColumnSizing.tsx
@@ -0,0 +1,102 @@
+import { useEffect, useState } from "react";
+import { useSetAtom } from "jotai";
+import { useSnackbar } from "notistack";
+import { useDebounce } from "use-debounce";
+import { isEqual, isEmpty } from "lodash-es";
+
+import LoadingButton from "@mui/lab/LoadingButton";
+import CheckIcon from "@mui/icons-material/Check";
+import CircularProgressOptical from "@src/components/CircularProgressOptical";
+
+import {
+  tableScope,
+  updateColumnAtom,
+  IUpdateColumnOptions,
+} from "@src/atoms/tableScope";
+import { DEBOUNCE_DELAY } from "./Table";
+import { ColumnSizingState } from "@tanstack/react-table";
+
+/** Debounces columnSizing and asks admins if they want to save for all users */
+export function useSaveColumnSizing(
+  columnSizing: ColumnSizingState,
+  canEditColumn: boolean
+) {
+  const { enqueueSnackbar, closeSnackbar } = useSnackbar();
+  const updateColumn = useSetAtom(updateColumnAtom, tableScope);
+
+  // Debounce for saving to schema
+  const [debouncedColumnSizing] = useDebounce(columnSizing, DEBOUNCE_DELAY, {
+    equalityFn: isEqual,
+  });
+  // Offer to save when column sizing changes
+  useEffect(() => {
+    if (!canEditColumn || isEmpty(debouncedColumnSizing)) return;
+
+    const snackbarId = enqueueSnackbar("Save column sizes for all users?", {
+      action: (
+        <SaveColumnSizingButton
+          debouncedColumnSizing={debouncedColumnSizing}
+          updateColumn={updateColumn}
+        />
+      ),
+      anchorOrigin: { horizontal: "center", vertical: "top" },
+    });
+
+    return () => closeSnackbar(snackbarId);
+  }, [
+    debouncedColumnSizing,
+    canEditColumn,
+    enqueueSnackbar,
+    closeSnackbar,
+    updateColumn,
+  ]);
+
+  return null;
+}
+
+interface ISaveColumnSizingButtonProps {
+  debouncedColumnSizing: ColumnSizingState;
+  updateColumn: (update: IUpdateColumnOptions) => Promise<void>;
+}
+
+/**
+ * Make the button a component so it can have its own state,
+ * so we can display the loading state without showing a new snackbar
+ */
+function SaveColumnSizingButton({
+  debouncedColumnSizing,
+  updateColumn,
+}: ISaveColumnSizingButtonProps) {
+  const [state, setState] = useState<"" | "loading" | "success">("");
+
+  const handleSaveToSchema = async () => {
+    setState("loading");
+    // Do this one by one for now to prevent race conditions.
+    // Need to support updating multiple columns in updateColumnAtom
+    // in the future.
+    for (const [key, value] of Object.entries(debouncedColumnSizing)) {
+      await updateColumn({ key, config: { width: value } });
+    }
+    setState("success");
+  };
+
+  return (
+    <LoadingButton
+      variant="contained"
+      color="primary"
+      onClick={handleSaveToSchema}
+      loading={Boolean(state)}
+      loadingIndicator={
+        state === "success" ? (
+          <CheckIcon color="primary" />
+        ) : (
+          <CircularProgressOptical size={20} color="primary" />
+        )
+      }
+    >
+      Save
+    </LoadingButton>
+  );
+}
+
+export default useSaveColumnSizing;

From 0ec112106c1f59f6a95320206a6de258eb643afc Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 24 Oct 2022 15:19:28 +1100
Subject: [PATCH 200/309] display rows out of order

---
 src/components/Table/Styled/StyledCell.tsx |  4 ++++
 src/components/Table/Table.tsx             | 22 +++++++++++++---------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/components/Table/Styled/StyledCell.tsx b/src/components/Table/Styled/StyledCell.tsx
index af2e4646..b445607e 100644
--- a/src/components/Table/Styled/StyledCell.tsx
+++ b/src/components/Table/Styled/StyledCell.tsx
@@ -25,5 +25,9 @@ export const StyledCell = styled("div")(({ theme }) => ({
       .alpha(1)
       .toHslString(),
   },
+
+  "[data-out-of-order='true'] + [role='row'] &": {
+    borderTop: `1px solid ${theme.palette.divider}`,
+  },
 }));
 StyledCell.displayName = "StyledCell";
diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index 04f5fb35..8c148649 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -19,17 +19,13 @@ import {
 } from "@tanstack/react-table";
 import { useVirtual } from "react-virtual";
 
-import { TOP_BAR_HEIGHT } from "@src/layouts/Navigation/TopBar";
-import { TABLE_TOOLBAR_HEIGHT } from "@src/components/TableToolbar";
 import { StyledTable } from "./Styled/StyledTable";
 import { StyledRow } from "./Styled/StyledRow";
 import { StyledResizer } from "./Styled/StyledResizer";
 import ColumnHeaderComponent from "./Column";
 
-import { IconButton, LinearProgress, Button } from "@mui/material";
-import { LoadingButton } from "@mui/lab";
+import { IconButton } from "@mui/material";
 
-import TableContainer, { OUT_OF_ORDER_MARGIN } from "./TableContainer";
 import ColumnHeader, { COLUMN_HEADER_HEIGHT } from "./ColumnHeader";
 import FinalColumnHeader from "./FinalColumnHeader";
 import FinalColumn from "./formatters/FinalColumn";
@@ -74,7 +70,7 @@ export const DEFAULT_ROW_HEIGHT = 41;
 export const DEFAULT_COL_WIDTH = 150;
 export const MIN_COL_WIDTH = 80;
 export const TABLE_PADDING = 16;
-export const TABLE_GUTTER = 8;
+export const OUT_OF_ORDER_MARGIN = 8;
 export const DEBOUNCE_DELAY = 500;
 
 declare module "@tanstack/table-core" {
@@ -214,8 +210,10 @@ export default function TableComponent() {
     overscan: 10,
     paddingEnd: TABLE_PADDING,
     estimateSize: useCallback(
-      () => tableSchema.rowHeight || DEFAULT_ROW_HEIGHT,
-      [tableSchema.rowHeight]
+      (index: number) =>
+        (tableSchema.rowHeight || DEFAULT_ROW_HEIGHT) +
+        (tableRows[index]._rowy_outOfOrder ? OUT_OF_ORDER_MARGIN : 0),
+      [tableSchema.rowHeight, tableRows]
     ),
   });
 
@@ -383,7 +381,13 @@ export default function TableComponent() {
                 key={row.id}
                 role="row"
                 aria-rowindex={row.index + 2}
-                style={{ height: tableSchema.rowHeight }}
+                style={{
+                  height: tableSchema.rowHeight,
+                  marginBottom: row.original._rowy_outOfOrder
+                    ? OUT_OF_ORDER_MARGIN
+                    : 0,
+                }}
+                data-out-of-order={row.original._rowy_outOfOrder || undefined}
               >
                 {paddingLeft > 0 && (
                   <div

From e892a371c12516c5ded3a19d73a3364cdee44664 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 24 Oct 2022 15:38:35 +1100
Subject: [PATCH 201/309] add out of order rows

---
 src/components/Table/OutOfOrderIndicator.tsx | 20 +++-------
 src/components/Table/Styled/StyledCell.tsx   |  8 ++--
 src/components/Table/Styled/StyledRow.tsx    |  1 +
 src/components/Table/Table.tsx               | 40 ++++++++++++++------
 src/components/Table/TableRow.tsx            |  2 +-
 5 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/src/components/Table/OutOfOrderIndicator.tsx b/src/components/Table/OutOfOrderIndicator.tsx
index 337b3d50..907ec2e3 100644
--- a/src/components/Table/OutOfOrderIndicator.tsx
+++ b/src/components/Table/OutOfOrderIndicator.tsx
@@ -3,7 +3,6 @@ import { useAtom } from "jotai";
 import { styled } from "@mui/material/styles";
 import RichTooltip from "@src/components/RichTooltip";
 import WarningIcon from "@mui/icons-material/WarningAmber";
-import { OUT_OF_ORDER_MARGIN } from "./TableContainer";
 
 import {
   projectScope,
@@ -24,15 +23,7 @@ const Dot = styled("div")(({ theme }) => ({
   backgroundColor: theme.palette.warning.main,
 }));
 
-export interface IOutOfOrderIndicatorProps {
-  top: number;
-  height: number;
-}
-
-export default function OutOfOrderIndicator({
-  top,
-  height,
-}: IOutOfOrderIndicatorProps) {
+export default function OutOfOrderIndicator() {
   const [dismissed, setDismissed] = useAtom(
     tableOutOfOrderDismissedAtom,
     projectScope
@@ -42,11 +33,12 @@ export default function OutOfOrderIndicator({
     <div
       className="out-of-order-dot"
       style={{
-        position: "absolute",
-        top: top,
-        height: height - OUT_OF_ORDER_MARGIN - 2,
-        marginLeft: `max(env(safe-area-inset-left), 16px)`,
+        position: "sticky",
+        zIndex: 9,
+        top: 0,
+        left: 8,
         width: 12,
+        marginRight: -12,
       }}
     >
       <RichTooltip
diff --git a/src/components/Table/Styled/StyledCell.tsx b/src/components/Table/Styled/StyledCell.tsx
index b445607e..58de99fd 100644
--- a/src/components/Table/Styled/StyledCell.tsx
+++ b/src/components/Table/Styled/StyledCell.tsx
@@ -5,14 +5,16 @@ export const StyledCell = styled("div")(({ theme }) => ({
   display: "flex",
   alignItems: "center",
   "--cell-padding": theme.spacing(10 / 8),
-  padding: "0 var(--cell-padding)",
+
+  "& > .cell-contents": {
+    padding: "0 var(--cell-padding)",
+    lineHeight: "calc(var(--row-height) - 1px)",
+  },
 
   overflow: "visible",
   contain: "none",
   position: "relative",
 
-  lineHeight: "calc(var(--row-height) - 1px)",
-
   backgroundColor: theme.palette.background.paper,
 
   border: `1px solid ${theme.palette.divider}`,
diff --git a/src/components/Table/Styled/StyledRow.tsx b/src/components/Table/Styled/StyledRow.tsx
index e49abeb7..da2e11a6 100644
--- a/src/components/Table/Styled/StyledRow.tsx
+++ b/src/components/Table/Styled/StyledRow.tsx
@@ -5,6 +5,7 @@ import { DEFAULT_ROW_HEIGHT } from "@src/components/Table";
 export const StyledRow = styled("div")(({ theme }) => ({
   display: "flex",
   height: DEFAULT_ROW_HEIGHT,
+  position: "relative",
 
   "& > *": {
     flexGrow: 0,
diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index 8c148649..a8b5a6da 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -23,6 +23,7 @@ import { StyledTable } from "./Styled/StyledTable";
 import { StyledRow } from "./Styled/StyledRow";
 import { StyledResizer } from "./Styled/StyledResizer";
 import ColumnHeaderComponent from "./Column";
+import OutOfOrderIndicator from "./OutOfOrderIndicator";
 
 import { IconButton } from "@mui/material";
 
@@ -303,7 +304,13 @@ export default function TableComponent() {
         aria-readonly={tableSettings.readOnly}
         aria-colcount={columns.length}
         aria-rowcount={tableRows.length + 1}
-        style={{ width: table.getTotalSize(), userSelect: "none" }}
+        style={
+          {
+            width: table.getTotalSize(),
+            userSelect: "none",
+            "--row-height": `${tableSchema.rowHeight || DEFAULT_ROW_HEIGHT}px`,
+          } as any
+        }
         onKeyDown={handleKeyDown}
       >
         <div
@@ -317,7 +324,12 @@ export default function TableComponent() {
           }}
         >
           {table.getHeaderGroups().map((headerGroup) => (
-            <StyledRow key={headerGroup.id} role="row" aria-rowindex={1}>
+            <StyledRow
+              key={headerGroup.id}
+              role="row"
+              aria-rowindex={1}
+              style={{ height: DEFAULT_ROW_HEIGHT + 1 }}
+            >
               {headerGroup.headers.map((header) => {
                 const isSelectedCell =
                   (!selectedCell && header.index === 0) ||
@@ -375,6 +387,7 @@ export default function TableComponent() {
 
           {virtualRows.map((virtualRow) => {
             const row = rows[virtualRow.index];
+            const outOfOrder = row.original._rowy_outOfOrder;
 
             return (
               <StyledRow
@@ -382,12 +395,10 @@ export default function TableComponent() {
                 role="row"
                 aria-rowindex={row.index + 2}
                 style={{
-                  height: tableSchema.rowHeight,
-                  marginBottom: row.original._rowy_outOfOrder
-                    ? OUT_OF_ORDER_MARGIN
-                    : 0,
+                  height: "auto",
+                  marginBottom: outOfOrder ? OUT_OF_ORDER_MARGIN : 0,
                 }}
-                data-out-of-order={row.original._rowy_outOfOrder || undefined}
+                data-out-of-order={outOfOrder || undefined}
               >
                 {paddingLeft > 0 && (
                   <div
@@ -396,6 +407,8 @@ export default function TableComponent() {
                   />
                 )}
 
+                {outOfOrder && <OutOfOrderIndicator />}
+
                 {virtualCols.map((virtualCell) => {
                   const cellIndex = virtualCell.index;
                   const cell = row.getVisibleCells()[cellIndex];
@@ -446,10 +459,15 @@ export default function TableComponent() {
                         (e.target as HTMLDivElement).focus();
                       }}
                     >
-                      {flexRender(
-                        cell.column.columnDef.cell,
-                        cell.getContext()
-                      )}
+                      <div
+                        className="cell-contents"
+                        style={{ height: tableSchema.rowHeight }}
+                      >
+                        {flexRender(
+                          cell.column.columnDef.cell,
+                          cell.getContext()
+                        )}
+                      </div>
                       {/* <button
                         tabIndex={isSelectedCell && focusInsideCell ? 0 : -1}
                       >
diff --git a/src/components/Table/TableRow.tsx b/src/components/Table/TableRow.tsx
index ca19ee77..80987211 100644
--- a/src/components/Table/TableRow.tsx
+++ b/src/components/Table/TableRow.tsx
@@ -16,7 +16,7 @@ export default function TableRow(props: RowRendererProps<any>) {
   if (props.row._rowy_outOfOrder)
     return (
       <Fragment key={props.row._rowy_ref.path}>
-        <OutOfOrderIndicator top={props.top} height={props.height} />
+        {/* <OutOfOrderIndicator top={props.top} height={props.height} /> */}
         <Row onContextMenu={handleContextMenu} {...props} />
       </Fragment>
     );

From bec3165bcc8654b7ae75c97143eeee345cb80321 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 24 Oct 2022 15:39:58 +1100
Subject: [PATCH 202/309] RowHeight: remove offset by 1 to match new table

---
 src/components/TableToolbar/RowHeight.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/TableToolbar/RowHeight.tsx b/src/components/TableToolbar/RowHeight.tsx
index 01056284..59e8523b 100644
--- a/src/components/TableToolbar/RowHeight.tsx
+++ b/src/components/TableToolbar/RowHeight.tsx
@@ -12,7 +12,7 @@ import {
 } from "@src/atoms/tableScope";
 import { DEFAULT_ROW_HEIGHT } from "@src/components/Table";
 
-const ROW_HEIGHTS = [33, 41, 65, 97, 129, 161];
+const ROW_HEIGHTS = [32, 40, 64, 96, 128, 160];
 
 export default function RowHeight() {
   const theme = useTheme();
@@ -63,7 +63,7 @@ export default function RowHeight() {
         <ListSubheader>Row height</ListSubheader>
         {ROW_HEIGHTS.map((height) => (
           <MenuItem key={height} value={height}>
-            {height - 1}px
+            {height}px
           </MenuItem>
         ))}
       </TextField>

From 276307218bd213b34130caff6dc16809c7ce1def Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 24 Oct 2022 15:59:56 +1100
Subject: [PATCH 203/309] split useVirtual calls into separate file

---
 src/components/Table/Styled/StyledResizer.tsx |   2 +-
 src/components/Table/Table.tsx                |  92 +++-----------
 .../Table/useKeyboardNavigation.tsx           |   5 +
 src/components/Table/useVirtualization.tsx    | 117 ++++++++++++++++++
 4 files changed, 138 insertions(+), 78 deletions(-)
 create mode 100644 src/components/Table/useVirtualization.tsx

diff --git a/src/components/Table/Styled/StyledResizer.tsx b/src/components/Table/Styled/StyledResizer.tsx
index 526dd8b6..83e005e0 100644
--- a/src/components/Table/Styled/StyledResizer.tsx
+++ b/src/components/Table/Styled/StyledResizer.tsx
@@ -39,7 +39,7 @@ export const StyledResizer = styled("div", {
     height: "50%",
     width: 4,
     borderRadius: 2,
-    marginRight: 2,
+    marginRight: 3,
 
     background: isResizing
       ? theme.palette.primary.main
diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index a8b5a6da..b7b32b13 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -1,10 +1,6 @@
 import { useMemo, useRef, useCallback, useState, useEffect } from "react";
 import { useAtom, useSetAtom } from "jotai";
-import {
-  useDebounce,
-  useDebouncedCallback,
-  useThrottledCallback,
-} from "use-debounce";
+import { useThrottledCallback } from "use-debounce";
 import { useSnackbar } from "notistack";
 import useMemoValue from "use-memo-value";
 import { DndProvider } from "react-dnd";
@@ -17,7 +13,6 @@ import {
   getCoreRowModel,
   useReactTable,
 } from "@tanstack/react-table";
-import { useVirtual } from "react-virtual";
 
 import { StyledTable } from "./Styled/StyledTable";
 import { StyledRow } from "./Styled/StyledRow";
@@ -55,7 +50,6 @@ import {
   updateColumnAtom,
   updateFieldAtom,
   selectedCellAtom,
-  SelectedCell,
 } from "@src/atoms/tableScope";
 import { COLLECTION_PAGE_SIZE } from "@src/config/db";
 
@@ -66,6 +60,7 @@ import { TableRow, ColumnConfig } from "@src/types/table";
 import { StyledCell } from "./Styled/StyledCell";
 import { useKeyboardNavigation } from "./useKeyboardNavigation";
 import { useSaveColumnSizing } from "./useSaveColumnSizing";
+import useVirtualization from "./useVirtualization";
 
 export const DEFAULT_ROW_HEIGHT = 41;
 export const DEFAULT_COL_WIDTH = 150;
@@ -195,85 +190,28 @@ export default function TableComponent() {
     onColumnSizingChange: setColumnSizing,
   }));
 
-  useSaveColumnSizing(columnSizing, canEditColumn);
-
   const { rows } = table.getRowModel();
   const leafColumns = table.getVisibleLeafColumns();
   // console.log(table, selectedCell);
 
-  const {
-    virtualItems: virtualRows,
-    totalSize: totalHeight,
-    scrollToIndex: scrollToRowIndex,
-  } = useVirtual({
-    parentRef: containerRef,
-    size: tableRows.length,
-    overscan: 10,
-    paddingEnd: TABLE_PADDING,
-    estimateSize: useCallback(
-      (index: number) =>
-        (tableSchema.rowHeight || DEFAULT_ROW_HEIGHT) +
-        (tableRows[index]._rowy_outOfOrder ? OUT_OF_ORDER_MARGIN : 0),
-      [tableSchema.rowHeight, tableRows]
-    ),
-  });
-
-  const {
-    virtualItems: virtualCols,
-    totalSize: totalWidth,
-    scrollToIndex: scrollToColIndex,
-  } = useVirtual({
-    parentRef: containerRef,
-    horizontal: true,
-    size: leafColumns.length,
-    overscan: 10,
-    paddingStart: TABLE_PADDING,
-    paddingEnd: TABLE_PADDING,
-    estimateSize: useCallback(
-      (index: number) => leafColumns[index].columnDef.size || DEFAULT_COL_WIDTH,
-      [leafColumns]
-    ),
-  });
-
-  useEffect(() => {
-    if (!selectedCell) return;
-    if (selectedCell.path) {
-      const rowIndex = tableRows.findIndex(
-        (row) => row._rowy_ref.path === selectedCell.path
-      );
-      if (rowIndex > -1) scrollToRowIndex(rowIndex);
-    }
-    if (selectedCell.columnKey) {
-      const colIndex = leafColumns.findIndex(
-        (col) => col.id === selectedCell.columnKey
-      );
-      if (colIndex > -1) scrollToColIndex(colIndex);
-    }
-  }, [
-    selectedCell,
-    tableRows,
-    leafColumns,
-    scrollToRowIndex,
-    scrollToColIndex,
-  ]);
-
   const { handleKeyDown, focusInsideCell } = useKeyboardNavigation({
     gridRef,
     tableRows,
     leafColumns,
   });
-
-  const paddingTop = virtualRows.length > 0 ? virtualRows?.[0]?.start || 0 : 0;
-  const paddingBottom =
-    virtualRows.length > 0
-      ? totalHeight - (virtualRows?.[virtualRows.length - 1]?.end || 0)
-      : 0;
-
-  const paddingLeft = virtualCols.length > 0 ? virtualCols?.[0]?.start || 0 : 0;
-  const paddingRight =
-    virtualCols.length > 0
-      ? totalWidth - (virtualCols?.[virtualCols.length - 1]?.end || 0)
-      : 0;
+  const {
+    virtualRows,
+    // totalHeight,
+    // scrollToRowIndex,
+    virtualCols,
+    // totalWidth,
+    // scrollToColIndex,
+    paddingTop,
+    paddingBottom,
+    paddingLeft,
+    paddingRight,
+  } = useVirtualization(containerRef, leafColumns);
+  useSaveColumnSizing(columnSizing, canEditColumn);
 
   const fetchMoreOnBottomReached = useThrottledCallback(
     (containerElement?: HTMLDivElement | null) => {
diff --git a/src/components/Table/useKeyboardNavigation.tsx b/src/components/Table/useKeyboardNavigation.tsx
index d71c9f8e..c9ab2319 100644
--- a/src/components/Table/useKeyboardNavigation.tsx
+++ b/src/components/Table/useKeyboardNavigation.tsx
@@ -12,6 +12,11 @@ export interface IUseKeyboardNavigationProps {
   leafColumns: Column<TableRow, any>[];
 }
 
+/**
+ * Implementation of accessibility standards for data grids
+ * - https://www.w3.org/WAI/ARIA/apg/patterns/grid/
+ * - https://www.w3.org/WAI/ARIA/apg/example-index/grid/dataGrids
+ */
 export function useKeyboardNavigation({
   gridRef,
   tableRows,
diff --git a/src/components/Table/useVirtualization.tsx b/src/components/Table/useVirtualization.tsx
new file mode 100644
index 00000000..52ddba5a
--- /dev/null
+++ b/src/components/Table/useVirtualization.tsx
@@ -0,0 +1,117 @@
+import { useEffect, useCallback } from "react";
+import { useAtom } from "jotai";
+import { useVirtual } from "react-virtual";
+
+import {
+  tableScope,
+  tableSchemaAtom,
+  tableRowsAtom,
+  selectedCellAtom,
+} from "@src/atoms/tableScope";
+import {
+  TABLE_PADDING,
+  DEFAULT_ROW_HEIGHT,
+  OUT_OF_ORDER_MARGIN,
+  DEFAULT_COL_WIDTH,
+} from "./Table";
+import { TableRow } from "@src/types/table";
+import { Column } from "@tanstack/react-table";
+
+/**
+ * Virtualizes rows and columns,
+ * and scrolls to selected cell
+ */
+export function useVirtualization(
+  containerRef: React.RefObject<HTMLDivElement>,
+  leafColumns: Column<TableRow, unknown>[]
+) {
+  const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
+  const [tableRows] = useAtom(tableRowsAtom, tableScope);
+  const [selectedCell] = useAtom(selectedCellAtom, tableScope);
+
+  // Virtualize rows
+  const {
+    virtualItems: virtualRows,
+    totalSize: totalHeight,
+    scrollToIndex: scrollToRowIndex,
+  } = useVirtual({
+    parentRef: containerRef,
+    size: tableRows.length,
+    overscan: 10,
+    paddingEnd: TABLE_PADDING,
+    estimateSize: useCallback(
+      (index: number) =>
+        (tableSchema.rowHeight || DEFAULT_ROW_HEIGHT) +
+        (tableRows[index]._rowy_outOfOrder ? OUT_OF_ORDER_MARGIN : 0),
+      [tableSchema.rowHeight, tableRows]
+    ),
+  });
+
+  // Virtualize columns
+  const {
+    virtualItems: virtualCols,
+    totalSize: totalWidth,
+    scrollToIndex: scrollToColIndex,
+  } = useVirtual({
+    parentRef: containerRef,
+    horizontal: true,
+    size: leafColumns.length,
+    overscan: 10,
+    paddingStart: TABLE_PADDING,
+    paddingEnd: TABLE_PADDING,
+    estimateSize: useCallback(
+      (index: number) => leafColumns[index].columnDef.size || DEFAULT_COL_WIDTH,
+      [leafColumns]
+    ),
+  });
+
+  // Scroll to selected cell
+  useEffect(() => {
+    if (!selectedCell) return;
+    if (selectedCell.path) {
+      const rowIndex = tableRows.findIndex(
+        (row) => row._rowy_ref.path === selectedCell.path
+      );
+      if (rowIndex > -1) scrollToRowIndex(rowIndex);
+    }
+    if (selectedCell.columnKey) {
+      const colIndex = leafColumns.findIndex(
+        (col) => col.id === selectedCell.columnKey
+      );
+      if (colIndex > -1) scrollToColIndex(colIndex);
+    }
+  }, [
+    selectedCell,
+    tableRows,
+    leafColumns,
+    scrollToRowIndex,
+    scrollToColIndex,
+  ]);
+
+  const paddingTop = virtualRows.length > 0 ? virtualRows?.[0]?.start || 0 : 0;
+  const paddingBottom =
+    virtualRows.length > 0
+      ? totalHeight - (virtualRows?.[virtualRows.length - 1]?.end || 0)
+      : 0;
+
+  const paddingLeft = virtualCols.length > 0 ? virtualCols?.[0]?.start || 0 : 0;
+  const paddingRight =
+    virtualCols.length > 0
+      ? totalWidth - (virtualCols?.[virtualCols.length - 1]?.end || 0)
+      : 0;
+
+  return {
+    virtualRows,
+    totalHeight,
+    scrollToRowIndex,
+    virtualCols,
+    totalWidth,
+    scrollToColIndex,
+    paddingTop,
+    paddingBottom,
+    paddingLeft,
+    paddingRight,
+  };
+}
+
+export default useVirtualization;

From feaf5273a2d9ba177d7136c97aa6b74248692ef8 Mon Sep 17 00:00:00 2001
From: Bobby Wang <bofei@mail.com>
Date: Mon, 24 Oct 2022 23:13:29 +0800
Subject: [PATCH 204/309] move stripe secret to secret manager, implement
 dropdown ui

---
 .../WebhooksModal/Schemas/basic.tsx           | 11 ++-
 .../WebhooksModal/Schemas/sendgrid.tsx        | 11 ++-
 .../WebhooksModal/Schemas/stripe.tsx          | 73 ++++++++++++-------
 .../WebhooksModal/Schemas/typeform.tsx        | 11 ++-
 .../WebhooksModal/Schemas/webform.tsx         | 11 ++-
 .../TableModals/WebhooksModal/Step1Auth.tsx   | 33 ++++++++-
 .../TableModals/WebhooksModal/utils.tsx       |  6 ++
 7 files changed, 120 insertions(+), 36 deletions(-)

diff --git a/src/components/TableModals/WebhooksModal/Schemas/basic.tsx b/src/components/TableModals/WebhooksModal/Schemas/basic.tsx
index d9f81121..7f9e4d11 100644
--- a/src/components/TableModals/WebhooksModal/Schemas/basic.tsx
+++ b/src/components/TableModals/WebhooksModal/Schemas/basic.tsx
@@ -1,7 +1,10 @@
 import { Typography } from "@mui/material";
 import WarningIcon from "@mui/icons-material/WarningAmber";
 import { TableSettings } from "@src/types/table";
-import { IWebhook } from "@src/components/TableModals/WebhooksModal/utils";
+import {
+  IWebhook,
+  ISecret,
+} from "@src/components/TableModals/WebhooksModal/utils";
 
 const requestType = [
   "declare type WebHookRequest {",
@@ -81,7 +84,11 @@ export const webhookBasic = {
       return true;
     }`,
   },
-  auth: (webhookObject: IWebhook, setWebhookObject: (w: IWebhook) => void) => {
+  auth: (
+    webhookObject: IWebhook,
+    setWebhookObject: (w: IWebhook) => void,
+    secrets: ISecret
+  ) => {
     return (
       <Typography color="text.disabled">
         <WarningIcon aria-label="Warning" style={{ verticalAlign: "bottom" }} />
diff --git a/src/components/TableModals/WebhooksModal/Schemas/sendgrid.tsx b/src/components/TableModals/WebhooksModal/Schemas/sendgrid.tsx
index 713308a9..b557dd78 100644
--- a/src/components/TableModals/WebhooksModal/Schemas/sendgrid.tsx
+++ b/src/components/TableModals/WebhooksModal/Schemas/sendgrid.tsx
@@ -1,7 +1,10 @@
 import { Typography, Link, TextField } from "@mui/material";
 import InlineOpenInNewIcon from "@src/components/InlineOpenInNewIcon";
 import { TableSettings } from "@src/types/table";
-import { IWebhook } from "@src/components/TableModals/WebhooksModal/utils";
+import {
+  IWebhook,
+  ISecret,
+} from "@src/components/TableModals/WebhooksModal/utils";
 
 export const webhookSendgrid = {
   name: "SendGrid",
@@ -37,7 +40,11 @@ export const webhookSendgrid = {
       return true;
     }`,
   },
-  auth: (webhookObject: IWebhook, setWebhookObject: (w: IWebhook) => void) => {
+  auth: (
+    webhookObject: IWebhook,
+    setWebhookObject: (w: IWebhook) => void,
+    secrets: ISecret
+  ) => {
     return (
       <>
         <Typography gutterBottom>
diff --git a/src/components/TableModals/WebhooksModal/Schemas/stripe.tsx b/src/components/TableModals/WebhooksModal/Schemas/stripe.tsx
index 77a78536..80e990c9 100644
--- a/src/components/TableModals/WebhooksModal/Schemas/stripe.tsx
+++ b/src/components/TableModals/WebhooksModal/Schemas/stripe.tsx
@@ -1,7 +1,14 @@
 import { Typography, Link, TextField } from "@mui/material";
 import InlineOpenInNewIcon from "@src/components/InlineOpenInNewIcon";
 import { TableSettings } from "@src/types/table";
-import { IWebhook } from "@src/components/TableModals/WebhooksModal/utils";
+import {
+  IWebhook,
+  ISecret,
+} from "@src/components/TableModals/WebhooksModal/utils";
+import InputLabel from "@mui/material/InputLabel";
+import MenuItem from "@mui/material/MenuItem";
+import FormControl from "@mui/material/FormControl";
+import Select from "@mui/material/Select";
 
 export const webhookStripe = {
   name: "Stripe",
@@ -32,21 +39,20 @@ export const webhookStripe = {
   return true;
 }`,
   },
-  auth: (webhookObject: IWebhook, setWebhookObject: (w: IWebhook) => void) => {
+  auth: (
+    webhookObject: IWebhook,
+    setWebhookObject: (w: IWebhook) => void,
+    secrets: ISecret
+  ) => {
+    console.log(secrets);
     return (
       <>
         <Typography gutterBottom>
-          Get your{" "}
-          <Link
-            href="https://dashboard.stripe.com/apikeys"
-            target="_blank"
-            rel="noopener noreferrer"
-            variant="inherit"
-          >
-            secret key
-            <InlineOpenInNewIcon />
-          </Link>{" "}
-          and{" "}
+          Select or add your secret key in the format of{" "}
+          <code>
+            {"{" + `"publicKey":"pk_...","secretKey": "sk_..."` + "}"}
+          </code>{" "}
+          and get your{" "}
           <Link
             href="https://dashboard.stripe.com/webhooks"
             target="_blank"
@@ -61,19 +67,34 @@ export const webhookStripe = {
           Then add the secret below.
         </Typography>
 
-        <TextField
-          id="stripe-secret-key"
-          label="Secret key"
-          value={webhookObject.auth.secretKey}
-          fullWidth
-          multiline
-          onChange={(e) => {
-            setWebhookObject({
-              ...webhookObject,
-              auth: { ...webhookObject.auth, secretKey: e.target.value },
-            });
-          }}
-        />
+        <FormControl fullWidth margin={"normal"}>
+          <InputLabel id="stripe-secret-key">Secret key</InputLabel>
+          <Select
+            labelId="stripe-secret-key"
+            id="stripe-secret-key"
+            label="Secret key"
+            variant="filled"
+            value={webhookObject.auth.secretKey}
+            onChange={(e) => {
+              setWebhookObject({
+                ...webhookObject,
+                auth: { ...webhookObject.auth, secretKey: e.target.value },
+              });
+            }}
+          >
+            {secrets.keys.map((secret) => {
+              return <MenuItem value={secret}>{secret}</MenuItem>;
+            })}
+            <MenuItem
+              onClick={() => {
+                const secretManagerLink = `https://console.cloud.google.com/security/secret-manager/create?project=${secrets.projectId}`;
+                window?.open?.(secretManagerLink, "_blank")?.focus();
+              }}
+            >
+              Add a key in Secret Manager
+            </MenuItem>
+          </Select>
+        </FormControl>
         <TextField
           id="stripe-signing-secret"
           label="Signing key"
diff --git a/src/components/TableModals/WebhooksModal/Schemas/typeform.tsx b/src/components/TableModals/WebhooksModal/Schemas/typeform.tsx
index 8efd60f8..5fd4ce7d 100644
--- a/src/components/TableModals/WebhooksModal/Schemas/typeform.tsx
+++ b/src/components/TableModals/WebhooksModal/Schemas/typeform.tsx
@@ -1,7 +1,10 @@
 import { Typography, Link, TextField } from "@mui/material";
 import InlineOpenInNewIcon from "@src/components/InlineOpenInNewIcon";
 import { TableSettings } from "@src/types/table";
-import { IWebhook } from "@src/components/TableModals/WebhooksModal/utils";
+import {
+  IWebhook,
+  ISecret,
+} from "@src/components/TableModals/WebhooksModal/utils";
 
 export const webhookTypeform = {
   name: "Typeform",
@@ -75,7 +78,11 @@ export const webhookTypeform = {
       return true;
     }`,
   },
-  auth: (webhookObject: IWebhook, setWebhookObject: (w: IWebhook) => void) => {
+  auth: (
+    webhookObject: IWebhook,
+    setWebhookObject: (w: IWebhook) => void,
+    secrets: ISecret
+  ) => {
     return (
       <>
         <Typography gutterBottom>
diff --git a/src/components/TableModals/WebhooksModal/Schemas/webform.tsx b/src/components/TableModals/WebhooksModal/Schemas/webform.tsx
index 4529f479..bf5e8cda 100644
--- a/src/components/TableModals/WebhooksModal/Schemas/webform.tsx
+++ b/src/components/TableModals/WebhooksModal/Schemas/webform.tsx
@@ -1,7 +1,10 @@
 import { Typography, Link, TextField } from "@mui/material";
 import InlineOpenInNewIcon from "@src/components/InlineOpenInNewIcon";
 import { TableSettings } from "@src/types/table";
-import { IWebhook } from "@src/components/TableModals/WebhooksModal/utils";
+import {
+  IWebhook,
+  ISecret,
+} from "@src/components/TableModals/WebhooksModal/utils";
 
 export const webhook = {
   name: "Web Form",
@@ -47,7 +50,11 @@ export const webhook = {
       return true;
     }`,
   },
-  auth: (webhookObject: IWebhook, setWebhookObject: (w: IWebhook) => void) => {
+  auth: (
+    webhookObject: IWebhook,
+    setWebhookObject: (w: IWebhook) => void,
+    secrets: ISecret
+  ) => {
     return (
       <>
         <Typography gutterBottom>
diff --git a/src/components/TableModals/WebhooksModal/Step1Auth.tsx b/src/components/TableModals/WebhooksModal/Step1Auth.tsx
index e252e979..59bafba9 100644
--- a/src/components/TableModals/WebhooksModal/Step1Auth.tsx
+++ b/src/components/TableModals/WebhooksModal/Step1Auth.tsx
@@ -1,13 +1,41 @@
+import { useAtom } from "jotai";
+import { useEffect, useState } from "react";
 import { IWebhookModalStepProps } from "./WebhookModal";
 
 import { FormControlLabel, Checkbox, Typography } from "@mui/material";
 
-import { webhookSchemas } from "./utils";
+import {
+  projectIdAtom,
+  projectScope,
+  rowyRunAtom,
+} from "@src/atoms/projectScope";
+import { runRoutes } from "@src/constants/runRoutes";
+import { webhookSchemas, ISecret } from "./utils";
 
 export default function Step1Endpoint({
   webhookObject,
   setWebhookObject,
 }: IWebhookModalStepProps) {
+  const [rowyRun] = useAtom(rowyRunAtom, projectScope);
+  const [projectId] = useAtom(projectIdAtom, projectScope);
+  const [secrets, setSecrets] = useState<ISecret>({
+    loading: true,
+    keys: [],
+    projectId,
+  });
+
+  useEffect(() => {
+    rowyRun({
+      route: runRoutes.listSecrets,
+    }).then((secrets) => {
+      setSecrets({
+        loading: false,
+        keys: secrets as string[],
+        projectId,
+      });
+    });
+  }, []);
+
   return (
     <>
       <Typography variant="inherit" paragraph>
@@ -37,7 +65,8 @@ export default function Step1Endpoint({
       {webhookObject.auth?.enabled &&
         webhookSchemas[webhookObject.type].auth(
           webhookObject,
-          setWebhookObject
+          setWebhookObject,
+          secrets
         )}
       {}
     </>
diff --git a/src/components/TableModals/WebhooksModal/utils.tsx b/src/components/TableModals/WebhooksModal/utils.tsx
index c9cdccf1..7c338bab 100644
--- a/src/components/TableModals/WebhooksModal/utils.tsx
+++ b/src/components/TableModals/WebhooksModal/utils.tsx
@@ -78,6 +78,12 @@ export interface IWebhook {
   auth?: any;
 }
 
+export interface ISecret {
+  loading: boolean;
+  keys: string[];
+  projectId: string;
+}
+
 export const webhookSchemas = {
   basic,
   typeform,

From 562c14086fdd82e0b01752823cc340590aa99889 Mon Sep 17 00:00:00 2001
From: Bobby Wang <bofei@mail.com>
Date: Tue, 25 Oct 2022 00:01:23 +0800
Subject: [PATCH 205/309] add warning message in case of secret key name change
 or deletion

---
 .../TableModals/WebhooksModal/Schemas/stripe.tsx    | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/components/TableModals/WebhooksModal/Schemas/stripe.tsx b/src/components/TableModals/WebhooksModal/Schemas/stripe.tsx
index 80e990c9..31eb4aff 100644
--- a/src/components/TableModals/WebhooksModal/Schemas/stripe.tsx
+++ b/src/components/TableModals/WebhooksModal/Schemas/stripe.tsx
@@ -1,4 +1,4 @@
-import { Typography, Link, TextField } from "@mui/material";
+import { Typography, Link, TextField, Alert } from "@mui/material";
 import InlineOpenInNewIcon from "@src/components/InlineOpenInNewIcon";
 import { TableSettings } from "@src/types/table";
 import {
@@ -44,7 +44,6 @@ export const webhookStripe = {
     setWebhookObject: (w: IWebhook) => void,
     secrets: ISecret
   ) => {
-    console.log(secrets);
     return (
       <>
         <Typography gutterBottom>
@@ -67,6 +66,16 @@ export const webhookStripe = {
           Then add the secret below.
         </Typography>
 
+        {webhookObject.auth.secretKey &&
+          !secrets.loading &&
+          !secrets.keys.includes(webhookObject.auth.secretKey) && (
+            <Alert severity="error" sx={{ height: "auto!important" }}>
+              Your previously selected key{" "}
+              <code>{webhookObject.auth.secretKey}</code> does not exist in
+              Secret Manager. Please select your key again.
+            </Alert>
+          )}
+
         <FormControl fullWidth margin={"normal"}>
           <InputLabel id="stripe-secret-key">Secret key</InputLabel>
           <Select

From 08e0bdbf4ffafb80d05df59f49ad1eb8f649a600 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 25 Oct 2022 12:33:29 +1100
Subject: [PATCH 206/309] fix being unable to tab out of table

---
 src/components/Table/Table.tsx                 | 14 +++++++-------
 src/components/Table/useKeyboardNavigation.tsx |  3 +++
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index b7b32b13..ae15b34b 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -139,13 +139,13 @@ export default function TableComponent() {
         columnHelper.display({
           id: "_rowy_column_actions",
           header: () => "Actions",
-          cell: () => (
-            <>
-              <IconButton>M</IconButton>
-              <IconButton>D</IconButton>
-              <IconButton>X</IconButton>
-            </>
-          ),
+          // cell: () => (
+          //   <>
+          //     <IconButton>M</IconButton>
+          //     <IconButton>D</IconButton>
+          //     <IconButton>X</IconButton>
+          //   </>
+          // ),
         })
       );
     }
diff --git a/src/components/Table/useKeyboardNavigation.tsx b/src/components/Table/useKeyboardNavigation.tsx
index c9ab2319..cd2332c6 100644
--- a/src/components/Table/useKeyboardNavigation.tsx
+++ b/src/components/Table/useKeyboardNavigation.tsx
@@ -58,6 +58,9 @@ export function useKeyboardNavigation({
     )
       return;
 
+    // If Tab, ignore so we can exit the table
+    if (e.key === "Tab") return;
+
     // Enter: enter cell
     if (e.key === "Enter") {
       setFocusInsideCell(true);

From 23b6fb741be09e1a924389940cee1757276c9098 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 25 Oct 2022 15:49:38 +1100
Subject: [PATCH 207/309] add react-beautiful-dnd to columns to reorder

---
 src/components/Table/Column.tsx |  27 +++--
 src/components/Table/Table.tsx  | 202 +++++++++++++++++++++-----------
 2 files changed, 154 insertions(+), 75 deletions(-)

diff --git a/src/components/Table/Column.tsx b/src/components/Table/Column.tsx
index 35b42500..bc841fc0 100644
--- a/src/components/Table/Column.tsx
+++ b/src/components/Table/Column.tsx
@@ -1,3 +1,4 @@
+import { forwardRef } from "react";
 import { Grid, GridProps, Typography } from "@mui/material";
 import { alpha } from "@mui/material/styles";
 
@@ -16,20 +17,25 @@ export interface IColumnProps extends Partial<GridProps> {
   active?: boolean;
 }
 
-export default function Column({
-  label,
-  type,
-  secondaryItem,
-  children,
+export const Column = forwardRef(function Column(
+  {
+    label,
+    type,
+    secondaryItem,
+    children,
 
-  active,
-  ...props
-}: IColumnProps) {
+    active,
+    ...props
+  }: IColumnProps,
+  ref: React.ForwardedRef<HTMLDivElement>
+) {
   return (
     <Grid
+      ref={ref}
       container
       alignItems="center"
       wrap="nowrap"
+      aria-label={label}
       {...props}
       sx={[
         {
@@ -99,6 +105,7 @@ export default function Column({
 
             ml: 0.5,
           }}
+          aria-hidden
         >
           {label}
         </Typography>
@@ -113,4 +120,6 @@ export default function Column({
       {children}
     </Grid>
   );
-}
+});
+
+export default Column;
diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index ae15b34b..2f04d79c 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -1,11 +1,12 @@
-import { useMemo, useRef, useCallback, useState, useEffect } from "react";
+import { useMemo, useRef, useState, useEffect, useCallback } from "react";
 import { useAtom, useSetAtom } from "jotai";
 import { useThrottledCallback } from "use-debounce";
-import { useSnackbar } from "notistack";
-import useMemoValue from "use-memo-value";
-import { DndProvider } from "react-dnd";
-import { HTML5Backend } from "react-dnd-html5-backend";
-import { isEmpty, isEqual } from "lodash-es";
+import {
+  DragDropContext,
+  DropResult,
+  Droppable,
+  Draggable,
+} from "react-beautiful-dnd";
 
 import {
   createColumnHelper,
@@ -20,7 +21,7 @@ import { StyledResizer } from "./Styled/StyledResizer";
 import ColumnHeaderComponent from "./Column";
 import OutOfOrderIndicator from "./OutOfOrderIndicator";
 
-import { IconButton } from "@mui/material";
+import { IconButton, Portal } from "@mui/material";
 
 import ColumnHeader, { COLUMN_HEADER_HEIGHT } from "./ColumnHeader";
 import FinalColumnHeader from "./FinalColumnHeader";
@@ -111,10 +112,6 @@ export default function TableComponent() {
           size: columnConfig.width,
           enableResizing: columnConfig.resizable !== false,
           minSize: MIN_COL_WIDTH,
-          // draggable: true,
-          // resizable: true,
-          // frozen: columnConfig.fixed,
-          // headerRenderer: ColumnHeader,
           // formatter:
           //   getFieldProp("TableCell", getFieldType(columnConfig)) ??
           //   function InDev() {
@@ -181,6 +178,9 @@ export default function TableComponent() {
     columnResizeMode: "onChange",
   });
 
+  // Store local columnSizing state so we can save it to table schema
+  // in `useSaveColumnSizing`. This could be generalized by storing the
+  // entire table state.
   const [columnSizing, setColumnSizing] = useState(
     table.initialState.columnSizing
   );
@@ -192,7 +192,6 @@ export default function TableComponent() {
 
   const { rows } = table.getRowModel();
   const leafColumns = table.getVisibleLeafColumns();
-  // console.log(table, selectedCell);
 
   const { handleKeyDown, focusInsideCell } = useKeyboardNavigation({
     gridRef,
@@ -213,6 +212,22 @@ export default function TableComponent() {
   } = useVirtualization(containerRef, leafColumns);
   useSaveColumnSizing(columnSizing, canEditColumn);
 
+  const handleDropColumn = useCallback(
+    (result: DropResult) => {
+      if (result.destination?.index === undefined || !result.draggableId)
+        return;
+
+      console.log(result.draggableId, result.destination.index);
+
+      updateColumn({
+        key: result.draggableId,
+        index: result.destination.index,
+        config: {},
+      });
+    },
+    [updateColumn]
+  );
+
   const fetchMoreOnBottomReached = useThrottledCallback(
     (containerElement?: HTMLDivElement | null) => {
       if (!containerElement) return;
@@ -261,61 +276,109 @@ export default function TableComponent() {
             padding: `0 ${TABLE_PADDING}px`,
           }}
         >
-          {table.getHeaderGroups().map((headerGroup) => (
-            <StyledRow
-              key={headerGroup.id}
-              role="row"
-              aria-rowindex={1}
-              style={{ height: DEFAULT_ROW_HEIGHT + 1 }}
-            >
-              {headerGroup.headers.map((header) => {
-                const isSelectedCell =
-                  (!selectedCell && header.index === 0) ||
-                  (selectedCell?.path === "_rowy_header" &&
-                    selectedCell?.columnKey === header.id);
-
-                return (
-                  <ColumnHeaderComponent
-                    key={header.id}
-                    data-row-id={"_rowy_header"}
-                    data-col-id={header.id}
-                    data-frozen={header.column.getIsPinned() || undefined}
-                    data-frozen-last={lastFrozen === header.id || undefined}
-                    role="columnheader"
-                    tabIndex={isSelectedCell ? 0 : -1}
-                    aria-colindex={header.index + 1}
-                    aria-readonly={!canEditColumn}
-                    // TODO: aria-sort={"none" | "ascending" | "descending" | "other" | undefined}
-                    aria-selected={isSelectedCell}
-                    label={header.column.columnDef.meta?.name || header.id}
-                    type={header.column.columnDef.meta?.type}
-                    style={{
-                      width: header.getSize(),
-                      left: header.column.getIsPinned()
-                        ? virtualCols[header.index].start - TABLE_PADDING
-                        : undefined,
-                    }}
-                    sx={{ "& + &": { borderLeft: "none" } }}
-                    onClick={(e) => {
-                      setSelectedCell({
-                        path: "_rowy_header",
-                        columnKey: header.id,
-                      });
-                      (e.target as HTMLDivElement).focus();
-                    }}
+          <DragDropContext onDragEnd={handleDropColumn}>
+            {table.getHeaderGroups().map((headerGroup) => (
+              <Droppable droppableId="droppable-column" direction="horizontal">
+                {(provided) => (
+                  <StyledRow
+                    key={headerGroup.id}
+                    role="row"
+                    aria-rowindex={1}
+                    style={{ height: DEFAULT_ROW_HEIGHT + 1 }}
+                    {...provided.droppableProps}
+                    ref={provided.innerRef}
                   >
-                    {header.column.getCanResize() && (
-                      <StyledResizer
-                        isResizing={header.column.getIsResizing()}
-                        onMouseDown={header.getResizeHandler()}
-                        onTouchStart={header.getResizeHandler()}
-                      />
-                    )}
-                  </ColumnHeaderComponent>
-                );
-              })}
-            </StyledRow>
-          ))}
+                    {headerGroup.headers.map((header) => {
+                      const isSelectedCell =
+                        (!selectedCell && header.index === 0) ||
+                        (selectedCell?.path === "_rowy_header" &&
+                          selectedCell?.columnKey === header.id);
+
+                      return (
+                        <Draggable
+                          key={header.id}
+                          draggableId={header.id}
+                          index={header.index}
+                          isDragDisabled={!canEditColumn}
+                          disableInteractiveElementBlocking
+                        >
+                          {(provided, snapshot) => (
+                            <ColumnHeaderComponent
+                              key={header.id}
+                              data-row-id={"_rowy_header"}
+                              data-col-id={header.id}
+                              data-frozen={
+                                header.column.getIsPinned() || undefined
+                              }
+                              data-frozen-last={
+                                lastFrozen === header.id || undefined
+                              }
+                              ref={provided.innerRef}
+                              {...provided.draggableProps}
+                              role="columnheader"
+                              tabIndex={isSelectedCell ? 0 : -1}
+                              aria-colindex={header.index + 1}
+                              aria-readonly={!canEditColumn}
+                              // TODO: aria-sort={"none" | "ascending" | "descending" | "other" | undefined}
+                              aria-selected={isSelectedCell}
+                              label={
+                                header.column.columnDef.meta?.name || header.id
+                              }
+                              type={header.column.columnDef.meta?.type}
+                              style={{
+                                width: header.getSize(),
+                                left: header.column.getIsPinned()
+                                  ? virtualCols[header.index].start -
+                                    TABLE_PADDING
+                                  : undefined,
+                                ...provided.draggableProps.style,
+                              }}
+                              sx={[
+                                snapshot.isDragging
+                                  ? {}
+                                  : { "& + &": { borderLeft: "none" } },
+                              ]}
+                              onClick={(e) => {
+                                setSelectedCell({
+                                  path: "_rowy_header",
+                                  columnKey: header.id,
+                                });
+                                (e.target as HTMLDivElement).focus();
+                              }}
+                            >
+                              <div
+                                {...provided.dragHandleProps}
+                                tabIndex={
+                                  isSelectedCell && focusInsideCell ? 0 : -1
+                                }
+                                aria-describedby={
+                                  isSelectedCell && focusInsideCell
+                                    ? provided.dragHandleProps?.[
+                                        "aria-describedby"
+                                      ]
+                                    : undefined
+                                }
+                                style={{ position: "absolute", inset: 0 }}
+                              />
+
+                              {header.column.getCanResize() && (
+                                <StyledResizer
+                                  isResizing={header.column.getIsResizing()}
+                                  onMouseDown={header.getResizeHandler()}
+                                  onTouchStart={header.getResizeHandler()}
+                                />
+                              )}
+                            </ColumnHeaderComponent>
+                          )}
+                        </Draggable>
+                      );
+                    })}
+                    {provided.placeholder}
+                  </StyledRow>
+                )}
+              </Droppable>
+            ))}
+          </DragDropContext>
         </div>
 
         <div className="tbody" role="rowgroup">
@@ -371,6 +434,7 @@ export default function TableComponent() {
                         cell.column.columnDef.meta?.editable === false
                       }
                       aria-selected={isSelectedCell}
+                      aria-describedby="rowy-table-cell-description"
                       style={{
                         width: cell.column.getSize(),
                         left: cell.column.getIsPinned()
@@ -430,6 +494,12 @@ export default function TableComponent() {
           )}
         </div>
       </StyledTable>
+
+      <Portal>
+        <div id="rowy-table-cell-description" style={{ display: "none" }}>
+          Press Enter to edit.
+        </div>
+      </Portal>
     </div>
   );
 }

From 6f71c14035524bcbdae04910b73b77f4c10f86da Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 25 Oct 2022 15:50:05 +1100
Subject: [PATCH 208/309] fix columns not able to be reordered to position 0

---
 src/atoms/tableScope/columnActions.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/atoms/tableScope/columnActions.ts b/src/atoms/tableScope/columnActions.ts
index 4b879601..58e44405 100644
--- a/src/atoms/tableScope/columnActions.ts
+++ b/src/atoms/tableScope/columnActions.ts
@@ -75,7 +75,7 @@ export const updateColumnAtom = atom(
       throw new Error(`Column with key "${key}" not found`);
 
     // If column is not being reordered, just update the config
-    if (!index) {
+    if (index === undefined) {
       tableColumnsOrdered[currentIndex] = {
         ...tableColumnsOrdered[currentIndex],
         ...config,
@@ -93,6 +93,8 @@ export const updateColumnAtom = atom(
       });
     }
 
+    console.log(tableColumnsOrdered);
+
     // Reduce array into single object with updated indexes
     const updatedColumns = tableColumnsOrdered.reduce(tableColumnsReducer, {});
     await updateTableSchema({ columns: updatedColumns });

From 7d79c8588033b7d3d7e4e2148b036274cca99a77 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 25 Oct 2022 15:50:15 +1100
Subject: [PATCH 209/309] SideDrawer: add aria-label

---
 src/components/SideDrawer/SideDrawer.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/SideDrawer/SideDrawer.tsx b/src/components/SideDrawer/SideDrawer.tsx
index eafdcdfa..bc9017c5 100644
--- a/src/components/SideDrawer/SideDrawer.tsx
+++ b/src/components/SideDrawer/SideDrawer.tsx
@@ -122,7 +122,9 @@ export default function SideDrawer({
       )}
       variant="permanent"
       anchor="right"
-      PaperProps={{ elevation: 4, component: "aside" } as any}
+      PaperProps={
+        { elevation: 4, component: "aside", "aria-label": "Side drawer" } as any
+      }
     >
       <ErrorBoundary FallbackComponent={ErrorFallback}>
         <div className="sidedrawer-contents">

From 144bfbe2dd42b83d30fb604cbac1fffbb02d12d9 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 25 Oct 2022 16:46:23 +1100
Subject: [PATCH 210/309] ErrorFallback: change report issue URL to github
 discussion

---
 src/components/ErrorFallback.tsx | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/components/ErrorFallback.tsx b/src/components/ErrorFallback.tsx
index 83f8fb7a..487a9a7e 100644
--- a/src/components/ErrorFallback.tsx
+++ b/src/components/ErrorFallback.tsx
@@ -13,7 +13,7 @@ import EmptyState, { IEmptyStateProps } from "@src/components/EmptyState";
 import AccessDenied from "@src/components/AccessDenied";
 
 import { ROUTES } from "@src/constants/routes";
-import meta from "@root/package.json";
+import { EXTERNAL_LINKS } from "@src/constants/externalLinks";
 
 export const ERROR_TABLE_NOT_FOUND = "Table not found";
 
@@ -43,9 +43,13 @@ export function ErrorFallbackContents({
         <Button
           size={props.basic ? "small" : "medium"}
           href={
-            meta.repository.url.replace(".git", "") +
-            "/issues/new?labels=bug&template=bug_report.md&title=Error: " +
-            error.message.replace("\n", " ")
+            EXTERNAL_LINKS.gitHub +
+            "/discussions/new?labels=bug&category=support-q-a&title=" +
+            encodeURIComponent("Error: " + error.message.replace("\n", " ")) +
+            "&body=" +
+            encodeURIComponent(
+              "👉 **Please describe how to reproduce this bug here.**"
+            )
           }
           target="_blank"
           rel="noopener noreferrer"

From c5cd485e70a5d1e33434fd58ac56e6a5c854e7ea Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 25 Oct 2022 16:54:54 +1100
Subject: [PATCH 211/309] ErrorFallback: update discussion title to include
 error code and status if provided

---
 src/components/ErrorFallback.tsx | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/components/ErrorFallback.tsx b/src/components/ErrorFallback.tsx
index 487a9a7e..af9d9314 100644
--- a/src/components/ErrorFallback.tsx
+++ b/src/components/ErrorFallback.tsx
@@ -44,12 +44,21 @@ export function ErrorFallbackContents({
           size={props.basic ? "small" : "medium"}
           href={
             EXTERNAL_LINKS.gitHub +
-            "/discussions/new?labels=bug&category=support-q-a&title=" +
-            encodeURIComponent("Error: " + error.message.replace("\n", " ")) +
-            "&body=" +
-            encodeURIComponent(
-              "👉 **Please describe how to reproduce this bug here.**"
-            )
+            "/discussions/new?" +
+            new URLSearchParams({
+              labels: "bug",
+              category: "support-q-a",
+              title: [
+                "Error",
+                (error as any).code,
+                (error as any).status,
+                error.message,
+              ]
+                .filter(Boolean)
+                .join(": ")
+                .replace(/\n/g, " "),
+              body: "👉 **Please describe how to reproduce this bug here.**",
+            }).toString()
           }
           target="_blank"
           rel="noopener noreferrer"

From e5c427db0ac6201bcc35cf3f3d5a5af67b24de81 Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Tue, 25 Oct 2022 10:32:29 +0300
Subject: [PATCH 212/309] feat(info-drawer): add edit functionality for admin

---
 .../TableInformationDrawer/Details.tsx        | 256 +++++++++++-------
 1 file changed, 165 insertions(+), 91 deletions(-)

diff --git a/src/components/TableInformationDrawer/Details.tsx b/src/components/TableInformationDrawer/Details.tsx
index 3f93721b..c8e0dfd9 100644
--- a/src/components/TableInformationDrawer/Details.tsx
+++ b/src/components/TableInformationDrawer/Details.tsx
@@ -1,134 +1,208 @@
-import { useMemo } from "react";
+import { useMemo, useState } from "react";
 import { format } from "date-fns";
 import { find } from "lodash-es";
 import MDEditor from "@uiw/react-md-editor";
 
-import { Box, IconButton, Stack, Typography } from "@mui/material";
+import {
+  Box,
+  IconButton,
+  Stack,
+  TextField,
+  Typography,
+  useTheme,
+} from "@mui/material";
 
 import EditIcon from "@mui/icons-material/EditOutlined";
+import EditOffIcon from "@mui/icons-material/EditOffOutlined";
 
 import { tableScope, tableSettingsAtom } from "@src/atoms/tableScope";
-import { useAtom, useSetAtom } from "jotai";
+import { useAtom } from "jotai";
 import {
   projectScope,
   tablesAtom,
-  tableSettingsDialogAtom,
+  updateTableAtom,
   userRolesAtom,
 } from "@src/atoms/projectScope";
 import { DATE_TIME_FORMAT } from "@src/constants/dates";
+import SaveState from "@src/components/SideDrawer/SaveState";
 
 export default function Details() {
   const [userRoles] = useAtom(userRolesAtom, projectScope);
   const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
   const [tables] = useAtom(tablesAtom, projectScope);
-  const openTableSettingsDialog = useSetAtom(
-    tableSettingsDialogAtom,
-    projectScope
-  );
+  const [updateTable] = useAtom(updateTableAtom, projectScope);
+  const theme = useTheme();
 
   const settings = useMemo(
     () => find(tables, ["id", tableSettings.id]),
     [tables, tableSettings.id]
   );
 
+  const { description, details, _createdBy } = settings ?? {};
+
+  const [editDescription, setEditDescription] = useState(false);
+  const [localDescription, setLocalDescription] = useState(description ?? "");
+  const [localDetails, setLocalDetails] = useState(details ?? "");
+  const [editDetails, setEditDetails] = useState(false);
+
+  const [saveState, setSaveState] = useState<
+    "" | "unsaved" | "saving" | "saved"
+  >("");
+
   if (!settings) {
     return null;
   }
 
-  const editButton = userRoles.includes("ADMIN") && (
-    <IconButton
-      aria-label="Edit"
-      onClick={() =>
-        openTableSettingsDialog({
-          mode: "update",
-          data: settings,
-        })
-      }
-      disabled={!openTableSettingsDialog || settings.id.includes("/")}
-    >
-      <EditIcon />
-    </IconButton>
-  );
+  const handleSave = async () => {
+    setSaveState("saving");
+    await updateTable!({
+      ...settings,
+      description: localDescription,
+      details: localDetails,
+    });
+    setSaveState("saved");
+  };
 
-  const { description, details, _createdBy } = settings;
+  const isAdmin = userRoles.includes("ADMIN");
 
   return (
-    <Stack
-      direction="column"
-      gap={3}
-      sx={{
-        paddingTop: 3,
-        paddingRight: 3,
-        paddingBottom: 5,
-        "& > .MuiGrid-root": {
-          position: "relative",
-        },
-      }}
-    >
-      {/* Description */}
-      <Stack direction="column" gap={1}>
-        <Stack
-          direction="row"
-          justifyContent="space-between"
-          alignItems="flex-end"
-        >
-          <Typography variant="subtitle1" component="h3">
-            Description
-          </Typography>
-          {editButton}
+    <>
+      <Box
+        sx={{
+          paddingTop: 3,
+          paddingRight: 4,
+          position: "fixed",
+          right: 0,
+          zIndex: 1,
+        }}
+      >
+        <SaveState state={saveState} />
+      </Box>
+      <Stack
+        gap={3}
+        sx={{
+          paddingTop: 3,
+          paddingRight: 3,
+          paddingBottom: 5,
+        }}
+      >
+        {/* Description */}
+        <Stack gap={1}>
+          <Stack
+            direction="row"
+            justifyContent="space-between"
+            alignItems="flex-end"
+          >
+            <Typography variant="subtitle1" component="h3">
+              Description
+            </Typography>
+            {isAdmin && (
+              <IconButton
+                aria-label="Edit description"
+                onClick={() => {
+                  setEditDescription(!editDescription);
+                }}
+                sx={{ top: 4 }}
+              >
+                {editDescription ? <EditOffIcon /> : <EditIcon />}
+              </IconButton>
+            )}
+          </Stack>
+          {editDescription ? (
+            <TextField
+              sx={{
+                color: "text.secondary",
+              }}
+              value={localDescription}
+              onChange={(e) => {
+                setLocalDescription(e.target.value);
+                setSaveState("unsaved");
+              }}
+              onBlur={() => handleSave()}
+              rows={2}
+              minRows={2}
+            />
+          ) : (
+            <Typography variant="body2" color="text.secondary">
+              {localDescription ? localDescription : "No description"}
+            </Typography>
+          )}
         </Stack>
-        <Typography variant="body2" color="text.secondary">
-          {description ? description : "No description"}
-        </Typography>
-      </Stack>
-
-      {/* Details */}
-      <Stack direction="column" gap={1}>
-        <Stack
-          direction="row"
-          justifyContent="space-between"
-          alignItems="flex-end"
-        >
-          <Typography variant="subtitle1" component="h3">
-            Details
-          </Typography>
-          {editButton}
-        </Stack>
-        {!details ? (
-          <Typography variant="body2" color="text.secondary">
-            No details
-          </Typography>
-        ) : (
+        {/* Details */}
+        <Stack gap={1}>
+          <Stack
+            direction="row"
+            justifyContent="space-between"
+            alignItems="flex-end"
+          >
+            <Typography variant="subtitle1" component="h3">
+              Details
+            </Typography>
+            {isAdmin && (
+              <IconButton
+                aria-label="Edit details"
+                onClick={() => {
+                  setEditDetails(!editDetails);
+                }}
+                sx={{ top: 4 }}
+              >
+                {editDetails ? <EditOffIcon /> : <EditIcon />}
+              </IconButton>
+            )}
+          </Stack>
           <Box
             sx={{
               color: "text.secondary",
+              fontSize: `${theme.typography.body2.fontSize} !important`,
+              "& .w-md-editor": {
+                backgroundColor: `${theme.palette.action.input} !important`,
+              },
+              "& .w-md-editor-fullscreen": {
+                backgroundColor: `${theme.palette.background.paper} !important`,
+              },
             }}
           >
-            <MDEditor.Markdown source={details} />
+            {editDetails ? (
+              <MDEditor
+                style={{ margin: 1 }}
+                toolbarHeight={58}
+                value={localDetails}
+                textareaProps={{
+                  onChange: (e) => {
+                    setLocalDetails(e.target.value ?? "");
+                    setSaveState("unsaved");
+                  },
+                  onBlur: () => handleSave(),
+                }}
+              />
+            ) : !localDetails ? (
+              <Typography variant="body2">No details</Typography>
+            ) : (
+              <MDEditor.Markdown source={localDetails} />
+            )}
           </Box>
+        </Stack>
+        {/* Table Audits */}
+        {_createdBy && (
+          <Stack>
+            <Typography
+              variant="caption"
+              color="text.secondary"
+              component="div"
+              style={{ whiteSpace: "normal" }}
+            >
+              Created by{" "}
+              <Typography variant="caption" color="text.primary">
+                {_createdBy.displayName}
+              </Typography>{" "}
+              on{" "}
+              <Typography variant="caption" color="text.primary">
+                {format(_createdBy.timestamp.toDate(), DATE_TIME_FORMAT)}
+              </Typography>
+            </Typography>
+          </Stack>
         )}
       </Stack>
-
-      {/* Table Audits */}
-      {_createdBy && (
-        <Stack>
-          <Typography
-            variant="caption"
-            color="text.secondary"
-            component="div"
-            style={{ whiteSpace: "normal" }}
-          >
-            Created by{" "}
-            <Typography variant="caption" color="text.primary">
-              {_createdBy.displayName}
-            </Typography>{" "}
-            on{" "}
-            <Typography variant="caption" color="text.primary">
-              {format(_createdBy.timestamp.toDate(), DATE_TIME_FORMAT)}
-            </Typography>
-          </Typography>
-        </Stack>
-      )}
-    </Stack>
+    </>
   );
 }

From 9a2712a451f063dd2b071dce99c01f810ac721e9 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 26 Oct 2022 15:11:40 +1100
Subject: [PATCH 213/309] TableToolbarButton: support tooltip as description
 with separate label

---
 .../TableToolbar/TableToolbarButton.tsx       | 41 ++++++++++++-------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/src/components/TableToolbar/TableToolbarButton.tsx b/src/components/TableToolbar/TableToolbarButton.tsx
index 40f4b065..81f7dc64 100644
--- a/src/components/TableToolbar/TableToolbarButton.tsx
+++ b/src/components/TableToolbar/TableToolbarButton.tsx
@@ -4,27 +4,38 @@ import { Tooltip, Button, ButtonProps } from "@mui/material";
 export interface ITableToolbarButtonProps extends Partial<ButtonProps> {
   title: string;
   icon: React.ReactNode;
+  tooltip?: string;
 }
 
 export const TableToolbarButton = forwardRef(function TableToolbarButton_(
-  { title, icon, ...props }: ITableToolbarButtonProps,
+  { title, icon, tooltip, ...props }: ITableToolbarButtonProps,
   ref: React.Ref<HTMLButtonElement>
 ) {
+  // https://mui.com/material-ui/react-tooltip/#accessibility
+  const tooltipIsDescription = Boolean(tooltip);
+
+  const button = (
+    <Button
+      variant="outlined"
+      color="secondary"
+      size="small"
+      style={{ minWidth: 40, height: 32, padding: 0 }}
+      {...props}
+      {...(tooltipIsDescription
+        ? {
+            "aria-label": title, // Actual button label
+            title: tooltip, // Tooltip text, used to describe button e.g. why it’s disabled
+          }
+        : {})}
+      ref={ref}
+    >
+      {icon}
+    </Button>
+  );
+
   return (
-    <Tooltip title={title}>
-      <span>
-        <Button
-          variant="outlined"
-          color="secondary"
-          size="small"
-          style={{ minWidth: 40, height: 32, padding: 0 }}
-          aria-label={title}
-          {...props}
-          ref={ref}
-        >
-          {icon}
-        </Button>
-      </span>
+    <Tooltip title={tooltip || title} describeChild={tooltipIsDescription}>
+      {props.disabled ? <span title="">{button}</span> : button}
     </Tooltip>
   );
 });

From 35cee241a899ac21c15889925b7f0a33cd532d37 Mon Sep 17 00:00:00 2001
From: Han Tuerker <46192266+htuerker@users.noreply.github.com>
Date: Thu, 27 Oct 2022 09:07:19 +0300
Subject: [PATCH 214/309] Minor improvements to information panel (#13)

* remove unused file

* feat(table-information): add minor improvements

* Update src/components/TableInformationDrawer/Details.tsx

* Update src/components/TableSettingsDialog/TableDetails.tsx
---
 .../TableInformationDrawer/Details.tsx        | 50 ++++++++++++++++---
 .../TableSettingsDialog/TableDetails.tsx      | 23 ++++++++-
 2 files changed, 65 insertions(+), 8 deletions(-)

diff --git a/src/components/TableInformationDrawer/Details.tsx b/src/components/TableInformationDrawer/Details.tsx
index c8e0dfd9..78dd0236 100644
--- a/src/components/TableInformationDrawer/Details.tsx
+++ b/src/components/TableInformationDrawer/Details.tsx
@@ -1,6 +1,6 @@
 import { useMemo, useState } from "react";
 import { format } from "date-fns";
-import { find } from "lodash-es";
+import { find, isEqual } from "lodash-es";
 import MDEditor from "@uiw/react-md-editor";
 
 import {
@@ -44,6 +44,7 @@ export default function Details() {
   const [localDescription, setLocalDescription] = useState(description ?? "");
   const [localDetails, setLocalDetails] = useState(details ?? "");
   const [editDetails, setEditDetails] = useState(false);
+  const [mdFullScreen, setMdFullScreen] = useState(false);
 
   const [saveState, setSaveState] = useState<
     "" | "unsaved" | "saving" | "saved"
@@ -113,12 +114,17 @@ export default function Details() {
               sx={{
                 color: "text.secondary",
               }}
+              autoFocus={true}
               value={localDescription}
               onChange={(e) => {
                 setLocalDescription(e.target.value);
-                setSaveState("unsaved");
+                saveState !== "unsaved" && setSaveState("unsaved");
               }}
-              onBlur={() => handleSave()}
+              onBlur={() =>
+                isEqual(description, localDescription)
+                  ? setSaveState("")
+                  : handleSave()
+              }
               rows={2}
               minRows={2}
             />
@@ -151,28 +157,58 @@ export default function Details() {
             )}
           </Stack>
           <Box
+            data-color-mode={theme.palette.mode}
             sx={{
               color: "text.secondary",
-              fontSize: `${theme.typography.body2.fontSize} !important`,
+              ...theme.typography.body2,
               "& .w-md-editor": {
                 backgroundColor: `${theme.palette.action.input} !important`,
               },
               "& .w-md-editor-fullscreen": {
                 backgroundColor: `${theme.palette.background.paper} !important`,
               },
+              "& .w-md-editor-toolbar": {
+                display: "flex",
+                gap: 1,
+              },
+              "& .w-md-editor-toolbar > ul": {
+                display: "flex",
+                alignItems: "center",
+              },
+              "& .w-md-editor-toolbar > ul:first-of-type": {
+                overflowX: "auto",
+                marginRight: theme.spacing(1),
+              },
+              "& :is(h1, h2, h3, h4, h5, h6)": {
+                marginY: `${theme.spacing(1.5)} !important`,
+                borderBottom: "none !important",
+              },
+              "& details summary": {
+                marginBottom: theme.spacing(1),
+              },
             }}
           >
             {editDetails ? (
               <MDEditor
                 style={{ margin: 1 }}
-                toolbarHeight={58}
                 value={localDetails}
+                preview={mdFullScreen ? "live" : "edit"}
+                commandsFilter={(command) => {
+                  if (command.name === "fullscreen") {
+                    command.execute = () => setMdFullScreen(!mdFullScreen);
+                  }
+                  return command;
+                }}
                 textareaProps={{
+                  autoFocus: true,
                   onChange: (e) => {
                     setLocalDetails(e.target.value ?? "");
-                    setSaveState("unsaved");
+                    saveState !== "unsaved" && setSaveState("unsaved");
                   },
-                  onBlur: () => handleSave(),
+                  onBlur: () =>
+                    isEqual(details, localDetails)
+                      ? setSaveState("")
+                      : handleSave(),
                 }}
               />
             ) : !localDetails ? (
diff --git a/src/components/TableSettingsDialog/TableDetails.tsx b/src/components/TableSettingsDialog/TableDetails.tsx
index 705233b8..c4cdbe05 100644
--- a/src/components/TableSettingsDialog/TableDetails.tsx
+++ b/src/components/TableSettingsDialog/TableDetails.tsx
@@ -14,19 +14,40 @@ export default function TableDetails({ ...props }) {
         {props.label ?? ""}
       </InputLabel>
       <Box
+        data-color-mode={theme.palette.mode}
         sx={{
+          color: "text.secondary",
+          ...theme.typography.body2,
           "& .w-md-editor": {
             backgroundColor: `${theme.palette.action.input} !important`,
           },
           "& .w-md-editor-fullscreen": {
             backgroundColor: `${theme.palette.background.paper} !important`,
           },
+          "& .w-md-editor-toolbar": {
+            display: "flex",
+            gap: 1,
+          },
+          "& .w-md-editor-toolbar > ul": {
+            display: "flex",
+            alignItems: "center",
+          },
+          "& .w-md-editor-toolbar > ul:first-of-type": {
+            overflowX: "auto",
+            marginRight: theme.spacing(1),
+          },
+          "& :is(h1, h2, h3, h4, h5, h6)": {
+            marginY: `${theme.spacing(1.5)} !important`,
+            borderBottom: "none !important",
+          },
+          "& details summary": {
+            marginBottom: theme.spacing(1),
+          },
         }}
       >
         <MDEditor
           style={{ margin: 1 }}
           preview="live"
-          toolbarHeight={52}
           height={150}
           value={value}
           onChange={onChange}

From 881dba0311967d9c3503b3107a017fbb433a9012 Mon Sep 17 00:00:00 2001
From: Miriam Shams-Rainey <miriam.shams.rainey@duke.edu>
Date: Thu, 27 Oct 2022 02:42:52 -0400
Subject: [PATCH 215/309] Editable Action Label (#895)

* #513: Added Customizable Icons for Ratings Field

* #513: Customizable Rating Icons Side Drawer

Also updated formatting of custom rating icons to match default star sz

* #513: Rating customization preview uses MUIRatings

* #513: Using star icon outline for visibility

* Added customization for action name/label

* Update src/components/fields/Rating/Settings.tsx
---
 src/components/fields/Action/Settings.tsx     | 28 ++++++++++++++++++-
 .../fields/Action/SideDrawerField.tsx         |  3 +-
 src/components/fields/Action/TableCell.tsx    | 10 ++++++-
 src/components/fields/Rating/Settings.tsx     |  1 +
 4 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/src/components/fields/Action/Settings.tsx b/src/components/fields/Action/Settings.tsx
index 0c0655b1..74e64aaa 100644
--- a/src/components/fields/Action/Settings.tsx
+++ b/src/components/fields/Action/Settings.tsx
@@ -559,6 +559,32 @@ const Settings = ({ config, onChange, fieldName }: ISettingsProps) => {
           title: "Customization",
           content: (
             <>
+            <Stack>
+            <FormControlLabel
+                control={
+                  <Checkbox
+                    checked={config.customName?.enabled}
+                    onChange={(e) =>
+                      onChange("customName.enabled")(e.target.checked)
+                    }
+                    name="customName.enabled"
+                  />
+                }
+                label="Customize label for action"
+                style={{ marginLeft: -11 }}
+              />
+              {config.customName?.enabled && (
+                <TextField
+                id="customName.actionName"
+                value={get(config, "customName.actionName")}
+                onChange={(e) =>
+                  onChange("customName.actionName")(e.target.value)
+                }
+                label="Action name:"
+                        className="labelHorizontal"
+                        inputProps={{ style: { width: "10ch" } }}
+                ></TextField>
+              )}
               <FormControlLabel
                 control={
                   <Checkbox
@@ -572,7 +598,7 @@ const Settings = ({ config, onChange, fieldName }: ISettingsProps) => {
                 label="Customize button icons with emoji"
                 style={{ marginLeft: -11 }}
               />
-
+              </Stack>
               {config.customIcons?.enabled && (
                 <Grid container spacing={2} sx={{ mt: { xs: 0, sm: -1 } }}>
                   <Grid item xs={12} sm={true}>
diff --git a/src/components/fields/Action/SideDrawerField.tsx b/src/components/fields/Action/SideDrawerField.tsx
index a4d8a6dc..ed734b70 100644
--- a/src/components/fields/Action/SideDrawerField.tsx
+++ b/src/components/fields/Action/SideDrawerField.tsx
@@ -10,6 +10,7 @@ import ActionFab from "./ActionFab";
 import { tableScope, tableRowsAtom } from "@src/atoms/tableScope";
 import { fieldSx, getFieldId } from "@src/components/SideDrawer/utils";
 import { sanitiseCallableName, isUrl } from "./utils";
+import { getActionName } from "./TableCell"
 
 export default function Action({
   column,
@@ -60,7 +61,7 @@ export default function Action({
         ) : hasRan ? (
           value.status
         ) : (
-          sanitiseCallableName(column.key)
+          sanitiseCallableName(getActionName(column))
         )}
       </Box>
 
diff --git a/src/components/fields/Action/TableCell.tsx b/src/components/fields/Action/TableCell.tsx
index d762d913..4c09fd61 100644
--- a/src/components/fields/Action/TableCell.tsx
+++ b/src/components/fields/Action/TableCell.tsx
@@ -4,6 +4,14 @@ import { Stack } from "@mui/material";
 
 import ActionFab from "./ActionFab";
 import { sanitiseCallableName, isUrl } from "./utils";
+import { get } from "lodash-es";
+
+
+export const getActionName = (column: any) => {
+  const config = get(column, "config")
+  if (!get(config, "customName.enabled")) { return get(column, "name") } 
+  return get(config, "customName.actionName") || get(column, "name");
+};
 
 export default function Action({
   column,
@@ -29,7 +37,7 @@ export default function Action({
         ) : hasRan ? (
           value.status
         ) : (
-          sanitiseCallableName(column.key)
+          sanitiseCallableName(getActionName(column))
         )}
       </div>
 
diff --git a/src/components/fields/Rating/Settings.tsx b/src/components/fields/Rating/Settings.tsx
index 6134b530..3ca64483 100644
--- a/src/components/fields/Rating/Settings.tsx
+++ b/src/components/fields/Rating/Settings.tsx
@@ -22,6 +22,7 @@ export default function Settings({ onChange, config }: ISettingsProps) {
             if (input > 20) { input = 20 }
             onChange("max")(input);
           }}
+          inputProps={{ min: 1, max: 20 }}
         />
       </Grid>
       <Grid item xs={6}>

From e4da6bcb068474e9ccf96579fc91e6a502cac93a Mon Sep 17 00:00:00 2001
From: Han Tuerker <46192266+htuerker@users.noreply.github.com>
Date: Thu, 27 Oct 2022 10:09:00 +0300
Subject: [PATCH 216/309] Feat: Runtime options (#898)

* feat(runtime-options): add runtime options, update rowy run github link

* Update src/components/TableModals/ExtensionsModal/ExtensionList.tsx

* Update src/components/TableModals/ExtensionsModal/RuntimeOptions.tsx
---
 .../ExtensionsModal/ExtensionsModal.tsx       |  77 +++++++++---
 .../ExtensionsModal/RuntimeOptions.tsx        | 117 ++++++++++++++++++
 .../TableModals/ExtensionsModal/utils.ts      |   6 +
 src/constants/externalLinks.ts                |   4 +-
 src/types/table.d.ts                          |   6 +-
 5 files changed, 188 insertions(+), 22 deletions(-)
 create mode 100644 src/components/TableModals/ExtensionsModal/RuntimeOptions.tsx

diff --git a/src/components/TableModals/ExtensionsModal/ExtensionsModal.tsx b/src/components/TableModals/ExtensionsModal/ExtensionsModal.tsx
index 57f6fbee..3ae3d20b 100644
--- a/src/components/TableModals/ExtensionsModal/ExtensionsModal.tsx
+++ b/src/components/TableModals/ExtensionsModal/ExtensionsModal.tsx
@@ -23,7 +23,6 @@ import {
 } from "@src/atoms/tableScope";
 import { useSnackLogContext } from "@src/contexts/SnackLogContext";
 
-import { emptyExtensionObject, IExtension, ExtensionType } from "./utils";
 import { runRoutes } from "@src/constants/runRoutes";
 import { analytics, logEvent } from "@src/analytics";
 import {
@@ -31,6 +30,14 @@ import {
   getTableBuildFunctionPathname,
 } from "@src/utils/table";
 
+import {
+  emptyExtensionObject,
+  IExtension,
+  ExtensionType,
+  IRuntimeOptions,
+} from "./utils";
+import RuntimeOptions from "./RuntimeOptions";
+
 export default function ExtensionsModal({ onClose }: ITableModalProps) {
   const [currentUser] = useAtom(currentUserAtom, projectScope);
   const [rowyRun] = useAtom(rowyRunAtom, projectScope);
@@ -39,12 +46,24 @@ export default function ExtensionsModal({ onClose }: ITableModalProps) {
   const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
   const [updateTableSchema] = useAtom(updateTableSchemaAtom, tableScope);
 
-  const currentExtensionObjects = (tableSchema.extensionObjects ??
-    []) as IExtension[];
   const [localExtensionsObjects, setLocalExtensionsObjects] = useState(
-    currentExtensionObjects
+    tableSchema.extensionObjects ?? []
   );
 
+  const [localRuntimeOptions, setLocalRuntimeOptions] = useState(
+    tableSchema.runtimeOptions ?? {}
+  );
+
+  const errors = {
+    runtimeOptions: {
+      timeoutSeconds: !(
+        !!localRuntimeOptions.timeoutSeconds &&
+        localRuntimeOptions.timeoutSeconds > 0 &&
+        localRuntimeOptions.timeoutSeconds <= 540
+      ),
+    },
+  };
+
   const [openMigrationGuide, setOpenMigrationGuide] = useState(false);
   useEffect(() => {
     if (tableSchema.sparks) setOpenMigrationGuide(true);
@@ -57,7 +76,9 @@ export default function ExtensionsModal({ onClose }: ITableModalProps) {
   } | null>(null);
 
   const snackLogContext = useSnackLogContext();
-  const edited = !isEqual(currentExtensionObjects, localExtensionsObjects);
+  const edited =
+    !isEqual(tableSchema.extensionObjects ?? [], localExtensionsObjects) ||
+    !isEqual(tableSchema.runtimeOptions ?? {}, localRuntimeOptions);
 
   const handleClose = (
     _setOpen: React.Dispatch<React.SetStateAction<boolean>>
@@ -70,7 +91,8 @@ export default function ExtensionsModal({ onClose }: ITableModalProps) {
         cancel: "Keep",
         handleConfirm: () => {
           _setOpen(false);
-          setLocalExtensionsObjects(currentExtensionObjects);
+          setLocalExtensionsObjects(tableSchema.extensionObjects ?? []);
+          setLocalRuntimeOptions(tableSchema.runtimeOptions ?? {});
           onClose();
         },
       });
@@ -79,15 +101,18 @@ export default function ExtensionsModal({ onClose }: ITableModalProps) {
     }
   };
 
-  const handleSaveExtensions = async (callback?: Function) => {
+  const handleSave = async (callback?: Function) => {
     if (updateTableSchema)
-      await updateTableSchema({ extensionObjects: localExtensionsObjects });
+      await updateTableSchema({
+        extensionObjects: localExtensionsObjects,
+        runtimeOptions: localRuntimeOptions,
+      });
     if (callback) callback();
     onClose();
   };
 
   const handleSaveDeploy = async () => {
-    handleSaveExtensions(() => {
+    handleSave(() => {
       try {
         snackLogContext.requestSnackLog();
         rowyRun({
@@ -132,6 +157,13 @@ export default function ExtensionsModal({ onClose }: ITableModalProps) {
     setExtensionModal(null);
   };
 
+  const handleUpdateRuntimeOptions = (update: IRuntimeOptions) => {
+    setLocalRuntimeOptions((runtimeOptions) => ({
+      ...runtimeOptions,
+      ...update,
+    }));
+  };
+
   const handleUpdateActive = (index: number, active: boolean) => {
     setLocalExtensionsObjects(
       localExtensionsObjects.map((extensionObject, i) => {
@@ -217,24 +249,31 @@ export default function ExtensionsModal({ onClose }: ITableModalProps) {
           />
         }
         children={
-          <ExtensionList
-            extensions={localExtensionsObjects}
-            handleUpdateActive={handleUpdateActive}
-            handleEdit={handleEdit}
-            handleDuplicate={handleDuplicate}
-            handleDelete={handleDelete}
-          />
+          <>
+            <ExtensionList
+              extensions={localExtensionsObjects}
+              handleUpdateActive={handleUpdateActive}
+              handleEdit={handleEdit}
+              handleDuplicate={handleDuplicate}
+              handleDelete={handleDelete}
+            />
+            <RuntimeOptions
+              runtimeOptions={localRuntimeOptions}
+              handleUpdate={handleUpdateRuntimeOptions}
+              errors={errors.runtimeOptions}
+            />
+          </>
         }
         actions={{
           primary: {
             children: "Save & Deploy",
             onClick: handleSaveDeploy,
-            disabled: !edited,
+            disabled: !edited || errors.runtimeOptions.timeoutSeconds,
           },
           secondary: {
             children: "Save",
-            onClick: () => handleSaveExtensions(),
-            disabled: !edited,
+            onClick: () => handleSave(),
+            disabled: !edited || errors.runtimeOptions.timeoutSeconds,
           },
         }}
       />
diff --git a/src/components/TableModals/ExtensionsModal/RuntimeOptions.tsx b/src/components/TableModals/ExtensionsModal/RuntimeOptions.tsx
new file mode 100644
index 00000000..90ca584c
--- /dev/null
+++ b/src/components/TableModals/ExtensionsModal/RuntimeOptions.tsx
@@ -0,0 +1,117 @@
+import { useState } from "react";
+import { useAtom, useSetAtom } from "jotai";
+
+import {
+  Accordion,
+  AccordionDetails,
+  AccordionSummary,
+  Button,
+  Grid,
+  InputAdornment,
+  TextField,
+  Typography,
+} from "@mui/material";
+import { ChevronDown } from "@src/assets/icons";
+import MultiSelect from "@rowy/multiselect";
+
+import {
+  compatibleRowyRunVersionAtom,
+  projectScope,
+  rowyRunModalAtom,
+} from "@src/atoms/projectScope";
+
+import { IRuntimeOptions } from "./utils";
+
+export default function RuntimeOptions({
+  runtimeOptions,
+  handleUpdate,
+  errors,
+}: {
+  runtimeOptions: IRuntimeOptions;
+  handleUpdate: (runtimeOptions: IRuntimeOptions) => void;
+  errors: { timeoutSeconds: boolean };
+}) {
+  const [compatibleRowyRunVersion] = useAtom(
+    compatibleRowyRunVersionAtom,
+    projectScope
+  );
+  const openRowyRunModal = useSetAtom(rowyRunModalAtom, projectScope);
+
+  const [expanded, setExpanded] = useState(false);
+
+  const isCompatibleRowyRun = compatibleRowyRunVersion({ minVersion: "1.6.4" });
+
+  return (
+    <Accordion
+      sx={{
+        padding: 0,
+        boxShadow: "none",
+        backgroundImage: "inherit",
+        backgroundColor: "inherit",
+      }}
+      expanded={isCompatibleRowyRun && expanded}
+    >
+      <AccordionSummary
+        sx={{ padding: 0 }}
+        expandIcon={
+          isCompatibleRowyRun ? (
+            <ChevronDown />
+          ) : (
+            <Button>Update Rowy Run</Button>
+          )
+        }
+        onClick={() =>
+          isCompatibleRowyRun
+            ? setExpanded(!expanded)
+            : openRowyRunModal({
+                version: "1.6.4",
+                feature: "Runtime options",
+              })
+        }
+      >
+        <Typography variant="subtitle1">Runtime options</Typography>
+      </AccordionSummary>
+      <AccordionDetails sx={{ padding: 0 }}>
+        <Grid container spacing={2}>
+          <Grid item xs={12} md={6}>
+            <MultiSelect
+              label="Memory Allocated"
+              value={runtimeOptions.memory ?? "256MB"}
+              onChange={(value) => handleUpdate({ memory: value ?? "256MB" })}
+              multiple={false}
+              options={["128MB", "256MB", "512MB", "1GB", "2GB", "4GB", "8GB"]}
+            />
+          </Grid>
+
+          <Grid item xs={12} md={6}>
+            <TextField
+              value={runtimeOptions.timeoutSeconds ?? 60}
+              label="Timeout"
+              fullWidth
+              InputProps={{
+                endAdornment: (
+                  <InputAdornment position="end">seconds</InputAdornment>
+                ),
+              }}
+              onChange={(e) =>
+                !isNaN(Number(e.target.value)) &&
+                handleUpdate({
+                  timeoutSeconds: Number(e.target.value),
+                })
+              }
+              inputProps={{
+                inputMode: "numeric",
+              }}
+              error={errors.timeoutSeconds}
+              helperText={
+                errors.timeoutSeconds
+                  ? "Timeout must be an integer between 1 and 540"
+                  : "The maximum timeout that can be specified is 9 mins (540 seconds)"
+              }
+            />
+          </Grid>
+        </Grid>
+      </AccordionDetails>
+    </Accordion>
+  );
+}
diff --git a/src/components/TableModals/ExtensionsModal/utils.ts b/src/components/TableModals/ExtensionsModal/utils.ts
index 117ef381..28d24fda 100644
--- a/src/components/TableModals/ExtensionsModal/utils.ts
+++ b/src/components/TableModals/ExtensionsModal/utils.ts
@@ -52,6 +52,12 @@ export interface IExtension {
   trackedFields?: string[];
 }
 
+// https://firebase.google.com/docs/functions/manage-functions#set_runtime_options
+export interface IRuntimeOptions {
+  memory?: "128MB" | "256MB" | "512MB" | "1GB" | "2GB" | "4GB" | "8GB";
+  timeoutSeconds?: number;
+}
+
 export const triggerTypes: ExtensionTrigger[] = ["create", "update", "delete"];
 
 const extensionBodyTemplate = {
diff --git a/src/constants/externalLinks.ts b/src/constants/externalLinks.ts
index bf2f41ab..4625d6ba 100644
--- a/src/constants/externalLinks.ts
+++ b/src/constants/externalLinks.ts
@@ -15,8 +15,8 @@ export const EXTERNAL_LINKS = {
   twitter: "https://twitter.com/rowyio",
   productHunt: "https://www.producthunt.com/products/rowy-2",
 
-  rowyRun: meta.repository.url.replace(".git", "Run"),
-  rowyRunGitHub: meta.repository.url.replace(".git", "Run"),
+  rowyRun: meta.repository.url.replace("rowy.git", "backend"),
+  rowyRunGitHub: meta.repository.url.replace("rowy.git", "backend"),
   // prettier-ignore
   rowyRunDeploy: `https://deploy.cloud.run/?git_repo=${meta.repository.url.replace(".git", "Run")}.git`,
 
diff --git a/src/types/table.d.ts b/src/types/table.d.ts
index 376cd3ea..dadbf2ab 100644
--- a/src/types/table.d.ts
+++ b/src/types/table.d.ts
@@ -4,7 +4,10 @@ import type {
   DocumentData,
   DocumentReference,
 } from "firebase/firestore";
-import { IExtension } from "@src/components/TableModals/ExtensionsModal/utils";
+import {
+  IExtension,
+  IRuntimeOptions,
+} from "@src/components/TableModals/ExtensionsModal/utils";
 import { IWebhook } from "@src/components/TableModals/WebhooksModal/utils";
 
 /**
@@ -104,6 +107,7 @@ export type TableSchema = {
   extensionObjects?: IExtension[];
   compiledExtension?: string;
   webhooks?: IWebhook[];
+  runtimeOptions?: IRuntimeOptions;
 
   /** @deprecated Migrate to Extensions */
   sparks?: string;

From d2261167b767a3b16c52f11fa45fc86994bf0f63 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Fri, 28 Oct 2022 12:06:14 +1100
Subject: [PATCH 217/309] fix TableInformationDrawer crashing because of
 imports

---
 .../TableInformationDrawer/TableInformationDrawer.tsx           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/TableInformationDrawer/TableInformationDrawer.tsx b/src/components/TableInformationDrawer/TableInformationDrawer.tsx
index f2074049..25b9a5e8 100644
--- a/src/components/TableInformationDrawer/TableInformationDrawer.tsx
+++ b/src/components/TableInformationDrawer/TableInformationDrawer.tsx
@@ -17,7 +17,7 @@ import CloseIcon from "@mui/icons-material/Close";
 import { sideDrawerAtom, tableScope } from "@src/atoms/tableScope";
 
 import { TOP_BAR_HEIGHT } from "@src/layouts/Navigation/TopBar";
-import { TABLE_TOOLBAR_HEIGHT } from "@src/components/TableToolbar/TableToolbar";
+import { TABLE_TOOLBAR_HEIGHT } from "@src/components/TableToolbar";
 import ErrorFallback from "@src/components/ErrorFallback";
 import Details from "./Details";
 

From ccd76595dd3a182e2506b19628668919a1f43868 Mon Sep 17 00:00:00 2001
From: shamsmosowi <shams.mosowi@gmail.com>
Date: Fri, 28 Oct 2022 19:09:03 +0200
Subject: [PATCH 218/309] allow for file type derivatives to be exportable

---
 .../TableModals/ExportModal/ModalContentsDownload.tsx       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/TableModals/ExportModal/ModalContentsDownload.tsx b/src/components/TableModals/ExportModal/ModalContentsDownload.tsx
index 468d52cc..8b6690dd 100644
--- a/src/components/TableModals/ExportModal/ModalContentsDownload.tsx
+++ b/src/components/TableModals/ExportModal/ModalContentsDownload.tsx
@@ -137,7 +137,11 @@ export default function Export({
       <ColumnSelect
         value={columns.map((x) => x.key)}
         onChange={handleChange(setColumns)}
-        filterColumns={(column) => DOWNLOADABLE_COLUMNS.includes(column.type)}
+        filterColumns={(column) =>
+          column.type === FieldType.derivative
+            ? DOWNLOADABLE_COLUMNS.includes(column.config?.renderFieldType)
+            : DOWNLOADABLE_COLUMNS.includes(column.type)
+        }
         label="Columns to export"
         labelPlural="columns"
         TextFieldProps={{

From 986a02293bbf7c92d8df0c6d4c0a03e04339d789 Mon Sep 17 00:00:00 2001
From: Miriam Shams-Rainey <mshamsrainey@gmail.com>
Date: Fri, 28 Oct 2022 14:23:01 -0400
Subject: [PATCH 219/309] More explicit opacity declaration for custom icons

---
 src/components/fields/Rating/Icon.tsx         | 25 +++++++++++++++++++
 src/components/fields/Rating/Settings.tsx     |  5 ++--
 .../fields/Rating/SideDrawerField.tsx         |  6 ++---
 src/components/fields/Rating/TableCell.tsx    | 15 +++--------
 4 files changed, 34 insertions(+), 17 deletions(-)
 create mode 100644 src/components/fields/Rating/Icon.tsx

diff --git a/src/components/fields/Rating/Icon.tsx b/src/components/fields/Rating/Icon.tsx
new file mode 100644
index 00000000..4bb8a95c
--- /dev/null
+++ b/src/components/fields/Rating/Icon.tsx
@@ -0,0 +1,25 @@
+import RatingIcon from "@mui/icons-material/Star";
+import RatingOutlineIcon from "@mui/icons-material/StarBorder"
+import { get } from "lodash-es";
+
+
+export default function Icon(config: any, isEmpty: Boolean) {
+// console.log(config)
+ if (isEmpty) {
+    //console.log(getStateOutline(config))
+    return getStateOutline(config.config)
+ } else {
+    return getStateIcon(config.config)
+}
+} 
+
+const getStateIcon = (config: any) => {
+    // only use the config to get the custom rating icon if enabled via toggle
+    if (!get(config, "customIcons.enabled")) { return <RatingIcon /> }
+    console.log(get(config, "customIcons.rating"))
+    return get(config, "customIcons.rating") || <RatingIcon />;
+  };
+const getStateOutline = (config: any) => {
+    if (!get(config, "customIcons.enabled")) { return <RatingOutlineIcon /> }
+    return get(config, "customIcons.rating") || <RatingOutlineIcon />;
+  }
\ No newline at end of file
diff --git a/src/components/fields/Rating/Settings.tsx b/src/components/fields/Rating/Settings.tsx
index 6134b530..1d9e5096 100644
--- a/src/components/fields/Rating/Settings.tsx
+++ b/src/components/fields/Rating/Settings.tsx
@@ -6,6 +6,7 @@ import ToggleButton from "@mui/material/ToggleButton";
 import ToggleButtonGroup from "@mui/material/ToggleButtonGroup";
 import MuiRating from "@mui/material/Rating";
 import { get } from "lodash-es";
+import Icon from "./Icon"
 
 export default function Settings({ onChange, config }: ISettingsProps) {
   return (
@@ -79,9 +80,9 @@ export default function Settings({ onChange, config }: ISettingsProps) {
             <MuiRating aria-label="Preview of the rating field with custom icon"
               name="Preview"
               onClick={(e) => e.stopPropagation()}
-              icon={get(config, "customIcons.rating") || <RatingIcon />}
+              icon={<Icon config={config} isEmpty={false} />}
               size="small"
-              emptyIcon={get(config, "customIcons.rating") || <RatingOutlineIcon />}
+              emptyIcon={<Icon config={config} isEmpty={true} style={{ opacity: 0.55 }} />}
               max={get(config, "max")}
               precision={get(config, "precision")}
               sx={{ pt: 0.5 }}
diff --git a/src/components/fields/Rating/SideDrawerField.tsx b/src/components/fields/Rating/SideDrawerField.tsx
index eb117dd4..2652bf65 100644
--- a/src/components/fields/Rating/SideDrawerField.tsx
+++ b/src/components/fields/Rating/SideDrawerField.tsx
@@ -3,8 +3,8 @@ import { ISideDrawerFieldProps } from "@src/components/fields/types";
 import { Grid } from "@mui/material";
 import { Rating as MuiRating } from "@mui/material";
 import "@mui/lab";
-import { getStateIcon, getStateOutline } from "./TableCell";
 import { fieldSx } from "@src/components/SideDrawer/utils";
+import Icon from "./Icon"
 
 export default function Rating({
   column,
@@ -28,8 +28,8 @@ export default function Rating({
           onChange(newValue);
           onSubmit();
         }}
-        icon={getStateIcon(column.config)}
-        emptyIcon={getStateOutline(column.config)}
+        icon={<Icon config={column.config} isEmpty={false}/>}
+        emptyIcon={<Icon config={column.config} isEmpty={true} style={{opacity: 0.5}}/>}
         size="small"
         max={max}
         precision={precision}
diff --git a/src/components/fields/Rating/TableCell.tsx b/src/components/fields/Rating/TableCell.tsx
index 2e7aee52..6aaa72e1 100644
--- a/src/components/fields/Rating/TableCell.tsx
+++ b/src/components/fields/Rating/TableCell.tsx
@@ -4,18 +4,9 @@ import MuiRating from "@mui/material/Rating";
 import RatingIcon from "@mui/icons-material/Star";
 import RatingOutlineIcon from "@mui/icons-material/StarBorder"
 import { get } from "lodash-es";
+import Icon from "./Icon"
 
 
-export const getStateIcon = (config: any) => {
-  // only use the config to get the custom rating icon if enabled via toggle
-  if (!get(config, "customIcons.enabled")) { return <RatingIcon /> }
-  return get(config, "customIcons.rating") || <RatingIcon />;
-};
-
-export const getStateOutline = (config: any) => {
-  if (!get(config, "customIcons.enabled")) { return <RatingOutlineIcon /> }
-  return get(config, "customIcons.rating") || <RatingOutlineIcon />;
-}
 
 export default function Rating({
   row,
@@ -42,11 +33,11 @@ export default function Rating({
       name={`${row.id}-${column.key}`}
       value={typeof value === "number" ? value : 0}
       onClick={(e) => e.stopPropagation()}
-      icon={getStateIcon(column.config)}
+      icon={<Icon config={column.config} isEmpty={false} />}
       size="small"
       disabled={disabled}
       onChange={(_, newValue) => onSubmit(newValue)}
-      emptyIcon={getStateOutline(column.config)}
+      emptyIcon={<Icon config={column.config} isEmpty={true} style={{ opacity: 0.55 }} />}
       max={max}
       precision={precision}
       sx={{ mx: -0.25 }}

From 58ebbe80e64644a10b01542dcbd605116fc62497 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 31 Oct 2022 14:51:25 +1100
Subject: [PATCH 220/309] =?UTF-8?q?ErrorFallback:=20update=20message=20to?=
 =?UTF-8?q?=20be=20more=20clear=20for=20non-technical=20users=20not=20fami?=
 =?UTF-8?q?liar=20with=20the=20term=20=E2=80=9Creproduce=20this=20bug?=
 =?UTF-8?q?=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ErrorFallback.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ErrorFallback.tsx b/src/components/ErrorFallback.tsx
index af9d9314..83257aac 100644
--- a/src/components/ErrorFallback.tsx
+++ b/src/components/ErrorFallback.tsx
@@ -57,7 +57,7 @@ export function ErrorFallbackContents({
                 .filter(Boolean)
                 .join(": ")
                 .replace(/\n/g, " "),
-              body: "👉 **Please describe how to reproduce this bug here.**",
+              body: "👉 **Please describe the steps that you took that led to this bug.**",
             }).toString()
           }
           target="_blank"

From 2355ff7dfc3778972cc5a8d3214d2d3455bf8e37 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 31 Oct 2022 16:17:21 +1100
Subject: [PATCH 221/309] add context menu for rows

---
 src/components/Table/Table.tsx | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index 2f04d79c..4f2f51c3 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -51,6 +51,7 @@ import {
   updateColumnAtom,
   updateFieldAtom,
   selectedCellAtom,
+  contextMenuTargetAtom,
 } from "@src/atoms/tableScope";
 import { COLLECTION_PAGE_SIZE } from "@src/config/db";
 
@@ -89,6 +90,7 @@ export default function TableComponent() {
   const [tableNextPage] = useAtom(tableNextPageAtom, tableScope);
   const [tablePage, setTablePage] = useAtom(tablePageAtom, tableScope);
   const [selectedCell, setSelectedCell] = useAtom(selectedCellAtom, tableScope);
+  const setContextMenuTarget = useSetAtom(contextMenuTargetAtom, tableScope);
 
   const updateColumn = useSetAtom(updateColumnAtom, tableScope);
   const updateField = useSetAtom(updateFieldAtom, tableScope);
@@ -460,6 +462,15 @@ export default function TableComponent() {
                         });
                         (e.target as HTMLDivElement).focus();
                       }}
+                      onContextMenu={(e) => {
+                        e.preventDefault();
+                        setSelectedCell({
+                          path: row.original._rowy_ref.path,
+                          columnKey: cell.column.id,
+                        });
+                        (e.target as HTMLDivElement).focus();
+                        setContextMenuTarget(e.target as HTMLElement);
+                      }}
                     >
                       <div
                         className="cell-contents"
@@ -500,6 +511,8 @@ export default function TableComponent() {
           Press Enter to edit.
         </div>
       </Portal>
+
+      <ContextMenu />
     </div>
   );
 }

From 1f581af858180bddefc08f8c042a912677ea5f2a Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 31 Oct 2022 17:04:18 +1100
Subject: [PATCH 222/309] use existing ColumnHeader to enable sort, column menu

---
 .../Table/ColumnHeader/ColumnHeader.tsx       | 117 +++++++++---------
 .../Table/ColumnHeader/ColumnHeaderSort.tsx   |  39 +++---
 src/components/Table/Styled/StyledResizer.tsx |   5 +-
 src/components/Table/Styled/StyledRow.tsx     |   2 +
 src/components/Table/Styled/StyledTable.tsx   |   2 +
 src/components/Table/Table.tsx                |  51 ++++----
 6 files changed, 108 insertions(+), 108 deletions(-)

diff --git a/src/components/Table/ColumnHeader/ColumnHeader.tsx b/src/components/Table/ColumnHeader/ColumnHeader.tsx
index a1652c04..7ad33e72 100644
--- a/src/components/Table/ColumnHeader/ColumnHeader.tsx
+++ b/src/components/Table/ColumnHeader/ColumnHeader.tsx
@@ -1,36 +1,33 @@
-import { useRef } from "react";
+import { forwardRef, useRef } from "react";
 import { useAtom, useSetAtom } from "jotai";
-import { useDrag, useDrop } from "react-dnd";
 
 import {
   styled,
-  alpha,
   Tooltip,
   TooltipProps,
   tooltipClasses,
   Fade,
   Grid,
+  GridProps,
   IconButton,
   Typography,
 } from "@mui/material";
 import DropdownIcon from "@mui/icons-material/MoreHoriz";
 import LockIcon from "@mui/icons-material/LockOutlined";
 
-import ColumnHeaderSort from "./ColumnHeaderSort";
+import ColumnHeaderSort, { SORT_STATES } from "./ColumnHeaderSort";
 
-import {
-  projectScope,
-  userRolesAtom,
-  altPressAtom,
-} from "@src/atoms/projectScope";
+import { projectScope, altPressAtom } from "@src/atoms/projectScope";
 import {
   tableScope,
-  updateColumnAtom,
   columnMenuAtom,
+  tableSortsAtom,
 } from "@src/atoms/tableScope";
 import { getFieldProp } from "@src/components/fields";
 import { COLUMN_HEADER_HEIGHT } from "@src/components/Table/Column";
 import { ColumnConfig } from "@src/types/table";
+import { FieldType } from "@src/constants/fields";
+import { spreadSx } from "@src/utils/ui";
 
 export { COLUMN_HEADER_HEIGHT };
 
@@ -47,36 +44,20 @@ const LightTooltip = styled(({ className, ...props }: TooltipProps) => (
   },
 }));
 
-export interface IDraggableHeaderRendererProps {
+export interface IColumnHeaderProps extends Partial<GridProps> {
   column: ColumnConfig;
+  width: number;
+  focusInsideCell: boolean;
+  children: React.ReactNode;
 }
 
-export default function DraggableHeaderRenderer({
-  column,
-}: IDraggableHeaderRendererProps) {
-  const [userRoles] = useAtom(userRolesAtom, projectScope);
-  const updateColumn = useSetAtom(updateColumnAtom, tableScope);
+export const ColumnHeader = forwardRef(function ColumnHeader(
+  { column, width, focusInsideCell, children, ...props }: IColumnHeaderProps,
+  ref: React.Ref<HTMLDivElement>
+) {
   const openColumnMenu = useSetAtom(columnMenuAtom, tableScope);
   const [altPress] = useAtom(altPressAtom, projectScope);
-
-  const [{ isDragging }, dragRef] = useDrag({
-    type: "COLUMN_DRAG",
-    item: { key: column.key },
-    collect: (monitor) => ({
-      isDragging: monitor.isDragging(),
-    }),
-  });
-
-  const [{ isOver }, dropRef] = useDrop({
-    accept: "COLUMN_DRAG",
-    drop: ({ key }: { key: string }) => {
-      updateColumn({ key, config: {}, index: column.index });
-    },
-    collect: (monitor) => ({
-      isOver: monitor.isOver(),
-      canDrop: monitor.canDrop(),
-    }),
-  });
+  const [tableSorts] = useAtom(tableSortsAtom, tableScope);
 
   const buttonRef = useRef<HTMLButtonElement>(null);
 
@@ -85,14 +66,26 @@ export default function DraggableHeaderRenderer({
     openColumnMenu({ column, anchorEl: buttonRef.current });
   };
 
+  const _sortKey = getFieldProp("sortKey", (column as any).type);
+  const sortKey = _sortKey ? `${column.key}.${_sortKey}` : column.key;
+  const currentSort: typeof SORT_STATES[number] =
+    tableSorts[0]?.key !== sortKey
+      ? "none"
+      : tableSorts[0]?.direction || "none";
+
   return (
     <Grid
-      key={column.key}
+      role="columnheader"
       id={`column-header-${column.key}`}
-      ref={(ref) => {
-        dragRef(ref);
-        dropRef(ref);
-      }}
+      ref={ref}
+      {...props}
+      aria-sort={
+        currentSort === "none"
+          ? "none"
+          : currentSort === "asc"
+          ? "ascending"
+          : "descending"
+      }
       container
       alignItems="center"
       wrap="nowrap"
@@ -100,7 +93,8 @@ export default function DraggableHeaderRenderer({
       sx={[
         {
           height: "100%",
-          "& svg, & button": { display: "block" },
+          "& svg, & button": { display: "block", zIndex: 1 },
+          border: (theme) => `1px solid ${theme.palette.divider}`,
 
           color: "text.secondary",
           transition: (theme) =>
@@ -109,29 +103,18 @@ export default function DraggableHeaderRenderer({
             }),
           "&:hover": { color: "text.primary" },
 
-          cursor: "move",
+          position: "relative",
 
           py: 0,
           pr: 0.5,
           pl: 1,
           width: "100%",
         },
-        isDragging
-          ? { opacity: 0.5 }
-          : isOver
-          ? {
-              backgroundColor: (theme) =>
-                alpha(
-                  theme.palette.primary.main,
-                  theme.palette.action.focusOpacity
-                ),
-              color: "primary.main",
-            }
-          : {},
+        ...spreadSx(props.sx),
       ]}
       className="column-header"
     >
-      {(column.width as number) > 140 && (
+      {width > 140 && (
         <Tooltip
           title={
             <>
@@ -149,6 +132,7 @@ export default function DraggableHeaderRenderer({
             onClick={() => {
               navigator.clipboard.writeText(column.key);
             }}
+            style={{ position: "relative", zIndex: 2 }}
           >
             {column.editable === false ? (
               <LockIcon />
@@ -190,6 +174,8 @@ export default function DraggableHeaderRenderer({
               fontWeight: "fontWeightMedium",
               lineHeight: `${COLUMN_HEADER_HEIGHT}px`,
               textOverflow: "clip",
+              position: "relative",
+              zIndex: 1,
             }}
             component="div"
             color="inherit"
@@ -205,15 +191,22 @@ export default function DraggableHeaderRenderer({
         </LightTooltip>
       </Grid>
 
-      <Grid item>
-        <ColumnHeaderSort column={column as any} />
-      </Grid>
+      {column.type !== FieldType.id && (
+        <Grid item>
+          <ColumnHeaderSort
+            sortKey={sortKey}
+            currentSort={currentSort}
+            tabIndex={focusInsideCell ? 0 : -1}
+          />
+        </Grid>
+      )}
 
       <Grid item>
         <Tooltip title="Column settings">
           <IconButton
             size="small"
             aria-label={`Column settings for ${column.name as string}`}
+            tabIndex={focusInsideCell ? 0 : -1}
             id={`column-settings-${column.key}`}
             color="inherit"
             onClick={handleOpenMenu}
@@ -225,13 +218,17 @@ export default function DraggableHeaderRenderer({
                 }),
 
               color: "text.disabled",
-              ".column-header:hover &": { color: "text.primary" },
+              ".column-header:hover &, &:focus": { color: "text.primary" },
             }}
           >
             <DropdownIcon />
           </IconButton>
         </Tooltip>
       </Grid>
+
+      {children}
     </Grid>
   );
-}
+});
+
+export default ColumnHeader;
diff --git a/src/components/Table/ColumnHeader/ColumnHeaderSort.tsx b/src/components/Table/ColumnHeader/ColumnHeaderSort.tsx
index deab488b..c8c4878f 100644
--- a/src/components/Table/ColumnHeader/ColumnHeaderSort.tsx
+++ b/src/components/Table/ColumnHeader/ColumnHeaderSort.tsx
@@ -1,4 +1,4 @@
-import { useAtom } from "jotai";
+import { useSetAtom } from "jotai";
 import { colord } from "colord";
 
 import { Tooltip, IconButton } from "@mui/material";
@@ -8,27 +8,22 @@ import IconSlash, {
 } from "@src/components/IconSlash";
 
 import { tableScope, tableSortsAtom } from "@src/atoms/tableScope";
-import { FieldType } from "@src/constants/fields";
-import { getFieldProp } from "@src/components/fields";
 
-import { ColumnConfig } from "@src/types/table";
-
-const SORT_STATES = ["none", "desc", "asc"] as const;
+export const SORT_STATES = ["none", "desc", "asc"] as const;
 
 export interface IColumnHeaderSortProps {
-  column: ColumnConfig;
+  sortKey: string;
+  currentSort: typeof SORT_STATES[number];
+  tabIndex?: number;
 }
 
-export default function ColumnHeaderSort({ column }: IColumnHeaderSortProps) {
-  const [tableSorts, setTableSorts] = useAtom(tableSortsAtom, tableScope);
+export default function ColumnHeaderSort({
+  sortKey,
+  currentSort,
+  tabIndex,
+}: IColumnHeaderSortProps) {
+  const setTableSorts = useSetAtom(tableSortsAtom, tableScope);
 
-  const _sortKey = getFieldProp("sortKey", (column as any).type);
-  const sortKey = _sortKey ? `${column.key}.${_sortKey}` : column.key;
-
-  const currentSort: typeof SORT_STATES[number] =
-    tableSorts[0]?.key !== sortKey
-      ? "none"
-      : tableSorts[0]?.direction || "none";
   const nextSort =
     SORT_STATES[SORT_STATES.indexOf(currentSort) + 1] ?? SORT_STATES[0];
 
@@ -37,8 +32,6 @@ export default function ColumnHeaderSort({ column }: IColumnHeaderSortProps) {
     else setTableSorts([{ key: sortKey, direction: nextSort }]);
   };
 
-  if (column.type === FieldType.id) return null;
-
   return (
     <Tooltip
       title={nextSort === "none" ? "Unsort" : `Sort by ${nextSort}ending`}
@@ -48,9 +41,10 @@ export default function ColumnHeaderSort({ column }: IColumnHeaderSortProps) {
         size="small"
         onClick={handleSortClick}
         color="inherit"
+        tabIndex={tabIndex}
         sx={{
           bgcolor: "background.default",
-          "&:hover": {
+          "&:hover, &:focus": {
             backgroundColor: (theme) =>
               colord(theme.palette.background.default)
                 .mix(
@@ -74,7 +68,8 @@ export default function ColumnHeaderSort({ column }: IColumnHeaderSortProps) {
 
           position: "relative",
           opacity: currentSort !== "none" ? 1 : 0,
-          ".column-header:hover &": { opacity: 1 },
+          "[role='columnheader']:hover &, [role='columnheader']:focus &, [role='columnheader']:focus-within &, &:focus":
+            { opacity: 1 },
 
           transition: (theme) =>
             theme.transitions.create(["background-color", "opacity"], {
@@ -89,7 +84,7 @@ export default function ColumnHeaderSort({ column }: IColumnHeaderSortProps) {
 
             transform: currentSort === "asc" ? "rotate(180deg)" : "none",
           },
-          "&:hover .arrow": {
+          "&:hover .arrow, &:focus .arrow": {
             transform:
               currentSort === "asc" || nextSort === "asc"
                 ? "rotate(180deg)"
@@ -100,7 +95,7 @@ export default function ColumnHeaderSort({ column }: IColumnHeaderSortProps) {
             strokeDashoffset:
               currentSort === "none" ? 0 : ICON_SLASH_STROKE_DASHOFFSET,
           },
-          "&:hover .icon-slash": {
+          "&:hover .icon-slash, &:focus .icon-slash": {
             strokeDashoffset:
               nextSort === "none" ? 0 : ICON_SLASH_STROKE_DASHOFFSET,
           },
diff --git a/src/components/Table/Styled/StyledResizer.tsx b/src/components/Table/Styled/StyledResizer.tsx
index 83e005e0..7f23f1da 100644
--- a/src/components/Table/Styled/StyledResizer.tsx
+++ b/src/components/Table/Styled/StyledResizer.tsx
@@ -9,6 +9,7 @@ export const StyledResizer = styled("div", {
   shouldForwardProp: (prop) => prop !== "isResizing",
 })<IStyledResizerProps>(({ theme, isResizing }) => ({
   position: "absolute",
+  zIndex: 5,
   right: 0,
   top: 0,
   height: "100%",
@@ -39,7 +40,7 @@ export const StyledResizer = styled("div", {
     height: "50%",
     width: 4,
     borderRadius: 2,
-    marginRight: 3,
+    marginRight: 2,
 
     background: isResizing
       ? theme.palette.primary.main
@@ -51,3 +52,5 @@ export const StyledResizer = styled("div", {
   },
 }));
 StyledResizer.displayName = "StyledResizer";
+
+export default StyledResizer;
diff --git a/src/components/Table/Styled/StyledRow.tsx b/src/components/Table/Styled/StyledRow.tsx
index da2e11a6..5033152b 100644
--- a/src/components/Table/Styled/StyledRow.tsx
+++ b/src/components/Table/Styled/StyledRow.tsx
@@ -32,3 +32,5 @@ export const StyledRow = styled("div")(({ theme }) => ({
   },
 }));
 StyledRow.displayName = "StyledRow";
+
+export default StyledRow;
diff --git a/src/components/Table/Styled/StyledTable.tsx b/src/components/Table/Styled/StyledTable.tsx
index 0033ee68..23c648e5 100644
--- a/src/components/Table/Styled/StyledTable.tsx
+++ b/src/components/Table/Styled/StyledTable.tsx
@@ -31,3 +31,5 @@ export const StyledTable = styled("div")(({ theme }) => ({
   },
 }));
 StyledTable.displayName = "StyledTable";
+
+export default StyledTable;
diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index 4f2f51c3..fc9a2c8a 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -1,29 +1,27 @@
 import { useMemo, useRef, useState, useEffect, useCallback } from "react";
 import { useAtom, useSetAtom } from "jotai";
 import { useThrottledCallback } from "use-debounce";
-import {
-  DragDropContext,
-  DropResult,
-  Droppable,
-  Draggable,
-} from "react-beautiful-dnd";
-
 import {
   createColumnHelper,
   flexRender,
   getCoreRowModel,
   useReactTable,
 } from "@tanstack/react-table";
+import {
+  DragDropContext,
+  DropResult,
+  Droppable,
+  Draggable,
+} from "react-beautiful-dnd";
+import { Portal } from "@mui/material";
 
-import { StyledTable } from "./Styled/StyledTable";
-import { StyledRow } from "./Styled/StyledRow";
-import { StyledResizer } from "./Styled/StyledResizer";
-import ColumnHeaderComponent from "./Column";
+import StyledTable from "./Styled/StyledTable";
+import StyledRow from "./Styled/StyledRow";
+import ColumnHeader from "./ColumnHeader";
+import StyledResizer from "./Styled/StyledResizer";
 import OutOfOrderIndicator from "./OutOfOrderIndicator";
+import ContextMenu from "./ContextMenu";
 
-import { IconButton, Portal } from "@mui/material";
-
-import ColumnHeader, { COLUMN_HEADER_HEIGHT } from "./ColumnHeader";
 import FinalColumnHeader from "./FinalColumnHeader";
 import FinalColumn from "./formatters/FinalColumn";
 // import TableRow from "./TableRow";
@@ -31,8 +29,6 @@ import EmptyState from "@src/components/EmptyState";
 // import BulkActions from "./BulkActions";
 import AddRow from "@src/components/TableToolbar/AddRow";
 import { AddRow as AddRowIcon } from "@src/assets/icons";
-import Loading from "@src/components/Loading";
-import ContextMenu from "./ContextMenu";
 
 import {
   projectScope,
@@ -291,6 +287,8 @@ export default function TableComponent() {
                     ref={provided.innerRef}
                   >
                     {headerGroup.headers.map((header) => {
+                      if (!header.column.columnDef.meta) return null;
+
                       const isSelectedCell =
                         (!selectedCell && header.index === 0) ||
                         (selectedCell?.path === "_rowy_header" &&
@@ -305,7 +303,7 @@ export default function TableComponent() {
                           disableInteractiveElementBlocking
                         >
                           {(provided, snapshot) => (
-                            <ColumnHeaderComponent
+                            <ColumnHeader
                               key={header.id}
                               data-row-id={"_rowy_header"}
                               data-col-id={header.id}
@@ -317,16 +315,11 @@ export default function TableComponent() {
                               }
                               ref={provided.innerRef}
                               {...provided.draggableProps}
-                              role="columnheader"
                               tabIndex={isSelectedCell ? 0 : -1}
                               aria-colindex={header.index + 1}
                               aria-readonly={!canEditColumn}
-                              // TODO: aria-sort={"none" | "ascending" | "descending" | "other" | undefined}
                               aria-selected={isSelectedCell}
-                              label={
-                                header.column.columnDef.meta?.name || header.id
-                              }
-                              type={header.column.columnDef.meta?.type}
+                              column={header.column.columnDef.meta!}
                               style={{
                                 width: header.getSize(),
                                 left: header.column.getIsPinned()
@@ -335,6 +328,7 @@ export default function TableComponent() {
                                   : undefined,
                                 ...provided.draggableProps.style,
                               }}
+                              width={header.getSize()}
                               sx={[
                                 snapshot.isDragging
                                   ? {}
@@ -347,6 +341,9 @@ export default function TableComponent() {
                                 });
                                 (e.target as HTMLDivElement).focus();
                               }}
+                              focusInsideCell={
+                                isSelectedCell && focusInsideCell
+                              }
                             >
                               <div
                                 {...provided.dragHandleProps}
@@ -360,7 +357,11 @@ export default function TableComponent() {
                                       ]
                                     : undefined
                                 }
-                                style={{ position: "absolute", inset: 0 }}
+                                style={{
+                                  position: "absolute",
+                                  inset: 0,
+                                  zIndex: 0,
+                                }}
                               />
 
                               {header.column.getCanResize() && (
@@ -370,7 +371,7 @@ export default function TableComponent() {
                                   onTouchStart={header.getResizeHandler()}
                                 />
                               )}
-                            </ColumnHeaderComponent>
+                            </ColumnHeader>
                           )}
                         </Draggable>
                       );

From 19aee53038fd754c4fda34dde61fcc51bb975609 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 31 Oct 2022 17:56:54 +1100
Subject: [PATCH 223/309] add final column

---
 .../Table/ColumnHeader/ColumnHeader.tsx       |   2 +-
 .../Table/ContextMenu/ContextMenuItem.tsx     |  27 +-
 .../Table/ContextMenu/MenuContents.tsx        | 310 +++++++++---------
 .../FinalColumn.tsx                           |  62 +++-
 .../Table/FinalColumn/FinalColumnHeader.tsx   |  58 ++++
 src/components/Table/FinalColumnHeader.tsx    |  29 --
 src/components/Table/Styled/StyledRow.tsx     |  16 +-
 src/components/Table/Table.tsx                |  33 +-
 src/components/Table/TableRow.tsx             |  32 --
 9 files changed, 315 insertions(+), 254 deletions(-)
 rename src/components/Table/{formatters => FinalColumn}/FinalColumn.tsx (67%)
 create mode 100644 src/components/Table/FinalColumn/FinalColumnHeader.tsx
 delete mode 100644 src/components/Table/FinalColumnHeader.tsx
 delete mode 100644 src/components/Table/TableRow.tsx

diff --git a/src/components/Table/ColumnHeader/ColumnHeader.tsx b/src/components/Table/ColumnHeader/ColumnHeader.tsx
index 7ad33e72..1a01c9dd 100644
--- a/src/components/Table/ColumnHeader/ColumnHeader.tsx
+++ b/src/components/Table/ColumnHeader/ColumnHeader.tsx
@@ -96,6 +96,7 @@ export const ColumnHeader = forwardRef(function ColumnHeader(
           "& svg, & button": { display: "block", zIndex: 1 },
           border: (theme) => `1px solid ${theme.palette.divider}`,
 
+          backgroundColor: "background.default",
           color: "text.secondary",
           transition: (theme) =>
             theme.transitions.create("color", {
@@ -112,7 +113,6 @@ export const ColumnHeader = forwardRef(function ColumnHeader(
         },
         ...spreadSx(props.sx),
       ]}
-      className="column-header"
     >
       {width > 140 && (
         <Tooltip
diff --git a/src/components/Table/ContextMenu/ContextMenuItem.tsx b/src/components/Table/ContextMenu/ContextMenuItem.tsx
index 777d1db1..8feb79cb 100644
--- a/src/components/Table/ContextMenu/ContextMenuItem.tsx
+++ b/src/components/Table/ContextMenu/ContextMenuItem.tsx
@@ -19,6 +19,7 @@ export interface IContextMenuItem extends Partial<MenuItemProps> {
   disabled?: boolean;
   hotkeyLabel?: string;
   divider?: boolean;
+  subItems?: IContextMenuItem[];
 }
 
 export interface IContextMenuItemProps extends IContextMenuItem {
@@ -82,16 +83,20 @@ export default function ContextMenuItem({
       </>
     );
   } else {
-    return (
-      <MenuItem {...props} onClick={onClick}>
-        <ListItemIcon>{icon}</ListItemIcon>
-        <ListItemText>{label}</ListItemText>
-        {hotkeyLabel && (
-          <Typography variant="body2" color="text.secondary">
-            {hotkeyLabel}
-          </Typography>
-        )}
-      </MenuItem>
-    );
+    if (props.divider) {
+      return <Divider variant="middle" />;
+    } else {
+      return (
+        <MenuItem {...props} onClick={onClick}>
+          <ListItemIcon>{icon}</ListItemIcon>
+          <ListItemText>{label}</ListItemText>
+          {hotkeyLabel && (
+            <Typography variant="body2" color="text.secondary">
+              {hotkeyLabel}
+            </Typography>
+          )}
+        </MenuItem>
+      );
+    }
   }
 }
diff --git a/src/components/Table/ContextMenu/MenuContents.tsx b/src/components/Table/ContextMenu/MenuContents.tsx
index 60d58069..c098ebe2 100644
--- a/src/components/Table/ContextMenu/MenuContents.tsx
+++ b/src/components/Table/ContextMenu/MenuContents.tsx
@@ -62,182 +62,188 @@ export default function MenuContents({ onClose }: IMenuContentsProps) {
   if (!tableSchema.columns || !selectedCell) return null;
 
   const selectedColumn = tableSchema.columns[selectedCell.columnKey];
-  const menuActions = getFieldProp("contextMenuActions", selectedColumn.type);
+  const row = find(tableRows, ["_rowy_ref.path", selectedCell.path]);
+
+  if (!row) return null;
 
   const actionGroups: IContextMenuItem[][] = [];
-  const row = find(tableRows, ["_rowy_ref.path", selectedCell.path]);
-  // Field type actions
-  const fieldTypeActions = menuActions
-    ? menuActions(selectedCell, onClose)
-    : [];
-  if (fieldTypeActions.length > 0) actionGroups.push(fieldTypeActions);
 
-  if (selectedColumn.type === FieldType.derivative) {
-    const renderedFieldMenuActions = getFieldProp(
-      "contextMenuActions",
-      selectedColumn.config?.renderFieldType
-    );
-    if (renderedFieldMenuActions) {
-      actionGroups.push(renderedFieldMenuActions(selectedCell, onClose));
-    }
-  }
-
-  // Cell actions
-  // TODO: Add copy and paste here
-  const cellValue = row?.[selectedCell.columnKey];
-  const handleClearValue = () =>
-    updateField({
-      path: selectedCell.path,
-      fieldName: selectedColumn.fieldName,
-      value: null,
-      deleteField: true,
+  const handleDuplicate = () => {
+    addRow({
+      row,
+      setId: addRowIdType === "custom" ? "decrement" : addRowIdType,
     });
-  const columnFilters = getFieldProp("filter", selectedColumn.type);
-  const handleFilterValue = () => {
-    openTableFiltersPopover({
-      defaultQuery: {
-        key: selectedColumn.fieldName,
-        operator: columnFilters!.operators[0]?.value || "==",
-        value: cellValue,
-      },
-    });
-    onClose();
   };
-  const cellActions = [
+  const handleDelete = () => deleteRow(row._rowy_ref.path);
+  const rowActions: IContextMenuItem[] = [
     {
-      label: altPress ? "Clear value" : "Clear value…",
-      color: "error",
-      icon: <ClearIcon />,
+      label: "Copy ID",
+      icon: <CopyIcon />,
+      onClick: () => {
+        navigator.clipboard.writeText(row._rowy_ref.id);
+        onClose();
+      },
+    },
+    {
+      label: "Copy path",
+      icon: <CopyIcon />,
+      onClick: () => {
+        navigator.clipboard.writeText(row._rowy_ref.path);
+        onClose();
+      },
+    },
+    {
+      label: "Open in Firebase Console",
+      icon: <OpenIcon />,
+      onClick: () => {
+        window.open(
+          `https://console.firebase.google.com/project/${projectId}/firestore/data/~2F${row._rowy_ref.path.replace(
+            /\//g,
+            "~2F"
+          )}`
+        );
+        onClose();
+      },
+    },
+    { label: "Divider", divider: true },
+    {
+      label: "Duplicate",
+      icon: <DuplicateIcon />,
       disabled:
-        selectedColumn.editable === false ||
-        !row ||
-        cellValue ||
-        getFieldProp("group", selectedColumn.type) === "Auditing",
+        tableSettings.tableType === "collectionGroup" ||
+        (!userRoles.includes("ADMIN") && tableSettings.readOnly),
       onClick: altPress
-        ? handleClearValue
+        ? handleDuplicate
         : () => {
             confirm({
-              title: "Clear cell value?",
-              body: "The cell’s value cannot be recovered after",
-              confirm: "Delete",
-              confirmColor: "error",
-              handleConfirm: handleClearValue,
+              title: "Duplicate row?",
+              body: (
+                <>
+                  Row path:
+                  <br />
+                  <code style={{ userSelect: "all", wordBreak: "break-all" }}>
+                    {row._rowy_ref.path}
+                  </code>
+                </>
+              ),
+              confirm: "Duplicate",
+              handleConfirm: handleDuplicate,
             });
             onClose();
           },
     },
     {
-      label: "Filter value",
-      icon: <FilterIcon />,
-      disabled: !columnFilters || cellValue === undefined,
-      onClick: handleFilterValue,
+      label: altPress ? "Delete" : "Delete…",
+      color: "error",
+      icon: <DeleteIcon />,
+      disabled: !userRoles.includes("ADMIN") && tableSettings.readOnly,
+      onClick: altPress
+        ? handleDelete
+        : () => {
+            confirm({
+              title: "Delete row?",
+              body: (
+                <>
+                  Row path:
+                  <br />
+                  <code style={{ userSelect: "all", wordBreak: "break-all" }}>
+                    {row._rowy_ref.path}
+                  </code>
+                </>
+              ),
+              confirm: "Delete",
+              confirmColor: "error",
+              handleConfirm: handleDelete,
+            });
+            onClose();
+          },
     },
   ];
-  actionGroups.push(cellActions);
 
-  // Row actions
-  if (row) {
-    const handleDuplicate = () => {
-      addRow({
-        row,
-        setId: addRowIdType === "custom" ? "decrement" : addRowIdType,
+  if (selectedColumn) {
+    const menuActions = getFieldProp(
+      "contextMenuActions",
+      selectedColumn?.type
+    );
+
+    // Field type actions
+    const fieldTypeActions = menuActions
+      ? menuActions(selectedCell, onClose)
+      : [];
+    if (fieldTypeActions.length > 0) actionGroups.push(fieldTypeActions);
+
+    if (selectedColumn?.type === FieldType.derivative) {
+      const renderedFieldMenuActions = getFieldProp(
+        "contextMenuActions",
+        selectedColumn.config?.renderFieldType
+      );
+      if (renderedFieldMenuActions) {
+        actionGroups.push(renderedFieldMenuActions(selectedCell, onClose));
+      }
+    }
+
+    // Cell actions
+    // TODO: Add copy and paste here
+    const cellValue = row?.[selectedCell.columnKey];
+    const handleClearValue = () =>
+      updateField({
+        path: selectedCell.path,
+        fieldName: selectedColumn.fieldName,
+        value: null,
+        deleteField: true,
       });
+    const columnFilters = getFieldProp("filter", selectedColumn?.type);
+    const handleFilterValue = () => {
+      openTableFiltersPopover({
+        defaultQuery: {
+          key: selectedColumn.fieldName,
+          operator: columnFilters!.operators[0]?.value || "==",
+          value: cellValue,
+        },
+      });
+      onClose();
     };
-    const handleDelete = () => deleteRow(row._rowy_ref.path);
-    const rowActions = [
+    const cellActions = [
+      {
+        label: altPress ? "Clear value" : "Clear value…",
+        color: "error",
+        icon: <ClearIcon />,
+        disabled:
+          selectedColumn?.editable === false ||
+          !row ||
+          cellValue ||
+          getFieldProp("group", selectedColumn?.type) === "Auditing",
+        onClick: altPress
+          ? handleClearValue
+          : () => {
+              confirm({
+                title: "Clear cell value?",
+                body: "The cell’s value cannot be recovered after",
+                confirm: "Delete",
+                confirmColor: "error",
+                handleConfirm: handleClearValue,
+              });
+              onClose();
+            },
+      },
+      {
+        label: "Filter value",
+        icon: <FilterIcon />,
+        disabled: !columnFilters || cellValue === undefined,
+        onClick: handleFilterValue,
+      },
+    ];
+    actionGroups.push(cellActions);
+
+    // Row actions as sub-menu
+    actionGroups.push([
       {
         label: "Row",
         icon: <RowIcon />,
-        subItems: [
-          {
-            label: "Copy ID",
-            icon: <CopyIcon />,
-            onClick: () => {
-              navigator.clipboard.writeText(row._rowy_ref.id);
-              onClose();
-            },
-          },
-          {
-            label: "Copy path",
-            icon: <CopyIcon />,
-            onClick: () => {
-              navigator.clipboard.writeText(row._rowy_ref.path);
-              onClose();
-            },
-          },
-          {
-            label: "Open in Firebase Console",
-            icon: <OpenIcon />,
-            onClick: () => {
-              window.open(
-                `https://console.firebase.google.com/project/${projectId}/firestore/data/~2F${row._rowy_ref.path.replace(
-                  /\//g,
-                  "~2F"
-                )}`
-              );
-              onClose();
-            },
-          },
-          { label: "Divider", divider: true },
-          {
-            label: "Duplicate",
-            icon: <DuplicateIcon />,
-            disabled:
-              tableSettings.tableType === "collectionGroup" ||
-              (!userRoles.includes("ADMIN") && tableSettings.readOnly),
-            onClick: altPress
-              ? handleDuplicate
-              : () => {
-                  confirm({
-                    title: "Duplicate row?",
-                    body: (
-                      <>
-                        Row path:
-                        <br />
-                        <code
-                          style={{ userSelect: "all", wordBreak: "break-all" }}
-                        >
-                          {row._rowy_ref.path}
-                        </code>
-                      </>
-                    ),
-                    confirm: "Duplicate",
-                    handleConfirm: handleDuplicate,
-                  });
-                  onClose();
-                },
-          },
-          {
-            label: altPress ? "Delete" : "Delete…",
-            color: "error",
-            icon: <DeleteIcon />,
-            disabled: !userRoles.includes("ADMIN") && tableSettings.readOnly,
-            onClick: altPress
-              ? handleDelete
-              : () => {
-                  confirm({
-                    title: "Delete row?",
-                    body: (
-                      <>
-                        Row path:
-                        <br />
-                        <code
-                          style={{ userSelect: "all", wordBreak: "break-all" }}
-                        >
-                          {row._rowy_ref.path}
-                        </code>
-                      </>
-                    ),
-                    confirm: "Delete",
-                    confirmColor: "error",
-                    handleConfirm: handleDelete,
-                  });
-                  onClose();
-                },
-          },
-        ],
+        subItems: rowActions,
       },
-    ];
+    ]);
+  } else {
     actionGroups.push(rowActions);
   }
 
diff --git a/src/components/Table/formatters/FinalColumn.tsx b/src/components/Table/FinalColumn/FinalColumn.tsx
similarity index 67%
rename from src/components/Table/formatters/FinalColumn.tsx
rename to src/components/Table/FinalColumn/FinalColumn.tsx
index 84dd4563..0d5212ff 100644
--- a/src/components/Table/formatters/FinalColumn.tsx
+++ b/src/components/Table/FinalColumn/FinalColumn.tsx
@@ -1,9 +1,10 @@
 import { useAtom, useSetAtom } from "jotai";
-import type { FormatterProps } from "react-data-grid";
+import type { CellContext } from "@tanstack/table-core";
 
 import { Stack, Tooltip, IconButton, alpha } from "@mui/material";
 import { CopyCells as CopyCellsIcon } from "@src/assets/icons";
 import DeleteIcon from "@mui/icons-material/DeleteOutlined";
+import MenuIcon from "@mui/icons-material/MoreHoriz";
 
 import {
   projectScope,
@@ -17,10 +18,14 @@ import {
   tableSettingsAtom,
   addRowAtom,
   deleteRowAtom,
+  contextMenuTargetAtom,
 } from "@src/atoms/tableScope";
 import { TableRow } from "@src/types/table";
 
-export default function FinalColumn({ row }: FormatterProps<TableRow, any>) {
+export default function FinalColumn({
+  row,
+  focusInsideCell,
+}: CellContext<TableRow, any> & { focusInsideCell: boolean }) {
   const [userRoles] = useAtom(userRolesAtom, projectScope);
   const [addRowIdType] = useAtom(tableAddRowIdTypeAtom, projectScope);
   const confirm = useSetAtom(confirmDialogAtom, projectScope);
@@ -28,12 +33,13 @@ export default function FinalColumn({ row }: FormatterProps<TableRow, any>) {
   const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
   const addRow = useSetAtom(addRowAtom, tableScope);
   const deleteRow = useSetAtom(deleteRowAtom, tableScope);
+  const setContextMenuTarget = useSetAtom(contextMenuTargetAtom, tableScope);
 
   const [altPress] = useAtom(altPressAtom, projectScope);
-  const handleDelete = () => deleteRow(row._rowy_ref.path);
+  const handleDelete = () => deleteRow(row.original._rowy_ref.path);
   const handleDuplicate = () => {
     addRow({
-      row,
+      row: row.original,
       setId: addRowIdType === "custom" ? "decrement" : addRowIdType,
     });
   };
@@ -42,7 +48,26 @@ export default function FinalColumn({ row }: FormatterProps<TableRow, any>) {
     return null;
 
   return (
-    <Stack direction="row" spacing={0.5}>
+    <Stack
+      direction="row"
+      alignItems="center"
+      style={{ height: "100%" }}
+      gap={0.5}
+    >
+      <Tooltip title="Row menu">
+        <IconButton
+          size="small"
+          color="inherit"
+          onClick={(e) => {
+            setContextMenuTarget(e.target as HTMLElement);
+          }}
+          className="row-hover-iconButton"
+          tabIndex={focusInsideCell ? 0 : -1}
+        >
+          <MenuIcon />
+        </IconButton>
+      </Tooltip>
+
       <Tooltip title="Duplicate row">
         <IconButton
           size="small"
@@ -61,7 +86,7 @@ export default function FinalColumn({ row }: FormatterProps<TableRow, any>) {
                         <code
                           style={{ userSelect: "all", wordBreak: "break-all" }}
                         >
-                          {row._rowy_ref.path}
+                          {row.original._rowy_ref.path}
                         </code>
                       </>
                     ),
@@ -70,8 +95,8 @@ export default function FinalColumn({ row }: FormatterProps<TableRow, any>) {
                   });
                 }
           }
-          aria-label="Duplicate row"
           className="row-hover-iconButton"
+          tabIndex={focusInsideCell ? 0 : -1}
         >
           <CopyCellsIcon />
         </IconButton>
@@ -94,7 +119,7 @@ export default function FinalColumn({ row }: FormatterProps<TableRow, any>) {
                         <code
                           style={{ userSelect: "all", wordBreak: "break-all" }}
                         >
-                          {row._rowy_ref.path}
+                          {row.original._rowy_ref.path}
                         </code>
                       </>
                     ),
@@ -104,19 +129,20 @@ export default function FinalColumn({ row }: FormatterProps<TableRow, any>) {
                   });
                 }
           }
-          aria-label={`Delete row${altPress ? "" : "…"}`}
           className="row-hover-iconButton"
+          tabIndex={focusInsideCell ? 0 : -1}
           sx={{
-            ".rdg-row:hover .row-hover-iconButton&&": {
-              color: "error.main",
-              backgroundColor: (theme) =>
-                alpha(
-                  theme.palette.error.main,
-                  theme.palette.action.hoverOpacity * 2
-                ),
-            },
+            "[role='row']:hover .row-hover-iconButton&&, .row-hover-iconButton&&:focus":
+              {
+                color: "error.main",
+                backgroundColor: (theme) =>
+                  alpha(
+                    theme.palette.error.main,
+                    theme.palette.action.hoverOpacity * 2
+                  ),
+              },
           }}
-          disabled={!row._rowy_ref.path}
+          disabled={!row.original._rowy_ref.path}
         >
           <DeleteIcon />
         </IconButton>
diff --git a/src/components/Table/FinalColumn/FinalColumnHeader.tsx b/src/components/Table/FinalColumn/FinalColumnHeader.tsx
new file mode 100644
index 00000000..0a949885
--- /dev/null
+++ b/src/components/Table/FinalColumn/FinalColumnHeader.tsx
@@ -0,0 +1,58 @@
+import { useAtom, useSetAtom } from "jotai";
+
+import { Box, BoxProps, Button } from "@mui/material";
+import { AddColumn as AddColumnIcon } from "@src/assets/icons";
+
+import { projectScope, userRolesAtom } from "@src/atoms/projectScope";
+import { tableScope, columnModalAtom } from "@src/atoms/tableScope";
+import { spreadSx } from "@src/utils/ui";
+
+export interface IFinalColumnHeaderProps extends Partial<BoxProps> {
+  focusInsideCell: boolean;
+}
+
+export default function FinalColumnHeader({
+  focusInsideCell,
+  ...props
+}: IFinalColumnHeaderProps) {
+  const [userRoles] = useAtom(userRolesAtom, projectScope);
+  const openColumnModal = useSetAtom(columnModalAtom, tableScope);
+
+  if (!userRoles.includes("ADMIN")) return null;
+
+  return (
+    <Box
+      role="columnheader"
+      {...props}
+      sx={[
+        {
+          backgroundColor: "background.default",
+          border: (theme) => `1px solid ${theme.palette.divider}`,
+          borderLeft: "none",
+          borderTopRightRadius: (theme) => theme.shape.borderRadius,
+          borderBottomRightRadius: (theme) => theme.shape.borderRadius,
+
+          display: "flex",
+          alignItems: "center",
+
+          width: 32 * 3 + 4 * 2 + 10 * 2,
+          overflow: "visible",
+          px: 1,
+        },
+        ...spreadSx(props.sx),
+      ]}
+      className="column-header"
+    >
+      <Button
+        onClick={() => openColumnModal({ type: "new" })}
+        variant="contained"
+        color="primary"
+        startIcon={<AddColumnIcon />}
+        style={{ zIndex: 1, flexShrink: 0 }}
+        tabIndex={focusInsideCell ? 0 : -1}
+      >
+        Add column
+      </Button>
+    </Box>
+  );
+}
diff --git a/src/components/Table/FinalColumnHeader.tsx b/src/components/Table/FinalColumnHeader.tsx
deleted file mode 100644
index b425d1b1..00000000
--- a/src/components/Table/FinalColumnHeader.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { useAtom, useSetAtom } from "jotai";
-import { Column } from "react-data-grid";
-
-import { Button } from "@mui/material";
-import { AddColumn as AddColumnIcon } from "@src/assets/icons";
-
-import { projectScope, userRolesAtom } from "@src/atoms/projectScope";
-import { tableScope, columnModalAtom } from "@src/atoms/tableScope";
-
-const FinalColumnHeader: Column<any>["headerRenderer"] = ({ column }) => {
-  const [userRoles] = useAtom(userRolesAtom, projectScope);
-  const openColumnModal = useSetAtom(columnModalAtom, tableScope);
-
-  if (!userRoles.includes("ADMIN")) return null;
-
-  return (
-    <Button
-      onClick={(e) => openColumnModal({ type: "new" })}
-      variant="contained"
-      color="primary"
-      startIcon={<AddColumnIcon />}
-      style={{ zIndex: 1 }}
-    >
-      Add column
-    </Button>
-  );
-};
-
-export default FinalColumnHeader;
diff --git a/src/components/Table/Styled/StyledRow.tsx b/src/components/Table/Styled/StyledRow.tsx
index 5033152b..cbaed8c2 100644
--- a/src/components/Table/Styled/StyledRow.tsx
+++ b/src/components/Table/Styled/StyledRow.tsx
@@ -1,4 +1,4 @@
-import { styled } from "@mui/material";
+import { styled, alpha } from "@mui/material";
 
 import { DEFAULT_ROW_HEIGHT } from "@src/components/Table";
 
@@ -30,6 +30,20 @@ export const StyledRow = styled("div")(({ theme }) => ({
       borderBottomRightRadius: theme.shape.borderRadius,
     },
   },
+
+  "& .MuiIconButton-root.row-hover-iconButton, .MuiIconButton-root.row-hover-iconButton:focus":
+    {
+      color: theme.palette.text.disabled,
+      transitionDuration: "0s",
+    },
+  "&:hover .MuiIconButton-root.row-hover-iconButton, .MuiIconButton-root.row-hover-iconButton:focus":
+    {
+      color: theme.palette.text.primary,
+      backgroundColor: alpha(
+        theme.palette.action.hover,
+        theme.palette.action.hoverOpacity * 1.5
+      ),
+    },
 }));
 StyledRow.displayName = "StyledRow";
 
diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index fc9a2c8a..904d3d3b 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -19,12 +19,11 @@ import StyledTable from "./Styled/StyledTable";
 import StyledRow from "./Styled/StyledRow";
 import ColumnHeader from "./ColumnHeader";
 import StyledResizer from "./Styled/StyledResizer";
+import FinalColumnHeader from "./FinalColumn/FinalColumnHeader";
+import FinalColumn from "./FinalColumn/FinalColumn";
 import OutOfOrderIndicator from "./OutOfOrderIndicator";
 import ContextMenu from "./ContextMenu";
 
-import FinalColumnHeader from "./FinalColumnHeader";
-import FinalColumn from "./formatters/FinalColumn";
-// import TableRow from "./TableRow";
 import EmptyState from "@src/components/EmptyState";
 // import BulkActions from "./BulkActions";
 import AddRow from "@src/components/TableToolbar/AddRow";
@@ -133,7 +132,7 @@ export default function TableComponent() {
       _columns.push(
         columnHelper.display({
           id: "_rowy_column_actions",
-          header: () => "Actions",
+          cell: FinalColumn as any,
           // cell: () => (
           //   <>
           //     <IconButton>M</IconButton>
@@ -287,13 +286,27 @@ export default function TableComponent() {
                     ref={provided.innerRef}
                   >
                     {headerGroup.headers.map((header) => {
-                      if (!header.column.columnDef.meta) return null;
-
                       const isSelectedCell =
                         (!selectedCell && header.index === 0) ||
                         (selectedCell?.path === "_rowy_header" &&
                           selectedCell?.columnKey === header.id);
 
+                      if (header.id === "_rowy_column_actions")
+                        return (
+                          <FinalColumnHeader
+                            key={header.id}
+                            data-row-id={"_rowy_header"}
+                            data-col-id={header.id}
+                            tabIndex={isSelectedCell ? 0 : -1}
+                            focusInsideCell={isSelectedCell && focusInsideCell}
+                            aria-colindex={header.index + 1}
+                            aria-readonly={!canEditColumn}
+                            aria-selected={isSelectedCell}
+                          />
+                        );
+
+                      if (!header.column.columnDef.meta) return null;
+
                       return (
                         <Draggable
                           key={header.id}
@@ -477,10 +490,10 @@ export default function TableComponent() {
                         className="cell-contents"
                         style={{ height: tableSchema.rowHeight }}
                       >
-                        {flexRender(
-                          cell.column.columnDef.cell,
-                          cell.getContext()
-                        )}
+                        {flexRender(cell.column.columnDef.cell, {
+                          ...cell.getContext(),
+                          focusInsideCell: isSelectedCell && focusInsideCell,
+                        })}
                       </div>
                       {/* <button
                         tabIndex={isSelectedCell && focusInsideCell ? 0 : -1}
diff --git a/src/components/Table/TableRow.tsx b/src/components/Table/TableRow.tsx
deleted file mode 100644
index 80987211..00000000
--- a/src/components/Table/TableRow.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import { Fragment } from "react";
-import { useSetAtom } from "jotai";
-import { Row, RowRendererProps } from "react-data-grid";
-
-import OutOfOrderIndicator from "./OutOfOrderIndicator";
-
-import { tableScope, contextMenuTargetAtom } from "@src/atoms/tableScope";
-
-export default function TableRow(props: RowRendererProps<any>) {
-  const setContextMenuTarget = useSetAtom(contextMenuTargetAtom, tableScope);
-  const handleContextMenu = (e: React.MouseEvent) => {
-    e.preventDefault();
-    setContextMenuTarget(e?.target as HTMLElement);
-  };
-
-  if (props.row._rowy_outOfOrder)
-    return (
-      <Fragment key={props.row._rowy_ref.path}>
-        {/* <OutOfOrderIndicator top={props.top} height={props.height} /> */}
-        <Row onContextMenu={handleContextMenu} {...props} />
-      </Fragment>
-    );
-
-  return (
-    <Row
-      key={props.row._rowy_ref.path}
-      id={`row-${props.row._rowy_ref.path}`}
-      onContextMenu={handleContextMenu}
-      {...props}
-    />
-  );
-}

From 1fb5d68d56ad8e5c64df3de031838577f86dd8ab Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 31 Oct 2022 18:11:00 +1100
Subject: [PATCH 224/309] fix column virtualization not honoring minimum column
 width

---
 src/components/Table/useVirtualization.tsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/Table/useVirtualization.tsx b/src/components/Table/useVirtualization.tsx
index 52ddba5a..66b226ea 100644
--- a/src/components/Table/useVirtualization.tsx
+++ b/src/components/Table/useVirtualization.tsx
@@ -17,6 +17,8 @@ import {
 import { TableRow } from "@src/types/table";
 import { Column } from "@tanstack/react-table";
 
+import { MIN_COL_WIDTH } from "./Table";
+
 /**
  * Virtualizes rows and columns,
  * and scrolls to selected cell
@@ -60,7 +62,11 @@ export function useVirtualization(
     paddingStart: TABLE_PADDING,
     paddingEnd: TABLE_PADDING,
     estimateSize: useCallback(
-      (index: number) => leafColumns[index].columnDef.size || DEFAULT_COL_WIDTH,
+      (index: number) =>
+        Math.max(
+          MIN_COL_WIDTH,
+          leafColumns[index].columnDef.size || DEFAULT_COL_WIDTH
+        ),
       [leafColumns]
     ),
   });

From ef2424a1b53bf64064f49bb033e300b4344617a4 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 31 Oct 2022 18:17:33 +1100
Subject: [PATCH 225/309] fix ColumnHeaders over fixed columns

---
 src/components/Table/Table.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index 904d3d3b..f5719f27 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -340,6 +340,7 @@ export default function TableComponent() {
                                     TABLE_PADDING
                                   : undefined,
                                 ...provided.draggableProps.style,
+                                zIndex: header.column.getIsPinned() ? 11 : 10,
                               }}
                               width={header.getSize()}
                               sx={[

From 3a73311f0b16051dc64ab3b20e9d3aa5456e466e Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 31 Oct 2022 18:36:14 +1100
Subject: [PATCH 226/309] SideDrawer: prevent open when header is selected

---
 src/components/SideDrawer/SideDrawer.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/SideDrawer/SideDrawer.tsx b/src/components/SideDrawer/SideDrawer.tsx
index fb271eca..54b82de0 100644
--- a/src/components/SideDrawer/SideDrawer.tsx
+++ b/src/components/SideDrawer/SideDrawer.tsx
@@ -109,7 +109,7 @@ export default function SideDrawer({
   //   }
   // }, [cell]);
 
-  const disabled = !open && !cell; // && !urlDocState.doc;
+  const disabled = (!open && !cell) || selectedCellRowIndex <= -1; // && !urlDocState.doc;
   useEffect(() => {
     if (disabled && setOpen) setOpen(false);
   }, [disabled, setOpen]);

From 23183fcf1dc89f216f4ec0e5ad5c7d56ac136035 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 1 Nov 2022 12:53:45 +1100
Subject: [PATCH 227/309] fix ContextMenu not keyboard accessible

---
 src/components/Table/ContextMenu/ContextMenu.tsx | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/components/Table/ContextMenu/ContextMenu.tsx b/src/components/Table/ContextMenu/ContextMenu.tsx
index a8ad0725..9eaf4472 100644
--- a/src/components/Table/ContextMenu/ContextMenu.tsx
+++ b/src/components/Table/ContextMenu/ContextMenu.tsx
@@ -1,3 +1,4 @@
+import { useRef, useEffect } from "react";
 import { useAtom } from "jotai";
 import { ErrorBoundary } from "react-error-boundary";
 import { NonFullScreenErrorFallback } from "@src/components/ErrorFallback";
@@ -8,10 +9,21 @@ import MenuContents from "./MenuContents";
 import { tableScope, contextMenuTargetAtom } from "@src/atoms/tableScope";
 
 export default function ContextMenu() {
+  const menuRef = useRef<HTMLUListElement>(null);
   const [contextMenuTarget, setContextMenuTarget] = useAtom(
     contextMenuTargetAtom,
     tableScope
   );
+  const open = Boolean(contextMenuTarget);
+
+  useEffect(() => {
+    setTimeout(() => {
+      if (open && menuRef.current) {
+        const firstMenuitem = menuRef.current.querySelector("[role=menuitem]");
+        (firstMenuitem as HTMLElement)?.focus();
+      }
+    });
+  }, [open]);
 
   const handleClose = () => setContextMenuTarget(null);
 
@@ -20,11 +32,12 @@ export default function ContextMenu() {
       id="cell-context-menu"
       aria-label="Cell context menu"
       anchorEl={contextMenuTarget as any}
-      open={Boolean(contextMenuTarget)}
+      open={open}
       onClose={handleClose}
       anchorOrigin={{ vertical: "bottom", horizontal: "left" }}
       transformOrigin={{ vertical: "top", horizontal: "left" }}
       sx={{ "& .MuiMenu-paper": { minWidth: 160 } }}
+      MenuListProps={{ ref: menuRef }}
     >
       <ErrorBoundary FallbackComponent={NonFullScreenErrorFallback}>
         <MenuContents onClose={handleClose} />

From 564b4c8b3b8277a3ecf66f76c060ea39f2369a92 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 1 Nov 2022 13:19:31 +1100
Subject: [PATCH 228/309] move projectScope & perms out of Table and into
 TablePage

---
 src/components/Table/Table.tsx | 56 +++++++++++++---------------------
 src/pages/Table/TablePage.tsx  | 49 ++++++++++++++++++++++++++---
 2 files changed, 65 insertions(+), 40 deletions(-)

diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index f5719f27..614067b7 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -26,17 +26,9 @@ import ContextMenu from "./ContextMenu";
 
 import EmptyState from "@src/components/EmptyState";
 // import BulkActions from "./BulkActions";
-import AddRow from "@src/components/TableToolbar/AddRow";
-import { AddRow as AddRowIcon } from "@src/assets/icons";
 
-import {
-  projectScope,
-  userRolesAtom,
-  userSettingsAtom,
-} from "@src/atoms/projectScope";
 import {
   tableScope,
-  tableIdAtom,
   tableSettingsAtom,
   tableSchemaAtom,
   tableColumnsOrderedAtom,
@@ -52,7 +44,6 @@ import { COLLECTION_PAGE_SIZE } from "@src/config/db";
 
 import { getFieldType, getFieldProp } from "@src/components/fields";
 import { FieldType } from "@src/constants/fields";
-import { formatSubTableName } from "@src/utils/table";
 import { TableRow, ColumnConfig } from "@src/types/table";
 import { StyledCell } from "./Styled/StyledCell";
 import { useKeyboardNavigation } from "./useKeyboardNavigation";
@@ -73,11 +64,21 @@ declare module "@tanstack/table-core" {
 const columnHelper = createColumnHelper<TableRow>();
 const getRowId = (row: TableRow) => row._rowy_ref.path || row._rowy_ref.id;
 
-export default function TableComponent() {
-  const [userRoles] = useAtom(userRolesAtom, projectScope);
-  const [userSettings] = useAtom(userSettingsAtom, projectScope);
+export interface ITableProps {
+  canAddColumn: boolean;
+  canEditColumn: boolean;
+  canEditCell: boolean;
+  hiddenColumns?: string[];
+  emptyState?: React.ReactNode;
+}
 
-  const [tableId] = useAtom(tableIdAtom, tableScope);
+export default function Table({
+  canAddColumn,
+  canEditColumn,
+  canEditCell,
+  hiddenColumns,
+  emptyState,
+}: ITableProps) {
   const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
   const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
   const [tableColumnsOrdered] = useAtom(tableColumnsOrderedAtom, tableScope);
@@ -93,9 +94,6 @@ export default function TableComponent() {
   const containerRef = useRef<HTMLDivElement>(null);
   const gridRef = useRef<HTMLDivElement>(null);
 
-  const canAddColumn = userRoles.includes("ADMIN");
-  const canEditColumn = userRoles.includes("ADMIN");
-
   // Get column defs from table schema
   // Also add end column for admins
   const columns = useMemo(() => {
@@ -124,7 +122,6 @@ export default function TableComponent() {
           //   tableSettings.readOnly && !userRoles.includes("ADMIN")
           //     ? false
           //     : columnConfig.editable ?? true,
-          // width: columnConfig.width ?? DEFAULT_COL_WIDTH,
         })
       );
 
@@ -133,13 +130,6 @@ export default function TableComponent() {
         columnHelper.display({
           id: "_rowy_column_actions",
           cell: FinalColumn as any,
-          // cell: () => (
-          //   <>
-          //     <IconButton>M</IconButton>
-          //     <IconButton>D</IconButton>
-          //     <IconButton>X</IconButton>
-          //   </>
-          // ),
         })
       );
     }
@@ -147,14 +137,11 @@ export default function TableComponent() {
     return _columns;
   }, [tableColumnsOrdered, canAddColumn, tableSettings.readOnly]);
 
-  // Get user’s hidden columns from user document
-  const userDocHiddenFields =
-    userSettings.tables?.[formatSubTableName(tableId)]?.hiddenFields;
-  // Memoize into a VisibilityState
+  // Get user’s hidden columns from props and memoize into a VisibilityState
   const columnVisibility = useMemo(() => {
-    if (!Array.isArray(userDocHiddenFields)) return {};
-    return userDocHiddenFields.reduce((a, c) => ({ ...a, [c]: false }), {});
-  }, [userDocHiddenFields]);
+    if (!Array.isArray(hiddenColumns)) return {};
+    return hiddenColumns.reduce((a, c) => ({ ...a, [c]: false }), {});
+  }, [hiddenColumns]);
 
   // Get frozen columns
   const columnPinning = useMemo(
@@ -197,11 +184,7 @@ export default function TableComponent() {
   });
   const {
     virtualRows,
-    // totalHeight,
-    // scrollToRowIndex,
     virtualCols,
-    // totalWidth,
-    // scrollToColIndex,
     paddingTop,
     paddingBottom,
     paddingLeft,
@@ -518,6 +501,9 @@ export default function TableComponent() {
           {paddingBottom > 0 && (
             <div role="presentation" style={{ height: `${paddingBottom}px` }} />
           )}
+
+          {tableRows.length === 0 &&
+            (emptyState ?? <EmptyState sx={{ py: 8 }} />)}
         </div>
       </StyledTable>
 
diff --git a/src/pages/Table/TablePage.tsx b/src/pages/Table/TablePage.tsx
index 4fcf7059..d324a69d 100644
--- a/src/pages/Table/TablePage.tsx
+++ b/src/pages/Table/TablePage.tsx
@@ -18,9 +18,19 @@ import SideDrawer from "@src/components/SideDrawer";
 import ColumnMenu from "@src/components/ColumnMenu";
 import ColumnModals from "@src/components/ColumnModals";
 import TableModals from "@src/components/TableModals";
+import EmptyState from "@src/components/EmptyState";
+import AddRow from "@src/components/TableToolbar/AddRow";
+import { AddRow as AddRowIcon } from "@src/assets/icons";
 
+import {
+  projectScope,
+  userRolesAtom,
+  userSettingsAtom,
+} from "@src/atoms/projectScope";
 import {
   tableScope,
+  tableIdAtom,
+  tableSettingsAtom,
   tableSchemaAtom,
   columnModalAtom,
   tableModalAtom,
@@ -30,10 +40,8 @@ import ActionParamsProvider from "@src/components/fields/Action/FormDialog/Provi
 import { useSnackLogContext } from "@src/contexts/SnackLogContext";
 import { TOP_BAR_HEIGHT } from "@src/layouts/Navigation/TopBar";
 import { TABLE_TOOLBAR_HEIGHT } from "@src/components/TableToolbar";
-import {
-  DRAWER_COLLAPSED_WIDTH,
-  DRAWER_WIDTH,
-} from "@src/components/SideDrawer";
+import { DRAWER_COLLAPSED_WIDTH } from "@src/components/SideDrawer";
+import { formatSubTableName } from "@src/utils/table";
 
 // prettier-ignore
 const BuildLogsSnack = lazy(() => import("@src/components/TableModals/CloudLogsModal/BuildLogs/BuildLogsSnack" /* webpackChunkName: "TableModals-BuildLogsSnack" */));
@@ -53,9 +61,19 @@ export default function TablePage({
   disableModals,
   disableSideDrawer,
 }: ITablePageProps) {
+  const [userRoles] = useAtom(userRolesAtom, projectScope);
+  const [userSettings] = useAtom(userSettingsAtom, projectScope);
+  const [tableId] = useAtom(tableIdAtom, tableScope);
+  const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
   const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
   const snackLogContext = useSnackLogContext();
 
+  // Set permissions here so we can pass them to the Table component, which
+  // shouldn’t access projectScope at all, to separate concerns.
+  const canAddColumn = userRoles.includes("ADMIN");
+  const canEditColumn = userRoles.includes("ADMIN");
+  const canEditCell = userRoles.includes("ADMIN") || !tableSettings.readOnly;
+
   // Warn user about leaving when they have a table modal open
   useBeforeUnload(columnModalAtom, tableScope);
   useBeforeUnload(tableModalAtom, tableScope);
@@ -104,6 +122,7 @@ export default function TablePage({
             sx={{
               height: `calc(100vh - ${TOP_BAR_HEIGHT}px - ${TABLE_TOOLBAR_HEIGHT}px)`,
               width: `calc(100% - ${DRAWER_COLLAPSED_WIDTH}px)`,
+              position: "relative",
 
               '& [role="grid"]': {
                 marginBottom: `env(safe-area-inset-bottom)`,
@@ -112,7 +131,27 @@ export default function TablePage({
               },
             }}
           >
-            <Table />
+            <Table
+              canAddColumn={canAddColumn}
+              canEditColumn={canEditColumn}
+              canEditCell={canEditCell}
+              hiddenColumns={
+                userSettings.tables?.[formatSubTableName(tableId)]?.hiddenFields
+              }
+              emptyState={
+                <EmptyState
+                  Icon={AddRowIcon}
+                  message="Add a row to get started"
+                  description={
+                    <div>
+                      <br />
+                      <AddRow />
+                    </div>
+                  }
+                  style={{ position: "absolute", inset: 0 }}
+                />
+              }
+            />
           </Box>
         </Suspense>
       </ErrorBoundary>

From 74a9c01b03496d8cbdef961eccaa71023d9bf15c Mon Sep 17 00:00:00 2001
From: Miriam Shams-Rainey <mshamsrainey@gmail.com>
Date: Wed, 2 Nov 2022 00:43:10 -0400
Subject: [PATCH 229/309] Applied global theme changes

---
 src/components/fields/Rating/Icon.tsx            | 15 +++++++++------
 src/components/fields/Rating/Settings.tsx        |  4 +---
 src/components/fields/Rating/SideDrawerField.tsx |  2 +-
 src/components/fields/Rating/TableCell.tsx       |  5 +----
 src/theme/components.tsx                         |  3 ++-
 5 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/components/fields/Rating/Icon.tsx b/src/components/fields/Rating/Icon.tsx
index 4bb8a95c..374a395f 100644
--- a/src/components/fields/Rating/Icon.tsx
+++ b/src/components/fields/Rating/Icon.tsx
@@ -3,13 +3,16 @@ import RatingOutlineIcon from "@mui/icons-material/StarBorder"
 import { get } from "lodash-es";
 
 
-export default function Icon(config: any, isEmpty: Boolean) {
-// console.log(config)
- if (isEmpty) {
-    //console.log(getStateOutline(config))
-    return getStateOutline(config.config)
+export interface IIconProps{
+  config: any,
+  isEmpty: boolean
+}
+
+export default function ({config, isEmpty} : IIconProps) {
+if (isEmpty) {
+    return getStateOutline(config)
  } else {
-    return getStateIcon(config.config)
+    return getStateIcon(config)
 }
 } 
 
diff --git a/src/components/fields/Rating/Settings.tsx b/src/components/fields/Rating/Settings.tsx
index 1d9e5096..2a258cf6 100644
--- a/src/components/fields/Rating/Settings.tsx
+++ b/src/components/fields/Rating/Settings.tsx
@@ -1,6 +1,4 @@
 import { ISettingsProps } from "@src/components/fields/types";
-import RatingIcon from "@mui/icons-material/Star";
-import RatingOutlineIcon from "@mui/icons-material/StarBorder"
 import { InputLabel, TextField, Grid, FormControlLabel, Checkbox, Stack } from "@mui/material";
 import ToggleButton from "@mui/material/ToggleButton";
 import ToggleButtonGroup from "@mui/material/ToggleButtonGroup";
@@ -82,7 +80,7 @@ export default function Settings({ onChange, config }: ISettingsProps) {
               onClick={(e) => e.stopPropagation()}
               icon={<Icon config={config} isEmpty={false} />}
               size="small"
-              emptyIcon={<Icon config={config} isEmpty={true} style={{ opacity: 0.55 }} />}
+              emptyIcon={<Icon config={config} isEmpty={true} />}
               max={get(config, "max")}
               precision={get(config, "precision")}
               sx={{ pt: 0.5 }}
diff --git a/src/components/fields/Rating/SideDrawerField.tsx b/src/components/fields/Rating/SideDrawerField.tsx
index 2652bf65..18121c7f 100644
--- a/src/components/fields/Rating/SideDrawerField.tsx
+++ b/src/components/fields/Rating/SideDrawerField.tsx
@@ -29,7 +29,7 @@ export default function Rating({
           onSubmit();
         }}
         icon={<Icon config={column.config} isEmpty={false}/>}
-        emptyIcon={<Icon config={column.config} isEmpty={true} style={{opacity: 0.5}}/>}
+        emptyIcon={<Icon config={column.config} isEmpty={true} />}
         size="small"
         max={max}
         precision={precision}
diff --git a/src/components/fields/Rating/TableCell.tsx b/src/components/fields/Rating/TableCell.tsx
index 6aaa72e1..7b2a6530 100644
--- a/src/components/fields/Rating/TableCell.tsx
+++ b/src/components/fields/Rating/TableCell.tsx
@@ -1,9 +1,6 @@
 import { IHeavyCellProps } from "@src/components/fields/types";
 
 import MuiRating from "@mui/material/Rating";
-import RatingIcon from "@mui/icons-material/Star";
-import RatingOutlineIcon from "@mui/icons-material/StarBorder"
-import { get } from "lodash-es";
 import Icon from "./Icon"
 
 
@@ -37,7 +34,7 @@ export default function Rating({
       size="small"
       disabled={disabled}
       onChange={(_, newValue) => onSubmit(newValue)}
-      emptyIcon={<Icon config={column.config} isEmpty={true} style={{ opacity: 0.55 }} />}
+      emptyIcon={<Icon config={column.config} isEmpty={true} />}
       max={max}
       precision={precision}
       sx={{ mx: -0.25 }}
diff --git a/src/theme/components.tsx b/src/theme/components.tsx
index 48d4b446..435c9586 100644
--- a/src/theme/components.tsx
+++ b/src/theme/components.tsx
@@ -1341,11 +1341,12 @@ export const components = (theme: Theme): ThemeOptions => {
 
       MuiRating: {
         styleOverrides: {
-          iconFilled: { color: theme.palette.text.secondary },
           icon: {
             // https://github.com/mui/material-ui/issues/32557
             "& .MuiSvgIcon-root": { pointerEvents: "auto" },
+            color: theme.palette.text.secondary,
           },
+          iconEmpty: { opacity: 0.38 },
         },
       },
 

From 9b05906fbe4973aca820a8c67512313e8c4ac821 Mon Sep 17 00:00:00 2001
From: Miriam Shams-Rainey <mshamsrainey@gmail.com>
Date: Wed, 2 Nov 2022 01:03:25 -0400
Subject: [PATCH 230/309] Merge conflicts

---
 src/components/fields/Rating/Settings.tsx     |   2 +
 .../fields/Rating/SideDrawerField.tsx         |   1 +
 src/components/fields/Rating/TableCell.tsx    |   1 -
 src/theme/components.tsx                      | 140 +++++++++++-------
 4 files changed, 90 insertions(+), 54 deletions(-)

diff --git a/src/components/fields/Rating/Settings.tsx b/src/components/fields/Rating/Settings.tsx
index 2a258cf6..5bffda3d 100644
--- a/src/components/fields/Rating/Settings.tsx
+++ b/src/components/fields/Rating/Settings.tsx
@@ -6,6 +6,7 @@ import MuiRating from "@mui/material/Rating";
 import { get } from "lodash-es";
 import Icon from "./Icon"
 
+
 export default function Settings({ onChange, config }: ISettingsProps) {
   return (
     <Grid container spacing={2} justifyItems="end" direction={"row"}>
@@ -21,6 +22,7 @@ export default function Settings({ onChange, config }: ISettingsProps) {
             if (input > 20) { input = 20 }
             onChange("max")(input);
           }}
+          inputProps={{ min: 1, max: 20 }}
         />
       </Grid>
       <Grid item xs={6}>
diff --git a/src/components/fields/Rating/SideDrawerField.tsx b/src/components/fields/Rating/SideDrawerField.tsx
index 18121c7f..8011bf8e 100644
--- a/src/components/fields/Rating/SideDrawerField.tsx
+++ b/src/components/fields/Rating/SideDrawerField.tsx
@@ -6,6 +6,7 @@ import "@mui/lab";
 import { fieldSx } from "@src/components/SideDrawer/utils";
 import Icon from "./Icon"
 
+
 export default function Rating({
   column,
   value,
diff --git a/src/components/fields/Rating/TableCell.tsx b/src/components/fields/Rating/TableCell.tsx
index 7b2a6530..368d8fbe 100644
--- a/src/components/fields/Rating/TableCell.tsx
+++ b/src/components/fields/Rating/TableCell.tsx
@@ -4,7 +4,6 @@ import MuiRating from "@mui/material/Rating";
 import Icon from "./Icon"
 
 
-
 export default function Rating({
   row,
   column,
diff --git a/src/theme/components.tsx b/src/theme/components.tsx
index 435c9586..9224d46d 100644
--- a/src/theme/components.tsx
+++ b/src/theme/components.tsx
@@ -4,6 +4,7 @@ import type {} from "@mui/lab/themeAugmentation";
 import { MultiSelectProps } from "@rowy/multiselect";
 import { toRem } from "./typography";
 
+import ModalTransition from "@src/components/Modal/ModalTransition";
 import RadioIcon from "@src/theme/RadioIcon";
 import CheckboxIcon from "@src/theme/CheckboxIcon";
 import CheckboxIndeterminateIcon from "@src/theme/CheckboxIndeterminateIcon";
@@ -81,22 +82,22 @@ export const components = (theme: Theme): ThemeOptions => {
 
           body: { cursor: "default" },
 
-          "@supports selector(:has(a))": {
-            body: {
-              transition: "background-color 0s",
-              transitionDelay: theme.transitions.duration.leavingScreen + "ms",
-            },
+          // "@supports selector(:has(a))": {
+          //   body: {
+          //     transition: "background-color 0s",
+          //     transitionDelay: theme.transitions.duration.leavingScreen + "ms",
+          //   },
 
-            "#root": {
-              transformOrigin: `50% ${theme.spacing(1)}`,
-              transition: theme.transitions.create([
-                "transform",
-                "border-radius",
-              ]),
-              transitionDuration: `${theme.transitions.duration.leavingScreen}ms, 0s`,
-              transitionDelay: `0s, ${theme.transitions.duration.leavingScreen}ms`,
-            },
-          },
+          //   "#root": {
+          //     transformOrigin: `50% 0%`,
+          //     transition: theme.transitions.create([
+          //       "transform",
+          //       "border-radius",
+          //     ]),
+          //     transitionDuration: `${theme.transitions.duration.leavingScreen}ms, 0s`,
+          //     transitionDelay: `0s, ${theme.transitions.duration.leavingScreen}ms`,
+          //   },
+          // },
 
           "code, pre, pre.MuiTypography-root": {
             fontFamily: theme.typography.fontFamilyMono,
@@ -248,6 +249,9 @@ export const components = (theme: Theme): ThemeOptions => {
       },
 
       MuiDialog: {
+        defaultProps: {
+          TransitionComponent: ModalTransition,
+        },
         styleOverrides: {
           root: {
             "--dialog-title-height": "64px",
@@ -257,7 +261,7 @@ export const components = (theme: Theme): ThemeOptions => {
           },
 
           paper: {
-            borderRadius: (theme.shape.borderRadius as number) * 2,
+            borderRadius: (theme.shape.borderRadius as number) * 3,
 
             "--dialog-spacing": theme.spacing(3),
             [theme.breakpoints.down("sm")]: {
@@ -271,52 +275,44 @@ export const components = (theme: Theme): ThemeOptions => {
           paperFullScreen: {
             borderBottomLeftRadius: 0,
             borderBottomRightRadius: 0,
-            marginTop: `calc(env(safe-area-inset-top) + ${theme.spacing(2)})`,
-            maxHeight: `calc(100% - env(safe-area-inset-top) - ${theme.spacing(
-              2
-            )})`,
+            marginTop: `calc(env(safe-area-inset-top) + 10px)`,
+            maxHeight: `calc(100% - env(safe-area-inset-top) - 10px)`,
             maxWidth: "100% !important",
 
             paddingLeft: "env(safe-area-inset-left)",
             paddingRight: "env(safe-area-inset-right)",
             paddingBottom: "env(safe-area-inset-bottom)",
 
-            "body:has([data-open=true] &)": {
-              backgroundColor: theme.palette.common.black,
-              transitionDelay: "0s",
+            // "body:has([data-open=true] &)": {
+            //   backgroundColor: theme.palette.common.black,
+            //   transitionDelay: "0s",
 
-              "#root": {
-                borderRadius: (theme.shape.borderRadius as number) * 2,
-                overflow: "hidden",
-                filter: `grayscale(100%) contrast(${
-                  theme.palette.mode === "dark" ? "80" : "75"
-                }%)`,
+            //   "#root": {
+            //     borderRadius: (theme.shape.borderRadius as number) * 2,
+            //     overflow: "hidden",
+            //     filter: `grayscale(100%) contrast(${
+            //       theme.palette.mode === "dark" ? "80" : "75"
+            //     }%)`,
 
-                transform: `scale(0.9) translateY(${theme.spacing(1)})`,
-                transition: theme.transitions.create(
-                  ["transform", "border-radius"],
-                  {
-                    easing: theme.transitions.easing.easeOut,
-                  }
-                ),
-                transitionDuration: `${theme.transitions.duration.enteringScreen}ms, 0s`,
-                transitionDelay: "0s, 0s",
-              },
-            },
+            //     transform: `scale(0.9)`,
+            //     transition: theme.transitions.create(
+            //       ["transform", "border-radius"],
+            //       {
+            //         easing: theme.transitions.easing.easeOut,
+            //       }
+            //     ),
+            //     transitionDuration: `${theme.transitions.duration.enteringScreen}ms, 0s`,
+            //     transitionDelay: "0s, 0s",
+            //   },
+            // },
           },
         },
       },
       MuiDialogTitle: {
         styleOverrides: {
           root: {
-            padding: "var(--dialog-spacing)",
-            paddingTop: (64 - 28) / 2,
-            paddingBottom: (64 - 28) / 2,
-
-            [theme.breakpoints.down("sm")]: {
-              paddingTop: (56 - 28) / 2,
-              paddingBottom: (56 - 28) / 2,
-            },
+            ...(theme.typography.h5 as any),
+            padding: `calc((var(--dialog-title-height) - ${theme.typography.h5.lineHeight} * ${theme.typography.h5.fontSize}) / 2) var(--dialog-spacing)`,
           },
         },
       },
@@ -386,6 +382,18 @@ export const components = (theme: Theme): ThemeOptions => {
                 paddingRight: theme.spacing(1),
               },
             },
+
+            "input[type='search']::-webkit-search-cancel-button": {
+              appearance: "none",
+              mask: `url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'%3e%3cpath d='M12 2C6.47 2 2 6.47 2 12s4.47 10 10 10 10-4.47 10-10S17.53 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8zm3.59-13L12 10.59 8.41 7 7 8.41 10.59 12 7 15.59 8.41 17 12 13.41 15.59 17 17 15.59 13.41 12 17 8.41z'/%3e%3c/svg%3e") no-repeat 50% 50%`,
+              backgroundColor: "currentColor",
+              opacity: 0.67,
+
+              width: "1.5rem",
+              height: "1.5rem",
+              marginLeft: theme.spacing(0.5),
+              marginRight: 0,
+            },
           },
         },
       },
@@ -395,7 +403,17 @@ export const components = (theme: Theme): ThemeOptions => {
             caretColor: theme.palette.primary.main,
             ".Mui-error &": { caretColor: theme.palette.error.main },
           },
-          inputSizeSmall: theme.typography.body2 as any,
+          inputSizeSmall: {
+            ...(theme.typography.body2 as any),
+            [theme.breakpoints.only("xs")]: {
+              ...(theme.typography.body1 as any),
+              "&, &.MuiSelect-select": {
+                minHeight: `${theme.typography.body1.lineHeight}em`,
+              },
+              paddingTop: theme.spacing(0.5),
+              paddingBottom: theme.spacing(0.5),
+            },
+          },
         },
       },
       MuiFilledInput: {
@@ -535,7 +553,10 @@ export const components = (theme: Theme): ThemeOptions => {
             ".MuiMenu-list &": { whiteSpace: "normal" },
           },
           primary: {
-            ".MuiSelect-select &": theme.typography.body2,
+            ".MuiSelect-select &": {
+              ...(theme.typography.body2 as any),
+              [theme.breakpoints.only("xs")]: theme.typography.body1,
+            },
           },
           secondary: {
             ".MuiSelect-select &": { display: "none" },
@@ -545,6 +566,13 @@ export const components = (theme: Theme): ThemeOptions => {
 
       MuiMenu: {
         styleOverrides: {
+          root: {
+            ".MuiDialog-root + & .MuiMenu-paper, form:has(.MuiDialog-root) + & .MuiMenu-paper, .MuiDialog-root & .MuiMenu-paper":
+              {
+                backgroundImage:
+                  "linear-gradient(rgba(255, 255, 255, 0.2), rgba(255, 255, 255, 0.2))", // elevation 50
+              },
+          },
           list: { padding: theme.spacing(0.5, 0) },
         },
       },
@@ -725,12 +753,12 @@ export const components = (theme: Theme): ThemeOptions => {
           },
 
           contained: {
-            boxShadow: `0 -1px 0 0 rgba(0, 0, 0, 0.12) inset, ${theme.shadows[2]}`,
+            boxShadow: `0 -1px 0 0 rgba(0, 0, 0, 0.4) inset, 0 0 0 1px rgba(255, 255, 255, 0.08) inset, ${theme.shadows[2]}`,
             "&:hover": {
-              boxShadow: `0 -1px 0 0 rgba(0, 0, 0, 0.12) inset, ${theme.shadows[4]}`,
+              boxShadow: `0 -1px 0 0 rgba(0, 0, 0, 0.4) inset, 0 0 0 1px rgba(255, 255, 255, 0.08) inset, ${theme.shadows[4]}`,
             },
             "&:active": {
-              boxShadow: `0 -1px 0 0 rgba(0, 0, 0, 0.12) inset, ${theme.shadows[8]}`,
+              boxShadow: `0 -1px 0 0 rgba(0, 0, 0, 0.4) inset, 0 0 0 1px rgba(255, 255, 255, 0.08) inset, ${theme.shadows[8]}`,
             },
           },
           containedPrimary: {
@@ -1339,6 +1367,12 @@ export const components = (theme: Theme): ThemeOptions => {
         },
       },
 
+      MuiSkeleton: {
+        styleOverrides: {
+          rectangular: { borderRadius: theme.shape.borderRadius },
+        },
+      },
+
       MuiRating: {
         styleOverrides: {
           icon: {

From e436e2083a6767525fa82f7b839a3ddfb538f2ed Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 2 Nov 2022 16:36:10 +1100
Subject: [PATCH 231/309] re-enable table cells

---
 src/components/Table/CellValidation.tsx       | 42 +++---------
 .../Table/FinalColumn/FinalColumn.tsx         |  8 +--
 src/components/Table/Styled/StyledCell.tsx    |  8 ++-
 src/components/Table/Table.tsx                | 53 ++++++++-------
 .../fields/ConnectTable/InlineCell.tsx        |  4 +-
 .../fields/_withTableCell/withBasicCell.tsx   | 32 +++------
 .../fields/_withTableCell/withHeavyCell.tsx   | 61 +++++------------
 .../fields/_withTableCell/withPopoverCell.tsx | 67 +++++--------------
 src/components/fields/types.ts                | 10 +--
 src/types/table.d.ts                          | 16 +++--
 10 files changed, 107 insertions(+), 194 deletions(-)

diff --git a/src/components/Table/CellValidation.tsx b/src/components/Table/CellValidation.tsx
index ac6a9764..ad7560dc 100644
--- a/src/components/Table/CellValidation.tsx
+++ b/src/components/Table/CellValidation.tsx
@@ -2,30 +2,9 @@ import { styled } from "@mui/material/styles";
 import ErrorIcon from "@mui/icons-material/ErrorOutline";
 import WarningIcon from "@mui/icons-material/WarningAmber";
 
+import StyledCell from "./Styled/StyledCell";
 import RichTooltip from "@src/components/RichTooltip";
 
-const Root = styled("div", { shouldForwardProp: (prop) => prop !== "error" })(
-  ({ theme, ...props }) => ({
-    width: "100%",
-    height: "100%",
-    padding: "var(--cell-padding)",
-    position: "relative",
-
-    overflow: "hidden",
-    contain: "strict",
-    display: "flex",
-    alignItems: "center",
-
-    ...((props as any).error
-      ? {
-          ".rdg-cell:not([aria-selected=true]) &": {
-            boxShadow: `inset 0 0 0 2px ${theme.palette.error.main}`,
-          },
-        }
-      : {}),
-  })
-);
-
 const Dot = styled("div")(({ theme }) => ({
   position: "absolute",
   right: -5,
@@ -40,7 +19,7 @@ const Dot = styled("div")(({ theme }) => ({
   backgroundColor: theme.palette.error.main,
 
   boxShadow: `0 0 0 4px var(--background-color)`,
-  ".rdg-row:hover &": {
+  "[role='row']:hover &": {
     boxShadow: `0 0 0 4px var(--row-hover-background-color)`,
   },
 }));
@@ -60,13 +39,14 @@ export default function CellValidation({
   required,
   validationRegex,
   children,
+  ...props
 }: ICellValidationProps) {
   const isInvalid = validationRegex && !new RegExp(validationRegex).test(value);
   const isMissing = required && value === undefined;
 
   if (isInvalid)
     return (
-      <>
+      <StyledCell aria-invalid="true" {...props}>
         <RichTooltip
           icon={<ErrorIcon fontSize="inherit" color="error" />}
           title="Invalid data"
@@ -74,14 +54,13 @@ export default function CellValidation({
           placement="right"
           render={({ openTooltip }) => <Dot onClick={openTooltip} />}
         />
-
-        <Root {...({ error: true } as any)}>{children}</Root>
-      </>
+        {children}
+      </StyledCell>
     );
 
   if (isMissing)
     return (
-      <>
+      <StyledCell aria-invalid="true" {...props}>
         <RichTooltip
           icon={<WarningIcon fontSize="inherit" color="warning" />}
           title="Required field"
@@ -89,10 +68,9 @@ export default function CellValidation({
           placement="right"
           render={({ openTooltip }) => <Dot onClick={openTooltip} />}
         />
-
-        <Root {...({ error: true } as any)}>{children}</Root>
-      </>
+        {children}
+      </StyledCell>
     );
 
-  return <Root>{children}</Root>;
+  return <StyledCell {...props}>{children}</StyledCell>;
 }
diff --git a/src/components/Table/FinalColumn/FinalColumn.tsx b/src/components/Table/FinalColumn/FinalColumn.tsx
index 0d5212ff..c9d23dca 100644
--- a/src/components/Table/FinalColumn/FinalColumn.tsx
+++ b/src/components/Table/FinalColumn/FinalColumn.tsx
@@ -1,5 +1,5 @@
 import { useAtom, useSetAtom } from "jotai";
-import type { CellContext } from "@tanstack/table-core";
+import type { TableCellProps } from "@src/components/Table";
 
 import { Stack, Tooltip, IconButton, alpha } from "@mui/material";
 import { CopyCells as CopyCellsIcon } from "@src/assets/icons";
@@ -20,12 +20,8 @@ import {
   deleteRowAtom,
   contextMenuTargetAtom,
 } from "@src/atoms/tableScope";
-import { TableRow } from "@src/types/table";
 
-export default function FinalColumn({
-  row,
-  focusInsideCell,
-}: CellContext<TableRow, any> & { focusInsideCell: boolean }) {
+export default function FinalColumn({ row, focusInsideCell }: TableCellProps) {
   const [userRoles] = useAtom(userRolesAtom, projectScope);
   const [addRowIdType] = useAtom(tableAddRowIdTypeAtom, projectScope);
   const confirm = useSetAtom(confirmDialogAtom, projectScope);
diff --git a/src/components/Table/Styled/StyledCell.tsx b/src/components/Table/Styled/StyledCell.tsx
index 58de99fd..af2e03b4 100644
--- a/src/components/Table/Styled/StyledCell.tsx
+++ b/src/components/Table/Styled/StyledCell.tsx
@@ -12,7 +12,7 @@ export const StyledCell = styled("div")(({ theme }) => ({
   },
 
   overflow: "visible",
-  contain: "none",
+  contain: "strict",
   position: "relative",
 
   backgroundColor: theme.palette.background.paper,
@@ -31,5 +31,11 @@ export const StyledCell = styled("div")(({ theme }) => ({
   "[data-out-of-order='true'] + [role='row'] &": {
     borderTop: `1px solid ${theme.palette.divider}`,
   },
+
+  "&[aria-invalid='true']": {
+    boxShadow: `inset 0 0 0 2px ${theme.palette.error.main}`,
+  },
 }));
 StyledCell.displayName = "StyledCell";
+
+export default StyledCell;
diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index 614067b7..6f219236 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -6,6 +6,7 @@ import {
   flexRender,
   getCoreRowModel,
   useReactTable,
+  CellContext,
 } from "@tanstack/react-table";
 import {
   DragDropContext,
@@ -14,6 +15,7 @@ import {
   Draggable,
 } from "react-beautiful-dnd";
 import { Portal } from "@mui/material";
+import { ErrorBoundary } from "react-error-boundary";
 
 import StyledTable from "./Styled/StyledTable";
 import StyledRow from "./Styled/StyledRow";
@@ -23,8 +25,10 @@ import FinalColumnHeader from "./FinalColumn/FinalColumnHeader";
 import FinalColumn from "./FinalColumn/FinalColumn";
 import OutOfOrderIndicator from "./OutOfOrderIndicator";
 import ContextMenu from "./ContextMenu";
+import CellValidation from "./CellValidation";
 
 import EmptyState from "@src/components/EmptyState";
+import { InlineErrorFallback } from "@src/components/ErrorFallback";
 // import BulkActions from "./BulkActions";
 
 import {
@@ -57,6 +61,10 @@ export const TABLE_PADDING = 16;
 export const OUT_OF_ORDER_MARGIN = 8;
 export const DEBOUNCE_DELAY = 500;
 
+export type TableCellProps = CellContext<TableRow, any> & {
+  focusInsideCell: boolean;
+};
+
 declare module "@tanstack/table-core" {
   interface ColumnMeta<TData, TValue> extends ColumnConfig {}
 }
@@ -107,21 +115,7 @@ export default function Table({
           size: columnConfig.width,
           enableResizing: columnConfig.resizable !== false,
           minSize: MIN_COL_WIDTH,
-          // formatter:
-          //   getFieldProp("TableCell", getFieldType(columnConfig)) ??
-          //   function InDev() {
-          //     return null;
-          //   },
-          // editor:
-          //   getFieldProp("TableEditor", getFieldType(columnConfig)) ??
-          //   function InDev() {
-          //     return null;
-          //   },
-          // ...columnConfig,
-          // editable:
-          //   tableSettings.readOnly && !userRoles.includes("ADMIN")
-          //     ? false
-          //     : columnConfig.editable ?? true,
+          cell: getFieldProp("TableCell", getFieldType(columnConfig)),
         })
       );
 
@@ -419,7 +413,7 @@ export default function Table({
                     selectedCell?.columnKey === cell.column.id;
 
                   return (
-                    <StyledCell
+                    <CellValidation
                       key={cell.id}
                       data-row-id={row.id}
                       data-col-id={cell.column.id}
@@ -431,12 +425,17 @@ export default function Table({
                       tabIndex={isSelectedCell && !focusInsideCell ? 0 : -1}
                       aria-colindex={cellIndex + 1}
                       aria-readonly={
+                        !canEditCell &&
                         cell.column.columnDef.meta?.editable === false
                       }
+                      aria-required={Boolean(
+                        cell.column.columnDef.meta!.config?.required
+                      )}
                       aria-selected={isSelectedCell}
                       aria-describedby="rowy-table-cell-description"
                       style={{
                         width: cell.column.getSize(),
+                        height: tableSchema.rowHeight,
                         left: cell.column.getIsPinned()
                           ? virtualCell.start - TABLE_PADDING
                           : undefined,
@@ -469,22 +468,24 @@ export default function Table({
                         (e.target as HTMLDivElement).focus();
                         setContextMenuTarget(e.target as HTMLElement);
                       }}
+                      value={cell.getValue()}
+                      required={cell.column.columnDef.meta!.config?.required}
+                      validationRegex={
+                        cell.column.columnDef.meta!.config?.validationRegex
+                      }
                     >
                       <div
                         className="cell-contents"
                         style={{ height: tableSchema.rowHeight }}
                       >
-                        {flexRender(cell.column.columnDef.cell, {
-                          ...cell.getContext(),
-                          focusInsideCell: isSelectedCell && focusInsideCell,
-                        })}
+                        <ErrorBoundary fallbackRender={InlineErrorFallback}>
+                          {flexRender(cell.column.columnDef.cell, {
+                            ...cell.getContext(),
+                            focusInsideCell: isSelectedCell && focusInsideCell,
+                          })}
+                        </ErrorBoundary>
                       </div>
-                      {/* <button
-                        tabIndex={isSelectedCell && focusInsideCell ? 0 : -1}
-                      >
-                        {isSelectedCell ? "f" : "x"}
-                      </button> */}
-                    </StyledCell>
+                    </CellValidation>
                   );
                 })}
 
diff --git a/src/components/fields/ConnectTable/InlineCell.tsx b/src/components/fields/ConnectTable/InlineCell.tsx
index 72d886ad..3f8f3147 100644
--- a/src/components/fields/ConnectTable/InlineCell.tsx
+++ b/src/components/fields/ConnectTable/InlineCell.tsx
@@ -32,7 +32,7 @@ export const ConnectTable = forwardRef(function ConnectTable(
           value.map((item: any) => (
             <Grid item key={item.docPath}>
               <Chip
-                label={config.primaryKeys
+                label={(config.primaryKeys ?? [])
                   .map((key: string) => item.snapshot[key])
                   .join(" ")}
               />
@@ -41,7 +41,7 @@ export const ConnectTable = forwardRef(function ConnectTable(
         ) : value ? (
           <Grid item>
             <Chip
-              label={config.primaryKeys
+              label={(config.primaryKeys ?? [])
                 .map((key: string) => value.snapshot[key])
                 .join(" ")}
             />
diff --git a/src/components/fields/_withTableCell/withBasicCell.tsx b/src/components/fields/_withTableCell/withBasicCell.tsx
index 09d0bcb9..a268bf2e 100644
--- a/src/components/fields/_withTableCell/withBasicCell.tsx
+++ b/src/components/fields/_withTableCell/withBasicCell.tsx
@@ -1,12 +1,9 @@
-import { get } from "lodash-es";
-import { FormatterProps } from "react-data-grid";
+import type { TableCellProps } from "@src/components/Table";
 import { ErrorBoundary } from "react-error-boundary";
 import { IBasicCellProps } from "@src/components/fields/types";
 
 import { InlineErrorFallback } from "@src/components/ErrorFallback";
 import CellValidation from "@src/components/Table/CellValidation";
-import { FieldType } from "@src/constants/fields";
-import { TableRow } from "@src/types/table";
 
 /**
  * HOC to wrap around table cell components.
@@ -16,26 +13,17 @@ import { TableRow } from "@src/types/table";
 export default function withBasicCell(
   BasicCellComponent: React.ComponentType<IBasicCellProps>
 ) {
-  return function BasicCell(props: FormatterProps<TableRow>) {
-    const { name, key } = props.column;
-    const value = get(props.row, key);
-
-    const { validationRegex, required } = (props.column as any).config;
+  return function BasicCell({ row, column, getValue }: TableCellProps) {
+    const columnConfig = column.columnDef.meta!;
+    const { name } = columnConfig;
+    const value = getValue();
 
     return (
-      <ErrorBoundary FallbackComponent={InlineErrorFallback}>
-        <CellValidation
-          value={value}
-          required={required}
-          validationRegex={validationRegex}
-        >
-          <BasicCellComponent
-            value={value}
-            name={name as string}
-            type={(props.column as any).type as FieldType}
-          />
-        </CellValidation>
-      </ErrorBoundary>
+      <BasicCellComponent
+        value={value}
+        name={name as string}
+        type={columnConfig.type}
+      />
     );
   };
 }
diff --git a/src/components/fields/_withTableCell/withHeavyCell.tsx b/src/components/fields/_withTableCell/withHeavyCell.tsx
index 29eaf370..394a497c 100644
--- a/src/components/fields/_withTableCell/withHeavyCell.tsx
+++ b/src/components/fields/_withTableCell/withHeavyCell.tsx
@@ -1,16 +1,11 @@
 import { Suspense, useState, useEffect } from "react";
 import { useSetAtom } from "jotai";
 import { get } from "lodash-es";
-import { FormatterProps } from "react-data-grid";
-import { ErrorBoundary } from "react-error-boundary";
+import type { TableCellProps } from "@src/components/Table";
 import { IBasicCellProps, IHeavyCellProps } from "@src/components/fields/types";
 
-import { InlineErrorFallback } from "@src/components/ErrorFallback";
-import CellValidation from "@src/components/Table/CellValidation";
-
 import { tableScope, updateFieldAtom } from "@src/atoms/tableScope";
 import { FieldType } from "@src/constants/fields";
-import { TableRow } from "@src/types/table";
 
 /**
  * HOC to wrap table cell components.
@@ -24,11 +19,9 @@ export default function withHeavyCell(
   HeavyCellComponent: React.ComponentType<IHeavyCellProps>,
   readOnly: boolean = false
 ) {
-  return function HeavyCell(props: FormatterProps<TableRow>) {
+  return function HeavyCell({ row, column, getValue }: TableCellProps) {
     const updateField = useSetAtom(updateFieldAtom, tableScope);
 
-    const { validationRegex, required } = (props.column as any).config;
-
     // Initially display BasicCell to improve scroll performance
     const [displayedComponent, setDisplayedComponent] = useState<
       "basic" | "heavy"
@@ -41,7 +34,7 @@ export default function withHeavyCell(
     }, []);
 
     // TODO: Investigate if this still needs to be a state
-    const value = get(props.row, props.column.key);
+    const value = getValue();
     const [localValue, setLocalValue] = useState(value);
     useEffect(() => {
       setLocalValue(value);
@@ -50,29 +43,18 @@ export default function withHeavyCell(
     // Declare basicCell here so props can be reused by HeavyCellComponent
     const basicCellProps = {
       value: localValue,
-      name: props.column.name as string,
-      type: (props.column as any).type as FieldType,
+      name: column.columnDef.meta!.name,
+      type: column.columnDef.meta!.type,
     };
     const basicCell = <BasicCellComponent {...basicCellProps} />;
 
-    if (displayedComponent === "basic")
-      return (
-        <ErrorBoundary FallbackComponent={InlineErrorFallback}>
-          <CellValidation
-            value={value}
-            required={required}
-            validationRegex={validationRegex}
-          >
-            {basicCell}
-          </CellValidation>
-        </ErrorBoundary>
-      );
+    if (displayedComponent === "basic") return basicCell;
 
     const handleSubmit = (value: any) => {
       if (readOnly) return;
       updateField({
-        path: props.row._rowy_ref.path,
-        fieldName: props.column.key,
+        path: row.original._rowy_ref.path,
+        fieldName: column.id,
         value,
       });
       setLocalValue(value);
@@ -80,23 +62,16 @@ export default function withHeavyCell(
 
     if (displayedComponent === "heavy")
       return (
-        <ErrorBoundary FallbackComponent={InlineErrorFallback}>
-          <Suspense fallback={basicCell}>
-            <CellValidation
-              value={value}
-              required={required}
-              validationRegex={validationRegex}
-            >
-              <HeavyCellComponent
-                {...props}
-                {...basicCellProps}
-                docRef={props.row._rowy_ref}
-                onSubmit={handleSubmit}
-                disabled={props.column.editable === false}
-              />
-            </CellValidation>
-          </Suspense>
-        </ErrorBoundary>
+        <Suspense fallback={basicCell}>
+          <HeavyCellComponent
+            {...basicCellProps}
+            row={row.original}
+            column={column.columnDef.meta!}
+            docRef={row.original._rowy_ref}
+            onSubmit={handleSubmit}
+            disabled={column.columnDef.meta!.editable === false}
+          />
+        </Suspense>
       );
 
     // Should not reach this line
diff --git a/src/components/fields/_withTableCell/withPopoverCell.tsx b/src/components/fields/_withTableCell/withPopoverCell.tsx
index 5da116ca..5cb12ac5 100644
--- a/src/components/fields/_withTableCell/withPopoverCell.tsx
+++ b/src/components/fields/_withTableCell/withPopoverCell.tsx
@@ -1,19 +1,15 @@
 import { Suspense, useState, useEffect, useRef } from "react";
 import { useSetAtom } from "jotai";
-import { find, get } from "lodash-es";
-import { FormatterProps } from "react-data-grid";
+import { get } from "lodash-es";
+import type { TableCellProps } from "@src/components/Table";
 import {
   IBasicCellProps,
   IPopoverInlineCellProps,
   IPopoverCellProps,
 } from "@src/components/fields/types";
-import { ErrorBoundary } from "react-error-boundary";
 
 import { Popover, PopoverProps } from "@mui/material";
 
-import { InlineErrorFallback } from "@src/components/ErrorFallback";
-import CellValidation from "@src/components/Table/CellValidation";
-
 import { tableScope, updateFieldAtom } from "@src/atoms/tableScope";
 import { FieldType } from "@src/constants/fields";
 
@@ -39,13 +35,11 @@ export default function withPopoverCell(
   PopoverCellComponent: React.ComponentType<IPopoverCellProps>,
   options?: IPopoverCellOptions
 ) {
-  return function PopoverCell(props: FormatterProps<any>) {
+  return function PopoverCell({ row, column, getValue }: TableCellProps) {
     const { transparent, ...popoverProps } = options ?? {};
 
     const updateField = useSetAtom(updateFieldAtom, tableScope);
 
-    const { validationRegex, required } = (props.column as any).config;
-
     // Initially display BasicCell to improve scroll performance
     const [displayedComponent, setDisplayedComponent] = useState<
       "basic" | "inline" | "popover"
@@ -64,7 +58,7 @@ export default function withPopoverCell(
     const inlineCellRef = useRef<any>(null);
 
     // TODO: Investigate if this still needs to be a state
-    const value = get(props.row, props.column.key);
+    const value = getValue();
     const [localValue, setLocalValue] = useState(value);
     useEffect(() => {
       setLocalValue(value);
@@ -73,29 +67,19 @@ export default function withPopoverCell(
     // Declare basicCell here so props can be reused by HeavyCellComponent
     const basicCellProps = {
       value: localValue,
-      name: props.column.name as string,
-      type: (props.column as any).type as FieldType,
+      name: column.columnDef.meta!.name,
+      type: column.columnDef.meta!.type,
     };
 
     if (displayedComponent === "basic")
-      return (
-        <ErrorBoundary FallbackComponent={InlineErrorFallback}>
-          <CellValidation
-            value={value}
-            required={required}
-            validationRegex={validationRegex}
-          >
-            <BasicCellComponent {...basicCellProps} />
-          </CellValidation>
-        </ErrorBoundary>
-      );
+      return <BasicCellComponent {...basicCellProps} />;
 
     // This is where we update the documents
     const handleSubmit = (value: any) => {
       if (options?.readOnly) return;
       updateField({
-        path: props.row._rowy_ref.path,
-        fieldName: props.column.key,
+        path: row.original._rowy_ref.path,
+        fieldName: column.id,
         value,
         deleteField: value === undefined,
       });
@@ -113,12 +97,12 @@ export default function withPopoverCell(
 
     // Declare inlineCell and props here so it can be reused later
     const commonCellProps = {
-      ...props,
       ...basicCellProps,
-      column: props.column,
+      row: row.original,
+      column: column.columnDef.meta!,
       onSubmit: handleSubmit,
-      disabled: props.column.editable === false,
-      docRef: props.row._rowy_ref,
+      disabled: column.columnDef.meta!.editable === false,
+      docRef: row.original._rowy_ref,
       showPopoverCell,
       ref: inlineCellRef,
     };
@@ -126,31 +110,14 @@ export default function withPopoverCell(
       <InlineCellComponent {...commonCellProps} ref={inlineCellRef} />
     );
 
-    if (displayedComponent === "inline")
-      return (
-        <ErrorBoundary FallbackComponent={InlineErrorFallback}>
-          <CellValidation
-            value={value}
-            required={required}
-            validationRegex={validationRegex}
-          >
-            {inlineCell}
-          </CellValidation>
-        </ErrorBoundary>
-      );
+    if (displayedComponent === "inline") return inlineCell;
 
     const parentRef = inlineCellRef.current?.parentElement;
 
     if (displayedComponent === "popover")
       return (
-        <ErrorBoundary FallbackComponent={InlineErrorFallback}>
-          <CellValidation
-            value={value}
-            required={required}
-            validationRegex={validationRegex}
-          >
-            {inlineCell}
-          </CellValidation>
+        <>
+          {inlineCell}
 
           <Suspense fallback={null}>
             <Popover
@@ -175,7 +142,7 @@ export default function withPopoverCell(
               />
             </Popover>
           </Suspense>
-        </ErrorBoundary>
+        </>
       );
 
     // Should not reach this line
diff --git a/src/components/fields/types.ts b/src/components/fields/types.ts
index 66890472..c7309452 100644
--- a/src/components/fields/types.ts
+++ b/src/components/fields/types.ts
@@ -1,4 +1,5 @@
 import { FieldType } from "@src/constants/fields";
+import type { TableCellProps } from "@src/components/Table";
 import { FormatterProps, EditorProps } from "react-data-grid";
 import { Control, UseFormReturn } from "react-hook-form";
 import { PopoverProps } from "@mui/material";
@@ -28,7 +29,7 @@ export interface IFieldConfig {
     selectedCell: SelectedCell,
     reset: () => void
   ) => IContextMenuItem[];
-  TableCell: React.ComponentType<FormatterProps<TableRow>>;
+  TableCell: React.ComponentType<TableCellProps>;
   TableEditor: React.ComponentType<EditorProps<TableRow, any>>;
   SideDrawerField: React.ComponentType<ISideDrawerFieldProps>;
   settings?: React.ComponentType<ISettingsProps>;
@@ -49,10 +50,9 @@ export interface IBasicCellProps {
   type: FieldType;
   name: string;
 }
-export interface IHeavyCellProps
-  extends IBasicCellProps,
-    FormatterProps<TableRow> {
-  column: FormatterProps<TableRow>["column"] & { config?: Record<string, any> };
+export interface IHeavyCellProps extends IBasicCellProps {
+  row: TableRow;
+  column: ColumnConfig;
   onSubmit: (value: any) => void;
   docRef: TableRowRef;
   disabled: boolean;
diff --git a/src/types/table.d.ts b/src/types/table.d.ts
index 376cd3ea..5b54b9be 100644
--- a/src/types/table.d.ts
+++ b/src/types/table.d.ts
@@ -133,26 +133,28 @@ export type ColumnConfig = {
   /** Prevent column resizability */
   resizable?: boolean = true;
 
-  config?: {
+  config?: Partial<{
     /** Set column to required */
-    required?: boolean;
+    required: boolean;
     /** Set column default value */
-    defaultValue?: {
+    defaultValue: {
       type: "undefined" | "null" | "static" | "dynamic";
       value?: any;
       script?: string;
       dynamicValueFn?: string;
     };
+    /** Regex used in CellValidation */
+    validationRegex: string;
     /** FieldType to render for Derivative fields */
-    renderFieldType?: FieldType;
+    renderFieldType: FieldType;
     /** For sub-table fields */
-    parentLabel?: string[];
+    parentLabel: string[];
 
-    primaryKeys?: string[];
+    primaryKeys: string[];
 
     /** Column-specific config */
     [key: string]: any;
-  };
+  }>;
 };
 
 export type TableFilter = {

From 63265e3c859ee8f0c6157c39f7f1d9775728b796 Mon Sep 17 00:00:00 2001
From: Miriam Shams-Rainey <miriam.shams.rainey@duke.edu>
Date: Wed, 2 Nov 2022 01:40:42 -0400
Subject: [PATCH 232/309] #523: Added functional color field filtering (#894)

* #523: Added functional color field filtering

* Added custom Firestore filter comparing only hex

* Minor code style fixes
---
 src/components/fields/Color/filters.ts      | 21 +++++++++++++++++++++
 src/components/fields/Color/index.tsx       |  5 +++++
 src/hooks/useFirestoreCollectionWithAtom.ts |  8 ++++++--
 src/types/table.d.ts                        |  4 +++-
 4 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 src/components/fields/Color/filters.ts

diff --git a/src/components/fields/Color/filters.ts b/src/components/fields/Color/filters.ts
new file mode 100644
index 00000000..68677a91
--- /dev/null
+++ b/src/components/fields/Color/filters.ts
@@ -0,0 +1,21 @@
+import { IFilterOperator } from "@src/components/fields/types";
+
+export const filterOperators: IFilterOperator[] = [
+  {
+    label: "is",
+    secondaryLabel: "==",
+    value: "color-equal"
+  },
+  {
+    label: "is not",
+    secondaryLabel: "!=",
+    value: "color-not-equal"
+}
+];
+
+export const valueFormatter = (value: any) => {
+  if (value && value.hex) {
+    return value.hex.toString()
+  }
+  return "";
+};
\ No newline at end of file
diff --git a/src/components/fields/Color/index.tsx b/src/components/fields/Color/index.tsx
index 13cb9843..d8da5e50 100644
--- a/src/components/fields/Color/index.tsx
+++ b/src/components/fields/Color/index.tsx
@@ -7,6 +7,7 @@ import ColorIcon from "@mui/icons-material/Colorize";
 import BasicCell from "@src/components/fields/_BasicCell/BasicCellNull";
 import InlineCell from "./InlineCell";
 import NullEditor from "@src/components/Table/editors/NullEditor";
+import { filterOperators, valueFormatter } from "./filters";
 
 const PopoverCell = lazy(
   () => import("./PopoverCell" /* webpackChunkName: "PopoverCell-Color" */)
@@ -31,6 +32,10 @@ export const config: IFieldConfig = {
   }),
   TableEditor: NullEditor as any,
   SideDrawerField,
+  filter: {
+    operators: filterOperators,
+    valueFormatter
+  },
   csvImportParser: (value: string) => {
     try {
       const obj = JSON.parse(value);
diff --git a/src/hooks/useFirestoreCollectionWithAtom.ts b/src/hooks/useFirestoreCollectionWithAtom.ts
index 43f7165a..f8dada5f 100644
--- a/src/hooks/useFirestoreCollectionWithAtom.ts
+++ b/src/hooks/useFirestoreCollectionWithAtom.ts
@@ -376,12 +376,16 @@ export const tableFiltersToFirestoreFilters = (filters: TableFilter[]) => {
     } else if (filter.operator === "id-equal") {
       firestoreFilters.push(where(documentId(), "==", filter.value));
       continue;
+    } else if (filter.operator === "color-equal") {
+      firestoreFilters.push(where(filter.key.concat(".hex"), "==", filter.value.hex.toString()))
+      continue
+    } else if (filter.operator === "color-not-equal") {
+      firestoreFilters.push(where(filter.key.concat(".hex"), "!=", filter.value.hex.toString()))
+      continue
     }
-
     firestoreFilters.push(
       where(filter.key, filter.operator as WhereFilterOp, filter.value)
     );
   }
-
   return firestoreFilters;
 };
diff --git a/src/types/table.d.ts b/src/types/table.d.ts
index dadbf2ab..fd149f5e 100644
--- a/src/types/table.d.ts
+++ b/src/types/table.d.ts
@@ -169,7 +169,9 @@ export type TableFilter = {
     | "date-before-equal"
     | "date-after-equal"
     | "time-minute-equal"
-    | "id-equal";
+    | "id-equal"
+    | "color-equal"
+    | "color-not-equal";
   value: any;
 };
 

From 52411d29d301094e8654dda2c067215f688af07d Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 2 Nov 2022 16:49:00 +1100
Subject: [PATCH 233/309] Update src/components/fields/Rating/Icon.tsx

---
 src/components/fields/Rating/Icon.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/fields/Rating/Icon.tsx b/src/components/fields/Rating/Icon.tsx
index 374a395f..c0250c54 100644
--- a/src/components/fields/Rating/Icon.tsx
+++ b/src/components/fields/Rating/Icon.tsx
@@ -8,7 +8,7 @@ export interface IIconProps{
   isEmpty: boolean
 }
 
-export default function ({config, isEmpty} : IIconProps) {
+export default function Icon({config, isEmpty} : IIconProps) {
 if (isEmpty) {
     return getStateOutline(config)
  } else {

From d320ab24403be65911a4c6603821c7e003647a29 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Thu, 3 Nov 2022 15:07:43 +1100
Subject: [PATCH 234/309] fix dependencies

---
 package.json | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index ff663d09..fb029fc7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rowy",
-  "version": "2.6.1",
+  "version": "3.0.0",
   "homepage": "https://rowy.io",
   "repository": {
     "type": "git",
@@ -15,10 +15,9 @@
     "@mui/icons-material": "5.6.0",
     "@mui/lab": "^5.0.0-alpha.76",
     "@mui/material": "5.6.0",
-    "@mui/styles": "5.6.0",
     "@mui/x-date-pickers": "^5.0.0-alpha.4",
-    "@rowy/form-builder": "^0.6.2",
-    "@rowy/multiselect": "^0.4.0",
+    "@rowy/form-builder": "^0.7.0",
+    "@rowy/multiselect": "^0.4.1",
     "@tinymce/tinymce-react": "^3",
     "@uiw/react-md-editor": "^3.14.1",
     "algoliasearch": "^4.13.1",
@@ -31,12 +30,13 @@
     "file-saver": "^2.0.5",
     "firebase": "^9.6.11",
     "firebaseui": "^6.0.1",
-    "jotai": "^1.7.2",
+    "jotai": "^1.8.4",
     "json-stable-stringify-without-jsonify": "^1.0.1",
     "json2csv": "^5.0.7",
     "jszip": "^3.10.0",
     "lodash-es": "^4.17.21",
     "match-sorter": "^6.3.1",
+    "material-ui-popup-state": "^4.0.1",
     "mdi-material-ui": "^7.3.0",
     "monaco-editor-auto-typings": "^0.4.0",
     "notistack": "^2.0.4",
@@ -47,6 +47,7 @@
     "react-beautiful-dnd": "^13.1.0",
     "react-color-palette": "^6.2.0",
     "react-data-grid": "7.0.0-beta.5",
+    "react-detect-offline": "^2.4.5",
     "react-div-100vh": "^0.7.0",
     "react-dnd": "^16.0.1",
     "react-dnd-html5-backend": "^16.0.1",
@@ -64,6 +65,7 @@
     "react-scripts": "^5.0.0",
     "react-usestateref": "^1.0.8",
     "remark-gfm": "^3.0.1",
+    "seedrandom": "^3.0.5",
     "stream-browserify": "^3.0.0",
     "swr": "^1.3.0",
     "tinymce": "^5",
@@ -155,10 +157,12 @@
     "@types/node": "^17.0.23",
     "@types/react": "^18.0.5",
     "@types/react-beautiful-dnd": "^13.1.2",
+    "@types/react-detect-offline": "^2.4.1",
     "@types/react-div-100vh": "^0.4.0",
     "@types/react-dom": "^18.0.0",
     "@types/react-router-dom": "^5.3.3",
     "@types/react-router-hash-link": "^2.4.5",
+    "@types/seedrandom": "^3.0.2",
     "@typescript-eslint/parser": "^5.18.0",
     "craco-alias": "^3.0.1",
     "craco-swc": "^0.5.1",

From 796c980337084a29c98916276fde0bf2c123df7a Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 8 Nov 2022 16:18:33 +1100
Subject: [PATCH 235/309] unify withTableCell HOCs into single HOC with memo

---
 src/atoms/tableScope/ui.ts                    |   1 +
 src/components/SideDrawer/SideDrawer.tsx      |   6 +-
 src/components/Table/CellValidation.tsx       |   9 +-
 .../Table/FinalColumn/FinalColumn.tsx         |  11 +-
 src/components/Table/Styled/StyledCell.tsx    |  20 +-
 src/components/Table/Styled/StyledRow.tsx     |  34 +--
 src/components/Table/Styled/StyledTable.tsx   |  13 ++
 src/components/Table/Table.tsx                |  75 ++++---
 src/components/Table/TableContainer.tsx       |   2 +-
 src/components/Table/editors/TextEditor.tsx   |   2 +-
 .../Table/useKeyboardNavigation.tsx           |  13 +-
 src/components/Table/useVirtualization.tsx    |   4 +-
 src/components/Table/withTableCell.tsx        | 198 ++++++++++++++++++
 src/components/TableToolbar/RowHeight.tsx     |   4 +-
 .../fields/Checkbox/DisplayCell.tsx           |  30 +++
 .../{TableCell.tsx => EditorCell.tsx}         |   6 +-
 src/components/fields/Checkbox/index.tsx      |  14 +-
 .../{InlineCell.tsx => DisplayCell.tsx}       |  39 ++--
 .../fields/MultiSelect/PopoverCell.tsx        |   4 +-
 src/components/fields/MultiSelect/index.tsx   |  10 +-
 .../fields/Reference/EditorCell.tsx           |   2 +-
 .../fields/ShortText/EditorCell.tsx           |  61 ++++++
 src/components/fields/ShortText/index.tsx     |   7 +-
 .../fields/_BasicCell/BasicCellNull.tsx       |   4 +-
 .../fields/_withTableCell/withHeavyCell.tsx   |   7 +-
 .../fields/_withTableCell/withPopoverCell.tsx |  12 +-
 src/components/fields/types.ts                |  25 ++-
 src/hooks/useSaveOnUnmount.ts                 |  19 ++
 src/index.tsx                                 |  10 +-
 src/pages/Table/TablePage.tsx                 |   7 +-
 30 files changed, 509 insertions(+), 140 deletions(-)
 create mode 100644 src/components/Table/withTableCell.tsx
 create mode 100644 src/components/fields/Checkbox/DisplayCell.tsx
 rename src/components/fields/Checkbox/{TableCell.tsx => EditorCell.tsx} (92%)
 rename src/components/fields/MultiSelect/{InlineCell.tsx => DisplayCell.tsx} (50%)
 create mode 100644 src/components/fields/ShortText/EditorCell.tsx
 create mode 100644 src/hooks/useSaveOnUnmount.ts

diff --git a/src/atoms/tableScope/ui.ts b/src/atoms/tableScope/ui.ts
index f0083eda..3d11a081 100644
--- a/src/atoms/tableScope/ui.ts
+++ b/src/atoms/tableScope/ui.ts
@@ -133,6 +133,7 @@ export const sideDrawerOpenAtom = atom(false);
 export type SelectedCell = {
   path: string | "_rowy_header";
   columnKey: string | "_rowy_row_actions";
+  focusInside: boolean;
 };
 /** Store selected cell in table. Used in side drawer and context menu */
 export const selectedCellAtom = atom<SelectedCell | null>(null);
diff --git a/src/components/SideDrawer/SideDrawer.tsx b/src/components/SideDrawer/SideDrawer.tsx
index 54b82de0..04f896bd 100644
--- a/src/components/SideDrawer/SideDrawer.tsx
+++ b/src/components/SideDrawer/SideDrawer.tsx
@@ -79,7 +79,11 @@ export default function SideDrawer({
     if (direction === "down" && rowIndex < tableRows.length - 1) rowIndex += 1;
     const newPath = tableRows[rowIndex]._rowy_ref.path;
 
-    setCell((cell) => ({ columnKey: cell!.columnKey, path: newPath }));
+    setCell((cell) => ({
+      columnKey: cell!.columnKey,
+      path: newPath,
+      focusInside: false,
+    }));
 
     const columnIndex = visibleColumnKeys.indexOf(cell!.columnKey || "");
     dataGridRef?.current?.selectCell(
diff --git a/src/components/Table/CellValidation.tsx b/src/components/Table/CellValidation.tsx
index ad7560dc..02284cb3 100644
--- a/src/components/Table/CellValidation.tsx
+++ b/src/components/Table/CellValidation.tsx
@@ -1,3 +1,4 @@
+import { memo } from "react";
 import { styled } from "@mui/material/styles";
 import ErrorIcon from "@mui/icons-material/ErrorOutline";
 import WarningIcon from "@mui/icons-material/WarningAmber";
@@ -18,7 +19,7 @@ const Dot = styled("div")(({ theme }) => ({
   borderRadius: "50%",
   backgroundColor: theme.palette.error.main,
 
-  boxShadow: `0 0 0 4px var(--background-color)`,
+  boxShadow: `0 0 0 4px var(--cell-background-color)`,
   "[role='row']:hover &": {
     boxShadow: `0 0 0 4px var(--row-hover-background-color)`,
   },
@@ -34,7 +35,7 @@ export interface ICellValidationProps
   validationRegex?: string;
 }
 
-export default function CellValidation({
+export const CellValidation = memo(function MemoizedCellValidation({
   value,
   required,
   validationRegex,
@@ -73,4 +74,6 @@ export default function CellValidation({
     );
 
   return <StyledCell {...props}>{children}</StyledCell>;
-}
+});
+
+export default CellValidation;
diff --git a/src/components/Table/FinalColumn/FinalColumn.tsx b/src/components/Table/FinalColumn/FinalColumn.tsx
index c9d23dca..4b7c8bd0 100644
--- a/src/components/Table/FinalColumn/FinalColumn.tsx
+++ b/src/components/Table/FinalColumn/FinalColumn.tsx
@@ -1,3 +1,4 @@
+import { memo } from "react";
 import { useAtom, useSetAtom } from "jotai";
 import type { TableCellProps } from "@src/components/Table";
 
@@ -21,7 +22,10 @@ import {
   contextMenuTargetAtom,
 } from "@src/atoms/tableScope";
 
-export default function FinalColumn({ row, focusInsideCell }: TableCellProps) {
+export const FinalColumn = memo(function FinalColumn({
+  row,
+  focusInsideCell,
+}: TableCellProps) {
   const [userRoles] = useAtom(userRolesAtom, projectScope);
   const [addRowIdType] = useAtom(tableAddRowIdTypeAtom, projectScope);
   const confirm = useSetAtom(confirmDialogAtom, projectScope);
@@ -47,7 +51,7 @@ export default function FinalColumn({ row, focusInsideCell }: TableCellProps) {
     <Stack
       direction="row"
       alignItems="center"
-      style={{ height: "100%" }}
+      className="cell-contents"
       gap={0.5}
     >
       <Tooltip title="Row menu">
@@ -145,4 +149,5 @@ export default function FinalColumn({ row, focusInsideCell }: TableCellProps) {
       </Tooltip>
     </Stack>
   );
-}
+});
+export default FinalColumn;
diff --git a/src/components/Table/Styled/StyledCell.tsx b/src/components/Table/Styled/StyledCell.tsx
index af2e03b4..23ffb2ef 100644
--- a/src/components/Table/Styled/StyledCell.tsx
+++ b/src/components/Table/Styled/StyledCell.tsx
@@ -1,31 +1,29 @@
-import { colord } from "colord";
 import { styled } from "@mui/material";
 
 export const StyledCell = styled("div")(({ theme }) => ({
+  position: "relative",
   display: "flex",
   alignItems: "center",
+  lineHeight: "calc(var(--row-height) - 1px)",
+  whiteSpace: "nowrap",
   "--cell-padding": theme.spacing(10 / 8),
 
   "& > .cell-contents": {
     padding: "0 var(--cell-padding)",
-    lineHeight: "calc(var(--row-height) - 1px)",
+    width: "100%",
+    height: "100%",
+    contain: "strict",
+    overflow: "hidden",
   },
 
-  overflow: "visible",
-  contain: "strict",
-  position: "relative",
-
-  backgroundColor: theme.palette.background.paper,
+  backgroundColor: "var(--cell-background-color)",
 
   border: `1px solid ${theme.palette.divider}`,
   borderTop: "none",
   "& + &": { borderLeft: "none" },
 
   "[role='row']:hover &": {
-    backgroundColor: colord(theme.palette.background.paper)
-      .mix(theme.palette.action.hover, theme.palette.action.hoverOpacity)
-      .alpha(1)
-      .toHslString(),
+    backgroundColor: "var(--row-hover-background-color)",
   },
 
   "[data-out-of-order='true'] + [role='row'] &": {
diff --git a/src/components/Table/Styled/StyledRow.tsx b/src/components/Table/Styled/StyledRow.tsx
index cbaed8c2..49c3408f 100644
--- a/src/components/Table/Styled/StyledRow.tsx
+++ b/src/components/Table/Styled/StyledRow.tsx
@@ -1,10 +1,7 @@
 import { styled, alpha } from "@mui/material";
 
-import { DEFAULT_ROW_HEIGHT } from "@src/components/Table";
-
 export const StyledRow = styled("div")(({ theme }) => ({
   display: "flex",
-  height: DEFAULT_ROW_HEIGHT,
   position: "relative",
 
   "& > *": {
@@ -31,19 +28,24 @@ export const StyledRow = styled("div")(({ theme }) => ({
     },
   },
 
-  "& .MuiIconButton-root.row-hover-iconButton, .MuiIconButton-root.row-hover-iconButton:focus":
-    {
-      color: theme.palette.text.disabled,
-      transitionDuration: "0s",
-    },
-  "&:hover .MuiIconButton-root.row-hover-iconButton, .MuiIconButton-root.row-hover-iconButton:focus":
-    {
-      color: theme.palette.text.primary,
-      backgroundColor: alpha(
-        theme.palette.action.hover,
-        theme.palette.action.hoverOpacity * 1.5
-      ),
-    },
+  "& .row-hover-iconButton, .row-hover-iconButton:focus": {
+    color: theme.palette.text.disabled,
+    transitionDuration: "0s",
+
+    flexShrink: 0,
+    borderRadius: theme.shape.borderRadius,
+    padding: (32 - 20) / 2,
+    boxSizing: "content-box",
+
+    "&.end": { marginRight: theme.spacing(0.5) },
+  },
+  "&:hover .row-hover-iconButton, .row-hover-iconButton:focus": {
+    color: theme.palette.text.primary,
+    backgroundColor: alpha(
+      theme.palette.action.hover,
+      theme.palette.action.hoverOpacity * 1.5
+    ),
+  },
 }));
 StyledRow.displayName = "StyledRow";
 
diff --git a/src/components/Table/Styled/StyledTable.tsx b/src/components/Table/Styled/StyledTable.tsx
index 23c648e5..904520ba 100644
--- a/src/components/Table/Styled/StyledTable.tsx
+++ b/src/components/Table/Styled/StyledTable.tsx
@@ -1,6 +1,19 @@
 import { styled } from "@mui/material";
+import { colord } from "colord";
 
 export const StyledTable = styled("div")(({ theme }) => ({
+  "--cell-background-color":
+    theme.palette.mode === "light"
+      ? theme.palette.background.paper
+      : colord(theme.palette.background.paper)
+          .mix("#fff", 0.04)
+          .alpha(1)
+          .toHslString(),
+  "--row-hover-background-color": colord(theme.palette.background.paper)
+    .mix(theme.palette.action.hover, theme.palette.action.hoverOpacity)
+    .alpha(1)
+    .toHslString(),
+
   ...(theme.typography.caption as any),
   lineHeight: "inherit !important",
 
diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index 6f219236..a3d60147 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -14,6 +14,7 @@ import {
   Droppable,
   Draggable,
 } from "react-beautiful-dnd";
+import { get } from "lodash-es";
 import { Portal } from "@mui/material";
 import { ErrorBoundary } from "react-error-boundary";
 
@@ -63,6 +64,8 @@ export const DEBOUNCE_DELAY = 500;
 
 export type TableCellProps = CellContext<TableRow, any> & {
   focusInsideCell: boolean;
+  setFocusInsideCell: (focusInside: boolean) => void;
+  disabled: boolean;
 };
 
 declare module "@tanstack/table-core" {
@@ -95,6 +98,7 @@ export default function Table({
   const [tablePage, setTablePage] = useAtom(tablePageAtom, tableScope);
   const [selectedCell, setSelectedCell] = useAtom(selectedCellAtom, tableScope);
   const setContextMenuTarget = useSetAtom(contextMenuTargetAtom, tableScope);
+  const focusInsideCell = selectedCell?.focusInside ?? false;
 
   const updateColumn = useSetAtom(updateColumnAtom, tableScope);
   const updateField = useSetAtom(updateFieldAtom, tableScope);
@@ -109,7 +113,7 @@ export default function Table({
       // Hide column for all users using table schema
       .filter((column) => !column.hidden)
       .map((columnConfig) =>
-        columnHelper.accessor(columnConfig.fieldName, {
+        columnHelper.accessor((row) => get(row, columnConfig.fieldName), {
           id: columnConfig.fieldName,
           meta: columnConfig,
           size: columnConfig.width,
@@ -119,7 +123,7 @@ export default function Table({
         })
       );
 
-    if (canAddColumn || !tableSettings.readOnly) {
+    if (canAddColumn || canEditCell) {
       _columns.push(
         columnHelper.display({
           id: "_rowy_column_actions",
@@ -129,7 +133,7 @@ export default function Table({
     }
 
     return _columns;
-  }, [tableColumnsOrdered, canAddColumn, tableSettings.readOnly]);
+  }, [tableColumnsOrdered, canAddColumn, canEditCell]);
 
   // Get user’s hidden columns from props and memoize into a VisibilityState
   const columnVisibility = useMemo(() => {
@@ -171,7 +175,7 @@ export default function Table({
   const { rows } = table.getRowModel();
   const leafColumns = table.getVisibleLeafColumns();
 
-  const { handleKeyDown, focusInsideCell } = useKeyboardNavigation({
+  const { handleKeyDown } = useKeyboardNavigation({
     gridRef,
     tableRows,
     leafColumns,
@@ -228,7 +232,7 @@ export default function Table({
       <StyledTable
         ref={gridRef}
         role="grid"
-        aria-readonly={tableSettings.readOnly}
+        aria-readonly={!canEditCell}
         aria-colcount={columns.length}
         aria-rowcount={tableRows.length + 1}
         style={
@@ -320,15 +324,24 @@ export default function Table({
                                 zIndex: header.column.getIsPinned() ? 11 : 10,
                               }}
                               width={header.getSize()}
-                              sx={[
+                              sx={
                                 snapshot.isDragging
-                                  ? {}
-                                  : { "& + &": { borderLeft: "none" } },
-                              ]}
+                                  ? undefined
+                                  : { "& + &": { borderLeft: "none" } }
+                              }
                               onClick={(e) => {
                                 setSelectedCell({
                                   path: "_rowy_header",
                                   columnKey: header.id,
+                                  focusInside: false,
+                                });
+                                (e.target as HTMLDivElement).focus();
+                              }}
+                              onDoubleClick={(e) => {
+                                setSelectedCell({
+                                  path: "_rowy_header",
+                                  columnKey: header.id,
+                                  focusInside: true,
                                 });
                                 (e.target as HTMLDivElement).focus();
                               }}
@@ -425,11 +438,11 @@ export default function Table({
                       tabIndex={isSelectedCell && !focusInsideCell ? 0 : -1}
                       aria-colindex={cellIndex + 1}
                       aria-readonly={
-                        !canEditCell &&
+                        !canEditCell ||
                         cell.column.columnDef.meta?.editable === false
                       }
                       aria-required={Boolean(
-                        cell.column.columnDef.meta!.config?.required
+                        cell.column.columnDef.meta?.config?.required
                       )}
                       aria-selected={isSelectedCell}
                       aria-describedby="rowy-table-cell-description"
@@ -456,6 +469,15 @@ export default function Table({
                         setSelectedCell({
                           path: row.original._rowy_ref.path,
                           columnKey: cell.column.id,
+                          focusInside: false,
+                        });
+                        (e.target as HTMLDivElement).focus();
+                      }}
+                      onDoubleClick={(e) => {
+                        setSelectedCell({
+                          path: row.original._rowy_ref.path,
+                          columnKey: cell.column.id,
+                          focusInside: true,
                         });
                         (e.target as HTMLDivElement).focus();
                       }}
@@ -464,27 +486,32 @@ export default function Table({
                         setSelectedCell({
                           path: row.original._rowy_ref.path,
                           columnKey: cell.column.id,
+                          focusInside: false,
                         });
                         (e.target as HTMLDivElement).focus();
                         setContextMenuTarget(e.target as HTMLElement);
                       }}
                       value={cell.getValue()}
-                      required={cell.column.columnDef.meta!.config?.required}
+                      required={cell.column.columnDef.meta?.config?.required}
                       validationRegex={
-                        cell.column.columnDef.meta!.config?.validationRegex
+                        cell.column.columnDef.meta?.config?.validationRegex
                       }
                     >
-                      <div
-                        className="cell-contents"
-                        style={{ height: tableSchema.rowHeight }}
-                      >
-                        <ErrorBoundary fallbackRender={InlineErrorFallback}>
-                          {flexRender(cell.column.columnDef.cell, {
-                            ...cell.getContext(),
-                            focusInsideCell: isSelectedCell && focusInsideCell,
-                          })}
-                        </ErrorBoundary>
-                      </div>
+                      <ErrorBoundary fallbackRender={InlineErrorFallback}>
+                        {flexRender(cell.column.columnDef.cell, {
+                          ...cell.getContext(),
+                          focusInsideCell: isSelectedCell && focusInsideCell,
+                          setFocusInsideCell: (focusInside: boolean) =>
+                            setSelectedCell({
+                              path: row.original._rowy_ref.path,
+                              columnKey: cell.column.id,
+                              focusInside,
+                            }),
+                          disabled:
+                            !canEditCell ||
+                            cell.column.columnDef.meta?.editable === false,
+                        })}
+                      </ErrorBoundary>
                     </CellValidation>
                   );
                 })}
diff --git a/src/components/Table/TableContainer.tsx b/src/components/Table/TableContainer.tsx
index eb372f3e..10061298 100644
--- a/src/components/Table/TableContainer.tsx
+++ b/src/components/Table/TableContainer.tsx
@@ -43,7 +43,7 @@ export const TableContainer = styled("div", {
     "--color": theme.palette.text.primary,
     "--border-color": theme.palette.divider,
     // "--summary-border-color": "#aaa",
-    "--background-color":
+    "--cell-background-color":
       theme.palette.mode === "light"
         ? theme.palette.background.paper
         : colord(theme.palette.background.paper)
diff --git a/src/components/Table/editors/TextEditor.tsx b/src/components/Table/editors/TextEditor.tsx
index 2652c330..58229457 100644
--- a/src/components/Table/editors/TextEditor.tsx
+++ b/src/components/Table/editors/TextEditor.tsx
@@ -81,7 +81,7 @@ export default function TextEditor({ row, column }: EditorProps<any>) {
       sx={{
         width: "100%",
         height: "100%",
-        backgroundColor: "var(--background-color)",
+        backgroundColor: "var(--cell-background-color)",
 
         "& .MuiInputBase-root": {
           height: "100%",
diff --git a/src/components/Table/useKeyboardNavigation.tsx b/src/components/Table/useKeyboardNavigation.tsx
index cd2332c6..57c8829c 100644
--- a/src/components/Table/useKeyboardNavigation.tsx
+++ b/src/components/Table/useKeyboardNavigation.tsx
@@ -1,4 +1,3 @@
-import { useState } from "react";
 import { useSetAtom } from "jotai";
 import { Column } from "@tanstack/react-table";
 
@@ -23,7 +22,6 @@ export function useKeyboardNavigation({
   leafColumns,
 }: IUseKeyboardNavigationProps) {
   const setSelectedCell = useSetAtom(selectedCellAtom, tableScope);
-  const [focusInsideCell, setFocusInsideCell] = useState(false);
 
   const handleKeyDown = (e: React.KeyboardEvent<HTMLDivElement>) => {
     // Block default browser behavior for arrow keys (scroll) and other keys
@@ -43,7 +41,7 @@ export function useKeyboardNavigation({
 
     // Esc: exit cell
     if (e.key === "Escape") {
-      setFocusInsideCell(false);
+      setSelectedCell((c) => ({ ...c!, focusInside: false }));
       (
         gridRef.current?.querySelector("[aria-selected=true]") as HTMLDivElement
       )?.focus();
@@ -63,7 +61,7 @@ export function useKeyboardNavigation({
 
     // Enter: enter cell
     if (e.key === "Enter") {
-      setFocusInsideCell(true);
+      setSelectedCell((c) => ({ ...c!, focusInside: true }));
       (target.querySelector("[tabindex]") as HTMLElement)?.focus();
       return;
     }
@@ -125,6 +123,8 @@ export function useKeyboardNavigation({
           ? tableRows[newRowIndex]._rowy_ref.path
           : "_rowy_header",
       columnKey: leafColumns[newColIndex].id! || leafColumns[0].id!,
+      // When selected cell changes, exit current cell
+      focusInside: false,
     };
 
     // Store in selectedCellAtom
@@ -139,12 +139,9 @@ export function useKeyboardNavigation({
 
     // Focus the cell
     if (newCellEl) setTimeout(() => (newCellEl as HTMLDivElement).focus());
-
-    // When selected cell changes, exit current cell
-    setFocusInsideCell(false);
   };
 
-  return { handleKeyDown, focusInsideCell } as const;
+  return { handleKeyDown } as const;
 }
 
 export default useKeyboardNavigation;
diff --git a/src/components/Table/useVirtualization.tsx b/src/components/Table/useVirtualization.tsx
index 66b226ea..b9b3ca55 100644
--- a/src/components/Table/useVirtualization.tsx
+++ b/src/components/Table/useVirtualization.tsx
@@ -39,7 +39,7 @@ export function useVirtualization(
   } = useVirtual({
     parentRef: containerRef,
     size: tableRows.length,
-    overscan: 10,
+    overscan: 5,
     paddingEnd: TABLE_PADDING,
     estimateSize: useCallback(
       (index: number) =>
@@ -58,7 +58,7 @@ export function useVirtualization(
     parentRef: containerRef,
     horizontal: true,
     size: leafColumns.length,
-    overscan: 10,
+    overscan: 5,
     paddingStart: TABLE_PADDING,
     paddingEnd: TABLE_PADDING,
     estimateSize: useCallback(
diff --git a/src/components/Table/withTableCell.tsx b/src/components/Table/withTableCell.tsx
new file mode 100644
index 00000000..3021fe40
--- /dev/null
+++ b/src/components/Table/withTableCell.tsx
@@ -0,0 +1,198 @@
+import { memo, Suspense, useState, useEffect, useRef } from "react";
+import { useSetAtom } from "jotai";
+import { get, isEqual } from "lodash-es";
+import type { TableCellProps } from "@src/components/Table";
+import {
+  IDisplayCellProps,
+  IEditorCellProps,
+} from "@src/components/fields/types";
+
+import { Popover, PopoverProps } from "@mui/material";
+
+import { tableScope, updateFieldAtom } from "@src/atoms/tableScope";
+
+export interface ICellOptions {
+  /** If the rest of the row’s data is used, set this to true for memoization */
+  usesRowData?: boolean;
+  /** Handle padding inside the cell component */
+  disablePadding?: boolean;
+  /** Set popover background to be transparent */
+  transparent?: boolean;
+  /** Props to pass to MUI Popover component */
+  popoverProps?: Partial<PopoverProps>;
+}
+
+/**
+ * HOC to render table cells.
+ * Renders read-only DisplayCell while scrolling for scroll performance.
+ * Defers render for inline EditorCell.
+ * @param DisplayCellComponent - The lighter cell component to display values
+ * @param EditorCellComponent - The heavier cell component to edit inline
+ * @param editorMode - When to display the EditorCell
+ *   - "focus" (default) - when the cell is focused (Enter or double-click)
+ *   - "inline" - inline with deferred render
+ *   - "popover" - as a popover
+ * @param options - {@link ICellOptions}
+ */
+export default function withTableCell(
+  DisplayCellComponent: React.ComponentType<IDisplayCellProps>,
+  EditorCellComponent: React.ComponentType<IEditorCellProps>,
+  editorMode: "focus" | "inline" | "popover" = "focus",
+  options: ICellOptions = {}
+) {
+  return memo(
+    function TableCell({
+      row,
+      column,
+      getValue,
+      focusInsideCell,
+      setFocusInsideCell,
+      disabled,
+    }: TableCellProps) {
+      const value = getValue();
+      const updateField = useSetAtom(updateFieldAtom, tableScope);
+
+      // Store ref to rendered DisplayCell to get positioning for PopoverCell
+      const displayCellRef = useRef<HTMLDivElement>(null);
+      const parentRef = displayCellRef.current?.parentElement;
+
+      // Store Popover open state here so we can add delay for close transition
+      const [popoverOpen, setPopoverOpen] = useState(false);
+      useEffect(() => {
+        if (focusInsideCell) setPopoverOpen(true);
+      }, [focusInsideCell]);
+      const showPopoverCell = (popover: boolean) => {
+        if (popover) {
+          setPopoverOpen(true);
+          // Need to call this after a timeout, since the cell’s `onClick`
+          // event is fired, which sets focusInsideCell false
+          setTimeout(() => setFocusInsideCell(true));
+        } else {
+          setPopoverOpen(false);
+          // Call after a timeout to allow the close transition to finish
+          setTimeout(() => {
+            setFocusInsideCell(false);
+            // Focus the cell. Otherwise, it focuses the body.
+            parentRef?.focus();
+          }, 300);
+        }
+      };
+
+      // Declare basicCell here so props can be reused by HeavyCellComponent
+      const basicCellProps: IDisplayCellProps = {
+        value,
+        name: column.columnDef.meta!.name,
+        type: column.columnDef.meta!.type,
+        row: row.original,
+        column: column.columnDef.meta!,
+        docRef: row.original._rowy_ref,
+        disabled: column.columnDef.meta!.editable === false,
+        showPopoverCell,
+        setFocusInsideCell,
+      };
+
+      // Show display cell, unless if editorMode is inline
+      const displayCell = (
+        <div
+          className="cell-contents"
+          style={options.disablePadding ? { padding: 0 } : undefined}
+          ref={displayCellRef}
+        >
+          <DisplayCellComponent {...basicCellProps} />
+        </div>
+      );
+      if (disabled || (editorMode !== "inline" && !focusInsideCell))
+        return displayCell;
+
+      // This is where we update the documents
+      const handleSubmit = (value: any) => {
+        if (disabled) return;
+        updateField({
+          path: row.original._rowy_ref.path,
+          fieldName: column.id,
+          value,
+          deleteField: value === undefined,
+        });
+      };
+
+      const editorCell = (
+        <EditorCellComponent
+          {...basicCellProps}
+          tabIndex={focusInsideCell ? 0 : -1}
+          onSubmit={handleSubmit}
+          parentRef={parentRef}
+        />
+      );
+
+      if (editorMode === "focus" && focusInsideCell) {
+        return editorCell;
+      }
+
+      if (editorMode === "inline") {
+        return (
+          <div
+            className="cell-contents"
+            style={options.disablePadding ? { padding: 0 } : undefined}
+            ref={displayCellRef}
+          >
+            {editorCell}
+          </div>
+        );
+      }
+
+      if (editorMode === "popover")
+        return (
+          <>
+            {displayCell}
+
+            <Suspense fallback={null}>
+              <Popover
+                open={popoverOpen}
+                anchorEl={parentRef}
+                onClose={() => showPopoverCell(false)}
+                anchorOrigin={{ horizontal: "left", vertical: "bottom" }}
+                {...options.popoverProps}
+                sx={
+                  options.transparent
+                    ? {
+                        "& .MuiPopover-paper": {
+                          backgroundColor: "transparent",
+                        },
+                      }
+                    : {}
+                }
+                onClick={(e) => e.stopPropagation()}
+                onDoubleClick={(e) => e.stopPropagation()}
+                onKeyDown={(e) => e.stopPropagation()}
+              >
+                {editorCell}
+              </Popover>
+            </Suspense>
+          </>
+        );
+
+      // Should not reach this line
+      return null;
+    },
+    (prev, next) => {
+      const valueEqual = isEqual(
+        get(prev.row.original, prev.column.columnDef.meta!.fieldName),
+        get(next.row.original, next.column.columnDef.meta!.fieldName)
+      );
+      const columnEqual = isEqual(
+        prev.column.columnDef.meta,
+        next.column.columnDef.meta
+      );
+      const rowEqual = isEqual(prev.row.original, next.row.original);
+      const focusInsideCellEqual =
+        prev.focusInsideCell === next.focusInsideCell;
+      const disabledEqual = prev.disabled === next.disabled;
+
+      const baseEqualities =
+        valueEqual && columnEqual && focusInsideCellEqual && disabledEqual;
+
+      if (options?.usesRowData) return baseEqualities && rowEqual;
+      else return baseEqualities;
+    }
+  );
+}
diff --git a/src/components/TableToolbar/RowHeight.tsx b/src/components/TableToolbar/RowHeight.tsx
index 59e8523b..88f56944 100644
--- a/src/components/TableToolbar/RowHeight.tsx
+++ b/src/components/TableToolbar/RowHeight.tsx
@@ -12,7 +12,7 @@ import {
 } from "@src/atoms/tableScope";
 import { DEFAULT_ROW_HEIGHT } from "@src/components/Table";
 
-const ROW_HEIGHTS = [32, 40, 64, 96, 128, 160];
+const ROW_HEIGHTS = [32, 40, 64, 96, 128, 160].map((x) => x + 1);
 
 export default function RowHeight() {
   const theme = useTheme();
@@ -63,7 +63,7 @@ export default function RowHeight() {
         <ListSubheader>Row height</ListSubheader>
         {ROW_HEIGHTS.map((height) => (
           <MenuItem key={height} value={height}>
-            {height}px
+            {height - 1}px
           </MenuItem>
         ))}
       </TextField>
diff --git a/src/components/fields/Checkbox/DisplayCell.tsx b/src/components/fields/Checkbox/DisplayCell.tsx
new file mode 100644
index 00000000..67943586
--- /dev/null
+++ b/src/components/fields/Checkbox/DisplayCell.tsx
@@ -0,0 +1,30 @@
+import { IDisplayCellProps } from "@src/components/fields/types";
+
+import { FormControlLabel, Switch } from "@mui/material";
+
+export default function Checkbox({ column, value }: IDisplayCellProps) {
+  return (
+    <FormControlLabel
+      control={
+        <Switch checked={!!value} disabled color="success" tabIndex={-1} />
+      }
+      label={column.name as string}
+      labelPlacement="start"
+      sx={{
+        m: 0,
+        width: "100%",
+        alignItems: "center",
+
+        "& .MuiFormControlLabel-label": {
+          font: "inherit",
+          letterSpacing: "inherit",
+          flexGrow: 1,
+          overflowX: "hidden",
+          mt: "0 !important",
+        },
+
+        "& .MuiSwitch-root": { mr: -0.75 },
+      }}
+    />
+  );
+}
diff --git a/src/components/fields/Checkbox/TableCell.tsx b/src/components/fields/Checkbox/EditorCell.tsx
similarity index 92%
rename from src/components/fields/Checkbox/TableCell.tsx
rename to src/components/fields/Checkbox/EditorCell.tsx
index 5cef0a3b..4785700c 100644
--- a/src/components/fields/Checkbox/TableCell.tsx
+++ b/src/components/fields/Checkbox/EditorCell.tsx
@@ -1,4 +1,4 @@
-import { IHeavyCellProps } from "@src/components/fields/types";
+import { IEditorCellProps } from "@src/components/fields/types";
 import { useSetAtom } from "jotai";
 import { get } from "lodash-es";
 
@@ -17,7 +17,8 @@ export default function Checkbox({
   value,
   onSubmit,
   disabled,
-}: IHeavyCellProps) {
+  tabIndex,
+}: IEditorCellProps) {
   const confirm = useSetAtom(confirmDialogAtom, projectScope);
 
   const handleChange = () => {
@@ -43,6 +44,7 @@ export default function Checkbox({
           onChange={handleChange}
           disabled={disabled}
           color="success"
+          tabIndex={tabIndex}
         />
       }
       label={column.name as string}
diff --git a/src/components/fields/Checkbox/index.tsx b/src/components/fields/Checkbox/index.tsx
index 848a52c0..291d074c 100644
--- a/src/components/fields/Checkbox/index.tsx
+++ b/src/components/fields/Checkbox/index.tsx
@@ -1,13 +1,12 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withHeavyCell from "@src/components/fields/_withTableCell/withHeavyCell";
+import withTableCell from "@src/components/Table/withTableCell";
 
 import CheckboxIcon from "@mui/icons-material/ToggleOnOutlined";
-import BasicCell from "@src/components/fields/_BasicCell/BasicCellName";
-import NullEditor from "@src/components/Table/editors/NullEditor";
+import DisplayCell from "./DisplayCell";
 
-const TableCell = lazy(
-  () => import("./TableCell" /* webpackChunkName: "TableCell-Checkbox" */)
+const EditorCell = lazy(
+  () => import("./EditorCell" /* webpackChunkName: "EditorCell-Checkbox" */)
 );
 const SideDrawerField = lazy(
   () =>
@@ -25,8 +24,9 @@ export const config: IFieldConfig = {
   initializable: true,
   icon: <CheckboxIcon />,
   description: "True/false value. Default: false.",
-  TableCell: withHeavyCell(BasicCell, TableCell),
-  TableEditor: NullEditor as any,
+  TableCell: withTableCell(DisplayCell, EditorCell, "inline", {
+    usesRowData: true,
+  }),
   csvImportParser: (value: string) => {
     if (["YES", "TRUE", "1"].includes(value.toUpperCase())) return true;
     else if (["NO", "FALSE", "0"].includes(value.toUpperCase())) return false;
diff --git a/src/components/fields/MultiSelect/InlineCell.tsx b/src/components/fields/MultiSelect/DisplayCell.tsx
similarity index 50%
rename from src/components/fields/MultiSelect/InlineCell.tsx
rename to src/components/fields/MultiSelect/DisplayCell.tsx
index 8f27323c..94a07938 100644
--- a/src/components/fields/MultiSelect/InlineCell.tsx
+++ b/src/components/fields/MultiSelect/DisplayCell.tsx
@@ -1,5 +1,4 @@
-import { forwardRef } from "react";
-import { IPopoverInlineCellProps } from "@src/components/fields/types";
+import { IDisplayCellProps } from "@src/components/fields/types";
 
 import { ButtonBase, Grid } from "@mui/material";
 import { ChevronDown } from "@src/assets/icons";
@@ -7,22 +6,21 @@ import { ChevronDown } from "@src/assets/icons";
 import { sanitiseValue } from "./utils";
 import ChipList from "@src/components/Table/formatters/ChipList";
 import FormattedChip from "@src/components/FormattedChip";
-import { ConvertStringToArray } from "./ConvertStringToArray";
 
-export const MultiSelect = forwardRef(function MultiSelect(
-  { value, showPopoverCell, disabled, onSubmit }: IPopoverInlineCellProps,
-  ref: React.Ref<any>
-) {
-  if (typeof value === "string" && value !== "")
-    return <ConvertStringToArray value={value} onSubmit={onSubmit} />;
+export default function MultiSelect({
+  value,
+  showPopoverCell,
+  disabled,
+}: IDisplayCellProps) {
+  // if (typeof value === "string" && value !== "")
+  // return <ConvertStringToArray value={value} onSubmit={onSubmit} />;
 
   return (
     <ButtonBase
       onClick={() => showPopoverCell(true)}
-      ref={ref}
       disabled={disabled}
-      className="cell-collapse-padding"
-      sx={{
+      style={{
+        width: "100%",
         height: "100%",
         font: "inherit",
         color: "inherit !important",
@@ -42,20 +40,7 @@ export const MultiSelect = forwardRef(function MultiSelect(
         )}
       </ChipList>
 
-      {!disabled && (
-        <ChevronDown
-          className="row-hover-iconButton"
-          sx={{
-            flexShrink: 0,
-            mr: 0.5,
-            borderRadius: 1,
-            p: (32 - 20) / 2 / 8,
-            boxSizing: "content-box !important",
-          }}
-        />
-      )}
+      {!disabled && <ChevronDown className="row-hover-iconButton end" />}
     </ButtonBase>
   );
-});
-
-export default MultiSelect;
+}
diff --git a/src/components/fields/MultiSelect/PopoverCell.tsx b/src/components/fields/MultiSelect/PopoverCell.tsx
index 50c0ad05..0f35e52d 100644
--- a/src/components/fields/MultiSelect/PopoverCell.tsx
+++ b/src/components/fields/MultiSelect/PopoverCell.tsx
@@ -1,4 +1,4 @@
-import { IPopoverCellProps } from "@src/components/fields/types";
+import { IEditorCellProps } from "@src/components/fields/types";
 
 import MultiSelectComponent from "@rowy/multiselect";
 
@@ -11,7 +11,7 @@ export default function MultiSelect({
   parentRef,
   showPopoverCell,
   disabled,
-}: IPopoverCellProps) {
+}: IEditorCellProps) {
   const config = column.config ?? {};
 
   return (
diff --git a/src/components/fields/MultiSelect/index.tsx b/src/components/fields/MultiSelect/index.tsx
index b6f3a853..d5a18ed5 100644
--- a/src/components/fields/MultiSelect/index.tsx
+++ b/src/components/fields/MultiSelect/index.tsx
@@ -1,10 +1,9 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withPopoverCell from "@src/components/fields/_withTableCell/withPopoverCell";
+import withTableCell from "@src/components/Table/withTableCell";
 
 import { MultiSelect as MultiSelectIcon } from "@src/assets/icons";
-import BasicCell from "@src/components/fields/_BasicCell/BasicCellNull";
-import InlineCell from "./InlineCell";
+import DisplayCell from "./DisplayCell";
 import NullEditor from "@src/components/Table/editors/NullEditor";
 import { filterOperators } from "./Filter";
 const PopoverCell = lazy(
@@ -34,9 +33,8 @@ export const config: IFieldConfig = {
   icon: <MultiSelectIcon />,
   description:
     "Multiple values from predefined options. Options are searchable and users can optionally input custom values.",
-  TableCell: withPopoverCell(BasicCell, InlineCell, PopoverCell, {
-    anchorOrigin: { horizontal: "left", vertical: "bottom" },
-    transparent: true,
+  TableCell: withTableCell(DisplayCell, PopoverCell, "popover", {
+    disablePadding: true,
   }),
   TableEditor: NullEditor as any,
   SideDrawerField,
diff --git a/src/components/fields/Reference/EditorCell.tsx b/src/components/fields/Reference/EditorCell.tsx
index 12c5e6b2..8b96b8b3 100644
--- a/src/components/fields/Reference/EditorCell.tsx
+++ b/src/components/fields/Reference/EditorCell.tsx
@@ -61,7 +61,7 @@ export default function TextEditor({ row, column }: EditorProps<any>) {
       sx={{
         width: "100%",
         height: "100%",
-        backgroundColor: "var(--background-color)",
+        backgroundColor: "var(--cell-background-color)",
 
         "& .MuiInputBase-root": {
           height: "100%",
diff --git a/src/components/fields/ShortText/EditorCell.tsx b/src/components/fields/ShortText/EditorCell.tsx
new file mode 100644
index 00000000..418ce4dd
--- /dev/null
+++ b/src/components/fields/ShortText/EditorCell.tsx
@@ -0,0 +1,61 @@
+import type { IEditorCellProps } from "@src/components/fields/types";
+import { useSaveOnUnmount } from "@src/hooks/useSaveOnUnmount";
+
+import { InputBase } from "@mui/material";
+
+export default function ShortText({
+  column,
+  value,
+  onSubmit,
+  setFocusInsideCell,
+}: IEditorCellProps<string>) {
+  const [localValue, setLocalValue] = useSaveOnUnmount(value, onSubmit);
+  const maxLength = column.config?.maxLength;
+
+  return (
+    <InputBase
+      value={localValue}
+      onChange={(e) => setLocalValue(e.target.value)}
+      fullWidth
+      inputProps={{ maxLength }}
+      sx={{
+        width: "100%",
+        height: "calc(100% - 1px)",
+        marginTop: "1px",
+        paddingBottom: "1px",
+
+        backgroundColor: "var(--cell-background-color)",
+        outline: "inherit",
+        outlineOffset: "inherit",
+
+        font: "inherit", // Prevent text jumping
+        letterSpacing: "inherit", // Prevent text jumping
+
+        "& .MuiInputBase-input": { p: "var(--cell-padding)" },
+
+        "& textarea.MuiInputBase-input": {
+          lineHeight: (theme) => theme.typography.body2.lineHeight,
+          maxHeight: "100%",
+          boxSizing: "border-box",
+          py: 3 / 8,
+        },
+      }}
+      autoFocus
+      onKeyDown={(e) => {
+        if (e.key === "ArrowLeft" || e.key === "ArrowRight") {
+          e.stopPropagation();
+        }
+        if (e.key === "Escape") {
+          // Escape removes focus inside cell, this runs before save on unmount
+          setLocalValue(value);
+        }
+        if (e.key === "Enter") {
+          // Removes focus from inside cell, triggering save on unmount
+          setFocusInsideCell(false);
+        }
+      }}
+      onClick={(e) => e.stopPropagation()}
+      onDoubleClick={(e) => e.stopPropagation()}
+    />
+  );
+}
diff --git a/src/components/fields/ShortText/index.tsx b/src/components/fields/ShortText/index.tsx
index 88ef7a20..7bd36ddc 100644
--- a/src/components/fields/ShortText/index.tsx
+++ b/src/components/fields/ShortText/index.tsx
@@ -1,10 +1,10 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withBasicCell from "@src/components/fields/_withTableCell/withBasicCell";
+import withTableCell from "@src/components/Table/withTableCell";
 
 import ShortTextIcon from "@mui/icons-material/ShortText";
 import BasicCell from "@src/components/fields/_BasicCell/BasicCellValue";
-import TextEditor from "@src/components/Table/editors/TextEditor";
+import EditorCell from "./EditorCell";
 
 import { filterOperators } from "./Filter";
 import BasicContextMenuActions from "@src/components/fields/_BasicCell/BasicCellContextMenuActions";
@@ -30,8 +30,7 @@ export const config: IFieldConfig = {
   icon: <ShortTextIcon />,
   description: "Text displayed on a single line.",
   contextMenuActions: BasicContextMenuActions,
-  TableCell: withBasicCell(BasicCell),
-  TableEditor: TextEditor,
+  TableCell: withTableCell(BasicCell, EditorCell),
   SideDrawerField,
   settings: Settings,
   filter: {
diff --git a/src/components/fields/_BasicCell/BasicCellNull.tsx b/src/components/fields/_BasicCell/BasicCellNull.tsx
index 43d91ccb..6b8471b3 100644
--- a/src/components/fields/_BasicCell/BasicCellNull.tsx
+++ b/src/components/fields/_BasicCell/BasicCellNull.tsx
@@ -1,3 +1,3 @@
-export default function BasicCellNull() {
-  return null;
+export default function BasicCellNull(props: any) {
+  return <div {...props} style={{ position: "absolute", inset: 0 }} />;
 }
diff --git a/src/components/fields/_withTableCell/withHeavyCell.tsx b/src/components/fields/_withTableCell/withHeavyCell.tsx
index 394a497c..64c612fb 100644
--- a/src/components/fields/_withTableCell/withHeavyCell.tsx
+++ b/src/components/fields/_withTableCell/withHeavyCell.tsx
@@ -1,4 +1,4 @@
-import { Suspense, useState, useEffect } from "react";
+import { Suspense, useState, useEffect, startTransition } from "react";
 import { useSetAtom } from "jotai";
 import { get } from "lodash-es";
 import type { TableCellProps } from "@src/components/Table";
@@ -22,13 +22,14 @@ export default function withHeavyCell(
   return function HeavyCell({ row, column, getValue }: TableCellProps) {
     const updateField = useSetAtom(updateFieldAtom, tableScope);
 
+    // const displayedComponent = "heavy";
     // Initially display BasicCell to improve scroll performance
     const [displayedComponent, setDisplayedComponent] = useState<
       "basic" | "heavy"
     >("basic");
     // Then switch to HeavyCell once completed
     useEffect(() => {
-      setTimeout(() => {
+      startTransition(() => {
         setDisplayedComponent("heavy");
       });
     }, []);
@@ -45,6 +46,8 @@ export default function withHeavyCell(
       value: localValue,
       name: column.columnDef.meta!.name,
       type: column.columnDef.meta!.type,
+      onMouseOver: () => setDisplayedComponent("heavy"),
+      onMouseLeave: () => setDisplayedComponent("basic"),
     };
     const basicCell = <BasicCellComponent {...basicCellProps} />;
 
diff --git a/src/components/fields/_withTableCell/withPopoverCell.tsx b/src/components/fields/_withTableCell/withPopoverCell.tsx
index 5cb12ac5..8a1f6b20 100644
--- a/src/components/fields/_withTableCell/withPopoverCell.tsx
+++ b/src/components/fields/_withTableCell/withPopoverCell.tsx
@@ -43,13 +43,13 @@ export default function withPopoverCell(
     // Initially display BasicCell to improve scroll performance
     const [displayedComponent, setDisplayedComponent] = useState<
       "basic" | "inline" | "popover"
-    >("basic");
+    >("inline");
     // Then switch to heavier InlineCell once completed
-    useEffect(() => {
-      setTimeout(() => {
-        setDisplayedComponent("inline");
-      });
-    }, []);
+    // useEffect(() => {
+    //   setTimeout(() => {
+    //     setDisplayedComponent("inline");
+    //   });
+    // }, []);
 
     // Store Popover open state here so we can add delay for close transition
     const [popoverOpen, setPopoverOpen] = useState(false);
diff --git a/src/components/fields/types.ts b/src/components/fields/types.ts
index c7309452..1837e1db 100644
--- a/src/components/fields/types.ts
+++ b/src/components/fields/types.ts
@@ -30,7 +30,8 @@ export interface IFieldConfig {
     reset: () => void
   ) => IContextMenuItem[];
   TableCell: React.ComponentType<TableCellProps>;
-  TableEditor: React.ComponentType<EditorProps<TableRow, any>>;
+  /** @deprecated TODO: REMOVE */
+  TableEditor?: React.ComponentType<EditorProps<TableRow, any>>;
   SideDrawerField: React.ComponentType<ISideDrawerFieldProps>;
   settings?: React.ComponentType<ISettingsProps>;
   settingsValidator?: (config: Record<string, any>) => Record<string, string>;
@@ -45,11 +46,13 @@ export interface IFieldConfig {
   csvImportParser?: (value: string, config?: any) => any;
 }
 
+/** @deprecated TODO: REMOVE */
 export interface IBasicCellProps {
   value: any;
   type: FieldType;
   name: string;
 }
+/** @deprecated TODO: REMOVE */
 export interface IHeavyCellProps extends IBasicCellProps {
   row: TableRow;
   column: ColumnConfig;
@@ -57,14 +60,32 @@ export interface IHeavyCellProps extends IBasicCellProps {
   docRef: TableRowRef;
   disabled: boolean;
 }
-
+/** @deprecated TODO: REMOVE */
 export interface IPopoverInlineCellProps extends IHeavyCellProps {
   showPopoverCell: React.Dispatch<React.SetStateAction<boolean>>;
 }
+/** @deprecated TODO: REMOVE */
 export interface IPopoverCellProps extends IPopoverInlineCellProps {
   parentRef: PopoverProps["anchorEl"];
 }
 
+export interface IDisplayCellProps<T = any> {
+  value: T;
+  type: FieldType;
+  name: string;
+  row: TableRow;
+  column: ColumnConfig;
+  docRef: TableRowRef;
+  disabled: boolean;
+  showPopoverCell: (value: boolean) => void;
+  setFocusInsideCell: (focusInside: boolean) => void;
+}
+export interface IEditorCellProps<T = any> extends IDisplayCellProps<T> {
+  onSubmit: (value: T) => void;
+  tabIndex: number;
+  parentRef: PopoverProps["anchorEl"];
+}
+
 /** Props to be passed to all SideDrawerFields */
 export interface ISideDrawerFieldProps {
   /** The column config */
diff --git a/src/hooks/useSaveOnUnmount.ts b/src/hooks/useSaveOnUnmount.ts
new file mode 100644
index 00000000..7807ce23
--- /dev/null
+++ b/src/hooks/useSaveOnUnmount.ts
@@ -0,0 +1,19 @@
+/* eslint-disable react-hooks/exhaustive-deps */
+import { useLayoutEffect } from "react";
+import useState from "react-usestateref";
+
+export function useSaveOnUnmount<T>(
+  initialValue: T,
+  onSave: (value: T) => void
+) {
+  const [localValue, setLocalValue, localValueRef] = useState(initialValue);
+
+  useLayoutEffect(() => {
+    return () => {
+      onSave(localValueRef.current);
+    };
+  }, []);
+
+  return [localValue, setLocalValue, localValueRef] as const;
+}
+export default useSaveOnUnmount;
diff --git a/src/index.tsx b/src/index.tsx
index f4d7b2c9..5d545f47 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -8,11 +8,11 @@ import reportWebVitals from "./reportWebVitals";
 const container = document.getElementById("root")!;
 const root = createRoot(container);
 root.render(
-  // <StrictMode>
-  <Providers>
-    <App />
-  </Providers>
-  // </StrictMode>
+  <StrictMode>
+    <Providers>
+      <App />
+    </Providers>
+  </StrictMode>
 );
 
 // If you want to start measuring performance in your app, pass a function
diff --git a/src/pages/Table/TablePage.tsx b/src/pages/Table/TablePage.tsx
index d324a69d..234be866 100644
--- a/src/pages/Table/TablePage.tsx
+++ b/src/pages/Table/TablePage.tsx
@@ -2,7 +2,7 @@ import { useRef, Suspense, lazy } from "react";
 import { useAtom } from "jotai";
 import { DataGridHandle } from "react-data-grid";
 import { ErrorBoundary } from "react-error-boundary";
-import { isEmpty } from "lodash-es";
+import { isEmpty, intersection } from "lodash-es";
 
 import { Box, Fade } from "@mui/material";
 import ErrorFallback, {
@@ -72,7 +72,10 @@ export default function TablePage({
   // shouldn’t access projectScope at all, to separate concerns.
   const canAddColumn = userRoles.includes("ADMIN");
   const canEditColumn = userRoles.includes("ADMIN");
-  const canEditCell = userRoles.includes("ADMIN") || !tableSettings.readOnly;
+  const canEditCell =
+    userRoles.includes("ADMIN") ||
+    (!tableSettings.readOnly &&
+      intersection(userRoles, tableSettings.roles).length > 0);
 
   // Warn user about leaving when they have a table modal open
   useBeforeUnload(columnModalAtom, tableScope);

From c31f15f0584ef24f81c52c269cbeb62a56a47b84 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 8 Nov 2022 17:29:13 +1100
Subject: [PATCH 236/309] remove table not found error in case
 tableSettingsAtom value is stale

---
 src/components/ErrorFallback.tsx      | 37 +-------------------
 src/pages/Table/ProvidedTablePage.tsx | 50 ++++++++++++++++++++++++---
 2 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/src/components/ErrorFallback.tsx b/src/components/ErrorFallback.tsx
index 83257aac..3d7f130a 100644
--- a/src/components/ErrorFallback.tsx
+++ b/src/components/ErrorFallback.tsx
@@ -1,22 +1,18 @@
 import { useState, useEffect } from "react";
 import { FallbackProps } from "react-error-boundary";
-import { useLocation, Link } from "react-router-dom";
+import { useLocation } from "react-router-dom";
 import useOffline from "@src/hooks/useOffline";
 
 import { Typography, Button } from "@mui/material";
 import ReloadIcon from "@mui/icons-material/Refresh";
 import InlineOpenInNewIcon from "@src/components/InlineOpenInNewIcon";
 import OfflineIcon from "@mui/icons-material/CloudOff";
-import { Tables as TablesIcon } from "@src/assets/icons";
 
 import EmptyState, { IEmptyStateProps } from "@src/components/EmptyState";
 import AccessDenied from "@src/components/AccessDenied";
 
-import { ROUTES } from "@src/constants/routes";
 import { EXTERNAL_LINKS } from "@src/constants/externalLinks";
 
-export const ERROR_TABLE_NOT_FOUND = "Table not found";
-
 export interface IErrorFallbackProps extends FallbackProps, IEmptyStateProps {}
 
 export function ErrorFallbackContents({
@@ -70,37 +66,6 @@ export function ErrorFallbackContents({
     ),
   };
 
-  if (error.message.startsWith(ERROR_TABLE_NOT_FOUND)) {
-    if (isOffline) {
-      renderProps = { Icon: OfflineIcon, message: "You’re offline" };
-    } else {
-      renderProps = {
-        message: ERROR_TABLE_NOT_FOUND,
-        description: (
-          <>
-            <Typography variant="inherit">
-              Make sure you have the right ID
-            </Typography>
-            <code>
-              {error.message.replace(ERROR_TABLE_NOT_FOUND + ": ", "")}
-            </code>
-            <Button
-              size={props.basic ? "small" : "medium"}
-              variant="outlined"
-              color="secondary"
-              component={Link}
-              to={ROUTES.tables}
-              startIcon={<TablesIcon />}
-              onClick={() => resetErrorBoundary()}
-            >
-              All tables
-            </Button>
-          </>
-        ),
-      };
-    }
-  }
-
   if (error.message.startsWith("Loading chunk")) {
     if (isOffline) {
       renderProps = { Icon: OfflineIcon, message: "You’re offline" };
diff --git a/src/pages/Table/ProvidedTablePage.tsx b/src/pages/Table/ProvidedTablePage.tsx
index d2e5cb17..e605fcc6 100644
--- a/src/pages/Table/ProvidedTablePage.tsx
+++ b/src/pages/Table/ProvidedTablePage.tsx
@@ -1,17 +1,21 @@
 import { Suspense } from "react";
 import { useAtom, Provider } from "jotai";
 import { DebugAtoms } from "@src/atoms/utils";
-import { useParams, useOutlet } from "react-router-dom";
+import { useParams, useOutlet, Link } from "react-router-dom";
 import { ErrorBoundary } from "react-error-boundary";
 import { find, isEmpty } from "lodash-es";
+import useOffline from "@src/hooks/useOffline";
 
-import ErrorFallback, {
-  ERROR_TABLE_NOT_FOUND,
-} from "@src/components/ErrorFallback";
+import { Typography, Button } from "@mui/material";
+
+import ErrorFallback from "@src/components/ErrorFallback";
 import TableSourceFirestore from "@src/sources/TableSourceFirestore";
 import TablePage from "./TablePage";
 import TableToolbarSkeleton from "@src/components/TableToolbar/TableToolbarSkeleton";
 import TableSkeleton from "@src/components/Table/TableSkeleton";
+import EmptyState from "@src/components/EmptyState";
+import OfflineIcon from "@mui/icons-material/CloudOff";
+import { Tables as TablesIcon } from "@src/assets/icons";
 
 import {
   projectScope,
@@ -26,6 +30,7 @@ import {
   tableSettingsAtom,
 } from "@src/atoms/tableScope";
 import { SyncAtomValue } from "@src/atoms/utils";
+import { ROUTES } from "@src/constants/routes";
 import useDocumentTitle from "@src/hooks/useDocumentTitle";
 
 /**
@@ -39,6 +44,7 @@ export default function ProvidedTablePage() {
   const [currentUser] = useAtom(currentUserAtom, projectScope);
   const [projectSettings] = useAtom(projectSettingsAtom, projectScope);
   const [tables] = useAtom(tablesAtom, projectScope);
+  const isOffline = useOffline();
 
   const tableSettings = find(tables, ["id", id]);
   useDocumentTitle(projectId, tableSettings ? tableSettings.name : "Not found");
@@ -52,7 +58,41 @@ export default function ProvidedTablePage() {
         </>
       );
     } else {
-      throw new Error(ERROR_TABLE_NOT_FOUND + ": " + id);
+      if (isOffline) {
+        return (
+          <EmptyState
+            role="alert"
+            fullScreen
+            Icon={OfflineIcon}
+            message="You’re offline"
+          />
+        );
+      } else {
+        return (
+          <EmptyState
+            role="alert"
+            fullScreen
+            message="Table not found"
+            description={
+              <>
+                <Typography variant="inherit">
+                  Make sure you have the right ID
+                </Typography>
+                <code>{id}</code>
+                <Button
+                  variant="outlined"
+                  color="secondary"
+                  component={Link}
+                  to={ROUTES.tables}
+                  startIcon={<TablesIcon />}
+                >
+                  All tables
+                </Button>
+              </>
+            }
+          />
+        );
+      }
     }
   }
 

From 0356c0c12588648ba1e42eab6a070db8c2ddd49c Mon Sep 17 00:00:00 2001
From: shamsmosowi <shams.mosowi@gmail.com>
Date: Tue, 8 Nov 2022 16:46:15 +0100
Subject: [PATCH 237/309] fix clear value logic

---
 src/components/Table/ContextMenu/MenuContents.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Table/ContextMenu/MenuContents.tsx b/src/components/Table/ContextMenu/MenuContents.tsx
index 60d58069..f4d36ef3 100644
--- a/src/components/Table/ContextMenu/MenuContents.tsx
+++ b/src/components/Table/ContextMenu/MenuContents.tsx
@@ -111,7 +111,7 @@ export default function MenuContents({ onClose }: IMenuContentsProps) {
       disabled:
         selectedColumn.editable === false ||
         !row ||
-        cellValue ||
+        cellValue === undefined ||
         getFieldProp("group", selectedColumn.type) === "Auditing",
       onClick: altPress
         ? handleClearValue

From 53c7cc83d0e6666e09eb4776f49d6619ee0ec605 Mon Sep 17 00:00:00 2001
From: Han Tuerker <46192266+htuerker@users.noreply.github.com>
Date: Wed, 9 Nov 2022 05:04:07 +0300
Subject: [PATCH 238/309] fix error state (#18)

---
 .../TableModals/ExtensionsModal/ExtensionsModal.tsx | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/components/TableModals/ExtensionsModal/ExtensionsModal.tsx b/src/components/TableModals/ExtensionsModal/ExtensionsModal.tsx
index 3ae3d20b..71146804 100644
--- a/src/components/TableModals/ExtensionsModal/ExtensionsModal.tsx
+++ b/src/components/TableModals/ExtensionsModal/ExtensionsModal.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useState } from "react";
 import { useAtom, useSetAtom } from "jotai";
-import { isEqual } from "lodash-es";
+import { isEqual, isUndefined } from "lodash-es";
 import { ITableModalProps } from "@src/components/TableModals";
 
 import Modal from "@src/components/Modal";
@@ -56,11 +56,12 @@ export default function ExtensionsModal({ onClose }: ITableModalProps) {
 
   const errors = {
     runtimeOptions: {
-      timeoutSeconds: !(
-        !!localRuntimeOptions.timeoutSeconds &&
-        localRuntimeOptions.timeoutSeconds > 0 &&
-        localRuntimeOptions.timeoutSeconds <= 540
-      ),
+      timeoutSeconds:
+        !isUndefined(localRuntimeOptions.timeoutSeconds) &&
+        !(
+          localRuntimeOptions.timeoutSeconds! > 0 &&
+          localRuntimeOptions.timeoutSeconds! <= 540
+        ),
     },
   };
 

From 9d8ff4d10abb592a373e547326532b4c667b1a95 Mon Sep 17 00:00:00 2001
From: Bobby Wang <bofei@mail.com>
Date: Wed, 9 Nov 2022 10:24:28 +0800
Subject: [PATCH 239/309] Feature/remove listener fields when deleting column
 (#924)

* remove column from Derivative -> listenerFields and Action -> requiredFields when deleting a column

* remove column from Extensions -> requiredFields when deleting a column

* display where reference will be removed and force a rebuild if required when deleting column

* Update src/types/table.d.ts

* Update src/components/ColumnMenu/ColumnMenu.tsx

* Update src/components/ColumnMenu/ColumnMenu.tsx

* Update src/components/ColumnMenu/ColumnMenu.tsx

Co-authored-by: Sidney Alcantara <sidney@sidney.me>
---
 src/atoms/tableScope/columnActions.ts    | 43 ++++++++++++-
 src/components/ColumnMenu/ColumnMenu.tsx | 77 ++++++++++++++++++++++--
 src/types/table.d.ts                     |  4 ++
 3 files changed, 118 insertions(+), 6 deletions(-)

diff --git a/src/atoms/tableScope/columnActions.ts b/src/atoms/tableScope/columnActions.ts
index 58e44405..c0be303a 100644
--- a/src/atoms/tableScope/columnActions.ts
+++ b/src/atoms/tableScope/columnActions.ts
@@ -1,10 +1,12 @@
 import { atom } from "jotai";
 import { findIndex } from "lodash-es";
+import { FieldType } from "@src/constants/fields";
 
 import {
   tableColumnsOrderedAtom,
   tableColumnsReducer,
   updateTableSchemaAtom,
+  tableSchemaAtom,
 } from "./table";
 import { ColumnConfig } from "@src/types/table";
 
@@ -14,6 +16,7 @@ export interface IAddColumnOptions {
   /** Index to add column at. If undefined, adds to end */
   index?: number;
 }
+
 /**
  * Set function adds a column to tableSchema, to the end or by index.
  * Also fixes any issues with column indexes, so they go from 0 to length - 1
@@ -52,6 +55,7 @@ export interface IUpdateColumnOptions {
   /** If passed, reorders the column to the index */
   index?: number;
 }
+
 /**
  * Set function updates a column in tableSchema
  * @throws Error if column not found
@@ -112,13 +116,50 @@ export const updateColumnAtom = atom(
  * ```
  */
 export const deleteColumnAtom = atom(null, async (get, _set, key: string) => {
+  const tableSchema = get(tableSchemaAtom);
   const tableColumnsOrdered = [...get(tableColumnsOrderedAtom)];
   const updateTableSchema = get(updateTableSchemaAtom);
   if (!updateTableSchema) throw new Error("Cannot update table schema");
 
   const updatedColumns = tableColumnsOrdered
     .filter((c) => c.key !== key)
+    .map((c) => {
+      // remove column from derivatives listener fields
+      if (c.type === FieldType.derivative) {
+        return {
+          ...c,
+          config: {
+            ...c.config,
+            listenerFields:
+              c.config?.listenerFields?.filter((f) => f !== key) ?? [],
+          },
+        };
+      } else if (c.type === FieldType.action) {
+        return {
+          ...c,
+          config: {
+            ...c.config,
+            requiredFields:
+              c.config?.requiredFields?.filter((f) => f !== key) ?? [],
+          },
+        };
+      } else {
+        return c;
+      }
+    })
     .reduce(tableColumnsReducer, {});
 
-  await updateTableSchema({ columns: updatedColumns }, [`columns.${key}`]);
+  const updatedExtensionObjects = tableSchema?.extensionObjects?.map(
+    (extension) => {
+      return {
+        ...extension,
+        requiredFields: extension.requiredFields.filter((f) => f !== key),
+      };
+    }
+  );
+
+  await updateTableSchema(
+    { columns: updatedColumns, extensionObjects: updatedExtensionObjects },
+    [`columns.${key}`]
+  );
 });
diff --git a/src/components/ColumnMenu/ColumnMenu.tsx b/src/components/ColumnMenu/ColumnMenu.tsx
index 4884a75a..4ba8400b 100644
--- a/src/components/ColumnMenu/ColumnMenu.tsx
+++ b/src/components/ColumnMenu/ColumnMenu.tsx
@@ -7,6 +7,7 @@ import {
   ListItemIcon,
   ListItemText,
   Typography,
+  Divider,
 } from "@mui/material";
 import FilterIcon from "@mui/icons-material/FilterList";
 import LockOpenIcon from "@mui/icons-material/LockOpen";
@@ -50,12 +51,18 @@ import {
   columnModalAtom,
   tableFiltersPopoverAtom,
   tableNextPageAtom,
+  tableSchemaAtom,
 } from "@src/atoms/tableScope";
 import { FieldType } from "@src/constants/fields";
 import { getFieldProp } from "@src/components/fields";
 import { analytics, logEvent } from "@src/analytics";
-import { formatSubTableName, getTableSchemaPath } from "@src/utils/table";
+import {
+  formatSubTableName,
+  getTableBuildFunctionPathname,
+  getTableSchemaPath,
+} from "@src/utils/table";
 import { runRoutes } from "@src/constants/runRoutes";
+import { useSnackLogContext } from "@src/contexts/SnackLogContext";
 
 export interface IMenuModalProps {
   name: string;
@@ -91,6 +98,8 @@ export default function ColumnMenu() {
     tableScope
   );
   const [tableNextPage] = useAtom(tableNextPageAtom, tableScope);
+  const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
+  const snackLogContext = useSnackLogContext();
 
   const [altPress] = useAtom(altPressAtom, projectScope);
   const { enqueueSnackbar, closeSnackbar } = useSnackbar();
@@ -117,8 +126,42 @@ export default function ColumnMenu() {
   const userDocHiddenFields =
     userSettings.tables?.[formatSubTableName(tableId)]?.hiddenFields ?? [];
 
+  let referencedColumns: string[] = [];
+  let referencedExtensions: string[] = [];
+  Object.entries(tableSchema?.columns ?? {}).forEach(([key, c], index) => {
+    if (
+      c.config?.listenerFields?.includes(column.key) ||
+      c.config?.requiredFields?.includes(column.key)
+    ) {
+      referencedColumns.push(c.name);
+    }
+  });
+  tableSchema?.extensionObjects?.forEach((extension) => {
+    if (extension.requiredFields.includes(column.key)) {
+      referencedExtensions.push(extension.name);
+    }
+  });
+  const requireRebuild =
+    referencedColumns.length || referencedExtensions.length;
+
   const handleDeleteColumn = () => {
     deleteColumn(column.key);
+    if (requireRebuild) {
+      snackLogContext.requestSnackLog();
+      rowyRun({
+        route: runRoutes.buildFunction,
+        body: {
+          tablePath: tableSettings.collection,
+          // pathname must match old URL format
+          pathname: getTableBuildFunctionPathname(
+            tableSettings.id,
+            tableSettings.tableType
+          ),
+          tableConfigPath: getTableSchemaPath(tableSettings),
+        },
+      });
+      logEvent(analytics, "deployed_extensions");
+    }
     logEvent(analytics, "delete_column", { type: column.type });
     handleClose();
   };
@@ -360,8 +403,8 @@ export default function ColumnMenu() {
       icon: <ColumnRemoveIcon />,
       onClick: altPress
         ? handleDeleteColumn
-        : () =>
-            confirm({
+        : () => {
+            return confirm({
               title: "Delete column?",
               body: (
                 <>
@@ -373,12 +416,36 @@ export default function ColumnMenu() {
                   <Typography sx={{ mt: 1 }}>
                     Key: <code style={{ userSelect: "all" }}>{column.key}</code>
                   </Typography>
+                  {requireRebuild ? (
+                    <>
+                      <Divider sx={{ my: 2 }} />
+                      {referencedColumns.length ? (
+                        <Typography sx={{ mt: 1 }}>
+                          This column will be removed as a dependency of the following columns:{" "}
+                          <Typography key={column} fontWeight="bold" component="span">
+                            {referencedColumns.join(", ")}
+                          </Typography>
+                        </Typography>
+                      ) : null}
+                      {referencedExtensions.length ? (
+                        <Typography sx={{ mt: 1 }}>
+                          This column will be removed as a dependency from the following Extensions:{" "}
+                          <Typography key={extension} fontWeight="bold" component="span">
+                            {referencedExtensions.join(", ")}
+                          </Typography>
+                      ) : null}
+                      <Typography sx={{ mt: 1, fontWeight: "bold" }}>
+                        You need to re-deploy this table’s cloud function.
+                      </Typography>
+                    </>
+                  ) : null}
                 </>
               ),
-              confirm: "Delete",
+              confirm: requireRebuild ? "Delete & re-deploy" : "Delete",
               confirmColor: "error",
               handleConfirm: handleDeleteColumn,
-            }),
+            });
+          },
       color: "error" as "error",
     },
   ];
diff --git a/src/types/table.d.ts b/src/types/table.d.ts
index fd149f5e..f4e3bb96 100644
--- a/src/types/table.d.ts
+++ b/src/types/table.d.ts
@@ -149,6 +149,10 @@ export type ColumnConfig = {
     };
     /** FieldType to render for Derivative fields */
     renderFieldType?: FieldType;
+    /** Used in Derivative fields */
+    listenerFields?: string[];
+    /** Used in Derivative and Action fields */
+    requiredFields?: string[];
     /** For sub-table fields */
     parentLabel?: string[];
 

From 42a8443c94e99a37f69629769e429f7dd7bce184 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 9 Nov 2022 15:02:13 +1100
Subject: [PATCH 240/309] fix delete column copy

---
 src/components/ColumnMenu/ColumnMenu.tsx | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/ColumnMenu/ColumnMenu.tsx b/src/components/ColumnMenu/ColumnMenu.tsx
index 4ba8400b..09c17e23 100644
--- a/src/components/ColumnMenu/ColumnMenu.tsx
+++ b/src/components/ColumnMenu/ColumnMenu.tsx
@@ -421,18 +421,21 @@ export default function ColumnMenu() {
                       <Divider sx={{ my: 2 }} />
                       {referencedColumns.length ? (
                         <Typography sx={{ mt: 1 }}>
-                          This column will be removed as a dependency of the following columns:{" "}
-                          <Typography key={column} fontWeight="bold" component="span">
+                          This column will be removed as a dependency of the
+                          following columns:{" "}
+                          <Typography fontWeight="bold" component="span">
                             {referencedColumns.join(", ")}
                           </Typography>
                         </Typography>
                       ) : null}
                       {referencedExtensions.length ? (
                         <Typography sx={{ mt: 1 }}>
-                          This column will be removed as a dependency from the following Extensions:{" "}
-                          <Typography key={extension} fontWeight="bold" component="span">
+                          This column will be removed as a dependency from the
+                          following Extensions:{" "}
+                          <Typography fontWeight="bold" component="span">
                             {referencedExtensions.join(", ")}
                           </Typography>
+                        </Typography>
                       ) : null}
                       <Typography sx={{ mt: 1, fontWeight: "bold" }}>
                         You need to re-deploy this table’s cloud function.

From 73af4d768bd9786625143f5250d8e358cf39343a Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 9 Nov 2022 15:15:58 +1100
Subject: [PATCH 241/309] separate TablePage into its own chunk

---
 src/pages/Table/ProvidedSubTablePage.tsx | 6 ++++--
 src/pages/Table/ProvidedTablePage.tsx    | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/pages/Table/ProvidedSubTablePage.tsx b/src/pages/Table/ProvidedSubTablePage.tsx
index 2b3e090b..58380d27 100644
--- a/src/pages/Table/ProvidedSubTablePage.tsx
+++ b/src/pages/Table/ProvidedSubTablePage.tsx
@@ -1,4 +1,4 @@
-import { Suspense, useMemo } from "react";
+import { lazy, Suspense, useMemo } from "react";
 import { useAtom, Provider } from "jotai";
 import { selectAtom } from "jotai/utils";
 import { DebugAtoms } from "@src/atoms/utils";
@@ -10,7 +10,6 @@ import Modal from "@src/components/Modal";
 import BreadcrumbsSubTable from "@src/components/Table/BreadcrumbsSubTable";
 import ErrorFallback from "@src/components/ErrorFallback";
 import TableSourceFirestore from "@src/sources/TableSourceFirestore";
-import TablePage from "./TablePage";
 import TableToolbarSkeleton from "@src/components/TableToolbar/TableToolbarSkeleton";
 import TableSkeleton from "@src/components/Table/TableSkeleton";
 
@@ -25,6 +24,9 @@ import { ROUTES } from "@src/constants/routes";
 import { TOP_BAR_HEIGHT } from "@src/layouts/Navigation/TopBar";
 import { TABLE_TOOLBAR_HEIGHT } from "@src/components/TableToolbar";
 
+// prettier-ignore
+const TablePage = lazy(() => import("./TablePage" /* webpackChunkName: "TablePage" */));
+
 /**
  * Wraps `TablePage` with the data for a top-level table.
  */
diff --git a/src/pages/Table/ProvidedTablePage.tsx b/src/pages/Table/ProvidedTablePage.tsx
index d2e5cb17..ab2b7614 100644
--- a/src/pages/Table/ProvidedTablePage.tsx
+++ b/src/pages/Table/ProvidedTablePage.tsx
@@ -1,4 +1,4 @@
-import { Suspense } from "react";
+import { lazy, Suspense } from "react";
 import { useAtom, Provider } from "jotai";
 import { DebugAtoms } from "@src/atoms/utils";
 import { useParams, useOutlet } from "react-router-dom";
@@ -9,7 +9,6 @@ import ErrorFallback, {
   ERROR_TABLE_NOT_FOUND,
 } from "@src/components/ErrorFallback";
 import TableSourceFirestore from "@src/sources/TableSourceFirestore";
-import TablePage from "./TablePage";
 import TableToolbarSkeleton from "@src/components/TableToolbar/TableToolbarSkeleton";
 import TableSkeleton from "@src/components/Table/TableSkeleton";
 
@@ -28,6 +27,9 @@ import {
 import { SyncAtomValue } from "@src/atoms/utils";
 import useDocumentTitle from "@src/hooks/useDocumentTitle";
 
+// prettier-ignore
+const TablePage = lazy(() => import("./TablePage" /* webpackChunkName: "TablePage" */));
+
 /**
  * Wraps `TablePage` with the data for a top-level table.
  * `SubTablePage` is inserted in the outlet, alongside `TablePage`.

From 2dc2bdb6bc8ea4ee93a9aa9e8ee33791ed8f1d57 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 9 Nov 2022 15:59:27 +1100
Subject: [PATCH 242/309] Multiselect field: add back convert to array

---
 src/components/Table/withTableCell.tsx        |  1 +
 .../MultiSelect/ConvertStringToArray.tsx      | 29 -------------------
 .../fields/MultiSelect/DisplayCell.tsx        | 29 ++++++++++++-------
 .../fields/MultiSelect/PopoverCell.tsx        | 20 +++++++++++++
 .../fields/MultiSelect/SideDrawerField.tsx    | 25 ++++++++++++++--
 5 files changed, 62 insertions(+), 42 deletions(-)
 delete mode 100644 src/components/fields/MultiSelect/ConvertStringToArray.tsx

diff --git a/src/components/Table/withTableCell.tsx b/src/components/Table/withTableCell.tsx
index 3021fe40..88aa7e68 100644
--- a/src/components/Table/withTableCell.tsx
+++ b/src/components/Table/withTableCell.tsx
@@ -164,6 +164,7 @@ export default function withTableCell(
                 onClick={(e) => e.stopPropagation()}
                 onDoubleClick={(e) => e.stopPropagation()}
                 onKeyDown={(e) => e.stopPropagation()}
+                onContextMenu={(e) => e.stopPropagation()}
               >
                 {editorCell}
               </Popover>
diff --git a/src/components/fields/MultiSelect/ConvertStringToArray.tsx b/src/components/fields/MultiSelect/ConvertStringToArray.tsx
deleted file mode 100644
index 9d3f3ce0..00000000
--- a/src/components/fields/MultiSelect/ConvertStringToArray.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { IPopoverInlineCellProps } from "@src/components/fields/types";
-import { Grid, Tooltip, Button } from "@mui/material";
-
-export const ConvertStringToArray = ({
-  value,
-  onSubmit,
-}: Pick<IPopoverInlineCellProps, "value" | "onSubmit">) => (
-  <Grid container wrap="nowrap" alignItems="center">
-    <Grid item xs style={{ overflow: "hidden", textOverflow: "ellipsis" }}>
-      {value}
-    </Grid>
-    <Grid item>
-      <Tooltip title="It looks like this is a string. Click to convert to an array">
-        <Button
-          onClick={() => onSubmit([value])}
-          style={{
-            display: "flex",
-            minWidth: 0,
-            marginRight: -12,
-            paddingLeft: 12,
-            paddingRight: 12,
-          }}
-        >
-          Fix
-        </Button>
-      </Tooltip>
-    </Grid>
-  </Grid>
-);
diff --git a/src/components/fields/MultiSelect/DisplayCell.tsx b/src/components/fields/MultiSelect/DisplayCell.tsx
index 94a07938..9cb58369 100644
--- a/src/components/fields/MultiSelect/DisplayCell.tsx
+++ b/src/components/fields/MultiSelect/DisplayCell.tsx
@@ -1,6 +1,7 @@
 import { IDisplayCellProps } from "@src/components/fields/types";
 
 import { ButtonBase, Grid } from "@mui/material";
+import WarningIcon from "@mui/icons-material/WarningAmber";
 import { ChevronDown } from "@src/assets/icons";
 
 import { sanitiseValue } from "./utils";
@@ -29,16 +30,24 @@ export default function MultiSelect({
         justifyContent: "flex-start",
       }}
     >
-      <ChipList>
-        {sanitiseValue(value).map(
-          (item) =>
-            typeof item === "string" && (
-              <Grid item key={item}>
-                <FormattedChip label={item} />
-              </Grid>
-            )
-        )}
-      </ChipList>
+      {typeof value === "string" && value !== "" ? (
+        <div style={{ flexGrow: 1, paddingLeft: "var(--cell-padding)" }}>
+          <WarningIcon color="action" style={{ verticalAlign: "middle" }} />
+          &nbsp;
+          {value}
+        </div>
+      ) : (
+        <ChipList>
+          {sanitiseValue(value).map(
+            (item) =>
+              typeof item === "string" && (
+                <Grid item key={item}>
+                  <FormattedChip label={item} />
+                </Grid>
+              )
+          )}
+        </ChipList>
+      )}
 
       {!disabled && <ChevronDown className="row-hover-iconButton end" />}
     </ButtonBase>
diff --git a/src/components/fields/MultiSelect/PopoverCell.tsx b/src/components/fields/MultiSelect/PopoverCell.tsx
index 0f35e52d..8ef894cf 100644
--- a/src/components/fields/MultiSelect/PopoverCell.tsx
+++ b/src/components/fields/MultiSelect/PopoverCell.tsx
@@ -1,6 +1,9 @@
 import { IEditorCellProps } from "@src/components/fields/types";
 
+import { Typography, Button } from "@mui/material";
+import WarningIcon from "@mui/icons-material/WarningAmber";
 import MultiSelectComponent from "@rowy/multiselect";
+import EmptyState from "@src/components/EmptyState";
 
 import { sanitiseValue } from "./utils";
 
@@ -14,6 +17,23 @@ export default function MultiSelect({
 }: IEditorCellProps) {
   const config = column.config ?? {};
 
+  if (typeof value === "string" && value !== "")
+    return (
+      <EmptyState
+        Icon={WarningIcon}
+        message="Fix this value"
+        description={
+          <>
+            <Typography>This cell’s value is a string</Typography>
+            <Button color="primary" onClick={() => onSubmit([value])}>
+              Convert to array
+            </Button>
+          </>
+        }
+        sx={{ my: 3, width: column.width }}
+      />
+    );
+
   return (
     <MultiSelectComponent
       value={sanitiseValue(value)}
diff --git a/src/components/fields/MultiSelect/SideDrawerField.tsx b/src/components/fields/MultiSelect/SideDrawerField.tsx
index a0290625..2716e34c 100644
--- a/src/components/fields/MultiSelect/SideDrawerField.tsx
+++ b/src/components/fields/MultiSelect/SideDrawerField.tsx
@@ -1,11 +1,12 @@
 import { ISideDrawerFieldProps } from "@src/components/fields/types";
 
-import { Grid } from "@mui/material";
+import { Grid, Button } from "@mui/material";
+import WarningIcon from "@mui/icons-material/WarningAmber";
 import MultiSelectComponent from "@rowy/multiselect";
 import FormattedChip from "@src/components/FormattedChip";
 
+import { fieldSx } from "@src/components/SideDrawer/utils";
 import { sanitiseValue } from "./utils";
-import { ConvertStringToArray } from "./ConvertStringToArray";
 
 export default function MultiSelect({
   column,
@@ -24,7 +25,25 @@ export default function MultiSelect({
   };
 
   if (typeof value === "string" && value !== "")
-    return <ConvertStringToArray value={value} onSubmit={onChange} />;
+    return (
+      <Grid container wrap="nowrap" gap={1}>
+        <Grid item xs sx={fieldSx}>
+          <WarningIcon color="action" style={{ verticalAlign: "middle" }} />
+          &nbsp;{value}
+        </Grid>
+        <Grid item>
+          <Button
+            color="primary"
+            onClick={() => {
+              onChange([value]);
+              onSubmit();
+            }}
+          >
+            Convert to array
+          </Button>
+        </Grid>
+      </Grid>
+    );
 
   return (
     <>

From 387c2db2bcf5e7fe9685a0bf35cfea5e2489d053 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 9 Nov 2022 15:59:46 +1100
Subject: [PATCH 243/309] fix final/actions column for read-only users

---
 .../Table/FinalColumn/FinalColumnHeader.tsx   | 32 +++++++++++++++++--
 src/components/Table/Styled/StyledRow.tsx     |  3 +-
 src/components/Table/Table.tsx                |  1 +
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/components/Table/FinalColumn/FinalColumnHeader.tsx b/src/components/Table/FinalColumn/FinalColumnHeader.tsx
index 0a949885..416cab5c 100644
--- a/src/components/Table/FinalColumn/FinalColumnHeader.tsx
+++ b/src/components/Table/FinalColumn/FinalColumnHeader.tsx
@@ -9,16 +9,44 @@ import { spreadSx } from "@src/utils/ui";
 
 export interface IFinalColumnHeaderProps extends Partial<BoxProps> {
   focusInsideCell: boolean;
+  canAddColumn: boolean;
 }
 
 export default function FinalColumnHeader({
   focusInsideCell,
+  canAddColumn,
   ...props
 }: IFinalColumnHeaderProps) {
   const [userRoles] = useAtom(userRolesAtom, projectScope);
   const openColumnModal = useSetAtom(columnModalAtom, tableScope);
 
-  if (!userRoles.includes("ADMIN")) return null;
+  if (!userRoles.includes("ADMIN"))
+    return (
+      <Box
+        role="columnheader"
+        {...props}
+        sx={[
+          {
+            backgroundColor: "background.default",
+            border: (theme) => `1px solid ${theme.palette.divider}`,
+            borderLeft: "none",
+            borderTopRightRadius: (theme) => theme.shape.borderRadius,
+            borderBottomRightRadius: (theme) => theme.shape.borderRadius,
+
+            display: "flex",
+            alignItems: "center",
+
+            width: 32 * 3 + 4 * 2 + 10 * 2,
+            px: 1.5,
+            color: "text.secondary",
+          },
+          ...spreadSx(props.sx),
+        ]}
+        className="column-header"
+      >
+        Actions
+      </Box>
+    );
 
   return (
     <Box
@@ -37,7 +65,7 @@ export default function FinalColumnHeader({
 
           width: 32 * 3 + 4 * 2 + 10 * 2,
           overflow: "visible",
-          px: 1,
+          px: 0.75,
         },
         ...spreadSx(props.sx),
       ]}
diff --git a/src/components/Table/Styled/StyledRow.tsx b/src/components/Table/Styled/StyledRow.tsx
index 49c3408f..9aeeb73f 100644
--- a/src/components/Table/Styled/StyledRow.tsx
+++ b/src/components/Table/Styled/StyledRow.tsx
@@ -35,7 +35,8 @@ export const StyledRow = styled("div")(({ theme }) => ({
     flexShrink: 0,
     borderRadius: theme.shape.borderRadius,
     padding: (32 - 20) / 2,
-    boxSizing: "content-box",
+    width: 32,
+    height: 32,
 
     "&.end": { marginRight: theme.spacing(0.5) },
   },
diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index a3d60147..f7d72c76 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -283,6 +283,7 @@ export default function Table({
                             aria-colindex={header.index + 1}
                             aria-readonly={!canEditColumn}
                             aria-selected={isSelectedCell}
+                            canAddColumn={canAddColumn}
                           />
                         );
 

From 5678f96c2b8cc86d728eed4469d61ac906924aea Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 9 Nov 2022 17:07:22 +1100
Subject: [PATCH 244/309] migrate field types based on TextEditor

---
 src/components/Table/EditorCellTextField.tsx  |  77 +++++++++++
 src/components/Table/Styled/StyledCell.tsx    |   3 +
 src/components/Table/Table.tsx                |  11 +-
 src/components/Table/editors/TextEditor.tsx   | 122 ------------------
 src/components/Table/withTableCell.tsx        |   7 +-
 src/components/fields/Email/EditorCell.tsx    |   6 +
 src/components/fields/Email/index.tsx         |   9 +-
 .../Id/{TableCell.tsx => DisplayCell.tsx}     |   4 +-
 src/components/fields/Id/index.tsx            |  17 +--
 .../{BasicCell.tsx => DisplayCell.tsx}        |   7 +-
 src/components/fields/LongText/EditorCell.tsx |   6 +
 src/components/fields/LongText/index.tsx      |  17 +--
 src/components/fields/Number/BasicCell.tsx    |   5 -
 src/components/fields/Number/DisplayCell.tsx  |   5 +
 src/components/fields/Number/EditorCell.tsx   |  12 ++
 src/components/fields/Number/index.tsx        |   9 +-
 .../fields/Percentage/BasicCell.tsx           |  23 ----
 .../{TableCell.tsx => DisplayCell.tsx}        |   4 +-
 .../fields/Percentage/EditorCell.tsx          |  13 ++
 src/components/fields/Percentage/index.tsx    |  16 +--
 src/components/fields/Phone/EditorCell.tsx    |   6 +
 src/components/fields/Phone/index.tsx         |   9 +-
 .../{BasicCell.tsx => DisplayCell.tsx}        |   7 +-
 .../fields/Reference/EditorCell.tsx           | 111 ++++------------
 src/components/fields/Reference/index.tsx     |  18 +--
 .../fields/ShortText/EditorCell.tsx           |  61 +--------
 .../Url/{TableCell.tsx => DisplayCell.tsx}    |   7 +-
 src/components/fields/Url/EditorCell.tsx      |   6 +
 src/components/fields/Url/index.tsx           |  11 +-
 29 files changed, 223 insertions(+), 386 deletions(-)
 create mode 100644 src/components/Table/EditorCellTextField.tsx
 delete mode 100644 src/components/Table/editors/TextEditor.tsx
 create mode 100644 src/components/fields/Email/EditorCell.tsx
 rename src/components/fields/Id/{TableCell.tsx => DisplayCell.tsx} (69%)
 rename src/components/fields/LongText/{BasicCell.tsx => DisplayCell.tsx} (58%)
 create mode 100644 src/components/fields/LongText/EditorCell.tsx
 delete mode 100644 src/components/fields/Number/BasicCell.tsx
 create mode 100644 src/components/fields/Number/DisplayCell.tsx
 create mode 100644 src/components/fields/Number/EditorCell.tsx
 delete mode 100644 src/components/fields/Percentage/BasicCell.tsx
 rename src/components/fields/Percentage/{TableCell.tsx => DisplayCell.tsx} (85%)
 create mode 100644 src/components/fields/Percentage/EditorCell.tsx
 create mode 100644 src/components/fields/Phone/EditorCell.tsx
 rename src/components/fields/Reference/{BasicCell.tsx => DisplayCell.tsx} (81%)
 rename src/components/fields/Url/{TableCell.tsx => DisplayCell.tsx} (77%)
 create mode 100644 src/components/fields/Url/EditorCell.tsx

diff --git a/src/components/Table/EditorCellTextField.tsx b/src/components/Table/EditorCellTextField.tsx
new file mode 100644
index 00000000..ee0fd9f3
--- /dev/null
+++ b/src/components/Table/EditorCellTextField.tsx
@@ -0,0 +1,77 @@
+import type { IEditorCellProps } from "@src/components/fields/types";
+import { useSaveOnUnmount } from "@src/hooks/useSaveOnUnmount";
+
+import { InputBase, InputBaseProps } from "@mui/material";
+
+import { spreadSx } from "@src/utils/ui";
+
+export interface IEditorCellTextFieldProps extends IEditorCellProps<string> {
+  InputProps?: Partial<InputBaseProps>;
+}
+
+export default function EditorCellTextField({
+  column,
+  value,
+  onSubmit,
+  setFocusInsideCell,
+  InputProps = {},
+}: IEditorCellTextFieldProps) {
+  const [localValue, setLocalValue] = useSaveOnUnmount(value, onSubmit);
+  const maxLength = column.config?.maxLength;
+
+  return (
+    <InputBase
+      value={localValue}
+      onChange={(e) => setLocalValue(e.target.value)}
+      fullWidth
+      autoFocus
+      onKeyDown={(e) => {
+        if (
+          e.key === "ArrowLeft" ||
+          e.key === "ArrowRight" ||
+          e.key === "ArrowUp" ||
+          e.key === "ArrowDown"
+        ) {
+          e.stopPropagation();
+        }
+        if (e.key === "Escape") {
+          // Escape removes focus inside cell, this runs before save on unmount
+          setLocalValue(value);
+        }
+        if (e.key === "Enter" && !e.shiftKey) {
+          // Removes focus from inside cell, triggering save on unmount
+          setFocusInsideCell(false);
+        }
+      }}
+      onClick={(e) => e.stopPropagation()}
+      onDoubleClick={(e) => e.stopPropagation()}
+      {...InputProps}
+      inputProps={{ maxLength, ...InputProps.inputProps }}
+      sx={[
+        {
+          width: "100%",
+          height: "calc(100% - 1px)",
+          marginTop: "1px",
+          paddingBottom: "1px",
+
+          backgroundColor: "var(--cell-background-color)",
+          outline: "inherit",
+          outlineOffset: "inherit",
+
+          font: "inherit", // Prevent text jumping
+          letterSpacing: "inherit", // Prevent text jumping
+
+          "& .MuiInputBase-input": { p: "var(--cell-padding)" },
+
+          "& textarea.MuiInputBase-input": {
+            lineHeight: (theme) => theme.typography.body2.lineHeight,
+            maxHeight: "100%",
+            boxSizing: "border-box",
+            py: 3 / 8,
+          },
+        },
+        ...spreadSx(InputProps.sx),
+      ]}
+    />
+  );
+}
diff --git a/src/components/Table/Styled/StyledCell.tsx b/src/components/Table/Styled/StyledCell.tsx
index 23ffb2ef..c11fee62 100644
--- a/src/components/Table/Styled/StyledCell.tsx
+++ b/src/components/Table/Styled/StyledCell.tsx
@@ -14,6 +14,9 @@ export const StyledCell = styled("div")(({ theme }) => ({
     height: "100%",
     contain: "strict",
     overflow: "hidden",
+
+    display: "flex",
+    alignItems: "center",
   },
 
   backgroundColor: "var(--cell-background-color)",
diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index f7d72c76..f8ca9486 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -446,7 +446,11 @@ export default function Table({
                         cell.column.columnDef.meta?.config?.required
                       )}
                       aria-selected={isSelectedCell}
-                      aria-describedby="rowy-table-cell-description"
+                      aria-describedby={
+                        canEditCell
+                          ? "rowy-table-editable-cell-description"
+                          : undefined
+                      }
                       style={{
                         width: cell.column.getSize(),
                         height: tableSchema.rowHeight,
@@ -537,7 +541,10 @@ export default function Table({
       </StyledTable>
 
       <Portal>
-        <div id="rowy-table-cell-description" style={{ display: "none" }}>
+        <div
+          id="rowy-table-editable-cell-description"
+          style={{ display: "none" }}
+        >
           Press Enter to edit.
         </div>
       </Portal>
diff --git a/src/components/Table/editors/TextEditor.tsx b/src/components/Table/editors/TextEditor.tsx
deleted file mode 100644
index 58229457..00000000
--- a/src/components/Table/editors/TextEditor.tsx
+++ /dev/null
@@ -1,122 +0,0 @@
-import { useRef, useLayoutEffect } from "react";
-import { EditorProps } from "react-data-grid";
-import { useSetAtom } from "jotai";
-import { get } from "lodash-es";
-
-import { TextField } from "@mui/material";
-
-import { tableScope, updateFieldAtom } from "@src/atoms/tableScope";
-import { FieldType } from "@src/constants/fields";
-import { getFieldType } from "@src/components/fields";
-
-/** WARNING: THIS DOES NOT WORK IN REACT 18 STRICT MODE */
-export default function TextEditor({ row, column }: EditorProps<any>) {
-  const updateField = useSetAtom(updateFieldAtom, tableScope);
-
-  const type = getFieldType(column as any);
-
-  const cellValue = get(row, column.key);
-  const defaultValue =
-    type === FieldType.percentage && typeof cellValue === "number"
-      ? cellValue * 100
-      : cellValue;
-
-  const inputRef = useRef<HTMLInputElement>(null);
-
-  // WARNING: THIS DOES NOT WORK IN REACT 18 STRICT MODE
-  useLayoutEffect(() => {
-    const inputElement = inputRef.current;
-    return () => {
-      const newValue = inputElement?.value;
-      let formattedValue: any = newValue;
-      if (newValue !== undefined) {
-        if (type === FieldType.number) {
-          formattedValue = Number(newValue);
-        } else if (type === FieldType.percentage) {
-          formattedValue = Number(newValue) / 100;
-        }
-
-        updateField({
-          path: row._rowy_ref.path,
-          fieldName: column.key,
-          value: formattedValue,
-        });
-      }
-    };
-  }, [column.key, row._rowy_ref.path, type, updateField]);
-
-  let inputType = "text";
-  switch (type) {
-    case FieldType.email:
-      inputType = "email";
-      break;
-    case FieldType.phone:
-      inputType = "tel";
-      break;
-    case FieldType.url:
-      inputType = "url";
-      break;
-    case FieldType.number:
-    case FieldType.percentage:
-      inputType = "number";
-      break;
-
-    default:
-      break;
-  }
-
-  const { maxLength } = (column as any).config;
-
-  return (
-    <TextField
-      defaultValue={defaultValue}
-      type={inputType}
-      fullWidth
-      multiline={type === FieldType.longText}
-      variant="standard"
-      inputProps={{
-        ref: inputRef,
-        maxLength: maxLength,
-      }}
-      sx={{
-        width: "100%",
-        height: "100%",
-        backgroundColor: "var(--cell-background-color)",
-
-        "& .MuiInputBase-root": {
-          height: "100%",
-          font: "inherit", // Prevent text jumping
-          letterSpacing: "inherit", // Prevent text jumping
-          p: 0,
-        },
-        "& .MuiInputBase-input": {
-          height: "100%",
-          font: "inherit", // Prevent text jumping
-          letterSpacing: "inherit", // Prevent text jumping
-          p: "var(--cell-padding)",
-          pb: 1 / 8,
-        },
-        "& textarea.MuiInputBase-input": {
-          lineHeight: (theme) => theme.typography.body2.lineHeight,
-          maxHeight: "100%",
-          boxSizing: "border-box",
-          py: 3 / 8,
-        },
-      }}
-      InputProps={{
-        endAdornment:
-          (column as any).type === FieldType.percentage ? "%" : undefined,
-      }}
-      autoFocus
-      onKeyDown={(e) => {
-        if (e.key === "ArrowLeft" || e.key === "ArrowRight") {
-          e.stopPropagation();
-        }
-
-        if (e.key === "Escape") {
-          (e.target as any).value = defaultValue;
-        }
-      }}
-    />
-  );
-}
diff --git a/src/components/Table/withTableCell.tsx b/src/components/Table/withTableCell.tsx
index 88aa7e68..5e0b5478 100644
--- a/src/components/Table/withTableCell.tsx
+++ b/src/components/Table/withTableCell.tsx
@@ -36,7 +36,7 @@ export interface ICellOptions {
  */
 export default function withTableCell(
   DisplayCellComponent: React.ComponentType<IDisplayCellProps>,
-  EditorCellComponent: React.ComponentType<IEditorCellProps>,
+  EditorCellComponent: React.ComponentType<IEditorCellProps> | null,
   editorMode: "focus" | "inline" | "popover" = "focus",
   options: ICellOptions = {}
 ) {
@@ -115,13 +115,16 @@ export default function withTableCell(
         });
       };
 
-      const editorCell = (
+      // Show displayCell as a fallback if intentionally null
+      const editorCell = EditorCellComponent ? (
         <EditorCellComponent
           {...basicCellProps}
           tabIndex={focusInsideCell ? 0 : -1}
           onSubmit={handleSubmit}
           parentRef={parentRef}
         />
+      ) : (
+        displayCell
       );
 
       if (editorMode === "focus" && focusInsideCell) {
diff --git a/src/components/fields/Email/EditorCell.tsx b/src/components/fields/Email/EditorCell.tsx
new file mode 100644
index 00000000..c14a114a
--- /dev/null
+++ b/src/components/fields/Email/EditorCell.tsx
@@ -0,0 +1,6 @@
+import type { IEditorCellProps } from "@src/components/fields/types";
+import EditorCellTextField from "@src/components/Table/EditorCellTextField";
+
+export default function Email(props: IEditorCellProps<string>) {
+  return <EditorCellTextField {...props} InputProps={{ type: "email" }} />;
+}
diff --git a/src/components/fields/Email/index.tsx b/src/components/fields/Email/index.tsx
index 87b3a07a..d8a461ac 100644
--- a/src/components/fields/Email/index.tsx
+++ b/src/components/fields/Email/index.tsx
@@ -1,10 +1,10 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withBasicCell from "@src/components/fields/_withTableCell/withBasicCell";
+import withTableCell from "@src/components/Table/withTableCell";
 
 import EmailIcon from "@mui/icons-material/MailOutlined";
-import BasicCell from "@src/components/fields/_BasicCell/BasicCellValue";
-import TextEditor from "@src/components/Table/editors/TextEditor";
+import DisplayCell from "@src/components/fields/_BasicCell/BasicCellValue";
+import EditorCell from "./EditorCell";
 import { filterOperators } from "@src/components/fields/ShortText/Filter";
 import BasicContextMenuActions from "@src/components/fields/_BasicCell/BasicCellContextMenuActions";
 
@@ -23,8 +23,7 @@ export const config: IFieldConfig = {
   icon: <EmailIcon />,
   description: "Email address. Not validated.",
   contextMenuActions: BasicContextMenuActions,
-  TableCell: withBasicCell(BasicCell),
-  TableEditor: TextEditor,
+  TableCell: withTableCell(DisplayCell, EditorCell),
   SideDrawerField,
   filter: {
     operators: filterOperators,
diff --git a/src/components/fields/Id/TableCell.tsx b/src/components/fields/Id/DisplayCell.tsx
similarity index 69%
rename from src/components/fields/Id/TableCell.tsx
rename to src/components/fields/Id/DisplayCell.tsx
index 2ff1feff..fe86e927 100644
--- a/src/components/fields/Id/TableCell.tsx
+++ b/src/components/fields/Id/DisplayCell.tsx
@@ -1,8 +1,8 @@
-import { IHeavyCellProps } from "@src/components/fields/types";
+import { IDisplayCellProps } from "@src/components/fields/types";
 
 import { useTheme } from "@mui/material";
 
-export default function Id({ docRef }: IHeavyCellProps) {
+export default function Id({ docRef }: IDisplayCellProps) {
   const theme = useTheme();
 
   return (
diff --git a/src/components/fields/Id/index.tsx b/src/components/fields/Id/index.tsx
index c6222990..757ed231 100644
--- a/src/components/fields/Id/index.tsx
+++ b/src/components/fields/Id/index.tsx
@@ -1,17 +1,9 @@
-import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withHeavyCell from "@src/components/fields/_withTableCell/withHeavyCell";
+import withTableCell from "@src/components/Table/withTableCell";
 
+import DisplayCell from "./DisplayCell";
+import SideDrawerField from "./SideDrawerField";
 import { Id as IdIcon } from "@src/assets/icons";
-import BasicCell from "@src/components/fields/_BasicCell/BasicCellValue";
-import withSideDrawerEditor from "@src/components/Table/editors/withSideDrawerEditor";
-
-const TableCell = lazy(
-  () => import("./TableCell" /* webpackChunkName: "TableCell-Id" */)
-);
-const SideDrawerField = lazy(
-  () => import("./SideDrawerField" /* webpackChunkName: "SideDrawerField-Id" */)
-);
 
 export const config: IFieldConfig = {
   type: FieldType.id,
@@ -21,8 +13,7 @@ export const config: IFieldConfig = {
   initialValue: "",
   icon: <IdIcon />,
   description: "Displays the row’s ID. Read-only. Cannot be sorted.",
-  TableCell: withHeavyCell(BasicCell, TableCell),
-  TableEditor: withSideDrawerEditor(TableCell),
+  TableCell: withTableCell(DisplayCell, null),
   SideDrawerField,
 };
 export default config;
diff --git a/src/components/fields/LongText/BasicCell.tsx b/src/components/fields/LongText/DisplayCell.tsx
similarity index 58%
rename from src/components/fields/LongText/BasicCell.tsx
rename to src/components/fields/LongText/DisplayCell.tsx
index 14c6e23e..1e8e0fc2 100644
--- a/src/components/fields/LongText/BasicCell.tsx
+++ b/src/components/fields/LongText/DisplayCell.tsx
@@ -1,16 +1,15 @@
-import { IBasicCellProps } from "@src/components/fields/types";
+import { IDisplayCellProps } from "@src/components/fields/types";
 
 import { useTheme } from "@mui/material";
 
-export default function LongText({ value }: IBasicCellProps) {
+export default function LongText({ value }: IDisplayCellProps) {
   const theme = useTheme();
 
   return (
     <div
       style={{
-        width: "100%",
         maxHeight: "100%",
-        padding: theme.spacing(3 / 8, 0),
+        padding: theme.spacing(1, 0),
 
         whiteSpace: "pre-line",
         lineHeight: theme.typography.body2.lineHeight,
diff --git a/src/components/fields/LongText/EditorCell.tsx b/src/components/fields/LongText/EditorCell.tsx
new file mode 100644
index 00000000..ba2824bd
--- /dev/null
+++ b/src/components/fields/LongText/EditorCell.tsx
@@ -0,0 +1,6 @@
+import type { IEditorCellProps } from "@src/components/fields/types";
+import EditorCellTextField from "@src/components/Table/EditorCellTextField";
+
+export default function LongText(props: IEditorCellProps<string>) {
+  return <EditorCellTextField {...props} InputProps={{ multiline: true }} />;
+}
diff --git a/src/components/fields/LongText/index.tsx b/src/components/fields/LongText/index.tsx
index c4cec831..ef0ce27c 100644
--- a/src/components/fields/LongText/index.tsx
+++ b/src/components/fields/LongText/index.tsx
@@ -1,21 +1,15 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withBasicCell from "@src/components/fields/_withTableCell/withBasicCell";
+import withTableCell from "@src/components/Table/withTableCell";
 
 import LongTextIcon from "@mui/icons-material/Notes";
-import BasicCell from "./BasicCell";
-import TextEditor from "@src/components/Table/editors/TextEditor";
+import DisplayCell from "./DisplayCell";
+import EditorCell from "./EditorCell";
+import SideDrawerField from "./SideDrawerField";
 
 import { filterOperators } from "./Filter";
 import BasicContextMenuActions from "@src/components/fields/_BasicCell/BasicCellContextMenuActions";
 
-const SideDrawerField = lazy(
-  () =>
-    import(
-      "./SideDrawerField" /* webpackChunkName: "SideDrawerField-LongText" */
-    )
-);
-
 const Settings = lazy(
   () => import("./Settings" /* webpackChunkName: "Settings-LongText" */)
 );
@@ -30,8 +24,7 @@ export const config: IFieldConfig = {
   icon: <LongTextIcon />,
   description: "Text displayed on multiple lines.",
   contextMenuActions: BasicContextMenuActions,
-  TableCell: withBasicCell(BasicCell),
-  TableEditor: TextEditor,
+  TableCell: withTableCell(DisplayCell, EditorCell),
   SideDrawerField,
   settings: Settings,
   filter: {
diff --git a/src/components/fields/Number/BasicCell.tsx b/src/components/fields/Number/BasicCell.tsx
deleted file mode 100644
index 71d6be89..00000000
--- a/src/components/fields/Number/BasicCell.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import { IBasicCellProps } from "@src/components/fields/types";
-
-export default function Number_({ value }: IBasicCellProps) {
-  return <>{`${value ?? ""}`}</>;
-}
diff --git a/src/components/fields/Number/DisplayCell.tsx b/src/components/fields/Number/DisplayCell.tsx
new file mode 100644
index 00000000..5256a741
--- /dev/null
+++ b/src/components/fields/Number/DisplayCell.tsx
@@ -0,0 +1,5 @@
+import { IDisplayCellProps } from "@src/components/fields/types";
+
+export default function Number_({ value }: IDisplayCellProps) {
+  return <>{`${value ?? ""}`}</>;
+}
diff --git a/src/components/fields/Number/EditorCell.tsx b/src/components/fields/Number/EditorCell.tsx
new file mode 100644
index 00000000..93c5c31c
--- /dev/null
+++ b/src/components/fields/Number/EditorCell.tsx
@@ -0,0 +1,12 @@
+import type { IEditorCellProps } from "@src/components/fields/types";
+import EditorCellTextField from "@src/components/Table/EditorCellTextField";
+
+export default function Number_(props: IEditorCellProps<number>) {
+  return (
+    <EditorCellTextField
+      {...(props as any)}
+      InputProps={{ type: "number" }}
+      onSubmit={(v) => props.onSubmit(Number(v))}
+    />
+  );
+}
diff --git a/src/components/fields/Number/index.tsx b/src/components/fields/Number/index.tsx
index a7fdc94c..7bed8e43 100644
--- a/src/components/fields/Number/index.tsx
+++ b/src/components/fields/Number/index.tsx
@@ -1,10 +1,10 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withBasicCell from "@src/components/fields/_withTableCell/withBasicCell";
+import withTableCell from "@src/components/Table/withTableCell";
 
 import { Number as NumberIcon } from "@src/assets/icons";
-import BasicCell from "./BasicCell";
-import TextEditor from "@src/components/Table/editors/TextEditor";
+import DisplayCell from "./DisplayCell";
+import EditorCell from "./EditorCell";
 import { filterOperators } from "./Filter";
 import BasicContextMenuActions from "@src/components/fields/_BasicCell/BasicCellContextMenuActions";
 const SideDrawerField = lazy(
@@ -22,8 +22,7 @@ export const config: IFieldConfig = {
   icon: <NumberIcon />,
   description: "Numeric value.",
   contextMenuActions: BasicContextMenuActions,
-  TableCell: withBasicCell(BasicCell),
-  TableEditor: TextEditor,
+  TableCell: withTableCell(DisplayCell, EditorCell),
   SideDrawerField,
   filter: {
     operators: filterOperators,
diff --git a/src/components/fields/Percentage/BasicCell.tsx b/src/components/fields/Percentage/BasicCell.tsx
deleted file mode 100644
index 5f6228aa..00000000
--- a/src/components/fields/Percentage/BasicCell.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { IBasicCellProps } from "@src/components/fields/types";
-
-import { useTheme } from "@mui/material";
-
-export default function Percentage({ value }: IBasicCellProps) {
-  const theme = useTheme();
-
-  if (value === null || value === undefined) return null;
-
-  const percentage = typeof value === "number" ? value : 0;
-  return (
-    <div
-      style={{
-        textAlign: "right",
-        color: theme.palette.text.primary,
-        position: "relative",
-        zIndex: 1,
-      }}
-    >
-      {Math.round(percentage * 100)}%
-    </div>
-  );
-}
diff --git a/src/components/fields/Percentage/TableCell.tsx b/src/components/fields/Percentage/DisplayCell.tsx
similarity index 85%
rename from src/components/fields/Percentage/TableCell.tsx
rename to src/components/fields/Percentage/DisplayCell.tsx
index 29174a39..532103e4 100644
--- a/src/components/fields/Percentage/TableCell.tsx
+++ b/src/components/fields/Percentage/DisplayCell.tsx
@@ -1,9 +1,9 @@
-import { IHeavyCellProps } from "@src/components/fields/types";
+import { IDisplayCellProps } from "@src/components/fields/types";
 
 import { useTheme } from "@mui/material";
 import { resultColorsScale } from "@src/utils/color";
 
-export default function Percentage({ column, value }: IHeavyCellProps) {
+export default function Percentage({ column, value }: IDisplayCellProps) {
   const theme = useTheme();
   const { colors } = (column as any).config;
 
diff --git a/src/components/fields/Percentage/EditorCell.tsx b/src/components/fields/Percentage/EditorCell.tsx
new file mode 100644
index 00000000..652cdcd0
--- /dev/null
+++ b/src/components/fields/Percentage/EditorCell.tsx
@@ -0,0 +1,13 @@
+import type { IEditorCellProps } from "@src/components/fields/types";
+import EditorCellTextField from "@src/components/Table/EditorCellTextField";
+
+export default function Percentage(props: IEditorCellProps<number>) {
+  return (
+    <EditorCellTextField
+      {...(props as any)}
+      InputProps={{ type: "number", endAdornment: "%" }}
+      value={typeof props.value === "number" ? props.value * 100 : props.value}
+      onSubmit={(v) => props.onSubmit(Number(v) / 100)}
+    />
+  );
+}
diff --git a/src/components/fields/Percentage/index.tsx b/src/components/fields/Percentage/index.tsx
index f353774f..99239f7c 100644
--- a/src/components/fields/Percentage/index.tsx
+++ b/src/components/fields/Percentage/index.tsx
@@ -1,20 +1,13 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withHeavyCell from "@src/components/fields/_withTableCell/withHeavyCell";
+import withTableCell from "@src/components/Table/withTableCell";
 
 import { Percentage as PercentageIcon } from "@src/assets/icons";
-import TextEditor from "@src/components/Table/editors/TextEditor";
+import DisplayCell from "./DisplayCell";
+import EditorCell from "./EditorCell";
 import { filterOperators } from "@src/components/fields/Number/Filter";
 import BasicContextMenuActions from "@src/components/fields/_BasicCell/BasicCellContextMenuActions";
 
-const BasicCell = lazy(
-  () => import("./BasicCell" /* webpackChunkName: "BasicCell-Percentage" */)
-);
-
-const TableCell = lazy(
-  () => import("./TableCell" /* webpackChunkName: "TableCell-Percentage" */)
-);
-
 const SideDrawerField = lazy(
   () =>
     import(
@@ -37,8 +30,7 @@ export const config: IFieldConfig = {
   requireConfiguration: true,
   description: "Percentage stored as a number between 0 and 1.",
   contextMenuActions: BasicContextMenuActions,
-  TableCell: withHeavyCell(BasicCell, TableCell),
-  TableEditor: TextEditor,
+  TableCell: withTableCell(DisplayCell, EditorCell),
   SideDrawerField,
   settings: Settings,
   filter: {
diff --git a/src/components/fields/Phone/EditorCell.tsx b/src/components/fields/Phone/EditorCell.tsx
new file mode 100644
index 00000000..825fd00f
--- /dev/null
+++ b/src/components/fields/Phone/EditorCell.tsx
@@ -0,0 +1,6 @@
+import type { IEditorCellProps } from "@src/components/fields/types";
+import EditorCellTextField from "@src/components/Table/EditorCellTextField";
+
+export default function Phone(props: IEditorCellProps<string>) {
+  return <EditorCellTextField {...props} InputProps={{ type: "tel" }} />;
+}
diff --git a/src/components/fields/Phone/index.tsx b/src/components/fields/Phone/index.tsx
index 96115973..9e5c1ebe 100644
--- a/src/components/fields/Phone/index.tsx
+++ b/src/components/fields/Phone/index.tsx
@@ -1,10 +1,10 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withBasicCell from "@src/components/fields/_withTableCell/withBasicCell";
+import withTableCell from "@src/components/Table/withTableCell";
 
 import PhoneIcon from "@mui/icons-material/PhoneOutlined";
-import BasicCell from "@src/components/fields/_BasicCell/BasicCellValue";
-import TextEditor from "@src/components/Table/editors/TextEditor";
+import DisplayCell from "@src/components/fields/_BasicCell/BasicCellValue";
+import EditorCell from "./EditorCell";
 import { filterOperators } from "@src/components/fields/ShortText/Filter";
 import BasicContextMenuActions from "@src/components/fields/_BasicCell/BasicCellContextMenuActions";
 
@@ -23,8 +23,7 @@ export const config: IFieldConfig = {
   icon: <PhoneIcon />,
   description: "Phone number stored as text. Not validated.",
   contextMenuActions: BasicContextMenuActions,
-  TableCell: withBasicCell(BasicCell),
-  TableEditor: TextEditor,
+  TableCell: withTableCell(DisplayCell, EditorCell),
   SideDrawerField,
   filter: {
     operators: filterOperators,
diff --git a/src/components/fields/Reference/BasicCell.tsx b/src/components/fields/Reference/DisplayCell.tsx
similarity index 81%
rename from src/components/fields/Reference/BasicCell.tsx
rename to src/components/fields/Reference/DisplayCell.tsx
index b75b62d2..a15d9db4 100644
--- a/src/components/fields/Reference/BasicCell.tsx
+++ b/src/components/fields/Reference/DisplayCell.tsx
@@ -1,12 +1,12 @@
 import { useAtom } from "jotai";
-import { IBasicCellProps } from "@src/components/fields/types";
+import { IDisplayCellProps } from "@src/components/fields/types";
 
 import { Stack, IconButton } from "@mui/material";
 import LaunchIcon from "@mui/icons-material/Launch";
 
 import { projectScope, projectIdAtom } from "@src/atoms/projectScope";
 
-export default function Reference({ value }: IBasicCellProps) {
+export default function Reference({ value }: IDisplayCellProps) {
   const [projectId] = useAtom(projectIdAtom, projectScope);
 
   const path = value?.path ?? "";
@@ -17,8 +17,7 @@ export default function Reference({ value }: IBasicCellProps) {
       direction="row"
       alignItems="center"
       justifyContent="space-between"
-      className="cell-collapse-padding"
-      sx={{ p: "var(--cell-padding)", pr: 0.5 }}
+      sx={{ p: "var(--cell-padding)", pr: 0.5, width: "100%" }}
     >
       <div style={{ flexGrow: 1, overflow: "hidden" }}>{path}</div>
 
diff --git a/src/components/fields/Reference/EditorCell.tsx b/src/components/fields/Reference/EditorCell.tsx
index 8b96b8b3..770f352c 100644
--- a/src/components/fields/Reference/EditorCell.tsx
+++ b/src/components/fields/Reference/EditorCell.tsx
@@ -1,100 +1,33 @@
-import { useRef, useLayoutEffect } from "react";
-import { useAtom, useSetAtom } from "jotai";
-import { EditorProps } from "react-data-grid";
-import { get } from "lodash-es";
-import { useSnackbar } from "notistack";
+import type { IEditorCellProps } from "@src/components/fields/types";
+import EditorCellTextField from "@src/components/Table/EditorCellTextField";
 
-import { TextField } from "@mui/material";
+import { useAtom } from "jotai";
+import { doc, deleteField } from "firebase/firestore";
+import { useSnackbar } from "notistack";
 
 import { projectScope } from "@src/atoms/projectScope";
 import { firebaseDbAtom } from "@src/sources/ProjectSourceFirebase";
-import { tableScope, updateFieldAtom } from "@src/atoms/tableScope";
-import { doc, deleteField } from "firebase/firestore";
 
-/** WARNING: THIS DOES NOT WORK IN REACT 18 STRICT MODE */
-export default function TextEditor({ row, column }: EditorProps<any>) {
-  const [firebaseDb] = useAtom(firebaseDbAtom, projectScope);
-  const updateField = useSetAtom(updateFieldAtom, tableScope);
+export default function Reference(
+  props: IEditorCellProps<ReturnType<typeof doc>>
+) {
   const { enqueueSnackbar } = useSnackbar();
-
-  const inputRef = useRef<HTMLInputElement>(null);
-
-  // WARNING: THIS DOES NOT WORK IN REACT 18 STRICT MODE
-  useLayoutEffect(() => {
-    const inputElement = inputRef.current;
-    return () => {
-      const newValue = inputElement?.value;
-      if (newValue !== undefined && newValue !== "") {
-        try {
-          const refValue = doc(firebaseDb, newValue);
-
-          updateField({
-            path: row._rowy_ref.path,
-            fieldName: column.key,
-            value: refValue,
-          });
-        } catch (e: any) {
-          enqueueSnackbar(`Invalid path: ${e.message}`, { variant: "error" });
-        }
-      } else {
-        updateField({
-          path: row._rowy_ref.path,
-          fieldName: column.key,
-          value: deleteField(),
-        });
-      }
-    };
-  }, [column.key, row._rowy_ref.path, updateField]);
-
-  const defaultValue = get(row, column.key)?.path ?? "";
-  const { maxLength } = (column as any).config;
+  const [firebaseDb] = useAtom(firebaseDbAtom, projectScope);
 
   return (
-    <TextField
-      defaultValue={defaultValue}
-      fullWidth
-      variant="standard"
-      inputProps={{
-        ref: inputRef,
-        maxLength: maxLength,
-      }}
-      sx={{
-        width: "100%",
-        height: "100%",
-        backgroundColor: "var(--cell-background-color)",
-
-        "& .MuiInputBase-root": {
-          height: "100%",
-          font: "inherit", // Prevent text jumping
-          letterSpacing: "inherit", // Prevent text jumping
-          p: 0,
-        },
-        "& .MuiInputBase-input": {
-          height: "100%",
-          font: "inherit", // Prevent text jumping
-          letterSpacing: "inherit", // Prevent text jumping
-          p: "var(--cell-padding)",
-          pb: 1 / 8,
-        },
-        "& textarea.MuiInputBase-input": {
-          lineHeight: (theme) => theme.typography.body2.lineHeight,
-          maxHeight: "100%",
-          boxSizing: "border-box",
-          py: 3 / 8,
-        },
-      }}
-      // InputProps={{
-      //   endAdornment:
-      //     (column as any).type === FieldType.percentage ? "%" : undefined,
-      // }}
-      autoFocus
-      onKeyDown={(e) => {
-        if (e.key === "ArrowLeft" || e.key === "ArrowRight") {
-          e.stopPropagation();
-        }
-
-        if (e.key === "Escape") {
-          (e.target as any).value = defaultValue;
+    <EditorCellTextField
+      {...(props as any)}
+      value={props.value?.path ?? ""}
+      onSubmit={(newValue) => {
+        if (newValue !== undefined && newValue !== "") {
+          try {
+            const refValue = doc(firebaseDb, newValue);
+            props.onSubmit(refValue);
+          } catch (e: any) {
+            enqueueSnackbar(`Invalid path: ${e.message}`, { variant: "error" });
+          }
+        } else {
+          props.onSubmit(deleteField() as any);
         }
       }}
     />
diff --git a/src/components/fields/Reference/index.tsx b/src/components/fields/Reference/index.tsx
index 9d5b0f43..fcf0345d 100644
--- a/src/components/fields/Reference/index.tsx
+++ b/src/components/fields/Reference/index.tsx
@@ -1,24 +1,18 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
+import withTableCell from "@src/components/Table/withTableCell";
 
 import { Reference } from "@src/assets/icons";
-//import InlineCell from "./InlineCell";
-import BasicCell from "./BasicCell";
+import DisplayCell from "./DisplayCell";
+import EditorCell from "./EditorCell";
 import { filterOperators } from "@src/components/fields/ShortText/Filter";
-import withBasicCell from "@src/components/fields/_withTableCell/withBasicCell";
 
-const EditorCell = lazy(
-  () => import("./EditorCell" /* webpackChunkName: "EditorCell-Reference" */)
-);
 const SideDrawerField = lazy(
   () =>
     import(
       "./SideDrawerField" /* webpackChunkName: "SideDrawerField-Reference" */
     )
 );
-// const Settings = lazy(
-//   () => import("./Settings" /* webpackChunkName: "Settings-Reference" */)
-// );
 
 export const config: IFieldConfig = {
   type: FieldType.reference,
@@ -29,10 +23,10 @@ export const config: IFieldConfig = {
   initializable: true,
   icon: <Reference />,
   description: "Firestore document reference",
-  TableCell: withBasicCell(BasicCell),
-  TableEditor: EditorCell,
+  TableCell: withTableCell(DisplayCell, EditorCell, "focus", {
+    disablePadding: true,
+  }),
   SideDrawerField,
-  //settings: Settings,
   filter: { operators: filterOperators },
 };
 export default config;
diff --git a/src/components/fields/ShortText/EditorCell.tsx b/src/components/fields/ShortText/EditorCell.tsx
index 418ce4dd..0e34e5a8 100644
--- a/src/components/fields/ShortText/EditorCell.tsx
+++ b/src/components/fields/ShortText/EditorCell.tsx
@@ -1,61 +1,6 @@
 import type { IEditorCellProps } from "@src/components/fields/types";
-import { useSaveOnUnmount } from "@src/hooks/useSaveOnUnmount";
+import EditorCellTextField from "@src/components/Table/EditorCellTextField";
 
-import { InputBase } from "@mui/material";
-
-export default function ShortText({
-  column,
-  value,
-  onSubmit,
-  setFocusInsideCell,
-}: IEditorCellProps<string>) {
-  const [localValue, setLocalValue] = useSaveOnUnmount(value, onSubmit);
-  const maxLength = column.config?.maxLength;
-
-  return (
-    <InputBase
-      value={localValue}
-      onChange={(e) => setLocalValue(e.target.value)}
-      fullWidth
-      inputProps={{ maxLength }}
-      sx={{
-        width: "100%",
-        height: "calc(100% - 1px)",
-        marginTop: "1px",
-        paddingBottom: "1px",
-
-        backgroundColor: "var(--cell-background-color)",
-        outline: "inherit",
-        outlineOffset: "inherit",
-
-        font: "inherit", // Prevent text jumping
-        letterSpacing: "inherit", // Prevent text jumping
-
-        "& .MuiInputBase-input": { p: "var(--cell-padding)" },
-
-        "& textarea.MuiInputBase-input": {
-          lineHeight: (theme) => theme.typography.body2.lineHeight,
-          maxHeight: "100%",
-          boxSizing: "border-box",
-          py: 3 / 8,
-        },
-      }}
-      autoFocus
-      onKeyDown={(e) => {
-        if (e.key === "ArrowLeft" || e.key === "ArrowRight") {
-          e.stopPropagation();
-        }
-        if (e.key === "Escape") {
-          // Escape removes focus inside cell, this runs before save on unmount
-          setLocalValue(value);
-        }
-        if (e.key === "Enter") {
-          // Removes focus from inside cell, triggering save on unmount
-          setFocusInsideCell(false);
-        }
-      }}
-      onClick={(e) => e.stopPropagation()}
-      onDoubleClick={(e) => e.stopPropagation()}
-    />
-  );
+export default function ShortText(props: IEditorCellProps<string>) {
+  return <EditorCellTextField {...props} />;
 }
diff --git a/src/components/fields/Url/TableCell.tsx b/src/components/fields/Url/DisplayCell.tsx
similarity index 77%
rename from src/components/fields/Url/TableCell.tsx
rename to src/components/fields/Url/DisplayCell.tsx
index 6c8affc3..b3145716 100644
--- a/src/components/fields/Url/TableCell.tsx
+++ b/src/components/fields/Url/DisplayCell.tsx
@@ -1,9 +1,9 @@
-import { IBasicCellProps } from "@src/components/fields/types";
+import { IDisplayCellProps } from "@src/components/fields/types";
 
 import { Stack, IconButton } from "@mui/material";
 import LaunchIcon from "@mui/icons-material/Launch";
 
-export default function Url({ value }: IBasicCellProps) {
+export default function Url({ value }: IDisplayCellProps) {
   if (!value || typeof value !== "string") return null;
 
   const href = value.includes("http") ? value : `https://${value}`;
@@ -13,8 +13,7 @@ export default function Url({ value }: IBasicCellProps) {
       direction="row"
       alignItems="center"
       justifyContent="space-between"
-      className="cell-collapse-padding"
-      sx={{ p: "var(--cell-padding)", pr: 0.5 }}
+      sx={{ p: "var(--cell-padding)", pr: 0.5, width: "100%" }}
     >
       <div style={{ flexGrow: 1, overflow: "hidden" }}>{value}</div>
 
diff --git a/src/components/fields/Url/EditorCell.tsx b/src/components/fields/Url/EditorCell.tsx
new file mode 100644
index 00000000..6f39d2d9
--- /dev/null
+++ b/src/components/fields/Url/EditorCell.tsx
@@ -0,0 +1,6 @@
+import type { IEditorCellProps } from "@src/components/fields/types";
+import EditorCellTextField from "@src/components/Table/EditorCellTextField";
+
+export default function Url(props: IEditorCellProps<string>) {
+  return <EditorCellTextField {...props} InputProps={{ type: "url" }} />;
+}
diff --git a/src/components/fields/Url/index.tsx b/src/components/fields/Url/index.tsx
index 95376b06..c6fb3fd7 100644
--- a/src/components/fields/Url/index.tsx
+++ b/src/components/fields/Url/index.tsx
@@ -1,10 +1,10 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withBasicCell from "@src/components/fields/_withTableCell/withBasicCell";
+import withTableCell from "@src/components/Table/withTableCell";
 
 import UrlIcon from "@mui/icons-material/Link";
-import TableCell from "./TableCell";
-import TextEditor from "@src/components/Table/editors/TextEditor";
+import DisplayCell from "./DisplayCell";
+import EditorCell from "./EditorCell";
 import { filterOperators } from "@src/components/fields/ShortText/Filter";
 import BasicContextMenuActions from "@src/components/fields/_BasicCell/BasicCellContextMenuActions";
 
@@ -23,8 +23,9 @@ export const config: IFieldConfig = {
   icon: <UrlIcon />,
   description: "Web address. Not validated.",
   contextMenuActions: BasicContextMenuActions,
-  TableCell: withBasicCell(TableCell),
-  TableEditor: TextEditor,
+  TableCell: withTableCell(DisplayCell, EditorCell, "focus", {
+    disablePadding: true,
+  }),
   SideDrawerField,
   filter: {
     operators: filterOperators,

From 314824fd2b559b463a19da8d78fda89125b0aa4e Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 9 Nov 2022 17:38:19 +1100
Subject: [PATCH 245/309] add tabIndex to DisplayCells

---
 src/components/SideDrawer/MemoizedField.tsx   |  4 ---
 src/components/Table/withTableCell.tsx        | 26 ++++++++++++++-----
 src/components/fields/Action/BasicCell.tsx    |  5 ----
 src/components/fields/Action/DisplayCell.tsx  |  5 ++++
 .../Action/{TableCell.tsx => EditorCell.tsx}  |  9 ++++---
 src/components/fields/Action/index.tsx        | 14 +++++-----
 .../fields/MultiSelect/DisplayCell.tsx        |  2 ++
 .../fields/Reference/DisplayCell.tsx          |  3 ++-
 src/components/fields/Url/DisplayCell.tsx     |  3 ++-
 src/components/fields/types.ts                | 12 +++------
 10 files changed, 47 insertions(+), 36 deletions(-)
 delete mode 100644 src/components/fields/Action/BasicCell.tsx
 create mode 100644 src/components/fields/Action/DisplayCell.tsx
 rename src/components/fields/Action/{TableCell.tsx => EditorCell.tsx} (81%)

diff --git a/src/components/SideDrawer/MemoizedField.tsx b/src/components/SideDrawer/MemoizedField.tsx
index 8333631e..835ed74e 100644
--- a/src/components/SideDrawer/MemoizedField.tsx
+++ b/src/components/SideDrawer/MemoizedField.tsx
@@ -78,10 +78,6 @@ export const MemoizedField = memo(
           },
           onSubmit: handleSubmit,
           disabled,
-          // TODO: Remove
-          control: {} as any,
-          useFormMethods: {} as any,
-          docRef: _rowy_ref,
         })}
       </FieldWrapper>
     );
diff --git a/src/components/Table/withTableCell.tsx b/src/components/Table/withTableCell.tsx
index 5e0b5478..93d5641c 100644
--- a/src/components/Table/withTableCell.tsx
+++ b/src/components/Table/withTableCell.tsx
@@ -9,7 +9,11 @@ import {
 
 import { Popover, PopoverProps } from "@mui/material";
 
-import { tableScope, updateFieldAtom } from "@src/atoms/tableScope";
+import {
+  tableScope,
+  updateFieldAtom,
+  sideDrawerOpenAtom,
+} from "@src/atoms/tableScope";
 
 export interface ICellOptions {
   /** If the rest of the row’s data is used, set this to true for memoization */
@@ -32,12 +36,13 @@ export interface ICellOptions {
  *   - "focus" (default) - when the cell is focused (Enter or double-click)
  *   - "inline" - inline with deferred render
  *   - "popover" - as a popover
+ *   - "sideDrawer" - open the side drawer
  * @param options - {@link ICellOptions}
  */
 export default function withTableCell(
   DisplayCellComponent: React.ComponentType<IDisplayCellProps>,
   EditorCellComponent: React.ComponentType<IEditorCellProps> | null,
-  editorMode: "focus" | "inline" | "popover" = "focus",
+  editorMode: "focus" | "inline" | "popover" | "sideDrawer" = "focus",
   options: ICellOptions = {}
 ) {
   return memo(
@@ -51,6 +56,7 @@ export default function withTableCell(
     }: TableCellProps) {
       const value = getValue();
       const updateField = useSetAtom(updateFieldAtom, tableScope);
+      const setSideDrawerOpen = useSetAtom(sideDrawerOpenAtom, tableScope);
 
       // Store ref to rendered DisplayCell to get positioning for PopoverCell
       const displayCellRef = useRef<HTMLDivElement>(null);
@@ -59,8 +65,11 @@ export default function withTableCell(
       // Store Popover open state here so we can add delay for close transition
       const [popoverOpen, setPopoverOpen] = useState(false);
       useEffect(() => {
-        if (focusInsideCell) setPopoverOpen(true);
-      }, [focusInsideCell]);
+        if (focusInsideCell) {
+          setPopoverOpen(true);
+          if (editorMode === "sideDrawer") setSideDrawerOpen(true);
+        }
+      }, [focusInsideCell, setSideDrawerOpen]);
       const showPopoverCell = (popover: boolean) => {
         if (popover) {
           setPopoverOpen(true);
@@ -86,7 +95,9 @@ export default function withTableCell(
         row: row.original,
         column: column.columnDef.meta!,
         docRef: row.original._rowy_ref,
+        _rowy_ref: row.original._rowy_ref,
         disabled: column.columnDef.meta!.editable === false,
+        tabIndex: focusInsideCell ? 0 : -1,
         showPopoverCell,
         setFocusInsideCell,
       };
@@ -101,7 +112,11 @@ export default function withTableCell(
           <DisplayCellComponent {...basicCellProps} />
         </div>
       );
-      if (disabled || (editorMode !== "inline" && !focusInsideCell))
+      if (
+        disabled ||
+        (editorMode !== "inline" && !focusInsideCell) ||
+        editorMode === "sideDrawer"
+      )
         return displayCell;
 
       // This is where we update the documents
@@ -119,7 +134,6 @@ export default function withTableCell(
       const editorCell = EditorCellComponent ? (
         <EditorCellComponent
           {...basicCellProps}
-          tabIndex={focusInsideCell ? 0 : -1}
           onSubmit={handleSubmit}
           parentRef={parentRef}
         />
diff --git a/src/components/fields/Action/BasicCell.tsx b/src/components/fields/Action/BasicCell.tsx
deleted file mode 100644
index 76630d8f..00000000
--- a/src/components/fields/Action/BasicCell.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import { IBasicCellProps } from "@src/components/fields/types";
-
-export default function Action({ name, value }: IBasicCellProps) {
-  return <>{value ? value.status : name}</>;
-}
diff --git a/src/components/fields/Action/DisplayCell.tsx b/src/components/fields/Action/DisplayCell.tsx
new file mode 100644
index 00000000..f852ce6b
--- /dev/null
+++ b/src/components/fields/Action/DisplayCell.tsx
@@ -0,0 +1,5 @@
+import { IDisplayCellProps } from "@src/components/fields/types";
+
+export default function Action({ name, value }: IDisplayCellProps) {
+  return <>{value ? value.status : name}</>;
+}
diff --git a/src/components/fields/Action/TableCell.tsx b/src/components/fields/Action/EditorCell.tsx
similarity index 81%
rename from src/components/fields/Action/TableCell.tsx
rename to src/components/fields/Action/EditorCell.tsx
index d762d913..e05afbc8 100644
--- a/src/components/fields/Action/TableCell.tsx
+++ b/src/components/fields/Action/EditorCell.tsx
@@ -1,4 +1,4 @@
-import { IHeavyCellProps } from "@src/components/fields/types";
+import { IEditorCellProps } from "@src/components/fields/types";
 
 import { Stack } from "@mui/material";
 
@@ -11,15 +11,15 @@ export default function Action({
   value,
   onSubmit,
   disabled,
-}: IHeavyCellProps) {
+  tabIndex,
+}: IEditorCellProps) {
   const hasRan = value && ![null, undefined].includes(value.status);
 
   return (
     <Stack
       direction="row"
       alignItems="center"
-      className="cell-collapse-padding"
-      sx={{ padding: "var(--cell-padding)", pr: 0.5 }}
+      sx={{ padding: "var(--cell-padding)", pr: 0.5, width: "100%" }}
     >
       <div style={{ flexGrow: 1, overflow: "hidden" }}>
         {hasRan && isUrl(value.status) ? (
@@ -39,6 +39,7 @@ export default function Action({
         onSubmit={onSubmit}
         value={value}
         disabled={disabled}
+        tabIndex={tabIndex}
       />
     </Stack>
   );
diff --git a/src/components/fields/Action/index.tsx b/src/components/fields/Action/index.tsx
index 6a2b6de6..0677e7e4 100644
--- a/src/components/fields/Action/index.tsx
+++ b/src/components/fields/Action/index.tsx
@@ -1,13 +1,12 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withHeavyCell from "@src/components/fields/_withTableCell/withHeavyCell";
+import withTableCell from "@src/components/Table/withTableCell";
 
 import ActionIcon from "@mui/icons-material/TouchAppOutlined";
-import BasicCell from "./BasicCell";
-import NullEditor from "@src/components/Table/editors/NullEditor";
+import DisplayCell from "./DisplayCell";
 
-const TableCell = lazy(
-  () => import("./TableCell" /* webpackChunkName: "TableCell-Action" */)
+const EditorCell = lazy(
+  () => import("./EditorCell" /* webpackChunkName: "EditorCell-Action" */)
 );
 const SideDrawerField = lazy(
   () =>
@@ -25,8 +24,9 @@ export const config: IFieldConfig = {
   icon: <ActionIcon />,
   description:
     "Button with pre-defined action script or triggers a Cloud Function. Optionally supports Undo and Redo.",
-  TableCell: withHeavyCell(BasicCell, TableCell),
-  TableEditor: NullEditor as any,
+  TableCell: withTableCell(DisplayCell, EditorCell, "inline", {
+    disablePadding: true,
+  }),
   SideDrawerField,
   settings: Settings,
   requireConfiguration: true,
diff --git a/src/components/fields/MultiSelect/DisplayCell.tsx b/src/components/fields/MultiSelect/DisplayCell.tsx
index 9cb58369..91bcee84 100644
--- a/src/components/fields/MultiSelect/DisplayCell.tsx
+++ b/src/components/fields/MultiSelect/DisplayCell.tsx
@@ -12,6 +12,7 @@ export default function MultiSelect({
   value,
   showPopoverCell,
   disabled,
+  tabIndex,
 }: IDisplayCellProps) {
   // if (typeof value === "string" && value !== "")
   // return <ConvertStringToArray value={value} onSubmit={onSubmit} />;
@@ -29,6 +30,7 @@ export default function MultiSelect({
         textAlign: "inherit",
         justifyContent: "flex-start",
       }}
+      tabIndex={tabIndex}
     >
       {typeof value === "string" && value !== "" ? (
         <div style={{ flexGrow: 1, paddingLeft: "var(--cell-padding)" }}>
diff --git a/src/components/fields/Reference/DisplayCell.tsx b/src/components/fields/Reference/DisplayCell.tsx
index a15d9db4..98705d43 100644
--- a/src/components/fields/Reference/DisplayCell.tsx
+++ b/src/components/fields/Reference/DisplayCell.tsx
@@ -6,7 +6,7 @@ import LaunchIcon from "@mui/icons-material/Launch";
 
 import { projectScope, projectIdAtom } from "@src/atoms/projectScope";
 
-export default function Reference({ value }: IDisplayCellProps) {
+export default function Reference({ value, tabIndex }: IDisplayCellProps) {
   const [projectId] = useAtom(projectIdAtom, projectScope);
 
   const path = value?.path ?? "";
@@ -32,6 +32,7 @@ export default function Reference({ value }: IDisplayCellProps) {
         aria-label="Open in Firebase Console"
         className="row-hover-iconButton"
         style={{ flexShrink: 0 }}
+        tabIndex={tabIndex}
       >
         <LaunchIcon />
       </IconButton>
diff --git a/src/components/fields/Url/DisplayCell.tsx b/src/components/fields/Url/DisplayCell.tsx
index b3145716..20bd48dd 100644
--- a/src/components/fields/Url/DisplayCell.tsx
+++ b/src/components/fields/Url/DisplayCell.tsx
@@ -3,7 +3,7 @@ import { IDisplayCellProps } from "@src/components/fields/types";
 import { Stack, IconButton } from "@mui/material";
 import LaunchIcon from "@mui/icons-material/Launch";
 
-export default function Url({ value }: IDisplayCellProps) {
+export default function Url({ value, tabIndex }: IDisplayCellProps) {
   if (!value || typeof value !== "string") return null;
 
   const href = value.includes("http") ? value : `https://${value}`;
@@ -25,6 +25,7 @@ export default function Url({ value }: IDisplayCellProps) {
         size="small"
         style={{ flexShrink: 0 }}
         aria-label="Open in new tab"
+        tabIndex={tabIndex}
       >
         <LaunchIcon />
       </IconButton>
diff --git a/src/components/fields/types.ts b/src/components/fields/types.ts
index 1837e1db..a875a456 100644
--- a/src/components/fields/types.ts
+++ b/src/components/fields/types.ts
@@ -75,14 +75,17 @@ export interface IDisplayCellProps<T = any> {
   name: string;
   row: TableRow;
   column: ColumnConfig;
+  /** @deprecated */
   docRef: TableRowRef;
+  /** The row’s _rowy_ref object */
+  _rowy_ref: TableRowRef;
   disabled: boolean;
+  tabIndex: number;
   showPopoverCell: (value: boolean) => void;
   setFocusInsideCell: (focusInside: boolean) => void;
 }
 export interface IEditorCellProps<T = any> extends IDisplayCellProps<T> {
   onSubmit: (value: T) => void;
-  tabIndex: number;
   parentRef: PopoverProps["anchorEl"];
 }
 
@@ -104,13 +107,6 @@ export interface ISideDrawerFieldProps {
 
   /** Field locked. Do NOT check `column.locked` */
   disabled: boolean;
-
-  /** @deprecated */
-  docRef: TableRowRef;
-  /** @deprecated */
-  control: Control;
-  /** @deprecated */
-  useFormMethods: UseFormReturn;
 }
 
 export interface ISettingsProps {

From fd717075f8237d29e31f563ade58a5ab3770be50 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 9 Nov 2022 18:39:14 +1100
Subject: [PATCH 246/309] use side drawer fields as EditorCells

---
 src/atoms/tableScope/columnActions.ts         |   2 -
 src/components/Table/EditorCellTextField.tsx  |  21 ++--
 src/components/Table/withTableCell.tsx        | 116 ++++++++++++------
 src/components/fields/Action/ActionFab.tsx    |   2 -
 src/components/fields/Action/EditorCell.tsx   |   2 -
 .../fields/Action/SideDrawerField.tsx         |   6 -
 src/components/fields/Checkbox/EditorCell.tsx |   9 +-
 .../Code/{BasicCell.tsx => DisplayCell.tsx}   |   7 +-
 src/components/fields/Code/index.tsx          |   8 +-
 .../fields/MultiSelect/PopoverCell.tsx        |  16 ++-
 src/components/fields/Number/EditorCell.tsx   |   2 +-
 .../fields/Percentage/EditorCell.tsx          |   2 +-
 .../fields/Reference/EditorCell.tsx           |  46 +++++--
 src/components/fields/types.ts                |  18 ++-
 14 files changed, 166 insertions(+), 91 deletions(-)
 rename src/components/fields/Code/{BasicCell.tsx => DisplayCell.tsx} (67%)

diff --git a/src/atoms/tableScope/columnActions.ts b/src/atoms/tableScope/columnActions.ts
index 58e44405..96a37d2a 100644
--- a/src/atoms/tableScope/columnActions.ts
+++ b/src/atoms/tableScope/columnActions.ts
@@ -93,8 +93,6 @@ export const updateColumnAtom = atom(
       });
     }
 
-    console.log(tableColumnsOrdered);
-
     // Reduce array into single object with updated indexes
     const updatedColumns = tableColumnsOrdered.reduce(tableColumnsReducer, {});
     await updateTableSchema({ columns: updatedColumns });
diff --git a/src/components/Table/EditorCellTextField.tsx b/src/components/Table/EditorCellTextField.tsx
index ee0fd9f3..3d89d8be 100644
--- a/src/components/Table/EditorCellTextField.tsx
+++ b/src/components/Table/EditorCellTextField.tsx
@@ -1,8 +1,5 @@
 import type { IEditorCellProps } from "@src/components/fields/types";
-import { useSaveOnUnmount } from "@src/hooks/useSaveOnUnmount";
-
 import { InputBase, InputBaseProps } from "@mui/material";
-
 import { spreadSx } from "@src/utils/ui";
 
 export interface IEditorCellTextFieldProps extends IEditorCellProps<string> {
@@ -12,17 +9,18 @@ export interface IEditorCellTextFieldProps extends IEditorCellProps<string> {
 export default function EditorCellTextField({
   column,
   value,
-  onSubmit,
+  onDirty,
+  onChange,
   setFocusInsideCell,
   InputProps = {},
 }: IEditorCellTextFieldProps) {
-  const [localValue, setLocalValue] = useSaveOnUnmount(value, onSubmit);
   const maxLength = column.config?.maxLength;
 
   return (
     <InputBase
-      value={localValue}
-      onChange={(e) => setLocalValue(e.target.value)}
+      value={value}
+      onBlur={() => onDirty()}
+      onChange={(e) => onChange(e.target.value)}
       fullWidth
       autoFocus
       onKeyDown={(e) => {
@@ -34,9 +32,14 @@ export default function EditorCellTextField({
         ) {
           e.stopPropagation();
         }
+        // Escape prevents saving the new value
         if (e.key === "Escape") {
-          // Escape removes focus inside cell, this runs before save on unmount
-          setLocalValue(value);
+          // Setting isDirty to false prevents saving
+          onDirty(false);
+          // Stop propagation to prevent the table from closing the editor
+          e.stopPropagation();
+          // Close the editor after isDirty is set to false again
+          setTimeout(() => setFocusInsideCell(false));
         }
         if (e.key === "Enter" && !e.shiftKey) {
           // Removes focus from inside cell, triggering save on unmount
diff --git a/src/components/Table/withTableCell.tsx b/src/components/Table/withTableCell.tsx
index 93d5641c..65993041 100644
--- a/src/components/Table/withTableCell.tsx
+++ b/src/components/Table/withTableCell.tsx
@@ -1,4 +1,12 @@
-import { memo, Suspense, useState, useEffect, useRef } from "react";
+import {
+  memo,
+  Suspense,
+  useState,
+  useEffect,
+  useRef,
+  useLayoutEffect,
+} from "react";
+import useStateRef from "react-usestateref";
 import { useSetAtom } from "jotai";
 import { get, isEqual } from "lodash-es";
 import type { TableCellProps } from "@src/components/Table";
@@ -14,6 +22,7 @@ import {
   updateFieldAtom,
   sideDrawerOpenAtom,
 } from "@src/atoms/tableScope";
+import { spreadSx } from "@src/utils/ui";
 
 export interface ICellOptions {
   /** If the rest of the row’s data is used, set this to true for memoization */
@@ -36,13 +45,12 @@ export interface ICellOptions {
  *   - "focus" (default) - when the cell is focused (Enter or double-click)
  *   - "inline" - inline with deferred render
  *   - "popover" - as a popover
- *   - "sideDrawer" - open the side drawer
  * @param options - {@link ICellOptions}
  */
 export default function withTableCell(
   DisplayCellComponent: React.ComponentType<IDisplayCellProps>,
   EditorCellComponent: React.ComponentType<IEditorCellProps> | null,
-  editorMode: "focus" | "inline" | "popover" | "sideDrawer" = "focus",
+  editorMode: "focus" | "inline" | "popover" = "focus",
   options: ICellOptions = {}
 ) {
   return memo(
@@ -55,8 +63,6 @@ export default function withTableCell(
       disabled,
     }: TableCellProps) {
       const value = getValue();
-      const updateField = useSetAtom(updateFieldAtom, tableScope);
-      const setSideDrawerOpen = useSetAtom(sideDrawerOpenAtom, tableScope);
 
       // Store ref to rendered DisplayCell to get positioning for PopoverCell
       const displayCellRef = useRef<HTMLDivElement>(null);
@@ -65,11 +71,8 @@ export default function withTableCell(
       // Store Popover open state here so we can add delay for close transition
       const [popoverOpen, setPopoverOpen] = useState(false);
       useEffect(() => {
-        if (focusInsideCell) {
-          setPopoverOpen(true);
-          if (editorMode === "sideDrawer") setSideDrawerOpen(true);
-        }
-      }, [focusInsideCell, setSideDrawerOpen]);
+        if (focusInsideCell) setPopoverOpen(true);
+      }, [focusInsideCell]);
       const showPopoverCell = (popover: boolean) => {
         if (popover) {
           setPopoverOpen(true);
@@ -112,30 +115,16 @@ export default function withTableCell(
           <DisplayCellComponent {...basicCellProps} />
         </div>
       );
-      if (
-        disabled ||
-        (editorMode !== "inline" && !focusInsideCell) ||
-        editorMode === "sideDrawer"
-      )
+      if (disabled || (editorMode !== "inline" && !focusInsideCell))
         return displayCell;
 
-      // This is where we update the documents
-      const handleSubmit = (value: any) => {
-        if (disabled) return;
-        updateField({
-          path: row.original._rowy_ref.path,
-          fieldName: column.id,
-          value,
-          deleteField: value === undefined,
-        });
-      };
-
       // Show displayCell as a fallback if intentionally null
       const editorCell = EditorCellComponent ? (
-        <EditorCellComponent
+        <EditorCellManager
           {...basicCellProps}
-          onSubmit={handleSubmit}
+          EditorCellComponent={EditorCellComponent}
           parentRef={parentRef}
+          saveOnUnmount={editorMode === "focus"}
         />
       ) : (
         displayCell
@@ -169,15 +158,17 @@ export default function withTableCell(
                 onClose={() => showPopoverCell(false)}
                 anchorOrigin={{ horizontal: "left", vertical: "bottom" }}
                 {...options.popoverProps}
-                sx={
-                  options.transparent
-                    ? {
-                        "& .MuiPopover-paper": {
-                          backgroundColor: "transparent",
-                        },
-                      }
-                    : {}
-                }
+                sx={[
+                  {
+                    "& .MuiPopover-paper": {
+                      backgroundColor: options.transparent
+                        ? "transparent"
+                        : undefined,
+                      minWidth: column.getSize(),
+                    },
+                  },
+                  ...spreadSx(options.popoverProps?.sx),
+                ]}
                 onClick={(e) => e.stopPropagation()}
                 onDoubleClick={(e) => e.stopPropagation()}
                 onKeyDown={(e) => e.stopPropagation()}
@@ -214,3 +205,54 @@ export default function withTableCell(
     }
   );
 }
+
+interface IEditorCellManagerProps extends IDisplayCellProps {
+  EditorCellComponent: React.ComponentType<IEditorCellProps>;
+  parentRef: IEditorCellProps["parentRef"];
+  saveOnUnmount: boolean;
+}
+
+function EditorCellManager({
+  EditorCellComponent,
+  saveOnUnmount,
+  ...props
+}: IEditorCellManagerProps) {
+  const [localValue, setLocalValue, localValueRef] = useStateRef(props.value);
+  const [, setIsDirty, isDirtyRef] = useStateRef(false);
+  const updateField = useSetAtom(updateFieldAtom, tableScope);
+
+  // This is where we update the documents
+  const handleSubmit = () => {
+    if (props.disabled || !isDirtyRef.current) return;
+
+    updateField({
+      path: props._rowy_ref.path,
+      fieldName: props.column.fieldName,
+      value: localValueRef.current,
+      deleteField: localValueRef.current === undefined,
+    });
+  };
+
+  useLayoutEffect(() => {
+    return () => {
+      if (saveOnUnmount) {
+        console.log("unmount", props._rowy_ref.path, props.column.fieldName);
+        handleSubmit();
+      }
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  return (
+    <EditorCellComponent
+      {...props}
+      value={localValue}
+      onDirty={(dirty?: boolean) => setIsDirty(dirty ?? true)}
+      onChange={(v) => {
+        setIsDirty(true);
+        setLocalValue(v);
+      }}
+      onSubmit={handleSubmit}
+    />
+  );
+}
diff --git a/src/components/fields/Action/ActionFab.tsx b/src/components/fields/Action/ActionFab.tsx
index 4f8c31cc..6f87fb15 100644
--- a/src/components/fields/Action/ActionFab.tsx
+++ b/src/components/fields/Action/ActionFab.tsx
@@ -51,7 +51,6 @@ const getStateIcon = (actionState: "undo" | "redo" | string, config: any) => {
 export interface IActionFabProps extends Partial<FabProps> {
   row: any;
   column: any;
-  onSubmit: (value: any) => void;
   value: any;
   disabled: boolean;
 }
@@ -59,7 +58,6 @@ export interface IActionFabProps extends Partial<FabProps> {
 export default function ActionFab({
   row,
   column,
-  onSubmit,
   value,
   disabled,
   ...props
diff --git a/src/components/fields/Action/EditorCell.tsx b/src/components/fields/Action/EditorCell.tsx
index e05afbc8..1706c4e2 100644
--- a/src/components/fields/Action/EditorCell.tsx
+++ b/src/components/fields/Action/EditorCell.tsx
@@ -9,7 +9,6 @@ export default function Action({
   column,
   row,
   value,
-  onSubmit,
   disabled,
   tabIndex,
 }: IEditorCellProps) {
@@ -36,7 +35,6 @@ export default function Action({
       <ActionFab
         row={row}
         column={column}
-        onSubmit={onSubmit}
         value={value}
         disabled={disabled}
         tabIndex={tabIndex}
diff --git a/src/components/fields/Action/SideDrawerField.tsx b/src/components/fields/Action/SideDrawerField.tsx
index a4d8a6dc..f17dcb7e 100644
--- a/src/components/fields/Action/SideDrawerField.tsx
+++ b/src/components/fields/Action/SideDrawerField.tsx
@@ -15,8 +15,6 @@ export default function Action({
   column,
   _rowy_ref,
   value,
-  onChange,
-  onSubmit,
   disabled,
 }: ISideDrawerFieldProps) {
   const [row] = useAtom(
@@ -67,10 +65,6 @@ export default function Action({
       <ActionFab
         row={row}
         column={column}
-        onSubmit={(value) => {
-          onChange(value);
-          onSubmit();
-        }}
         value={value}
         disabled={disabled}
         id={getFieldId(column.key)}
diff --git a/src/components/fields/Checkbox/EditorCell.tsx b/src/components/fields/Checkbox/EditorCell.tsx
index 4785700c..620a8e62 100644
--- a/src/components/fields/Checkbox/EditorCell.tsx
+++ b/src/components/fields/Checkbox/EditorCell.tsx
@@ -15,6 +15,7 @@ export default function Checkbox({
   row,
   column,
   value,
+  onChange,
   onSubmit,
   disabled,
   tabIndex,
@@ -29,10 +30,14 @@ export default function Checkbox({
           /\{\{(.*?)\}\}/g,
           replacer(row)
         ),
-        handleConfirm: () => onSubmit(!value),
+        handleConfirm: () => {
+          onChange(!value);
+          onSubmit();
+        },
       });
     } else {
-      onSubmit(!value);
+      onChange(!value);
+      onSubmit();
     }
   };
 
diff --git a/src/components/fields/Code/BasicCell.tsx b/src/components/fields/Code/DisplayCell.tsx
similarity index 67%
rename from src/components/fields/Code/BasicCell.tsx
rename to src/components/fields/Code/DisplayCell.tsx
index 8b776896..2d8aa566 100644
--- a/src/components/fields/Code/BasicCell.tsx
+++ b/src/components/fields/Code/DisplayCell.tsx
@@ -1,20 +1,21 @@
-import { IBasicCellProps } from "@src/components/fields/types";
+import { IDisplayCellProps } from "@src/components/fields/types";
 
 import { useTheme } from "@mui/material";
 
-export default function Code({ value }: IBasicCellProps) {
+export default function Code({ value }: IDisplayCellProps) {
   const theme = useTheme();
   return (
     <div
       style={{
         width: "100%",
         maxHeight: "100%",
-        padding: theme.spacing(3 / 8, 0),
+        padding: theme.spacing(1, 0),
 
         whiteSpace: "pre-wrap",
         lineHeight: theme.typography.body2.lineHeight,
         fontFamily: theme.typography.fontFamilyMono,
         wordBreak: "break-word",
+        tabSize: 2,
       }}
     >
       {value}
diff --git a/src/components/fields/Code/index.tsx b/src/components/fields/Code/index.tsx
index 8db3ae97..18a7da7d 100644
--- a/src/components/fields/Code/index.tsx
+++ b/src/components/fields/Code/index.tsx
@@ -1,10 +1,9 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withBasicCell from "@src/components/fields/_withTableCell/withBasicCell";
+import withTableCell from "@src/components/Table/withTableCell";
 
 import CodeIcon from "@mui/icons-material/Code";
-import BasicCell from "./BasicCell";
-import withSideDrawerEditor from "@src/components/Table/editors/withSideDrawerEditor";
+import DisplayCell from "./DisplayCell";
 
 const Settings = lazy(
   () => import("./Settings" /* webpackChunkName: "Settings-Code" */)
@@ -24,8 +23,7 @@ export const config: IFieldConfig = {
   initializable: true,
   icon: <CodeIcon />,
   description: "Raw code edited with the Monaco Editor.",
-  TableCell: withBasicCell(BasicCell),
-  TableEditor: withSideDrawerEditor(BasicCell),
+  TableCell: withTableCell(DisplayCell, SideDrawerField, "popover"),
   SideDrawerField,
   settings: Settings,
 };
diff --git a/src/components/fields/MultiSelect/PopoverCell.tsx b/src/components/fields/MultiSelect/PopoverCell.tsx
index 8ef894cf..c96f5746 100644
--- a/src/components/fields/MultiSelect/PopoverCell.tsx
+++ b/src/components/fields/MultiSelect/PopoverCell.tsx
@@ -9,6 +9,7 @@ import { sanitiseValue } from "./utils";
 
 export default function MultiSelect({
   value,
+  onChange,
   onSubmit,
   column,
   parentRef,
@@ -25,7 +26,13 @@ export default function MultiSelect({
         description={
           <>
             <Typography>This cell’s value is a string</Typography>
-            <Button color="primary" onClick={() => onSubmit([value])}>
+            <Button
+              color="primary"
+              onClick={() => {
+                onChange([value]);
+                onSubmit();
+              }}
+            >
               Convert to array
             </Button>
           </>
@@ -37,7 +44,7 @@ export default function MultiSelect({
   return (
     <MultiSelectComponent
       value={sanitiseValue(value)}
-      onChange={onSubmit}
+      onChange={onChange}
       options={config.options ?? []}
       multiple
       freeText={config.freeText}
@@ -55,7 +62,10 @@ export default function MultiSelect({
           },
         },
       }}
-      onClose={() => showPopoverCell(false)}
+      onClose={() => {
+        showPopoverCell(false);
+        onSubmit();
+      }}
     />
   );
 }
diff --git a/src/components/fields/Number/EditorCell.tsx b/src/components/fields/Number/EditorCell.tsx
index 93c5c31c..5ae634a2 100644
--- a/src/components/fields/Number/EditorCell.tsx
+++ b/src/components/fields/Number/EditorCell.tsx
@@ -6,7 +6,7 @@ export default function Number_(props: IEditorCellProps<number>) {
     <EditorCellTextField
       {...(props as any)}
       InputProps={{ type: "number" }}
-      onSubmit={(v) => props.onSubmit(Number(v))}
+      onChange={(v) => props.onChange(Number(v))}
     />
   );
 }
diff --git a/src/components/fields/Percentage/EditorCell.tsx b/src/components/fields/Percentage/EditorCell.tsx
index 652cdcd0..16dd9a88 100644
--- a/src/components/fields/Percentage/EditorCell.tsx
+++ b/src/components/fields/Percentage/EditorCell.tsx
@@ -7,7 +7,7 @@ export default function Percentage(props: IEditorCellProps<number>) {
       {...(props as any)}
       InputProps={{ type: "number", endAdornment: "%" }}
       value={typeof props.value === "number" ? props.value * 100 : props.value}
-      onSubmit={(v) => props.onSubmit(Number(v) / 100)}
+      onChange={(v) => props.onChange(Number(v) / 100)}
     />
   );
 }
diff --git a/src/components/fields/Reference/EditorCell.tsx b/src/components/fields/Reference/EditorCell.tsx
index 770f352c..27232cff 100644
--- a/src/components/fields/Reference/EditorCell.tsx
+++ b/src/components/fields/Reference/EditorCell.tsx
@@ -1,34 +1,56 @@
+import { useState } from "react";
+import { useAtom } from "jotai";
+import { doc, deleteField } from "firebase/firestore";
+
 import type { IEditorCellProps } from "@src/components/fields/types";
 import EditorCellTextField from "@src/components/Table/EditorCellTextField";
 
-import { useAtom } from "jotai";
-import { doc, deleteField } from "firebase/firestore";
-import { useSnackbar } from "notistack";
+import { InputAdornment, Tooltip } from "@mui/material";
+import ErrorIcon from "@mui/icons-material/ErrorOutline";
 
 import { projectScope } from "@src/atoms/projectScope";
 import { firebaseDbAtom } from "@src/sources/ProjectSourceFirebase";
 
-export default function Reference(
-  props: IEditorCellProps<ReturnType<typeof doc>>
-) {
-  const { enqueueSnackbar } = useSnackbar();
+export default function Reference({
+  value,
+  ...props
+}: IEditorCellProps<ReturnType<typeof doc>>) {
   const [firebaseDb] = useAtom(firebaseDbAtom, projectScope);
 
+  const [localValue, setLocalValue] = useState(
+    Boolean(value) && "path" in value && typeof value.path === "string"
+      ? value.path
+      : ""
+  );
+  const [error, setError] = useState("");
+
   return (
     <EditorCellTextField
       {...(props as any)}
-      value={props.value?.path ?? ""}
-      onSubmit={(newValue) => {
+      value={localValue}
+      onChange={(newValue) => {
         if (newValue !== undefined && newValue !== "") {
           try {
             const refValue = doc(firebaseDb, newValue);
-            props.onSubmit(refValue);
+            props.onChange(refValue);
+            setError("");
           } catch (e: any) {
-            enqueueSnackbar(`Invalid path: ${e.message}`, { variant: "error" });
+            setError(e.message);
           }
         } else {
-          props.onSubmit(deleteField() as any);
+          props.onChange(deleteField() as any);
         }
+
+        setLocalValue(newValue);
+      }}
+      InputProps={{
+        endAdornment: error && (
+          <InputAdornment position="end" sx={{ mr: 1, cursor: "default" }}>
+            <Tooltip title={error}>
+              <ErrorIcon color="error" />
+            </Tooltip>
+          </InputAdornment>
+        ),
       }}
     />
   );
diff --git a/src/components/fields/types.ts b/src/components/fields/types.ts
index a875a456..95e57c68 100644
--- a/src/components/fields/types.ts
+++ b/src/components/fields/types.ts
@@ -85,23 +85,29 @@ export interface IDisplayCellProps<T = any> {
   setFocusInsideCell: (focusInside: boolean) => void;
 }
 export interface IEditorCellProps<T = any> extends IDisplayCellProps<T> {
-  onSubmit: (value: T) => void;
+  /** Call when the user has input but changes have not been saved */
+  onDirty: (dirty?: boolean) => void;
+  /** Update the local value. Also calls onDirty */
+  onChange: (value: T) => void;
+  /** Call when user input is ready to be saved (e.g. onBlur) */
+  onSubmit: () => void;
+  /** Get parent element for popover positioning */
   parentRef: PopoverProps["anchorEl"];
 }
 
 /** Props to be passed to all SideDrawerFields */
-export interface ISideDrawerFieldProps {
+export interface ISideDrawerFieldProps<T = any> {
   /** The column config */
-  column: FormatterProps<TableRow>["column"] & ColumnConfig;
+  column: ColumnConfig;
   /** The row’s _rowy_ref object */
   _rowy_ref: TableRowRef;
 
   /** The field’s local value – synced with db when field is not dirty */
-  value: any;
+  value: T;
   /** Call when the user has input but changes have not been saved */
-  onDirty: () => void;
+  onDirty: (dirty?: boolean) => void;
   /** Update the local value. Also calls onDirty */
-  onChange: (value: any) => void;
+  onChange: (T: any) => void;
   /** Call when user input is ready to be saved (e.g. onBlur) */
   onSubmit: () => void;
 

From fe665fef2a8a525b9a7712db91d2ed2dcf7d0fc9 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Thu, 10 Nov 2022 18:21:32 +1100
Subject: [PATCH 247/309] migrate all side drawer cells

---
 src/components/ColumnMenu/ColumnMenu.tsx      |   2 +-
 src/components/SideDrawer/MemoizedField.tsx   |   2 +-
 .../Table/ContextMenu/MenuContents.tsx        |   2 +-
 src/components/Table/withTableCell.tsx        |  72 +++++------
 src/components/fields/Code/DisplayCell.tsx    |   5 +-
 src/components/fields/Code/index.tsx          |   7 +-
 src/components/fields/Color/DisplayCell.tsx   |  60 +++++++++
 src/components/fields/Color/EditorCell.tsx    |  19 +++
 src/components/fields/Color/InlineCell.tsx    |  41 ------
 src/components/fields/Color/PopoverCell.tsx   |  30 -----
 .../fields/Color/SideDrawerField.tsx          |   4 +-
 src/components/fields/Color/index.tsx         |  15 +--
 .../fields/ConnectService/DisplayCell.tsx     |  50 +++++++
 .../{PopoverCell.tsx => EditorCell.tsx}       |  12 +-
 .../fields/ConnectService/InlineCell.tsx      |  56 --------
 .../fields/ConnectService/index.tsx           |  17 +--
 .../fields/ConnectTable/DisplayCell.tsx       |  61 +++++++++
 .../{PopoverCell.tsx => EditorCell.tsx}       |  12 +-
 .../fields/ConnectTable/InlineCell.tsx        |  68 ----------
 src/components/fields/ConnectTable/index.tsx  |  18 +--
 .../fields/Connector/DisplayCell.tsx          |  48 +++++++
 .../fields/Connector/EditorCell.tsx           |  25 ++++
 .../fields/Connector/InlineCell.tsx           |  57 --------
 .../fields/Connector/PopoverCell.tsx          |  35 -----
 .../fields/Connector/Select/PopupContents.tsx | 122 ++++++++----------
 .../fields/Connector/Select/index.tsx         |   8 +-
 .../fields/Connector/SideDrawerField.tsx      |   4 +-
 src/components/fields/Connector/index.tsx     |  19 ++-
 .../{TableCell.tsx => DisplayCell.tsx}        |   4 +-
 src/components/fields/CreatedAt/index.tsx     |  11 +-
 .../{TableCell.tsx => DisplayCell.tsx}        |   4 +-
 src/components/fields/CreatedBy/index.tsx     |  11 +-
 .../Date/{BasicCell.tsx => DisplayCell.tsx}   |  18 ++-
 .../Date/{TableCell.tsx => EditorCell.tsx}    |  49 +++----
 src/components/fields/Date/index.tsx          |  14 +-
 .../{BasicCell.tsx => DisplayCell.tsx}        |  18 ++-
 .../{TableCell.tsx => EditorCell.tsx}         |  50 +++----
 src/components/fields/DateTime/index.tsx      |  14 +-
 src/components/fields/Derivative/index.tsx    |   9 +-
 .../{TableCell.tsx => DisplayCell.tsx}        |   4 +-
 src/components/fields/Duration/index.tsx      |  13 +-
 .../{TableCell.tsx => DisplayCell.tsx}        |   4 +-
 src/components/fields/GeoPoint/index.tsx      |  14 +-
 src/components/fields/Id/index.tsx            |   6 +-
 .../Json/{BasicCell.tsx => DisplayCell.tsx}   |   8 +-
 .../fields/Json/SideDrawerField.tsx           |   8 +-
 src/components/fields/Json/index.tsx          |  10 +-
 src/components/fields/LongText/index.tsx      |   7 +-
 .../{BasicCell.tsx => DisplayCell.tsx}        |   4 +-
 .../fields/Markdown/SideDrawerField.tsx       |   2 +-
 src/components/fields/Markdown/index.tsx      |   8 +-
 .../fields/MultiSelect/DisplayCell.tsx        |  50 +++----
 .../{PopoverCell.tsx => EditorCell.tsx}       |   7 +-
 .../fields/MultiSelect/SideDrawerField.tsx    |   7 +-
 src/components/fields/MultiSelect/index.tsx   |  11 +-
 .../fields/RichText/DisplayCell.tsx           | 101 +++++++++++++++
 src/components/fields/RichText/TableCell.tsx  |  98 --------------
 src/components/fields/RichText/index.tsx      |  11 +-
 .../Slider/{TableCell.tsx => DisplayCell.tsx} |   4 +-
 src/components/fields/Slider/index.tsx        |  13 +-
 .../{TableCell.tsx => DisplayCell.tsx}        |   4 +-
 src/components/fields/UpdatedAt/index.tsx     |  11 +-
 .../{TableCell.tsx => DisplayCell.tsx}        |   4 +-
 src/components/fields/UpdatedBy/index.tsx     |  11 +-
 .../User/{TableCell.tsx => DisplayCell.tsx}   |   4 +-
 src/components/fields/User/index.tsx          |  11 +-
 ...json-stable-stringify-without-jsonify.d.ts |   2 +-
 67 files changed, 722 insertions(+), 788 deletions(-)
 create mode 100644 src/components/fields/Color/DisplayCell.tsx
 create mode 100644 src/components/fields/Color/EditorCell.tsx
 delete mode 100644 src/components/fields/Color/InlineCell.tsx
 delete mode 100644 src/components/fields/Color/PopoverCell.tsx
 create mode 100644 src/components/fields/ConnectService/DisplayCell.tsx
 rename src/components/fields/ConnectService/{PopoverCell.tsx => EditorCell.tsx} (81%)
 delete mode 100644 src/components/fields/ConnectService/InlineCell.tsx
 create mode 100644 src/components/fields/ConnectTable/DisplayCell.tsx
 rename src/components/fields/ConnectTable/{PopoverCell.tsx => EditorCell.tsx} (79%)
 delete mode 100644 src/components/fields/ConnectTable/InlineCell.tsx
 create mode 100644 src/components/fields/Connector/DisplayCell.tsx
 create mode 100644 src/components/fields/Connector/EditorCell.tsx
 delete mode 100644 src/components/fields/Connector/InlineCell.tsx
 delete mode 100644 src/components/fields/Connector/PopoverCell.tsx
 rename src/components/fields/CreatedAt/{TableCell.tsx => DisplayCell.tsx} (70%)
 rename src/components/fields/CreatedBy/{TableCell.tsx => DisplayCell.tsx} (85%)
 rename src/components/fields/Date/{BasicCell.tsx => DisplayCell.tsx} (51%)
 rename src/components/fields/Date/{TableCell.tsx => EditorCell.tsx} (69%)
 rename src/components/fields/DateTime/{BasicCell.tsx => DisplayCell.tsx} (51%)
 rename src/components/fields/DateTime/{TableCell.tsx => EditorCell.tsx} (70%)
 rename src/components/fields/Duration/{TableCell.tsx => DisplayCell.tsx} (67%)
 rename src/components/fields/GeoPoint/{TableCell.tsx => DisplayCell.tsx} (90%)
 rename src/components/fields/Json/{BasicCell.tsx => DisplayCell.tsx} (66%)
 rename src/components/fields/Markdown/{BasicCell.tsx => DisplayCell.tsx} (75%)
 rename src/components/fields/MultiSelect/{PopoverCell.tsx => EditorCell.tsx} (86%)
 create mode 100644 src/components/fields/RichText/DisplayCell.tsx
 delete mode 100644 src/components/fields/RichText/TableCell.tsx
 rename src/components/fields/Slider/{TableCell.tsx => DisplayCell.tsx} (89%)
 rename src/components/fields/UpdatedAt/{TableCell.tsx => DisplayCell.tsx} (70%)
 rename src/components/fields/UpdatedBy/{TableCell.tsx => DisplayCell.tsx} (87%)
 rename src/components/fields/User/{TableCell.tsx => DisplayCell.tsx} (83%)

diff --git a/src/components/ColumnMenu/ColumnMenu.tsx b/src/components/ColumnMenu/ColumnMenu.tsx
index 4884a75a..9d193179 100644
--- a/src/components/ColumnMenu/ColumnMenu.tsx
+++ b/src/components/ColumnMenu/ColumnMenu.tsx
@@ -205,7 +205,7 @@ export default function ColumnMenu() {
         });
         handleClose();
       },
-      active: !column.editable,
+      active: column.editable === false,
     },
     {
       label: "Disable resize",
diff --git a/src/components/SideDrawer/MemoizedField.tsx b/src/components/SideDrawer/MemoizedField.tsx
index 835ed74e..0fb62f62 100644
--- a/src/components/SideDrawer/MemoizedField.tsx
+++ b/src/components/SideDrawer/MemoizedField.tsx
@@ -53,7 +53,7 @@ export const MemoizedField = memo(
 
     // Should not reach this state
     if (isEmpty(fieldComponent)) {
-      // console.error('Could not find SideDrawerField component', field);
+      console.error("Could not find SideDrawerField component", field);
       return null;
     }
 
diff --git a/src/components/Table/ContextMenu/MenuContents.tsx b/src/components/Table/ContextMenu/MenuContents.tsx
index c098ebe2..5a10aaef 100644
--- a/src/components/Table/ContextMenu/MenuContents.tsx
+++ b/src/components/Table/ContextMenu/MenuContents.tsx
@@ -211,7 +211,7 @@ export default function MenuContents({ onClose }: IMenuContentsProps) {
         disabled:
           selectedColumn?.editable === false ||
           !row ||
-          cellValue ||
+          cellValue === undefined ||
           getFieldProp("group", selectedColumn?.type) === "Auditing",
         onClick: altPress
           ? handleClearValue
diff --git a/src/components/Table/withTableCell.tsx b/src/components/Table/withTableCell.tsx
index 65993041..28a7d3bd 100644
--- a/src/components/Table/withTableCell.tsx
+++ b/src/components/Table/withTableCell.tsx
@@ -17,11 +17,7 @@ import {
 
 import { Popover, PopoverProps } from "@mui/material";
 
-import {
-  tableScope,
-  updateFieldAtom,
-  sideDrawerOpenAtom,
-} from "@src/atoms/tableScope";
+import { tableScope, updateFieldAtom } from "@src/atoms/tableScope";
 import { spreadSx } from "@src/utils/ui";
 
 export interface ICellOptions {
@@ -30,7 +26,7 @@ export interface ICellOptions {
   /** Handle padding inside the cell component */
   disablePadding?: boolean;
   /** Set popover background to be transparent */
-  transparent?: boolean;
+  transparentPopover?: boolean;
   /** Props to pass to MUI Popover component */
   popoverProps?: Partial<PopoverProps>;
 }
@@ -120,12 +116,14 @@ export default function withTableCell(
 
       // Show displayCell as a fallback if intentionally null
       const editorCell = EditorCellComponent ? (
-        <EditorCellManager
-          {...basicCellProps}
-          EditorCellComponent={EditorCellComponent}
-          parentRef={parentRef}
-          saveOnUnmount={editorMode === "focus"}
-        />
+        <Suspense fallback={null}>
+          <EditorCellManager
+            {...basicCellProps}
+            EditorCellComponent={EditorCellComponent}
+            parentRef={parentRef}
+            saveOnUnmount={editorMode !== "inline"}
+          />
+        </Suspense>
       ) : (
         displayCell
       );
@@ -151,32 +149,32 @@ export default function withTableCell(
           <>
             {displayCell}
 
-            <Suspense fallback={null}>
-              <Popover
-                open={popoverOpen}
-                anchorEl={parentRef}
-                onClose={() => showPopoverCell(false)}
-                anchorOrigin={{ horizontal: "left", vertical: "bottom" }}
-                {...options.popoverProps}
-                sx={[
-                  {
-                    "& .MuiPopover-paper": {
-                      backgroundColor: options.transparent
-                        ? "transparent"
-                        : undefined,
-                      minWidth: column.getSize(),
-                    },
+            <Popover
+              open={popoverOpen}
+              anchorEl={parentRef}
+              onClose={() => showPopoverCell(false)}
+              anchorOrigin={{ horizontal: "center", vertical: "bottom" }}
+              transformOrigin={{ horizontal: "center", vertical: "top" }}
+              {...options.popoverProps}
+              sx={[
+                {
+                  "& .MuiPopover-paper": {
+                    backgroundColor: options.transparentPopover
+                      ? "transparent"
+                      : undefined,
+                    boxShadow: options.transparentPopover ? "none" : undefined,
+                    minWidth: column.getSize(),
                   },
-                  ...spreadSx(options.popoverProps?.sx),
-                ]}
-                onClick={(e) => e.stopPropagation()}
-                onDoubleClick={(e) => e.stopPropagation()}
-                onKeyDown={(e) => e.stopPropagation()}
-                onContextMenu={(e) => e.stopPropagation()}
-              >
-                {editorCell}
-              </Popover>
-            </Suspense>
+                },
+                ...spreadSx(options.popoverProps?.sx),
+              ]}
+              onClick={(e) => e.stopPropagation()}
+              onDoubleClick={(e) => e.stopPropagation()}
+              onKeyDown={(e) => e.stopPropagation()}
+              onContextMenu={(e) => e.stopPropagation()}
+            >
+              {editorCell}
+            </Popover>
           </>
         );
 
diff --git a/src/components/fields/Code/DisplayCell.tsx b/src/components/fields/Code/DisplayCell.tsx
index 2d8aa566..215266f2 100644
--- a/src/components/fields/Code/DisplayCell.tsx
+++ b/src/components/fields/Code/DisplayCell.tsx
@@ -4,6 +4,9 @@ import { useTheme } from "@mui/material";
 
 export default function Code({ value }: IDisplayCellProps) {
   const theme = useTheme();
+
+  if (typeof value !== "string") return null;
+
   return (
     <div
       style={{
@@ -18,7 +21,7 @@ export default function Code({ value }: IDisplayCellProps) {
         tabSize: 2,
       }}
     >
-      {value}
+      {value.substring(0, 1000)}
     </div>
   );
 }
diff --git a/src/components/fields/Code/index.tsx b/src/components/fields/Code/index.tsx
index 18a7da7d..72738586 100644
--- a/src/components/fields/Code/index.tsx
+++ b/src/components/fields/Code/index.tsx
@@ -23,7 +23,12 @@ export const config: IFieldConfig = {
   initializable: true,
   icon: <CodeIcon />,
   description: "Raw code edited with the Monaco Editor.",
-  TableCell: withTableCell(DisplayCell, SideDrawerField, "popover"),
+  TableCell: withTableCell(DisplayCell, SideDrawerField, "popover", {
+    popoverProps: {
+      anchorOrigin: { vertical: "top", horizontal: "center" },
+      PaperProps: { sx: { borderRadius: 1 } },
+    },
+  }),
   SideDrawerField,
   settings: Settings,
 };
diff --git a/src/components/fields/Color/DisplayCell.tsx b/src/components/fields/Color/DisplayCell.tsx
new file mode 100644
index 00000000..acdf325a
--- /dev/null
+++ b/src/components/fields/Color/DisplayCell.tsx
@@ -0,0 +1,60 @@
+import { IDisplayCellProps } from "@src/components/fields/types";
+
+import { ButtonBase, Box } from "@mui/material";
+import { ChevronDown } from "@src/assets/icons";
+
+export default function Color({
+  value,
+  showPopoverCell,
+  disabled,
+  tabIndex,
+}: IDisplayCellProps) {
+  const rendered = (
+    <div
+      style={{
+        flexGrow: 1,
+        paddingLeft: "var(--cell-padding)",
+        display: "flex",
+        alignItems: "center",
+        overflow: "hidden",
+      }}
+    >
+      {value?.hex && (
+        <Box
+          sx={{
+            width: 18,
+            height: 18,
+            flexShrink: 0,
+            mr: 1,
+
+            backgroundColor: value.hex,
+            boxShadow: (theme) => `0 0 0 1px ${theme.palette.divider} inset`,
+            borderRadius: 0.5,
+          }}
+        />
+      )}
+
+      {value?.hex}
+    </div>
+  );
+
+  if (disabled) return rendered;
+
+  return (
+    <ButtonBase
+      onClick={() => showPopoverCell(true)}
+      sx={{
+        width: "100%",
+        height: "100%",
+        font: "inherit",
+        color: "inherit",
+        letterSpacing: "inherit",
+        justifyContent: "flex-start",
+      }}
+      tabIndex={tabIndex}
+    >
+      {rendered}
+      <ChevronDown className="row-hover-iconButton end" />
+    </ButtonBase>
+  );
+}
diff --git a/src/components/fields/Color/EditorCell.tsx b/src/components/fields/Color/EditorCell.tsx
new file mode 100644
index 00000000..a0ce903b
--- /dev/null
+++ b/src/components/fields/Color/EditorCell.tsx
@@ -0,0 +1,19 @@
+import { IEditorCellProps } from "@src/components/fields/types";
+import { ColorPicker, toColor } from "react-color-palette";
+import "react-color-palette/lib/css/styles.css";
+
+import { Box } from "@mui/material";
+
+export default function Color({ value, onChange }: IEditorCellProps) {
+  return (
+    <Box sx={{ "& .rcp": { border: 0 } }}>
+      <ColorPicker
+        width={240}
+        height={180}
+        color={value?.hex ? toColor("hex", value.hex) : toColor("hex", "#fff")}
+        onChange={onChange}
+        alpha
+      />
+    </Box>
+  );
+}
diff --git a/src/components/fields/Color/InlineCell.tsx b/src/components/fields/Color/InlineCell.tsx
deleted file mode 100644
index af36b90f..00000000
--- a/src/components/fields/Color/InlineCell.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import { forwardRef } from "react";
-import { IPopoverInlineCellProps } from "@src/components/fields/types";
-
-import { ButtonBase, Box } from "@mui/material";
-
-export const Color = forwardRef(function Color(
-  { value, showPopoverCell, disabled }: IPopoverInlineCellProps,
-  ref: React.Ref<any>
-) {
-  return (
-    <ButtonBase
-      onClick={() => showPopoverCell(true)}
-      ref={ref}
-      disabled={disabled}
-      className="cell-collapse-padding"
-      sx={{
-        font: "inherit",
-        letterSpacing: "inherit",
-        p: "var(--cell-padding)",
-        justifyContent: "flex-start",
-        height: "100%",
-      }}
-    >
-      <Box
-        sx={{
-          width: 18,
-          height: 18,
-          mr: 1,
-
-          backgroundColor: value?.hex,
-          boxShadow: (theme) => `0 0 0 1px ${theme.palette.divider} inset`,
-          borderRadius: 0.5,
-        }}
-      />
-
-      {value?.hex}
-    </ButtonBase>
-  );
-});
-
-export default Color;
diff --git a/src/components/fields/Color/PopoverCell.tsx b/src/components/fields/Color/PopoverCell.tsx
deleted file mode 100644
index cfdbb219..00000000
--- a/src/components/fields/Color/PopoverCell.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import { useEffect, useState } from "react";
-import { IPopoverCellProps } from "@src/components/fields/types";
-import { useDebouncedCallback } from "use-debounce";
-import { ColorPicker, toColor } from "react-color-palette";
-import "react-color-palette/lib/css/styles.css";
-
-import { Box } from "@mui/material";
-
-export default function Color({ value, onSubmit }: IPopoverCellProps) {
-  const [localValue, setLocalValue] = useState(value);
-  const handleChangeComplete = useDebouncedCallback((color) => {
-    onSubmit(color);
-  }, 400);
-
-  useEffect(() => {
-    handleChangeComplete(localValue);
-  }, [localValue]);
-
-  return (
-    <Box sx={{ "& .rcp": { border: 0 } }}>
-      <ColorPicker
-        width={240}
-        height={180}
-        color={localValue?.hex ? localValue : toColor("hex", "#fff")}
-        onChange={setLocalValue}
-        alpha
-      />
-    </Box>
-  );
-}
diff --git a/src/components/fields/Color/SideDrawerField.tsx b/src/components/fields/Color/SideDrawerField.tsx
index 2090b68c..8f9499e3 100644
--- a/src/components/fields/Color/SideDrawerField.tsx
+++ b/src/components/fields/Color/SideDrawerField.tsx
@@ -87,7 +87,9 @@ export default function Color({
         <ColorPicker
           width={440}
           height={180}
-          color={value?.hex ? value : toColor("hex", "#fff")}
+          color={
+            value?.hex ? toColor("hex", value.hex) : toColor("hex", "#fff")
+          }
           onChange={onChange}
           onChangeComplete={onSubmit}
           alpha
diff --git a/src/components/fields/Color/index.tsx b/src/components/fields/Color/index.tsx
index 13cb9843..cb266301 100644
--- a/src/components/fields/Color/index.tsx
+++ b/src/components/fields/Color/index.tsx
@@ -1,15 +1,13 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withPopoverCell from "@src/components/fields/_withTableCell/withPopoverCell";
+import withTableCell from "@src/components/Table/withTableCell";
 import { toColor } from "react-color-palette";
 
 import ColorIcon from "@mui/icons-material/Colorize";
-import BasicCell from "@src/components/fields/_BasicCell/BasicCellNull";
-import InlineCell from "./InlineCell";
-import NullEditor from "@src/components/Table/editors/NullEditor";
+import DisplayCell from "./DisplayCell";
 
-const PopoverCell = lazy(
-  () => import("./PopoverCell" /* webpackChunkName: "PopoverCell-Color" */)
+const EditorCell = lazy(
+  () => import("./EditorCell" /* webpackChunkName: "EditorCell-Color" */)
 );
 const SideDrawerField = lazy(
   () =>
@@ -26,10 +24,9 @@ export const config: IFieldConfig = {
   icon: <ColorIcon />,
   description:
     "Color stored as Hex, RGB, and HSV. Edited with a visual picker.",
-  TableCell: withPopoverCell(BasicCell, InlineCell, PopoverCell, {
-    anchorOrigin: { horizontal: "left", vertical: "bottom" },
+  TableCell: withTableCell(DisplayCell, EditorCell, "popover", {
+    disablePadding: true,
   }),
-  TableEditor: NullEditor as any,
   SideDrawerField,
   csvImportParser: (value: string) => {
     try {
diff --git a/src/components/fields/ConnectService/DisplayCell.tsx b/src/components/fields/ConnectService/DisplayCell.tsx
new file mode 100644
index 00000000..e4d08055
--- /dev/null
+++ b/src/components/fields/ConnectService/DisplayCell.tsx
@@ -0,0 +1,50 @@
+import { IDisplayCellProps } from "@src/components/fields/types";
+
+import { ButtonBase, Grid, Chip } from "@mui/material";
+import { ChevronDown } from "@src/assets/icons";
+
+import ChipList from "@src/components/Table/formatters/ChipList";
+import { get } from "lodash-es";
+
+export default function ConnectService({
+  value,
+  showPopoverCell,
+  disabled,
+  column,
+  tabIndex,
+}: IDisplayCellProps) {
+  const config = column.config ?? {};
+  const displayKey = config.titleKey ?? config.primaryKey;
+
+  const rendered = (
+    <ChipList>
+      {Array.isArray(value) &&
+        value.map((snapshot) => (
+          <Grid item key={get(snapshot, config.primaryKey)}>
+            <Chip label={get(snapshot, displayKey)} size="small" />
+          </Grid>
+        ))}
+    </ChipList>
+  );
+
+  if (disabled) return rendered;
+
+  return (
+    <ButtonBase
+      onClick={() => showPopoverCell(true)}
+      style={{
+        width: "100%",
+        height: "100%",
+        font: "inherit",
+        color: "inherit !important",
+        letterSpacing: "inherit",
+        textAlign: "inherit",
+        justifyContent: "flex-start",
+      }}
+      tabIndex={tabIndex}
+    >
+      {rendered}
+      <ChevronDown className="row-hover-iconButton end" />
+    </ButtonBase>
+  );
+}
diff --git a/src/components/fields/ConnectService/PopoverCell.tsx b/src/components/fields/ConnectService/EditorCell.tsx
similarity index 81%
rename from src/components/fields/ConnectService/PopoverCell.tsx
rename to src/components/fields/ConnectService/EditorCell.tsx
index cc79c729..6d506f9c 100644
--- a/src/components/fields/ConnectService/PopoverCell.tsx
+++ b/src/components/fields/ConnectService/EditorCell.tsx
@@ -1,26 +1,26 @@
-import { IPopoverCellProps } from "@src/components/fields/types";
+import { IEditorCellProps } from "@src/components/fields/types";
 
 import ConnectServiceSelect from "./ConnectServiceSelect";
 
 export default function ConnectService({
   value,
-  onSubmit,
+  onChange,
   column,
   parentRef,
   showPopoverCell,
   disabled,
-  docRef,
-}: IPopoverCellProps) {
+  _rowy_ref,
+}: IEditorCellProps) {
   const config = column.config ?? {};
   if (!config) return null;
 
   return (
     <ConnectServiceSelect
       value={value}
-      onChange={onSubmit}
+      onChange={onChange}
       config={(config as any) ?? {}}
       disabled={disabled}
-      docRef={docRef as any}
+      docRef={_rowy_ref as any}
       TextFieldProps={{
         style: { display: "none" },
         SelectProps: {
diff --git a/src/components/fields/ConnectService/InlineCell.tsx b/src/components/fields/ConnectService/InlineCell.tsx
deleted file mode 100644
index 9a6622b9..00000000
--- a/src/components/fields/ConnectService/InlineCell.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import { forwardRef } from "react";
-import { IPopoverInlineCellProps } from "@src/components/fields/types";
-
-import { ButtonBase, Grid, Chip } from "@mui/material";
-import { ChevronDown } from "@src/assets/icons";
-
-import ChipList from "@src/components/Table/formatters/ChipList";
-import { get } from "lodash-es";
-
-export const ConnectService = forwardRef(function ConnectService(
-  { value, showPopoverCell, disabled, column }: IPopoverInlineCellProps,
-  ref: React.Ref<any>
-) {
-  const config = column.config ?? {};
-  const displayKey = config.titleKey ?? config.primaryKey;
-  return (
-    <ButtonBase
-      onClick={() => showPopoverCell(true)}
-      ref={ref}
-      disabled={disabled}
-      className="cell-collapse-padding"
-      sx={{
-        height: "100%",
-        font: "inherit",
-        color: "inherit !important",
-        letterSpacing: "inherit",
-        textAlign: "inherit",
-        justifyContent: "flex-start",
-      }}
-    >
-      <ChipList>
-        {Array.isArray(value) &&
-          value.map((snapshot) => (
-            <Grid item key={get(snapshot, config.primaryKey)}>
-              <Chip label={get(snapshot, displayKey)} size="small" />
-            </Grid>
-          ))}
-      </ChipList>
-
-      {!disabled && (
-        <ChevronDown
-          className="row-hover-iconButton"
-          sx={{
-            flexShrink: 0,
-            mr: 0.5,
-            borderRadius: 1,
-            p: (32 - 20) / 2 / 8,
-            boxSizing: "content-box !important",
-          }}
-        />
-      )}
-    </ButtonBase>
-  );
-});
-
-export default ConnectService;
diff --git a/src/components/fields/ConnectService/index.tsx b/src/components/fields/ConnectService/index.tsx
index fd34cda9..2495b867 100644
--- a/src/components/fields/ConnectService/index.tsx
+++ b/src/components/fields/ConnectService/index.tsx
@@ -1,15 +1,13 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withPopoverCell from "@src/components/fields/_withTableCell/withPopoverCell";
+import withTableCell from "@src/components/Table/withTableCell";
 
 import ConnectServiceIcon from "@mui/icons-material/Http";
-import BasicCell from "@src/components/fields/_BasicCell/BasicCellNull";
-import InlineCell from "./InlineCell";
-import NullEditor from "@src/components/Table/editors/NullEditor";
+import DisplayCell from "./DisplayCell";
 
-const PopoverCell = lazy(
+const EditorCell = lazy(
   () =>
-    import("./PopoverCell" /* webpackChunkName: "PopoverCell-ConnectService" */)
+    import("./EditorCell" /* webpackChunkName: "EditorCell-ConnectService" */)
 );
 const SideDrawerField = lazy(
   () =>
@@ -30,11 +28,10 @@ export const config: IFieldConfig = {
   icon: <ConnectServiceIcon />,
   description:
     "Connects to an external web service to fetch a list of results.",
-  TableCell: withPopoverCell(BasicCell, InlineCell, PopoverCell, {
-    anchorOrigin: { horizontal: "left", vertical: "bottom" },
-    transparent: true,
+  TableCell: withTableCell(DisplayCell, EditorCell, "popover", {
+    disablePadding: true,
+    transparentPopover: true,
   }),
-  TableEditor: NullEditor as any,
   SideDrawerField,
   requireConfiguration: true,
   settings: Settings,
diff --git a/src/components/fields/ConnectTable/DisplayCell.tsx b/src/components/fields/ConnectTable/DisplayCell.tsx
new file mode 100644
index 00000000..75c0da2b
--- /dev/null
+++ b/src/components/fields/ConnectTable/DisplayCell.tsx
@@ -0,0 +1,61 @@
+import { IDisplayCellProps } from "@src/components/fields/types";
+
+import { ButtonBase, Grid, Chip } from "@mui/material";
+import { ChevronDown } from "@src/assets/icons";
+
+import ChipList from "@src/components/Table/formatters/ChipList";
+
+export default function ConnectTable({
+  value,
+  showPopoverCell,
+  disabled,
+  column,
+  tabIndex,
+}: IDisplayCellProps) {
+  const config = column.config ?? {};
+
+  const rendered = (
+    <ChipList>
+      {Array.isArray(value) ? (
+        value.map((item: any) => (
+          <Grid item key={item.docPath}>
+            <Chip
+              label={(config.primaryKeys ?? [])
+                .map((key: string) => item.snapshot[key])
+                .join(" ")}
+            />
+          </Grid>
+        ))
+      ) : value ? (
+        <Grid item>
+          <Chip
+            label={(config.primaryKeys ?? [])
+              .map((key: string) => value.snapshot[key])
+              .join(" ")}
+          />
+        </Grid>
+      ) : null}
+    </ChipList>
+  );
+
+  if (disabled) return rendered;
+
+  return (
+    <ButtonBase
+      onClick={() => showPopoverCell(true)}
+      style={{
+        width: "100%",
+        height: "100%",
+        font: "inherit",
+        color: "inherit !important",
+        letterSpacing: "inherit",
+        textAlign: "inherit",
+        justifyContent: "flex-start",
+      }}
+      tabIndex={tabIndex}
+    >
+      {rendered}
+      <ChevronDown className="row-hover-iconButton end" />
+    </ButtonBase>
+  );
+}
diff --git a/src/components/fields/ConnectTable/PopoverCell.tsx b/src/components/fields/ConnectTable/EditorCell.tsx
similarity index 79%
rename from src/components/fields/ConnectTable/PopoverCell.tsx
rename to src/components/fields/ConnectTable/EditorCell.tsx
index 41192ef0..e4a7af9f 100644
--- a/src/components/fields/ConnectTable/PopoverCell.tsx
+++ b/src/components/fields/ConnectTable/EditorCell.tsx
@@ -1,16 +1,17 @@
-import { IPopoverCellProps } from "@src/components/fields/types";
+import { IEditorCellProps } from "@src/components/fields/types";
 
 import ConnectTableSelect from "./ConnectTableSelect";
 
 export default function ConnectTable({
   value,
+  onChange,
   onSubmit,
   column,
   parentRef,
   showPopoverCell,
   row,
   disabled,
-}: IPopoverCellProps) {
+}: IEditorCellProps) {
   const config = column.config ?? {};
   if (!config || !config.primaryKeys) return null;
 
@@ -19,7 +20,7 @@ export default function ConnectTable({
       row={row}
       column={column}
       value={value}
-      onChange={onSubmit}
+      onChange={onChange}
       config={(config as any) ?? {}}
       disabled={disabled}
       TextFieldProps={{
@@ -33,7 +34,10 @@ export default function ConnectTable({
           },
         },
       }}
-      onClose={() => showPopoverCell(false)}
+      onClose={() => {
+        showPopoverCell(false);
+        onSubmit();
+      }}
       loadBeforeOpen
     />
   );
diff --git a/src/components/fields/ConnectTable/InlineCell.tsx b/src/components/fields/ConnectTable/InlineCell.tsx
deleted file mode 100644
index 3f8f3147..00000000
--- a/src/components/fields/ConnectTable/InlineCell.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import { forwardRef } from "react";
-import { IPopoverInlineCellProps } from "@src/components/fields/types";
-
-import { ButtonBase, Grid, Chip } from "@mui/material";
-import { ChevronDown } from "@src/assets/icons";
-
-import ChipList from "@src/components/Table/formatters/ChipList";
-
-export const ConnectTable = forwardRef(function ConnectTable(
-  { value, showPopoverCell, disabled, column }: IPopoverInlineCellProps,
-  ref: React.Ref<any>
-) {
-  const config = column.config ?? {};
-
-  return (
-    <ButtonBase
-      onClick={() => showPopoverCell(true)}
-      ref={ref}
-      disabled={disabled}
-      className="cell-collapse-padding"
-      sx={{
-        height: "100%",
-        font: "inherit",
-        color: "inherit !important",
-        letterSpacing: "inherit",
-        textAlign: "inherit",
-        justifyContent: "flex-start",
-      }}
-    >
-      <ChipList>
-        {Array.isArray(value) ? (
-          value.map((item: any) => (
-            <Grid item key={item.docPath}>
-              <Chip
-                label={(config.primaryKeys ?? [])
-                  .map((key: string) => item.snapshot[key])
-                  .join(" ")}
-              />
-            </Grid>
-          ))
-        ) : value ? (
-          <Grid item>
-            <Chip
-              label={(config.primaryKeys ?? [])
-                .map((key: string) => value.snapshot[key])
-                .join(" ")}
-            />
-          </Grid>
-        ) : null}
-      </ChipList>
-
-      {!disabled && (
-        <ChevronDown
-          className="row-hover-iconButton"
-          sx={{
-            flexShrink: 0,
-            mr: 0.5,
-            borderRadius: 1,
-            p: (32 - 20) / 2 / 8,
-            boxSizing: "content-box !important",
-          }}
-        />
-      )}
-    </ButtonBase>
-  );
-});
-
-export default ConnectTable;
diff --git a/src/components/fields/ConnectTable/index.tsx b/src/components/fields/ConnectTable/index.tsx
index 30fae9c4..e5cd002b 100644
--- a/src/components/fields/ConnectTable/index.tsx
+++ b/src/components/fields/ConnectTable/index.tsx
@@ -1,15 +1,12 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withPopoverCell from "@src/components/fields/_withTableCell/withPopoverCell";
+import withTableCell from "@src/components/Table/withTableCell";
 
 import { ConnectTable as ConnectTableIcon } from "@src/assets/icons";
-import BasicCell from "@src/components/fields/_BasicCell/BasicCellNull";
-import InlineCell from "./InlineCell";
-import NullEditor from "@src/components/Table/editors/NullEditor";
+import DisplayCell from "./DisplayCell";
 
-const PopoverCell = lazy(
-  () =>
-    import("./PopoverCell" /* webpackChunkName: "PopoverCell-ConnectTable" */)
+const EditorCell = lazy(
+  () => import("./EditorCell" /* webpackChunkName: "EditorCell-ConnectTable" */)
 );
 const SideDrawerField = lazy(
   () =>
@@ -31,11 +28,10 @@ export const config: IFieldConfig = {
   icon: <ConnectTableIcon />,
   description:
     "Connects to an existing table to fetch a snapshot of values from a row. Requires Rowy Run and Algolia setup.",
-  TableCell: withPopoverCell(BasicCell, InlineCell, PopoverCell, {
-    anchorOrigin: { horizontal: "left", vertical: "bottom" },
-    transparent: true,
+  TableCell: withTableCell(DisplayCell, EditorCell, "popover", {
+    disablePadding: true,
+    transparentPopover: true,
   }),
-  TableEditor: NullEditor as any,
   SideDrawerField,
   settings: Settings,
   requireConfiguration: true,
diff --git a/src/components/fields/Connector/DisplayCell.tsx b/src/components/fields/Connector/DisplayCell.tsx
new file mode 100644
index 00000000..8c6316bc
--- /dev/null
+++ b/src/components/fields/Connector/DisplayCell.tsx
@@ -0,0 +1,48 @@
+import { IDisplayCellProps } from "@src/components/fields/types";
+
+import { ButtonBase, Grid, Chip } from "@mui/material";
+import { ChevronDown } from "@src/assets/icons";
+
+import ChipList from "@src/components/Table/formatters/ChipList";
+import { get } from "lodash-es";
+import { getLabel } from "./utils";
+
+export default function Connector({
+  value,
+  showPopoverCell,
+  disabled,
+  column,
+  tabIndex,
+}: IDisplayCellProps) {
+  const rendered = (
+    <ChipList>
+      {Array.isArray(value) &&
+        value.map((item) => (
+          <Grid item key={get(item, column.config?.id)}>
+            <Chip label={getLabel(column.config, item)} size="small" />
+          </Grid>
+        ))}
+    </ChipList>
+  );
+
+  if (disabled) return rendered;
+
+  return (
+    <ButtonBase
+      onClick={() => showPopoverCell(true)}
+      sx={{
+        width: "100%",
+        height: "100%",
+        font: "inherit",
+        color: "inherit !important",
+        letterSpacing: "inherit",
+        textAlign: "inherit",
+        justifyContent: "flex-start",
+      }}
+      tabIndex={tabIndex}
+    >
+      {rendered}
+      <ChevronDown className="row-hover-iconButton end" />
+    </ButtonBase>
+  );
+}
diff --git a/src/components/fields/Connector/EditorCell.tsx b/src/components/fields/Connector/EditorCell.tsx
new file mode 100644
index 00000000..e665af15
--- /dev/null
+++ b/src/components/fields/Connector/EditorCell.tsx
@@ -0,0 +1,25 @@
+import { Suspense } from "react";
+import { IEditorCellProps } from "@src/components/fields/types";
+
+import PopupContents from "./Select/PopupContents";
+import Loading from "@src/components/Loading";
+
+export default function Connector({
+  value,
+  onChange,
+  column,
+  disabled,
+  _rowy_ref,
+}: IEditorCellProps) {
+  return (
+    <Suspense fallback={<Loading />}>
+      <PopupContents
+        value={Array.isArray(value) ? value : []}
+        onChange={onChange}
+        column={column}
+        disabled={disabled}
+        _rowy_ref={_rowy_ref}
+      />
+    </Suspense>
+  );
+}
diff --git a/src/components/fields/Connector/InlineCell.tsx b/src/components/fields/Connector/InlineCell.tsx
deleted file mode 100644
index bd99142e..00000000
--- a/src/components/fields/Connector/InlineCell.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import { forwardRef } from "react";
-import { IPopoverInlineCellProps } from "@src/components/fields/types";
-
-import { ButtonBase, Grid, Chip } from "@mui/material";
-import { ChevronDown } from "@src/assets/icons";
-
-import ChipList from "@src/components/Table/formatters/ChipList";
-import { get } from "lodash-es";
-import { getLabel } from "./utils";
-
-export const Connector = forwardRef(function Connector(
-  { value, showPopoverCell, disabled, column }: IPopoverInlineCellProps,
-  ref: React.Ref<any>
-) {
-  const config = column.config ?? {};
-  const displayKey = config.titleKey ?? config.primaryKey;
-  return (
-    <ButtonBase
-      onClick={() => showPopoverCell(true)}
-      ref={ref}
-      disabled={disabled}
-      className="cell-collapse-padding"
-      sx={{
-        height: "100%",
-        font: "inherit",
-        color: "inherit !important",
-        letterSpacing: "inherit",
-        textAlign: "inherit",
-        justifyContent: "flex-start",
-      }}
-    >
-      <ChipList>
-        {Array.isArray(value) &&
-          value.map((item) => (
-            <Grid item key={get(item, config.id)}>
-              <Chip label={getLabel(config, item)} size="small" />
-            </Grid>
-          ))}
-      </ChipList>
-
-      {!disabled && (
-        <ChevronDown
-          className="row-hover-iconButton"
-          sx={{
-            flexShrink: 0,
-            mr: 0.5,
-            borderRadius: 1,
-            p: (32 - 20) / 2 / 8,
-            boxSizing: "content-box !important",
-          }}
-        />
-      )}
-    </ButtonBase>
-  );
-});
-
-export default Connector;
diff --git a/src/components/fields/Connector/PopoverCell.tsx b/src/components/fields/Connector/PopoverCell.tsx
deleted file mode 100644
index e52e94ea..00000000
--- a/src/components/fields/Connector/PopoverCell.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import { IPopoverCellProps } from "@src/components/fields/types";
-
-import Selector from "./Select";
-
-export default function ConnectService({
-  value,
-  onSubmit,
-  column,
-  parentRef,
-  showPopoverCell,
-  disabled,
-  docRef,
-}: IPopoverCellProps) {
-  return (
-    <Selector
-      value={value}
-      onChange={onSubmit}
-      column={column}
-      disabled={disabled}
-      docRef={docRef}
-      TextFieldProps={{
-        style: { display: "none" },
-        SelectProps: {
-          open: true,
-          MenuProps: {
-            anchorEl: parentRef,
-            anchorOrigin: { vertical: "bottom", horizontal: "left" },
-            transformOrigin: { vertical: "top", horizontal: "left" },
-          },
-          onClose: () => showPopoverCell(false),
-        },
-      }}
-    />
-  );
-}
diff --git a/src/components/fields/Connector/Select/PopupContents.tsx b/src/components/fields/Connector/Select/PopupContents.tsx
index 29453471..941418c7 100644
--- a/src/components/fields/Connector/Select/PopupContents.tsx
+++ b/src/components/fields/Connector/Select/PopupContents.tsx
@@ -1,5 +1,4 @@
-import React, { useEffect, useState } from "react";
-import clsx from "clsx";
+import { useEffect, useState } from "react";
 import { useDebouncedCallback } from "use-debounce";
 import { get } from "lodash-es";
 import { useAtom } from "jotai";
@@ -7,7 +6,6 @@ import { useAtom } from "jotai";
 import {
   Button,
   Checkbox,
-  Divider,
   Grid,
   InputAdornment,
   List,
@@ -21,7 +19,6 @@ import {
 import SearchIcon from "@mui/icons-material/Search";
 
 import { IConnectorSelectProps } from ".";
-import useStyles from "./styles";
 import Loading from "@src/components/Loading";
 import { getLabel } from "@src/components/fields/Connector/utils";
 import { useSnackbar } from "notistack";
@@ -37,7 +34,7 @@ export default function PopupContents({
   value = [],
   onChange,
   column,
-  docRef,
+  _rowy_ref,
 }: IPopupContentsProps) {
   const [rowyRun] = useAtom(rowyRunAtom, projectScope);
   const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
@@ -48,8 +45,6 @@ export default function PopupContents({
   const elementId = config.elementId;
   const multiple = Boolean(config.multiple);
 
-  const { classes } = useStyles();
-
   // Webservice search query
   const [query, setQuery] = useState("");
   // Webservice response
@@ -75,7 +70,7 @@ export default function PopupContents({
           columnKey: column.key,
           query: query,
           schemaDocPath: getTableSchemaPath(tableSettings),
-          rowDocPath: docRef.path,
+          rowDocPath: _rowy_ref.path,
         },
       });
       setResponse(resp);
@@ -105,93 +100,88 @@ export default function PopupContents({
   const clearSelection = () => onChange([]);
 
   return (
-    <Grid container direction="column" className={classes.grid}>
-      <Grid item className={classes.searchRow}>
+    <Grid container direction="column" sx={{ p: 1, height: "100%" }}>
+      <Grid item>
         <TextField
           value={query}
+          type="search"
           onChange={(e) => setQuery(e.target.value)}
           fullWidth
           variant="filled"
-          margin="dense"
           label="Search items"
-          className={classes.noMargins}
+          hiddenLabel
+          placeholder="Search items"
           InputProps={{
-            endAdornment: (
-              <InputAdornment position="end">
+            startAdornment: (
+              <InputAdornment position="start">
                 <SearchIcon />
               </InputAdornment>
             ),
           }}
+          InputLabelProps={{ className: "visually-hidden" }}
           onClick={(e) => e.stopPropagation()}
           onKeyDown={(e) => e.stopPropagation()}
         />
       </Grid>
 
-      <Grid item xs className={classes.listRow}>
-        <List className={classes.list}>
+      <Grid item xs>
+        <List sx={{ overflowY: "auto" }}>
           {hits.map((hit) => {
             const isSelected = selectedValues.some((v) => v === hit[elementId]);
             return (
-              <React.Fragment key={get(hit, elementId)}>
-                <MenuItem
-                  dense
-                  onClick={isSelected ? deselect(hit) : select(hit)}
-                  disabled={
-                    !isSelected && multiple && value.length >= config.max
-                  }
-                >
-                  <ListItemIcon className={classes.checkboxContainer}>
-                    {multiple ? (
-                      <Checkbox
-                        edge="start"
-                        checked={isSelected}
-                        tabIndex={-1}
-                        color="secondary"
-                        className={classes.checkbox}
-                        disableRipple
-                        inputProps={{
-                          "aria-labelledby": `label-${get(hit, elementId)}`,
-                        }}
-                      />
-                    ) : (
-                      <Radio
-                        edge="start"
-                        checked={isSelected}
-                        tabIndex={-1}
-                        color="secondary"
-                        className={classes.checkbox}
-                        disableRipple
-                        inputProps={{
-                          "aria-labelledby": `label-${get(hit, elementId)}`,
-                        }}
-                      />
-                    )}
-                  </ListItemIcon>
-                  <ListItemText
-                    id={`label-${get(hit, elementId)}`}
-                    primary={getLabel(config, hit)}
-                  />
-                </MenuItem>
-                <Divider className={classes.divider} />
-              </React.Fragment>
+              <MenuItem
+                key={get(hit, elementId)}
+                onClick={isSelected ? deselect(hit) : select(hit)}
+                disabled={!isSelected && multiple && value.length >= config.max}
+                disableGutters
+                style={{ margin: 0, width: "100%" }}
+              >
+                <ListItemIcon>
+                  {multiple ? (
+                    <Checkbox
+                      edge="start"
+                      checked={isSelected}
+                      tabIndex={-1}
+                      color="secondary"
+                      disableRipple
+                      inputProps={{
+                        "aria-labelledby": `label-${get(hit, elementId)}`,
+                      }}
+                      sx={{ py: 0 }}
+                    />
+                  ) : (
+                    <Radio
+                      edge="start"
+                      checked={isSelected}
+                      tabIndex={-1}
+                      color="secondary"
+                      disableRipple
+                      inputProps={{
+                        "aria-labelledby": `label-${get(hit, elementId)}`,
+                      }}
+                      sx={{ py: 0 }}
+                    />
+                  )}
+                </ListItemIcon>
+                <ListItemText
+                  id={`label-${get(hit, elementId)}`}
+                  primary={getLabel(config, hit)}
+                />
+              </MenuItem>
             );
           })}
         </List>
       </Grid>
 
       {multiple && (
-        <Grid item className={clsx(classes.footerRow, classes.selectedRow)}>
+        <Grid item>
           <Grid
             container
             direction="row"
             justifyContent="space-between"
             alignItems="center"
           >
-            <Typography
-              variant="button"
-              color="textSecondary"
-              className={classes.selectedNum}
-            >
+            <Typography variant="button" color="textSecondary" sx={{ ml: 1 }}>
               {value?.length} of {hits?.length}
             </Typography>
 
@@ -199,9 +189,9 @@ export default function PopupContents({
               disabled={!value || value.length === 0}
               onClick={clearSelection}
               color="primary"
-              className={classes.selectAllButton}
+              variant="text"
             >
-              Clear selection
+              Clear
             </Button>
           </Grid>
         </Grid>
diff --git a/src/components/fields/Connector/Select/index.tsx b/src/components/fields/Connector/Select/index.tsx
index 9e09ba40..2025ec37 100644
--- a/src/components/fields/Connector/Select/index.tsx
+++ b/src/components/fields/Connector/Select/index.tsx
@@ -24,7 +24,7 @@ export interface IConnectorSelectProps {
   className?: string;
   /** Override any props of the root MUI `TextField` component */
   TextFieldProps?: Partial<TextFieldProps>;
-  docRef: TableRowRef;
+  _rowy_ref: TableRowRef;
   disabled?: boolean;
 }
 
@@ -56,7 +56,11 @@ export default function ConnectorSelect({
         // prop for this component to a comma-separated string
         MenuProps: {
           classes: { paper: classes.paper, list: classes.menuChild },
-          MenuListProps: { disablePadding: true },
+          MenuListProps: {
+            disablePadding: true,
+            style: { padding: 0 },
+            component: "div",
+          } as any,
           anchorOrigin: { vertical: "bottom", horizontal: "center" },
           transformOrigin: { vertical: "top", horizontal: "center" },
           ...TextFieldProps.SelectProps?.MenuProps,
diff --git a/src/components/fields/Connector/SideDrawerField.tsx b/src/components/fields/Connector/SideDrawerField.tsx
index feccb0aa..b97f1491 100644
--- a/src/components/fields/Connector/SideDrawerField.tsx
+++ b/src/components/fields/Connector/SideDrawerField.tsx
@@ -11,7 +11,6 @@ export default function Connector({
   column,
   _rowy_ref,
   value,
-  onDirty,
   onChange,
   onSubmit,
   disabled,
@@ -32,7 +31,7 @@ export default function Connector({
           column={column}
           value={value}
           onChange={onChange}
-          docRef={_rowy_ref as any}
+          _rowy_ref={_rowy_ref}
           TextFieldProps={{
             label: "",
             hiddenLabel: true,
@@ -50,7 +49,6 @@ export default function Connector({
         <Grid container spacing={0.5} style={{ marginTop: 2 }}>
           {value.map((item) => {
             const key = get(item, config.elementId);
-            console.log(key, item);
             return (
               <Grid item key={key}>
                 <Chip
diff --git a/src/components/fields/Connector/index.tsx b/src/components/fields/Connector/index.tsx
index 2f030c60..7946e82b 100644
--- a/src/components/fields/Connector/index.tsx
+++ b/src/components/fields/Connector/index.tsx
@@ -1,14 +1,13 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withPopoverCell from "@src/components/fields/_withTableCell/withPopoverCell";
-import ConnectorIcon from "@mui/icons-material/Cable";
-import BasicCell from "@src/components/fields/_BasicCell/BasicCellNull";
-import InlineCell from "./InlineCell";
-import NullEditor from "@src/components/Table/editors/NullEditor";
+import withTableCell from "@src/components/Table/withTableCell";
 
-const PopoverCell = lazy(
+import ConnectorIcon from "@mui/icons-material/Cable";
+import DisplayCell from "./DisplayCell";
+
+const EditorCell = lazy(
   () =>
-    import("./PopoverCell" /* webpackChunkName: "PopoverCell-ConnectService" */)
+    import("./EditorCell" /* webpackChunkName: "EditorCell-ConnectService" */)
 );
 const SideDrawerField = lazy(
   () =>
@@ -30,11 +29,9 @@ export const config: IFieldConfig = {
   icon: <ConnectorIcon />,
   description:
     "Connects to any table or API to fetch a list of results based on a text query or row data.",
-  TableCell: withPopoverCell(BasicCell, InlineCell, PopoverCell, {
-    anchorOrigin: { horizontal: "left", vertical: "bottom" },
-    transparent: true,
+  TableCell: withTableCell(DisplayCell, EditorCell, "popover", {
+    disablePadding: true,
   }),
-  TableEditor: NullEditor as any,
   SideDrawerField,
   requireConfiguration: true,
   settings: Settings,
diff --git a/src/components/fields/CreatedAt/TableCell.tsx b/src/components/fields/CreatedAt/DisplayCell.tsx
similarity index 70%
rename from src/components/fields/CreatedAt/TableCell.tsx
rename to src/components/fields/CreatedAt/DisplayCell.tsx
index b659618d..04b56517 100644
--- a/src/components/fields/CreatedAt/TableCell.tsx
+++ b/src/components/fields/CreatedAt/DisplayCell.tsx
@@ -1,9 +1,9 @@
-import { IHeavyCellProps } from "@src/components/fields/types";
+import { IDisplayCellProps } from "@src/components/fields/types";
 
 import { format } from "date-fns";
 import { DATE_TIME_FORMAT } from "@src/constants/dates";
 
-export default function CreatedAt({ column, value }: IHeavyCellProps) {
+export default function CreatedAt({ column, value }: IDisplayCellProps) {
   if (!value) return null;
   const dateLabel = format(
     value.toDate ? value.toDate() : value,
diff --git a/src/components/fields/CreatedAt/index.tsx b/src/components/fields/CreatedAt/index.tsx
index 7f306509..151466fe 100644
--- a/src/components/fields/CreatedAt/index.tsx
+++ b/src/components/fields/CreatedAt/index.tsx
@@ -1,14 +1,10 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withHeavyCell from "@src/components/fields/_withTableCell/withHeavyCell";
+import withTableCell from "@src/components/Table/withTableCell";
 
 import { CreatedAt as CreatedAtIcon } from "@src/assets/icons";
-import BasicCell from "@src/components/fields/_BasicCell/BasicCellNull";
-import withSideDrawerEditor from "@src/components/Table/editors/withSideDrawerEditor";
+import DisplayCell from "./DisplayCell";
 
-const TableCell = lazy(
-  () => import("./TableCell" /* webpackChunkName: "TableCell-CreatedAt" */)
-);
 const SideDrawerField = lazy(
   () =>
     import(
@@ -28,8 +24,7 @@ export const config: IFieldConfig = {
   initialValue: null,
   icon: <CreatedAtIcon />,
   description: "Displays the timestamp of when the row was created. Read-only.",
-  TableCell: withHeavyCell(BasicCell, TableCell),
-  TableEditor: withSideDrawerEditor(TableCell),
+  TableCell: withTableCell(DisplayCell, null),
   SideDrawerField,
   settings: Settings,
 };
diff --git a/src/components/fields/CreatedBy/TableCell.tsx b/src/components/fields/CreatedBy/DisplayCell.tsx
similarity index 85%
rename from src/components/fields/CreatedBy/TableCell.tsx
rename to src/components/fields/CreatedBy/DisplayCell.tsx
index 69cc68e9..17ca0396 100644
--- a/src/components/fields/CreatedBy/TableCell.tsx
+++ b/src/components/fields/CreatedBy/DisplayCell.tsx
@@ -1,11 +1,11 @@
-import { IHeavyCellProps } from "@src/components/fields/types";
+import { IDisplayCellProps } from "@src/components/fields/types";
 
 import { Tooltip, Stack, Avatar } from "@mui/material";
 
 import { format } from "date-fns";
 import { DATE_TIME_FORMAT } from "@src/constants/dates";
 
-export default function CreatedBy({ column, value }: IHeavyCellProps) {
+export default function CreatedBy({ column, value }: IDisplayCellProps) {
   if (!value || !value.displayName || !value.timestamp) return null;
   const dateLabel = format(
     value.timestamp.toDate ? value.timestamp.toDate() : value.timestamp,
diff --git a/src/components/fields/CreatedBy/index.tsx b/src/components/fields/CreatedBy/index.tsx
index c844ec51..8bb0329c 100644
--- a/src/components/fields/CreatedBy/index.tsx
+++ b/src/components/fields/CreatedBy/index.tsx
@@ -1,14 +1,10 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withHeavyCell from "@src/components/fields/_withTableCell/withHeavyCell";
+import withTableCell from "@src/components/Table/withTableCell";
 
 import { CreatedBy as CreatedByIcon } from "@src/assets/icons";
-import BasicCell from "@src/components/fields/_BasicCell/BasicCellNull";
-import withSideDrawerEditor from "@src/components/Table/editors/withSideDrawerEditor";
+import DisplayCell from "./DisplayCell";
 
-const TableCell = lazy(
-  () => import("./TableCell" /* webpackChunkName: "TableCell-CreatedBy" */)
-);
 const SideDrawerField = lazy(
   () =>
     import(
@@ -29,8 +25,7 @@ export const config: IFieldConfig = {
   icon: <CreatedByIcon />,
   description:
     "Displays the user that created the row and timestamp. Read-only.",
-  TableCell: withHeavyCell(BasicCell, TableCell),
-  TableEditor: withSideDrawerEditor(TableCell),
+  TableCell: withTableCell(DisplayCell, null),
   SideDrawerField,
   settings: Settings,
 };
diff --git a/src/components/fields/Date/BasicCell.tsx b/src/components/fields/Date/DisplayCell.tsx
similarity index 51%
rename from src/components/fields/Date/BasicCell.tsx
rename to src/components/fields/Date/DisplayCell.tsx
index 11181f9a..719f2801 100644
--- a/src/components/fields/Date/BasicCell.tsx
+++ b/src/components/fields/Date/DisplayCell.tsx
@@ -1,20 +1,24 @@
-import { IBasicCellProps } from "@src/components/fields/types";
+import { IDisplayCellProps } from "@src/components/fields/types";
 import { isFunction, isDate } from "lodash-es";
 import { format } from "date-fns";
 import { DATE_FORMAT } from "@src/constants/dates";
 
-export default function Date_({
-  value,
-  format: formatProp,
-}: IBasicCellProps & { format?: string }) {
+export default function Date_({ value, column }: IDisplayCellProps) {
   if ((!!value && isFunction(value.toDate)) || isDate(value)) {
     try {
       const formatted = format(
         isDate(value) ? value : value.toDate(),
-        formatProp || DATE_FORMAT
+        column.config?.format || DATE_FORMAT
       );
       return (
-        <span style={{ fontVariantNumeric: "tabular-nums" }}>{formatted}</span>
+        <div
+          style={{
+            fontVariantNumeric: "tabular-nums",
+            padding: "0 var(--cell-padding)",
+          }}
+        >
+          {formatted}
+        </div>
       );
     } catch (e) {
       return null;
diff --git a/src/components/fields/Date/TableCell.tsx b/src/components/fields/Date/EditorCell.tsx
similarity index 69%
rename from src/components/fields/Date/TableCell.tsx
rename to src/components/fields/Date/EditorCell.tsx
index 08295168..2b9523ed 100644
--- a/src/components/fields/Date/TableCell.tsx
+++ b/src/components/fields/Date/EditorCell.tsx
@@ -1,5 +1,5 @@
 import { useDebouncedCallback } from "use-debounce";
-import { IHeavyCellProps } from "@src/components/fields/types";
+import { IEditorCellProps } from "@src/components/fields/types";
 
 import DatePicker from "@mui/lab/DatePicker";
 import { TextField } from "@mui/material";
@@ -7,33 +7,25 @@ import { ChevronDown } from "@src/assets/icons";
 
 import { transformValue, sanitizeValue } from "./utils";
 import { DATE_FORMAT } from "@src/constants/dates";
-import BasicCell from "./BasicCell";
 
 export default function Date_({
   column,
   value,
   disabled,
+  onChange,
   onSubmit,
-}: IHeavyCellProps) {
+  tabIndex,
+}: IEditorCellProps) {
   const format = column.config?.format ?? DATE_FORMAT;
   const transformedValue = transformValue(value);
 
   const handleDateChange = useDebouncedCallback((date: Date | null) => {
     const sanitized = sanitizeValue(date);
     if (sanitized === undefined) return;
-    onSubmit(sanitized);
+    onChange(sanitized);
+    onSubmit();
   }, 500);
 
-  if (disabled)
-    return (
-      <BasicCell
-        value={transformedValue}
-        type={(column as any).type}
-        name={column.key}
-        format={format}
-      />
-    );
-
   return (
     <DatePicker
       renderInput={(props) => (
@@ -43,24 +35,21 @@ export default function Date_({
           label=""
           hiddenLabel
           aria-label={column.name as string}
-          className="cell-collapse-padding"
           sx={{
             width: "100%",
             height: "100%",
 
-            "& .MuiInputBase-root": {
+            "&& .MuiInputBase-root": {
               height: "100%",
               font: "inherit", // Prevent text jumping
               letterSpacing: "inherit", // Prevent text jumping
 
-              ".rdg-cell &": {
-                background: "none !important",
-                boxShadow: "none",
-                borderRadius: 0,
-                padding: 0,
+              background: "none !important",
+              boxShadow: "none",
+              borderRadius: 0,
+              padding: 0,
 
-                "&::after": { width: "100%", left: 0 },
-              },
+              "&::after": { width: "100%", left: 0 },
             },
             "& .MuiInputBase-input": {
               height: "100%",
@@ -68,11 +57,9 @@ export default function Date_({
               letterSpacing: "inherit", // Prevent text jumping
               fontVariantNumeric: "tabular-nums",
 
-              ".rdg-cell &": {
-                padding: "var(--cell-padding)",
-                pr: 0,
-                pb: 1 / 8,
-              },
+              padding: "0 var(--cell-padding)",
+              pr: 0,
+              pb: 1 / 8,
             },
             "& .MuiInputAdornment-root": { m: 0 },
           }}
@@ -81,6 +68,7 @@ export default function Date_({
           onKeyDown={(e) => e.stopPropagation()}
           // Touch mode: make the whole field clickable
           onClick={props.inputProps?.onClick as any}
+          inputProps={{ ...props.inputProps, tabIndex }}
         />
       )}
       label={column.name}
@@ -91,12 +79,13 @@ export default function Date_({
       clearable
       OpenPickerButtonProps={{
         size: "small",
-        className: "row-hover-iconButton",
+        className: "row-hover-iconButton end",
         edge: false,
-        sx: { mr: 3 / 8, width: 32, height: 32 },
+        tabIndex,
       }}
       components={{ OpenPickerIcon: ChevronDown }}
       disableOpenPicker={false}
+      disabled={disabled}
     />
   );
 }
diff --git a/src/components/fields/Date/index.tsx b/src/components/fields/Date/index.tsx
index a4a6e353..fdc634d0 100644
--- a/src/components/fields/Date/index.tsx
+++ b/src/components/fields/Date/index.tsx
@@ -1,16 +1,15 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withHeavyCell from "@src/components/fields/_withTableCell/withHeavyCell";
+import withTableCell from "@src/components/Table/withTableCell";
 import { parse, format } from "date-fns";
 import { DATE_FORMAT } from "@src/constants/dates";
 
 import DateIcon from "@mui/icons-material/TodayOutlined";
-import BasicCell from "./BasicCell";
-import NullEditor from "@src/components/Table/editors/NullEditor";
+import DisplayCell from "./DisplayCell";
 import { filterOperators, valueFormatter } from "./filters";
 
-const TableCell = lazy(
-  () => import("./TableCell" /* webpackChunkName: "TableCell-Date" */)
+const EditorCell = lazy(
+  () => import("./EditorCell" /* webpackChunkName: "EditorCell-Date" */)
 );
 const SideDrawerField = lazy(
   () =>
@@ -29,8 +28,9 @@ export const config: IFieldConfig = {
   initializable: true,
   icon: <DateIcon />,
   description: `Formatted date. Format is configurable, default: ${DATE_FORMAT}. Edited with a visual picker.`,
-  TableCell: withHeavyCell(BasicCell, TableCell),
-  TableEditor: NullEditor as any,
+  TableCell: withTableCell(DisplayCell, EditorCell, "inline", {
+    disablePadding: true,
+  }),
   SideDrawerField,
   filter: { operators: filterOperators, valueFormatter },
   settings: Settings,
diff --git a/src/components/fields/DateTime/BasicCell.tsx b/src/components/fields/DateTime/DisplayCell.tsx
similarity index 51%
rename from src/components/fields/DateTime/BasicCell.tsx
rename to src/components/fields/DateTime/DisplayCell.tsx
index 6c4bac2f..f104d979 100644
--- a/src/components/fields/DateTime/BasicCell.tsx
+++ b/src/components/fields/DateTime/DisplayCell.tsx
@@ -1,20 +1,24 @@
-import { IBasicCellProps } from "@src/components/fields/types";
+import { IDisplayCellProps } from "@src/components/fields/types";
 import { isFunction, isDate } from "lodash-es";
 import { format } from "date-fns";
 import { DATE_TIME_FORMAT } from "@src/constants/dates";
 
-export default function DateTime({
-  value,
-  format: formatProp,
-}: IBasicCellProps & { format?: string }) {
+export default function DateTime({ value, column }: IDisplayCellProps) {
   if ((!!value && isFunction(value.toDate)) || isDate(value)) {
     try {
       const formatted = format(
         isDate(value) ? value : value.toDate(),
-        formatProp || DATE_TIME_FORMAT
+        column.config?.format || DATE_TIME_FORMAT
       );
       return (
-        <span style={{ fontVariantNumeric: "tabular-nums" }}>{formatted}</span>
+        <div
+          style={{
+            fontVariantNumeric: "tabular-nums",
+            padding: "0 var(--cell-padding)",
+          }}
+        >
+          {formatted}
+        </div>
       );
     } catch (e) {
       return null;
diff --git a/src/components/fields/DateTime/TableCell.tsx b/src/components/fields/DateTime/EditorCell.tsx
similarity index 70%
rename from src/components/fields/DateTime/TableCell.tsx
rename to src/components/fields/DateTime/EditorCell.tsx
index 53439ff0..acf8ca69 100644
--- a/src/components/fields/DateTime/TableCell.tsx
+++ b/src/components/fields/DateTime/EditorCell.tsx
@@ -1,5 +1,5 @@
 import { useDebouncedCallback } from "use-debounce";
-import { IHeavyCellProps } from "@src/components/fields/types";
+import { IEditorCellProps } from "@src/components/fields/types";
 import { setSeconds } from "date-fns";
 
 import DateTimePicker from "@mui/lab/DateTimePicker";
@@ -11,34 +11,26 @@ import {
   sanitizeValue,
 } from "@src/components/fields/Date/utils";
 import { DATE_TIME_FORMAT } from "@src/constants/dates";
-import BasicCell from "./BasicCell";
 
 export default function DateTime({
   column,
   value,
   disabled,
+  onChange,
   onSubmit,
-}: IHeavyCellProps) {
+  tabIndex,
+}: IEditorCellProps) {
   const transformedValue = transformValue(value);
 
   const handleDateChange = useDebouncedCallback((date: Date | null) => {
     const sanitized = sanitizeValue(date);
     if (!sanitized) return; // Temp disable setting it to null
-    onSubmit(sanitized);
+    onChange(sanitized);
+    onSubmit();
   }, 500);
 
   const format = column.config?.format ?? DATE_TIME_FORMAT;
 
-  if (disabled)
-    return (
-      <BasicCell
-        value={transformedValue}
-        type={(column as any).type}
-        name={column.key}
-        format={format}
-      />
-    );
-
   return (
     <DateTimePicker
       renderInput={(props) => (
@@ -48,24 +40,21 @@ export default function DateTime({
           label=""
           hiddenLabel
           aria-label={column.name as string}
-          className="cell-collapse-padding"
           sx={{
             width: "100%",
             height: "100%",
 
-            "& .MuiInputBase-root": {
+            "&& .MuiInputBase-root": {
               height: "100%",
               font: "inherit", // Prevent text jumping
               letterSpacing: "inherit", // Prevent text jumping
 
-              ".rdg-cell &": {
-                background: "none !important",
-                boxShadow: "none",
-                borderRadius: 0,
-                padding: 0,
+              background: "none !important",
+              boxShadow: "none",
+              borderRadius: 0,
+              padding: 0,
 
-                "&::after": { width: "100%", left: 0 },
-              },
+              "&::after": { width: "100%", left: 0 },
             },
             "& .MuiInputBase-input": {
               height: "100%",
@@ -73,11 +62,9 @@ export default function DateTime({
               letterSpacing: "inherit", // Prevent text jumping
               fontVariantNumeric: "tabular-nums",
 
-              ".rdg-cell &": {
-                padding: "var(--cell-padding)",
-                pr: 0,
-                pb: 1 / 8,
-              },
+              padding: "0 var(--cell-padding)",
+              pr: 0,
+              pb: 1 / 8,
             },
             "& .MuiInputAdornment-root": { m: 0 },
           }}
@@ -86,22 +73,23 @@ export default function DateTime({
           onKeyDown={(e) => e.stopPropagation()}
           // Touch mode: make the whole field clickable
           onClick={props.inputProps?.onClick as any}
+          inputProps={{ ...props.inputProps, tabIndex }}
         />
       )}
       label={column.name}
       value={transformedValue}
       onChange={(date) => handleDateChange(date ? setSeconds(date, 0) : null)}
       inputFormat={format}
-      mask={format.replace(/[A-Za-z]/g, "_")}
       clearable
       OpenPickerButtonProps={{
         size: "small",
-        className: "row-hover-iconButton",
+        className: "row-hover-iconButton end",
         edge: false,
-        sx: { mr: 3 / 8, width: 32, height: 32 },
+        tabIndex,
       }}
       components={{ OpenPickerIcon: ChevronDown }}
       disableOpenPicker={false}
+      disabled={disabled}
     />
   );
 }
diff --git a/src/components/fields/DateTime/index.tsx b/src/components/fields/DateTime/index.tsx
index 880557a0..dade54b4 100644
--- a/src/components/fields/DateTime/index.tsx
+++ b/src/components/fields/DateTime/index.tsx
@@ -1,16 +1,15 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withHeavyCell from "@src/components/fields/_withTableCell/withHeavyCell";
+import withTableCell from "@src/components/Table/withTableCell";
 import { parseJSON, format } from "date-fns";
 import { DATE_TIME_FORMAT } from "@src/constants/dates";
 
 import DateTimeIcon from "@mui/icons-material/AccessTime";
-import BasicCell from "./BasicCell";
-import NullEditor from "@src/components/Table/editors/NullEditor";
+import DisplayCell from "./DisplayCell";
 import { filterOperators, valueFormatter } from "./filters";
 
-const TableCell = lazy(
-  () => import("./TableCell" /* webpackChunkName: "TableCell-DateTime" */)
+const EditorCell = lazy(
+  () => import("./EditorCell" /* webpackChunkName: "EditorCell-DateTime" */)
 );
 const SideDrawerField = lazy(
   () =>
@@ -37,8 +36,9 @@ export const config: IFieldConfig = {
   initializable: true,
   icon: <DateTimeIcon />,
   description: `Formatted date & time. Format is configurable, default: ${DATE_TIME_FORMAT}. Edited with a visual picker.`,
-  TableCell: withHeavyCell(BasicCell, TableCell),
-  TableEditor: NullEditor as any,
+  TableCell: withTableCell(DisplayCell, EditorCell, "inline", {
+    disablePadding: true,
+  }),
   SideDrawerField,
   filter: {
     operators: filterOperators,
diff --git a/src/components/fields/Derivative/index.tsx b/src/components/fields/Derivative/index.tsx
index a42f2f8c..f37897ed 100644
--- a/src/components/fields/Derivative/index.tsx
+++ b/src/components/fields/Derivative/index.tsx
@@ -1,9 +1,7 @@
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withBasicCell from "@src/components/fields/_withTableCell/withBasicCell";
+import withTableCell from "@src/components/Table/withTableCell";
 
 import { Derivative as DerivativeIcon } from "@src/assets/icons";
-import BasicCell from "@src/components/fields/_BasicCell/BasicCellNull";
-import NullEditor from "@src/components/Table/editors/NullEditor";
 import Settings, { settingsValidator } from "./Settings";
 import ContextMenuActions from "./ContextMenuActions";
 
@@ -17,9 +15,8 @@ export const config: IFieldConfig = {
   icon: <DerivativeIcon />,
   description:
     "Value derived from the rest of the row’s values. Displayed using any other field type. Requires Rowy Run set up.",
-  TableCell: withBasicCell(BasicCell),
-  TableEditor: NullEditor as any,
-  SideDrawerField: BasicCell as any,
+  TableCell: withTableCell(() => null, null),
+  SideDrawerField: () => null as any,
   contextMenuActions: ContextMenuActions,
   settings: Settings,
   settingsValidator,
diff --git a/src/components/fields/Duration/TableCell.tsx b/src/components/fields/Duration/DisplayCell.tsx
similarity index 67%
rename from src/components/fields/Duration/TableCell.tsx
rename to src/components/fields/Duration/DisplayCell.tsx
index 78be60c0..a5bade41 100644
--- a/src/components/fields/Duration/TableCell.tsx
+++ b/src/components/fields/Duration/DisplayCell.tsx
@@ -1,8 +1,8 @@
-import { IBasicCellProps } from "@src/components/fields/types";
+import { IDisplayCellProps } from "@src/components/fields/types";
 
 import { getDurationString } from "./utils";
 
-export default function Duration({ value }: IBasicCellProps) {
+export default function Duration({ value }: IDisplayCellProps) {
   if (
     !value ||
     !value.start ||
diff --git a/src/components/fields/Duration/index.tsx b/src/components/fields/Duration/index.tsx
index 92d42ef9..56f05132 100644
--- a/src/components/fields/Duration/index.tsx
+++ b/src/components/fields/Duration/index.tsx
@@ -1,14 +1,10 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withBasicCell from "@src/components/fields/_withTableCell/withBasicCell";
+import withTableCell from "@src/components/Table/withTableCell";
 
 import DurationIcon from "@mui/icons-material/TimerOutlined";
-import BasicCell from "@src/components/fields/_BasicCell/BasicCellNull";
-import withSideDrawerEditor from "@src/components/Table/editors/withSideDrawerEditor";
+import DisplayCell from "./DisplayCell";
 
-const TableCell = lazy(
-  () => import("./TableCell" /* webpackChunkName: "TableCell-Duration" */)
-);
 const SideDrawerField = lazy(
   () =>
     import(
@@ -24,8 +20,9 @@ export const config: IFieldConfig = {
   initialValue: {},
   icon: <DurationIcon />,
   description: "Duration calculated from two timestamps.",
-  TableCell: withBasicCell(TableCell),
-  TableEditor: withSideDrawerEditor(TableCell),
+  TableCell: withTableCell(DisplayCell, SideDrawerField, "popover", {
+    popoverProps: { PaperProps: { sx: { p: 1 } } },
+  }),
   SideDrawerField,
 };
 export default config;
diff --git a/src/components/fields/GeoPoint/TableCell.tsx b/src/components/fields/GeoPoint/DisplayCell.tsx
similarity index 90%
rename from src/components/fields/GeoPoint/TableCell.tsx
rename to src/components/fields/GeoPoint/DisplayCell.tsx
index 2e57a835..f452c3fc 100644
--- a/src/components/fields/GeoPoint/TableCell.tsx
+++ b/src/components/fields/GeoPoint/DisplayCell.tsx
@@ -1,7 +1,7 @@
-import { IBasicCellProps } from "@src/components/fields/types";
+import { IDisplayCellProps } from "@src/components/fields/types";
 import { Typography } from "@mui/material";
 
-export default function GeoPoint({ value }: IBasicCellProps) {
+export default function GeoPoint({ value }: IDisplayCellProps) {
   if (!value) return null;
   const { latitude, longitude } = value;
 
diff --git a/src/components/fields/GeoPoint/index.tsx b/src/components/fields/GeoPoint/index.tsx
index 21b898b1..481198f6 100644
--- a/src/components/fields/GeoPoint/index.tsx
+++ b/src/components/fields/GeoPoint/index.tsx
@@ -1,14 +1,11 @@
 import { lazy } from "react";
 import { GeoPoint } from "firebase/firestore";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withBasicCell from "@src/components/fields/_withTableCell/withBasicCell";
+import withTableCell from "@src/components/Table/withTableCell";
 
 import GeoPointIcon from "@mui/icons-material/PinDropOutlined";
-import withSideDrawerEditor from "@src/components/Table/editors/withSideDrawerEditor";
+import DisplayCell from "./DisplayCell";
 
-const TableCell = lazy(
-  () => import("./TableCell" /* webpackChunkName: "TableCell-GeoPoint" */)
-);
 const SideDrawerField = lazy(
   () =>
     import(
@@ -24,8 +21,9 @@ export const config: IFieldConfig = {
   initialValue: {},
   icon: <GeoPointIcon />,
   description: "Geo point is represented as latitude/longitude pair.",
-  TableCell: withBasicCell(TableCell),
-  TableEditor: withSideDrawerEditor(TableCell),
+  TableCell: withTableCell(DisplayCell, SideDrawerField, "popover", {
+    popoverProps: { PaperProps: { sx: { p: 1, pt: 0 } } },
+  }),
   SideDrawerField,
   csvImportParser: (value: string) => {
     try {
@@ -35,7 +33,7 @@ export const config: IFieldConfig = {
       }
       throw new Error();
     } catch (e) {
-      console.error("Invalid Geopoint value");
+      console.error("Invalid GeoPoint value");
       return null;
     }
   },
diff --git a/src/components/fields/Id/index.tsx b/src/components/fields/Id/index.tsx
index 757ed231..0b2a5b85 100644
--- a/src/components/fields/Id/index.tsx
+++ b/src/components/fields/Id/index.tsx
@@ -1,10 +1,14 @@
+import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
 import withTableCell from "@src/components/Table/withTableCell";
 
 import DisplayCell from "./DisplayCell";
-import SideDrawerField from "./SideDrawerField";
 import { Id as IdIcon } from "@src/assets/icons";
 
+const SideDrawerField = lazy(
+  () => import("./SideDrawerField" /* webpackChunkName: "SideDrawerField-Id" */)
+);
+
 export const config: IFieldConfig = {
   type: FieldType.id,
   name: "ID",
diff --git a/src/components/fields/Json/BasicCell.tsx b/src/components/fields/Json/DisplayCell.tsx
similarity index 66%
rename from src/components/fields/Json/BasicCell.tsx
rename to src/components/fields/Json/DisplayCell.tsx
index ababa833..82a1eea1 100644
--- a/src/components/fields/Json/BasicCell.tsx
+++ b/src/components/fields/Json/DisplayCell.tsx
@@ -1,21 +1,21 @@
 import stringify from "json-stable-stringify-without-jsonify";
-import { IBasicCellProps } from "@src/components/fields/types";
+import { IDisplayCellProps } from "@src/components/fields/types";
 
 import { useTheme } from "@mui/material";
 
-export default function Json({ value }: IBasicCellProps) {
+export default function Json({ value }: IDisplayCellProps) {
   const theme = useTheme();
 
   if (!value) return null;
 
-  const formattedJson = stringify(value, { space: 2 });
+  const formattedJson = stringify(value, { space: 2 }).substring(0, 1000);
 
   return (
     <div
       style={{
         width: "100%",
         maxHeight: "100%",
-        padding: theme.spacing(3 / 8, 0),
+        padding: theme.spacing(1, 0),
 
         whiteSpace: "pre-wrap",
         lineHeight: theme.typography.body2.lineHeight,
diff --git a/src/components/fields/Json/SideDrawerField.tsx b/src/components/fields/Json/SideDrawerField.tsx
index d6b15595..89ddbc1e 100644
--- a/src/components/fields/Json/SideDrawerField.tsx
+++ b/src/components/fields/Json/SideDrawerField.tsx
@@ -82,8 +82,14 @@ export default function Json({
         sx={{
           minHeight: 32,
           mt: -32 / 8,
+          ".MuiPopover-root &": { mt: 0 }, // Don’t have margins in popover cell
 
-          "& .MuiTabs-flexContainer": { justifyContent: "flex-end" },
+          "& .MuiTabs-flexContainer": {
+            justifyContent: "flex-end",
+            ".MuiPopover-root &": {
+              justifyContent: "center",
+            },
+          },
           "& .MuiTab-root": { minHeight: 32, py: 0 },
         }}
       >
diff --git a/src/components/fields/Json/index.tsx b/src/components/fields/Json/index.tsx
index 8981d877..a847f009 100644
--- a/src/components/fields/Json/index.tsx
+++ b/src/components/fields/Json/index.tsx
@@ -1,10 +1,9 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withBasicCell from "@src/components/fields/_withTableCell/withBasicCell";
+import withTableCell from "@src/components/Table/withTableCell";
 
 import { Json as JsonIcon } from "@src/assets/icons";
-import BasicCell from "./BasicCell";
-import withSideDrawerEditor from "@src/components/Table/editors/withSideDrawerEditor";
+import DisplayCell from "./DisplayCell";
 import ContextMenuActions from "./ContextMenuActions";
 
 const SideDrawerField = lazy(
@@ -25,8 +24,9 @@ export const config: IFieldConfig = {
   initializable: true,
   icon: <JsonIcon />,
   description: "Object edited with a visual JSON editor.",
-  TableCell: withBasicCell(BasicCell),
-  TableEditor: withSideDrawerEditor(BasicCell),
+  TableCell: withTableCell(DisplayCell, SideDrawerField, "popover", {
+    popoverProps: { PaperProps: { sx: { p: 1 } } },
+  }),
   csvImportParser: (value) => {
     try {
       return JSON.parse(value);
diff --git a/src/components/fields/LongText/index.tsx b/src/components/fields/LongText/index.tsx
index ef0ce27c..6685d26c 100644
--- a/src/components/fields/LongText/index.tsx
+++ b/src/components/fields/LongText/index.tsx
@@ -5,11 +5,16 @@ import withTableCell from "@src/components/Table/withTableCell";
 import LongTextIcon from "@mui/icons-material/Notes";
 import DisplayCell from "./DisplayCell";
 import EditorCell from "./EditorCell";
-import SideDrawerField from "./SideDrawerField";
 
 import { filterOperators } from "./Filter";
 import BasicContextMenuActions from "@src/components/fields/_BasicCell/BasicCellContextMenuActions";
 
+const SideDrawerField = lazy(
+  () =>
+    import(
+      "./SideDrawerField" /* webpackChunkName: "SideDrawerField-LongText" */
+    )
+);
 const Settings = lazy(
   () => import("./Settings" /* webpackChunkName: "Settings-LongText" */)
 );
diff --git a/src/components/fields/Markdown/BasicCell.tsx b/src/components/fields/Markdown/DisplayCell.tsx
similarity index 75%
rename from src/components/fields/Markdown/BasicCell.tsx
rename to src/components/fields/Markdown/DisplayCell.tsx
index 37e825c1..8fe5d93f 100644
--- a/src/components/fields/Markdown/BasicCell.tsx
+++ b/src/components/fields/Markdown/DisplayCell.tsx
@@ -1,10 +1,10 @@
-import { IBasicCellProps } from "@src/components/fields/types";
+import { IDisplayCellProps } from "@src/components/fields/types";
 
 import { useTheme } from "@mui/material";
 
 import MDEditor from "@uiw/react-md-editor";
 
-export default function Markdown({ value }: IBasicCellProps) {
+export default function Markdown({ value }: IDisplayCellProps) {
   const theme = useTheme();
 
   if (!value || typeof value !== "string") return null;
diff --git a/src/components/fields/Markdown/SideDrawerField.tsx b/src/components/fields/Markdown/SideDrawerField.tsx
index 815c539d..2b51d9b1 100644
--- a/src/components/fields/Markdown/SideDrawerField.tsx
+++ b/src/components/fields/Markdown/SideDrawerField.tsx
@@ -34,7 +34,7 @@ export default function Markdown({
         {
           display: "block",
           padding: 0,
-          "& .wmde-markdown-var": { boxShadow: "none" },
+          "& .wmde-markdown-var": { boxShadow: (fieldSx as any)?.boxShadow },
         },
       ]}
       data-color-mode={theme.palette.mode}
diff --git a/src/components/fields/Markdown/index.tsx b/src/components/fields/Markdown/index.tsx
index 6053f093..23776019 100644
--- a/src/components/fields/Markdown/index.tsx
+++ b/src/components/fields/Markdown/index.tsx
@@ -1,10 +1,9 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withBasicCell from "@src/components/fields/_withTableCell/withBasicCell";
+import withTableCell from "@src/components/Table/withTableCell";
 
 import { Markdown as MarkdownIcon } from "@src/assets/icons";
-import BasicCell from "./BasicCell";
-import withSideDrawerEditor from "@src/components/Table/editors/withSideDrawerEditor";
+import DisplayCell from "./DisplayCell";
 
 const SideDrawerField = lazy(
   () =>
@@ -22,8 +21,7 @@ export const config: IFieldConfig = {
   initializable: true,
   icon: <MarkdownIcon />,
   description: "Markdown editor with preview",
-  TableCell: withBasicCell(BasicCell),
-  TableEditor: withSideDrawerEditor(BasicCell),
+  TableCell: withTableCell(DisplayCell, SideDrawerField, "popover"),
   SideDrawerField,
 };
 export default config;
diff --git a/src/components/fields/MultiSelect/DisplayCell.tsx b/src/components/fields/MultiSelect/DisplayCell.tsx
index 91bcee84..eb5e8267 100644
--- a/src/components/fields/MultiSelect/DisplayCell.tsx
+++ b/src/components/fields/MultiSelect/DisplayCell.tsx
@@ -1,6 +1,6 @@
 import { IDisplayCellProps } from "@src/components/fields/types";
 
-import { ButtonBase, Grid } from "@mui/material";
+import { ButtonBase, Grid, Tooltip } from "@mui/material";
 import WarningIcon from "@mui/icons-material/WarningAmber";
 import { ChevronDown } from "@src/assets/icons";
 
@@ -14,13 +14,33 @@ export default function MultiSelect({
   disabled,
   tabIndex,
 }: IDisplayCellProps) {
-  // if (typeof value === "string" && value !== "")
-  // return <ConvertStringToArray value={value} onSubmit={onSubmit} />;
+  const rendered =
+    typeof value === "string" && value !== "" ? (
+      <div style={{ flexGrow: 1, paddingLeft: "var(--cell-padding)" }}>
+        <Tooltip title="This cell’s value is a string and needs to be converted to an array">
+          <WarningIcon color="action" style={{ verticalAlign: "middle" }} />
+        </Tooltip>
+        &nbsp;
+        {value}
+      </div>
+    ) : (
+      <ChipList>
+        {sanitiseValue(value).map(
+          (item) =>
+            typeof item === "string" && (
+              <Grid item key={item}>
+                <FormattedChip label={item} />
+              </Grid>
+            )
+        )}
+      </ChipList>
+    );
+
+  if (disabled) return rendered;
 
   return (
     <ButtonBase
       onClick={() => showPopoverCell(true)}
-      disabled={disabled}
       style={{
         width: "100%",
         height: "100%",
@@ -32,26 +52,8 @@ export default function MultiSelect({
       }}
       tabIndex={tabIndex}
     >
-      {typeof value === "string" && value !== "" ? (
-        <div style={{ flexGrow: 1, paddingLeft: "var(--cell-padding)" }}>
-          <WarningIcon color="action" style={{ verticalAlign: "middle" }} />
-          &nbsp;
-          {value}
-        </div>
-      ) : (
-        <ChipList>
-          {sanitiseValue(value).map(
-            (item) =>
-              typeof item === "string" && (
-                <Grid item key={item}>
-                  <FormattedChip label={item} />
-                </Grid>
-              )
-          )}
-        </ChipList>
-      )}
-
-      {!disabled && <ChevronDown className="row-hover-iconButton end" />}
+      {rendered}
+      <ChevronDown className="row-hover-iconButton end" />
     </ButtonBase>
   );
 }
diff --git a/src/components/fields/MultiSelect/PopoverCell.tsx b/src/components/fields/MultiSelect/EditorCell.tsx
similarity index 86%
rename from src/components/fields/MultiSelect/PopoverCell.tsx
rename to src/components/fields/MultiSelect/EditorCell.tsx
index c96f5746..46fa6837 100644
--- a/src/components/fields/MultiSelect/PopoverCell.tsx
+++ b/src/components/fields/MultiSelect/EditorCell.tsx
@@ -57,8 +57,11 @@ export default function MultiSelect({
           open: true,
           MenuProps: {
             anchorEl: parentRef,
-            anchorOrigin: { vertical: "bottom", horizontal: "left" },
-            transformOrigin: { vertical: "top", horizontal: "left" },
+            anchorOrigin: { vertical: "bottom", horizontal: "center" },
+            transformOrigin: { vertical: "top", horizontal: "center" },
+            sx: {
+              "& .MuiPaper-root": { minWidth: `${column.width}px !important` },
+            },
           },
         },
       }}
diff --git a/src/components/fields/MultiSelect/SideDrawerField.tsx b/src/components/fields/MultiSelect/SideDrawerField.tsx
index 2716e34c..99c260be 100644
--- a/src/components/fields/MultiSelect/SideDrawerField.tsx
+++ b/src/components/fields/MultiSelect/SideDrawerField.tsx
@@ -1,6 +1,6 @@
 import { ISideDrawerFieldProps } from "@src/components/fields/types";
 
-import { Grid, Button } from "@mui/material";
+import { Grid, Button, Tooltip } from "@mui/material";
 import WarningIcon from "@mui/icons-material/WarningAmber";
 import MultiSelectComponent from "@rowy/multiselect";
 import FormattedChip from "@src/components/FormattedChip";
@@ -28,7 +28,9 @@ export default function MultiSelect({
     return (
       <Grid container wrap="nowrap" gap={1}>
         <Grid item xs sx={fieldSx}>
-          <WarningIcon color="action" style={{ verticalAlign: "middle" }} />
+          <Tooltip title="This cell’s value is a string and needs to be converted to an array">
+            <WarningIcon color="action" style={{ verticalAlign: "middle" }} />
+          </Tooltip>
           &nbsp;{value}
         </Grid>
         <Grid item>
@@ -38,6 +40,7 @@ export default function MultiSelect({
               onChange([value]);
               onSubmit();
             }}
+            disabled={disabled}
           >
             Convert to array
           </Button>
diff --git a/src/components/fields/MultiSelect/index.tsx b/src/components/fields/MultiSelect/index.tsx
index d5a18ed5..cdda43c0 100644
--- a/src/components/fields/MultiSelect/index.tsx
+++ b/src/components/fields/MultiSelect/index.tsx
@@ -4,11 +4,10 @@ import withTableCell from "@src/components/Table/withTableCell";
 
 import { MultiSelect as MultiSelectIcon } from "@src/assets/icons";
 import DisplayCell from "./DisplayCell";
-import NullEditor from "@src/components/Table/editors/NullEditor";
 import { filterOperators } from "./Filter";
-const PopoverCell = lazy(
-  () =>
-    import("./PopoverCell" /* webpackChunkName: "PopoverCell-MultiSelect" */)
+
+const EditorCell = lazy(
+  () => import("./EditorCell" /* webpackChunkName: "EditorCell-MultiSelect" */)
 );
 const SideDrawerField = lazy(
   () =>
@@ -33,10 +32,10 @@ export const config: IFieldConfig = {
   icon: <MultiSelectIcon />,
   description:
     "Multiple values from predefined options. Options are searchable and users can optionally input custom values.",
-  TableCell: withTableCell(DisplayCell, PopoverCell, "popover", {
+  TableCell: withTableCell(DisplayCell, EditorCell, "popover", {
     disablePadding: true,
+    transparentPopover: true,
   }),
-  TableEditor: NullEditor as any,
   SideDrawerField,
   settings: Settings,
   csvImportParser: (v) => {
diff --git a/src/components/fields/RichText/DisplayCell.tsx b/src/components/fields/RichText/DisplayCell.tsx
new file mode 100644
index 00000000..0513e198
--- /dev/null
+++ b/src/components/fields/RichText/DisplayCell.tsx
@@ -0,0 +1,101 @@
+import { IDisplayCellProps } from "@src/components/fields/types";
+// import { useAtom } from "jotai";
+
+import {
+  // styled,
+  useTheme,
+  // Tooltip,
+  // TooltipProps,
+  // tooltipClasses,
+  // Fade,
+} from "@mui/material";
+import RenderedHtml from "@src/components/RenderedHtml";
+
+// import { tableScope, tableSchemaAtom } from "@src/atoms/tableScope";
+// import { DEFAULT_ROW_HEIGHT } from "@src/components/Table";
+
+// type StylesProps = { width: number; rowHeight: number };
+
+// const StyledTooltip = styled(
+//   ({ className, width, rowHeight, ...props }: TooltipProps & StylesProps) => (
+//     <Tooltip {...props} classes={{ popper: className }} />
+//   )
+// )(({ theme, width, rowHeight }) => ({
+//   [`& .${tooltipClasses.tooltip}`]: {
+//     margin: 0,
+//     marginTop: `-${rowHeight - 1}px !important`,
+//     padding: theme.spacing(3 / 8, 1.25),
+
+//     width: width - 1,
+//     maxWidth: "none",
+//     minHeight: rowHeight - 1,
+//     overflowX: "hidden",
+
+//     background: theme.palette.background.paper,
+//     borderRadius: 0,
+//     boxShadow: `0 0 0 1px ${theme.palette.divider}, ${theme.shadows[4]}`,
+//     color: theme.palette.text.primary,
+
+//     display: "flex",
+//     alignItems: "center",
+//   },
+// }));
+
+export default function RichText({ column, value }: IDisplayCellProps) {
+  // const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
+
+  const theme = useTheme();
+
+  if (!value) return null;
+
+  const content = (
+    <RenderedHtml
+      html={value}
+      style={{
+        maxHeight: "100%",
+        whiteSpace: "normal",
+
+        ...theme.typography.body2,
+        fontSize: "0.75rem",
+        lineHeight: theme.typography.body2.lineHeight,
+      }}
+    />
+  );
+
+  // temp disable tooltip, which causes performance issues
+  return content;
+
+  // return (
+  //   <StyledTooltip
+  //     title={content}
+  //     enterDelay={1000}
+  //     placement="bottom-start"
+  //     PopperProps={{
+  //       modifiers: [
+  //         { name: "flip", enabled: false },
+  //         { name: "preventOverflow", enabled: false },
+  //         { name: "hide", enabled: false },
+  //       ],
+  //     }}
+  //     TransitionComponent={Fade}
+  //     width={column.width as number}
+  //     rowHeight={tableSchema.rowHeight ?? DEFAULT_ROW_HEIGHT}
+  //   >
+  //     <div
+  //       className="cell-collapse-padding"
+  //       style={{
+  //         width: "100%",
+  //         padding: theme.spacing(3 / 8, 1.25),
+  //         position: "absolute",
+  //         top: 0,
+  //         bottom: 0,
+
+  //         display: "flex",
+  //         alignItems: "center",
+  //       }}
+  //     >
+  //       {content}
+  //     </div>
+  //   </StyledTooltip>
+  // );
+}
diff --git a/src/components/fields/RichText/TableCell.tsx b/src/components/fields/RichText/TableCell.tsx
deleted file mode 100644
index 354a9a76..00000000
--- a/src/components/fields/RichText/TableCell.tsx
+++ /dev/null
@@ -1,98 +0,0 @@
-import { IHeavyCellProps } from "@src/components/fields/types";
-import { useAtom } from "jotai";
-
-import {
-  styled,
-  useTheme,
-  Tooltip,
-  TooltipProps,
-  tooltipClasses,
-  Fade,
-} from "@mui/material";
-import RenderedHtml from "@src/components/RenderedHtml";
-
-import { tableScope, tableSchemaAtom } from "@src/atoms/tableScope";
-import { DEFAULT_ROW_HEIGHT } from "@src/components/Table";
-
-type StylesProps = { width: number; rowHeight: number };
-
-const StyledTooltip = styled(
-  ({ className, width, rowHeight, ...props }: TooltipProps & StylesProps) => (
-    <Tooltip {...props} classes={{ popper: className }} />
-  )
-)(({ theme, width, rowHeight }) => ({
-  [`& .${tooltipClasses.tooltip}`]: {
-    margin: 0,
-    marginTop: `-${rowHeight - 1}px !important`,
-    padding: theme.spacing(3 / 8, 1.25),
-
-    width: width - 1,
-    maxWidth: "none",
-    minHeight: rowHeight - 1,
-    overflowX: "hidden",
-
-    background: theme.palette.background.paper,
-    borderRadius: 0,
-    boxShadow: `0 0 0 1px ${theme.palette.divider}, ${theme.shadows[4]}`,
-    color: theme.palette.text.primary,
-
-    display: "flex",
-    alignItems: "center",
-  },
-}));
-
-export default function RichText({ column, value }: IHeavyCellProps) {
-  const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
-
-  const theme = useTheme();
-
-  if (!value) return null;
-
-  const content = (
-    <RenderedHtml
-      html={value}
-      style={{
-        maxHeight: "100%",
-        whiteSpace: "normal",
-
-        ...theme.typography.body2,
-        fontSize: "0.75rem",
-        lineHeight: theme.typography.body2.lineHeight,
-      }}
-    />
-  );
-
-  return (
-    <StyledTooltip
-      title={content}
-      enterDelay={1000}
-      placement="bottom-start"
-      PopperProps={{
-        modifiers: [
-          { name: "flip", enabled: false },
-          { name: "preventOverflow", enabled: false },
-          { name: "hide", enabled: false },
-        ],
-      }}
-      TransitionComponent={Fade}
-      width={column.width as number}
-      rowHeight={tableSchema.rowHeight ?? DEFAULT_ROW_HEIGHT}
-    >
-      <div
-        className="cell-collapse-padding"
-        style={{
-          width: "100%",
-          padding: theme.spacing(3 / 8, 1.25),
-          position: "absolute",
-          top: 0,
-          bottom: 0,
-
-          display: "flex",
-          alignItems: "center",
-        }}
-      >
-        {content}
-      </div>
-    </StyledTooltip>
-  );
-}
diff --git a/src/components/fields/RichText/index.tsx b/src/components/fields/RichText/index.tsx
index 890f1d68..80202a98 100644
--- a/src/components/fields/RichText/index.tsx
+++ b/src/components/fields/RichText/index.tsx
@@ -1,15 +1,11 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withHeavyCell from "@src/components/fields/_withTableCell/withHeavyCell";
+import withTableCell from "@src/components/Table/withTableCell";
 
 import RichTextIcon from "@mui/icons-material/TextFormat";
-import BasicCell from "@src/components/fields/_BasicCell/BasicCellNull";
-import withSideDrawerEditor from "@src/components/Table/editors/withSideDrawerEditor";
+import DisplayCell from "./DisplayCell";
 import BasicContextMenuActions from "@src/components/fields/_BasicCell/BasicCellContextMenuActions";
 
-const TableCell = lazy(
-  () => import("./TableCell" /* webpackChunkName: "TableCell-RichText" */)
-);
 const SideDrawerField = lazy(
   () =>
     import(
@@ -27,8 +23,7 @@ export const config: IFieldConfig = {
   icon: <RichTextIcon />,
   description: "HTML edited with a rich text editor.",
   contextMenuActions: BasicContextMenuActions,
-  TableCell: withHeavyCell(BasicCell, TableCell),
-  TableEditor: withSideDrawerEditor(TableCell),
+  TableCell: withTableCell(DisplayCell, SideDrawerField, "popover"),
   SideDrawerField,
 };
 export default config;
diff --git a/src/components/fields/Slider/TableCell.tsx b/src/components/fields/Slider/DisplayCell.tsx
similarity index 89%
rename from src/components/fields/Slider/TableCell.tsx
rename to src/components/fields/Slider/DisplayCell.tsx
index 80699449..ae8cc736 100644
--- a/src/components/fields/Slider/TableCell.tsx
+++ b/src/components/fields/Slider/DisplayCell.tsx
@@ -1,10 +1,10 @@
-import { IHeavyCellProps } from "@src/components/fields/types";
+import { IDisplayCellProps } from "@src/components/fields/types";
 
 import { Grid, Box } from "@mui/material";
 
 import { resultColorsScale } from "@src/utils/color";
 
-export default function Slider({ column, value }: IHeavyCellProps) {
+export default function Slider({ column, value }: IDisplayCellProps) {
   const {
     max,
     min,
diff --git a/src/components/fields/Slider/index.tsx b/src/components/fields/Slider/index.tsx
index 80816fdf..6d21dc9d 100644
--- a/src/components/fields/Slider/index.tsx
+++ b/src/components/fields/Slider/index.tsx
@@ -1,15 +1,11 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withHeavyCell from "@src/components/fields/_withTableCell/withHeavyCell";
+import withTableCell from "@src/components/Table/withTableCell";
 
 import { Slider as SliderIcon } from "@src/assets/icons";
-import BasicCell from "@src/components/fields/_BasicCell/BasicCellNull";
-import withSideDrawerEditor from "@src/components/Table/editors/withSideDrawerEditor";
+import DisplayCell from "./DisplayCell";
 import { filterOperators } from "@src/components/fields/Number/Filter";
 
-const TableCell = lazy(
-  () => import("./TableCell" /* webpackChunkName: "TableCell-Slider" */)
-);
 const SideDrawerField = lazy(
   () =>
     import("./SideDrawerField" /* webpackChunkName: "SideDrawerField-Slider" */)
@@ -28,8 +24,9 @@ export const config: IFieldConfig = {
   icon: <SliderIcon />,
   requireConfiguration: true,
   description: "Numeric value edited with a Slider. Range is configurable.",
-  TableCell: withHeavyCell(BasicCell, TableCell),
-  TableEditor: withSideDrawerEditor(TableCell),
+  TableCell: withTableCell(DisplayCell, SideDrawerField, "popover", {
+    popoverProps: { PaperProps: { sx: { p: 1, pt: 5 } } },
+  }),
   settings: Settings,
   filter: {
     operators: filterOperators,
diff --git a/src/components/fields/UpdatedAt/TableCell.tsx b/src/components/fields/UpdatedAt/DisplayCell.tsx
similarity index 70%
rename from src/components/fields/UpdatedAt/TableCell.tsx
rename to src/components/fields/UpdatedAt/DisplayCell.tsx
index 52417bce..c6b29d9a 100644
--- a/src/components/fields/UpdatedAt/TableCell.tsx
+++ b/src/components/fields/UpdatedAt/DisplayCell.tsx
@@ -1,9 +1,9 @@
-import { IHeavyCellProps } from "@src/components/fields/types";
+import { IDisplayCellProps } from "@src/components/fields/types";
 
 import { format } from "date-fns";
 import { DATE_TIME_FORMAT } from "@src/constants/dates";
 
-export default function UpdatedAt({ column, value }: IHeavyCellProps) {
+export default function UpdatedAt({ column, value }: IDisplayCellProps) {
   if (!value) return null;
   const dateLabel = format(
     value.toDate ? value.toDate() : value,
diff --git a/src/components/fields/UpdatedAt/index.tsx b/src/components/fields/UpdatedAt/index.tsx
index 3c2c3f28..9b7476eb 100644
--- a/src/components/fields/UpdatedAt/index.tsx
+++ b/src/components/fields/UpdatedAt/index.tsx
@@ -1,14 +1,10 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withHeavyCell from "@src/components/fields/_withTableCell/withHeavyCell";
+import withTableCell from "@src/components/Table/withTableCell";
 
 import { UpdatedAt as UpdatedAtIcon } from "@src/assets/icons";
-import BasicCell from "@src/components/fields/_BasicCell/BasicCellNull";
-import withSideDrawerEditor from "@src/components/Table/editors/withSideDrawerEditor";
+import DisplayCell from "./DisplayCell";
 
-const TableCell = lazy(
-  () => import("./TableCell" /* webpackChunkName: "TableCell-UpdatedAt" */)
-);
 const SideDrawerField = lazy(
   () =>
     import(
@@ -29,8 +25,7 @@ export const config: IFieldConfig = {
   icon: <UpdatedAtIcon />,
   description:
     "Displays the timestamp of the last update to the row. Read-only.",
-  TableCell: withHeavyCell(BasicCell, TableCell),
-  TableEditor: withSideDrawerEditor(TableCell),
+  TableCell: withTableCell(DisplayCell, null),
   SideDrawerField,
   settings: Settings,
 };
diff --git a/src/components/fields/UpdatedBy/TableCell.tsx b/src/components/fields/UpdatedBy/DisplayCell.tsx
similarity index 87%
rename from src/components/fields/UpdatedBy/TableCell.tsx
rename to src/components/fields/UpdatedBy/DisplayCell.tsx
index 5484626f..1bf71be3 100644
--- a/src/components/fields/UpdatedBy/TableCell.tsx
+++ b/src/components/fields/UpdatedBy/DisplayCell.tsx
@@ -1,11 +1,11 @@
-import { IHeavyCellProps } from "@src/components/fields/types";
+import { IDisplayCellProps } from "@src/components/fields/types";
 
 import { Tooltip, Stack, Avatar } from "@mui/material";
 
 import { format } from "date-fns";
 import { DATE_TIME_FORMAT } from "@src/constants/dates";
 
-export default function UpdatedBy({ column, value }: IHeavyCellProps) {
+export default function UpdatedBy({ column, value }: IDisplayCellProps) {
   if (!value || !value.displayName || !value.timestamp) return null;
   const dateLabel = format(
     value.timestamp.toDate ? value.timestamp.toDate() : value.timestamp,
diff --git a/src/components/fields/UpdatedBy/index.tsx b/src/components/fields/UpdatedBy/index.tsx
index 09ca1e2f..5ddfb877 100644
--- a/src/components/fields/UpdatedBy/index.tsx
+++ b/src/components/fields/UpdatedBy/index.tsx
@@ -1,14 +1,10 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withHeavyCell from "@src/components/fields/_withTableCell/withHeavyCell";
+import withTableCell from "@src/components/Table/withTableCell";
 
 import { UpdatedBy as UpdatedByIcon } from "@src/assets/icons";
-import BasicCell from "@src/components/fields/_BasicCell/BasicCellNull";
-import withSideDrawerEditor from "@src/components/Table/editors/withSideDrawerEditor";
+import DisplayCell from "./DisplayCell";
 
-const TableCell = lazy(
-  () => import("./TableCell" /* webpackChunkName: "TableCell-UpdatedBy" */)
-);
 const SideDrawerField = lazy(
   () =>
     import(
@@ -30,8 +26,7 @@ export const config: IFieldConfig = {
   icon: <UpdatedByIcon />,
   description:
     "Displays the user that last updated the row, timestamp, and updated field key. Read-only.",
-  TableCell: withHeavyCell(BasicCell, TableCell),
-  TableEditor: withSideDrawerEditor(TableCell),
+  TableCell: withTableCell(DisplayCell, null),
   SideDrawerField,
   settings: Settings,
 };
diff --git a/src/components/fields/User/TableCell.tsx b/src/components/fields/User/DisplayCell.tsx
similarity index 83%
rename from src/components/fields/User/TableCell.tsx
rename to src/components/fields/User/DisplayCell.tsx
index e1761826..d299b6c5 100644
--- a/src/components/fields/User/TableCell.tsx
+++ b/src/components/fields/User/DisplayCell.tsx
@@ -1,11 +1,11 @@
-import { IHeavyCellProps } from "@src/components/fields/types";
+import { IDisplayCellProps } from "@src/components/fields/types";
 
 import { Tooltip, Stack, Avatar } from "@mui/material";
 
 import { format } from "date-fns";
 import { DATE_TIME_FORMAT } from "@src/constants/dates";
 
-export default function User({ value, column }: IHeavyCellProps) {
+export default function User({ value, column }: IDisplayCellProps) {
   if (!value || !value.displayName) return null;
 
   const chip = (
diff --git a/src/components/fields/User/index.tsx b/src/components/fields/User/index.tsx
index 70ec0a83..29f996d8 100644
--- a/src/components/fields/User/index.tsx
+++ b/src/components/fields/User/index.tsx
@@ -1,14 +1,10 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withHeavyCell from "@src/components/fields/_withTableCell/withHeavyCell";
+import withTableCell from "@src/components/Table/withTableCell";
 
 import UserIcon from "@mui/icons-material/PersonOutlined";
-import BasicCell from "@src/components/fields/_BasicCell/BasicCellNull";
-import withSideDrawerEditor from "@src/components/Table/editors/withSideDrawerEditor";
+import DisplayCell from "./DisplayCell";
 
-const TableCell = lazy(
-  () => import("./TableCell" /* webpackChunkName: "TableCell-User" */)
-);
 const SideDrawerField = lazy(
   () =>
     import("./SideDrawerField" /* webpackChunkName: "SideDrawerField-User" */)
@@ -27,8 +23,7 @@ export const config: IFieldConfig = {
   initialValue: null,
   icon: <UserIcon />,
   description: "User information and optionally, timestamp. Read-only.",
-  TableCell: withHeavyCell(BasicCell, TableCell),
-  TableEditor: withSideDrawerEditor(TableCell),
+  TableCell: withTableCell(DisplayCell, null),
   SideDrawerField,
   settings: Settings,
 };
diff --git a/src/types/json-stable-stringify-without-jsonify.d.ts b/src/types/json-stable-stringify-without-jsonify.d.ts
index 3e1639a6..a0f5dc4b 100644
--- a/src/types/json-stable-stringify-without-jsonify.d.ts
+++ b/src/types/json-stable-stringify-without-jsonify.d.ts
@@ -1,4 +1,4 @@
 declare module "json-stable-stringify-without-jsonify" {
-  const stringify: any;
+  const stringify: (...args: any) => string;
   export default stringify;
 }

From 26ea9abaf4312ee516bed8f9fff99c5dfa5f2d0d Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Fri, 11 Nov 2022 14:20:53 +1100
Subject: [PATCH 248/309] fix rendered rich text & markdown being tab-able

---
 src/components/fields/Markdown/DisplayCell.tsx | 4 +++-
 src/components/fields/RichText/DisplayCell.tsx | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/fields/Markdown/DisplayCell.tsx b/src/components/fields/Markdown/DisplayCell.tsx
index 8fe5d93f..9bf4c028 100644
--- a/src/components/fields/Markdown/DisplayCell.tsx
+++ b/src/components/fields/Markdown/DisplayCell.tsx
@@ -4,7 +4,7 @@ import { useTheme } from "@mui/material";
 
 import MDEditor from "@uiw/react-md-editor";
 
-export default function Markdown({ value }: IDisplayCellProps) {
+export default function Markdown({ value, tabIndex }: IDisplayCellProps) {
   const theme = useTheme();
 
   if (!value || typeof value !== "string") return null;
@@ -13,6 +13,8 @@ export default function Markdown({ value }: IDisplayCellProps) {
     <div
       data-color-mode={theme.palette.mode}
       style={{ height: "100%", overflow: "hidden", whiteSpace: "normal" }}
+      // Prevent user tabbing into any rendered links
+      {...({ inert: tabIndex === -1 ? "inert" : undefined } as any)}
     >
       <MDEditor.Markdown source={value.slice(0, 240)} />
     </div>
diff --git a/src/components/fields/RichText/DisplayCell.tsx b/src/components/fields/RichText/DisplayCell.tsx
index 0513e198..aceb4d5d 100644
--- a/src/components/fields/RichText/DisplayCell.tsx
+++ b/src/components/fields/RichText/DisplayCell.tsx
@@ -41,7 +41,7 @@ import RenderedHtml from "@src/components/RenderedHtml";
 //   },
 // }));
 
-export default function RichText({ column, value }: IDisplayCellProps) {
+export default function RichText({ value, tabIndex }: IDisplayCellProps) {
   // const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
 
   const theme = useTheme();
@@ -59,6 +59,8 @@ export default function RichText({ column, value }: IDisplayCellProps) {
         fontSize: "0.75rem",
         lineHeight: theme.typography.body2.lineHeight,
       }}
+      // Prevent user tabbing into any rendered links
+      {...({ inert: tabIndex === -1 ? "inert" : undefined } as any)}
     />
   );
 

From 742a992098e6554cbc2644bc644712bfe394a23a Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Fri, 11 Nov 2022 14:59:07 +1100
Subject: [PATCH 249/309] fix date fields render loop

---
 src/components/fields/Date/EditorCell.tsx     | 7 ++-----
 src/components/fields/Date/index.tsx          | 2 +-
 src/components/fields/DateTime/EditorCell.tsx | 6 ++----
 src/components/fields/DateTime/index.tsx      | 2 +-
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/components/fields/Date/EditorCell.tsx b/src/components/fields/Date/EditorCell.tsx
index 2b9523ed..56de95c1 100644
--- a/src/components/fields/Date/EditorCell.tsx
+++ b/src/components/fields/Date/EditorCell.tsx
@@ -63,11 +63,7 @@ export default function Date_({
             },
             "& .MuiInputAdornment-root": { m: 0 },
           }}
-          // Prevent react-data-grid showing NullEditor, which unmounts this field
-          onDoubleClick={(e) => e.stopPropagation()}
-          onKeyDown={(e) => e.stopPropagation()}
-          // Touch mode: make the whole field clickable
-          onClick={props.inputProps?.onClick as any}
+          onClick={(e) => e.stopPropagation()}
           inputProps={{ ...props.inputProps, tabIndex }}
         />
       )}
@@ -86,6 +82,7 @@ export default function Date_({
       components={{ OpenPickerIcon: ChevronDown }}
       disableOpenPicker={false}
       disabled={disabled}
+      PopperProps={{ onClick: (e) => e.stopPropagation() }}
     />
   );
 }
diff --git a/src/components/fields/Date/index.tsx b/src/components/fields/Date/index.tsx
index fdc634d0..1ff9b01a 100644
--- a/src/components/fields/Date/index.tsx
+++ b/src/components/fields/Date/index.tsx
@@ -28,7 +28,7 @@ export const config: IFieldConfig = {
   initializable: true,
   icon: <DateIcon />,
   description: `Formatted date. Format is configurable, default: ${DATE_FORMAT}. Edited with a visual picker.`,
-  TableCell: withTableCell(DisplayCell, EditorCell, "inline", {
+  TableCell: withTableCell(DisplayCell, EditorCell, "focus", {
     disablePadding: true,
   }),
   SideDrawerField,
diff --git a/src/components/fields/DateTime/EditorCell.tsx b/src/components/fields/DateTime/EditorCell.tsx
index acf8ca69..5a8cf2f1 100644
--- a/src/components/fields/DateTime/EditorCell.tsx
+++ b/src/components/fields/DateTime/EditorCell.tsx
@@ -68,11 +68,8 @@ export default function DateTime({
             },
             "& .MuiInputAdornment-root": { m: 0 },
           }}
-          // Prevent react-data-grid showing NullEditor, which unmounts this field
-          onDoubleClick={(e) => e.stopPropagation()}
           onKeyDown={(e) => e.stopPropagation()}
-          // Touch mode: make the whole field clickable
-          onClick={props.inputProps?.onClick as any}
+          onClick={(e) => e.stopPropagation()}
           inputProps={{ ...props.inputProps, tabIndex }}
         />
       )}
@@ -90,6 +87,7 @@ export default function DateTime({
       components={{ OpenPickerIcon: ChevronDown }}
       disableOpenPicker={false}
       disabled={disabled}
+      PopperProps={{ onClick: (e) => e.stopPropagation() }}
     />
   );
 }
diff --git a/src/components/fields/DateTime/index.tsx b/src/components/fields/DateTime/index.tsx
index dade54b4..cc247b97 100644
--- a/src/components/fields/DateTime/index.tsx
+++ b/src/components/fields/DateTime/index.tsx
@@ -36,7 +36,7 @@ export const config: IFieldConfig = {
   initializable: true,
   icon: <DateTimeIcon />,
   description: `Formatted date & time. Format is configurable, default: ${DATE_TIME_FORMAT}. Edited with a visual picker.`,
-  TableCell: withTableCell(DisplayCell, EditorCell, "inline", {
+  TableCell: withTableCell(DisplayCell, EditorCell, "focus", {
     disablePadding: true,
   }),
   SideDrawerField,

From f9656e2c4ed63954e9d129dcefa649f2324d7a6d Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Fri, 11 Nov 2022 15:49:47 +1100
Subject: [PATCH 250/309] migrate all remaining fields

---
 src/components/Table/Table.tsx                |  25 +-
 src/components/Table/TableContainer.tsx       | 252 ------------------
 src/components/fields/File/DisplayCell.tsx    |  36 +++
 .../File/{TableCell.tsx => EditorCell.tsx}    |  28 +-
 src/components/fields/File/index.tsx          |  14 +-
 src/components/fields/Image/DisplayCell.tsx   | 113 ++++++++
 .../Image/{TableCell.tsx => EditorCell.tsx}   | 184 ++++---------
 src/components/fields/Image/index.tsx         |  14 +-
 src/components/fields/Rating/DisplayCell.tsx  |  68 +++++
 src/components/fields/Rating/EditorCell.tsx   |  27 ++
 .../fields/Rating/SideDrawerField.tsx         |   3 +-
 src/components/fields/Rating/TableCell.tsx    |  55 ----
 src/components/fields/Rating/index.tsx        |  12 +-
 .../fields/SingleSelect/DisplayCell.tsx       |  46 ++++
 .../{PopoverCell.tsx => EditorCell.tsx}       |  23 +-
 .../fields/SingleSelect/InlineCell.tsx        |  51 ----
 src/components/fields/SingleSelect/index.tsx  |  18 +-
 src/components/fields/Status/DisplayCell.tsx  |  71 +++++
 .../{PopoverCell.tsx => EditorCell.tsx}       |  23 +-
 src/components/fields/Status/InlineCell.tsx   |  69 -----
 src/components/fields/Status/index.tsx        |  19 +-
 .../{TableCell.tsx => DisplayCell.tsx}        |  24 +-
 .../fields/SubTable/SideDrawerField.tsx       |   4 +-
 src/components/fields/SubTable/index.tsx      |  14 +-
 src/hooks/useFirebaseStorageUploader.tsx      |   5 +-
 25 files changed, 527 insertions(+), 671 deletions(-)
 delete mode 100644 src/components/Table/TableContainer.tsx
 create mode 100644 src/components/fields/File/DisplayCell.tsx
 rename src/components/fields/File/{TableCell.tsx => EditorCell.tsx} (89%)
 create mode 100644 src/components/fields/Image/DisplayCell.tsx
 rename src/components/fields/Image/{TableCell.tsx => EditorCell.tsx} (51%)
 create mode 100644 src/components/fields/Rating/DisplayCell.tsx
 create mode 100644 src/components/fields/Rating/EditorCell.tsx
 delete mode 100644 src/components/fields/Rating/TableCell.tsx
 create mode 100644 src/components/fields/SingleSelect/DisplayCell.tsx
 rename src/components/fields/SingleSelect/{PopoverCell.tsx => EditorCell.tsx} (54%)
 delete mode 100644 src/components/fields/SingleSelect/InlineCell.tsx
 create mode 100644 src/components/fields/Status/DisplayCell.tsx
 rename src/components/fields/Status/{PopoverCell.tsx => EditorCell.tsx} (67%)
 delete mode 100644 src/components/fields/Status/InlineCell.tsx
 rename src/components/fields/SubTable/{TableCell.tsx => DisplayCell.tsx} (60%)

diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index f8ca9486..ad26cb42 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -15,7 +15,6 @@ import {
   Draggable,
 } from "react-beautiful-dnd";
 import { get } from "lodash-es";
-import { Portal } from "@mui/material";
 import { ErrorBoundary } from "react-error-boundary";
 
 import StyledTable from "./Styled/StyledTable";
@@ -426,6 +425,14 @@ export default function Table({
                     selectedCell?.path === row.original._rowy_ref.path &&
                     selectedCell?.columnKey === cell.column.id;
 
+                  const fieldTypeGroup = getFieldProp(
+                    "group",
+                    cell.column.columnDef.meta?.type
+                  );
+                  const isReadOnlyCell =
+                    fieldTypeGroup === "Auditing" ||
+                    fieldTypeGroup === "Metadata";
+
                   return (
                     <CellValidation
                       key={cell.id}
@@ -447,7 +454,7 @@ export default function Table({
                       )}
                       aria-selected={isSelectedCell}
                       aria-describedby={
-                        canEditCell
+                        canEditCell && !isReadOnlyCell
                           ? "rowy-table-editable-cell-description"
                           : undefined
                       }
@@ -540,14 +547,12 @@ export default function Table({
         </div>
       </StyledTable>
 
-      <Portal>
-        <div
-          id="rowy-table-editable-cell-description"
-          style={{ display: "none" }}
-        >
-          Press Enter to edit.
-        </div>
-      </Portal>
+      <div
+        id="rowy-table-editable-cell-description"
+        style={{ display: "none" }}
+      >
+        Press Enter to edit.
+      </div>
 
       <ContextMenu />
     </div>
diff --git a/src/components/Table/TableContainer.tsx b/src/components/Table/TableContainer.tsx
deleted file mode 100644
index 10061298..00000000
--- a/src/components/Table/TableContainer.tsx
+++ /dev/null
@@ -1,252 +0,0 @@
-import { colord } from "colord";
-import { styled, alpha, darken, lighten } from "@mui/material";
-import { TOP_BAR_HEIGHT } from "@src/layouts/Navigation/TopBar";
-import { TABLE_TOOLBAR_HEIGHT } from "@src/components/TableToolbar";
-import {
-  DRAWER_COLLAPSED_WIDTH,
-  DRAWER_WIDTH,
-} from "@src/components/SideDrawer";
-
-export const OUT_OF_ORDER_MARGIN = 8;
-
-export const TableContainer = styled("div", {
-  shouldForwardProp: (prop) => prop !== "rowHeight",
-})<{ rowHeight: number }>(({ theme, rowHeight }) => ({
-  display: "flex",
-  position: "relative",
-  flexDirection: "column",
-  height: `calc(100vh - ${TOP_BAR_HEIGHT}px - ${TABLE_TOOLBAR_HEIGHT}px)`,
-
-  "& .left-scroll-divider": {
-    position: "absolute",
-    top: 0,
-    bottom: 0,
-    left: 0,
-    width: 1,
-    zIndex: 1,
-
-    backgroundColor: colord(theme.palette.background.paper)
-      .mix(theme.palette.divider, 0.12)
-      .alpha(1)
-      .toHslString(),
-  },
-
-  "& > .rdg": {
-    width: `calc(100% - ${DRAWER_COLLAPSED_WIDTH}px)`,
-    flex: 1,
-    paddingBottom: `max(env(safe-area-inset-bottom), ${theme.spacing(2)})`,
-  },
-
-  [theme.breakpoints.down("sm")]: { width: "100%" },
-
-  "& .rdg": {
-    "--color": theme.palette.text.primary,
-    "--border-color": theme.palette.divider,
-    // "--summary-border-color": "#aaa",
-    "--cell-background-color":
-      theme.palette.mode === "light"
-        ? theme.palette.background.paper
-        : colord(theme.palette.background.paper)
-            .mix("#fff", 0.04)
-            .alpha(1)
-            .toHslString(),
-    "--header-background-color": theme.palette.background.default,
-    "--row-hover-background-color": colord(theme.palette.background.paper)
-      .mix(theme.palette.action.hover, theme.palette.action.hoverOpacity)
-      .alpha(1)
-      .toHslString(),
-    "--row-selected-background-color":
-      theme.palette.mode === "light"
-        ? lighten(theme.palette.primary.main, 0.9)
-        : darken(theme.palette.primary.main, 0.8),
-    "--row-selected-hover-background-color":
-      theme.palette.mode === "light"
-        ? lighten(theme.palette.primary.main, 0.8)
-        : darken(theme.palette.primary.main, 0.7),
-    "--checkbox-color": theme.palette.primary.main,
-    "--checkbox-focus-color": theme.palette.primary.main,
-    "--checkbox-disabled-border-color": "#ccc",
-    "--checkbox-disabled-background-color": "#ddd",
-    "--selection-color": theme.palette.primary.main,
-    "--font-size": "0.75rem",
-    "--cell-padding": theme.spacing(0, 1.25),
-
-    border: "none",
-    backgroundColor: "transparent",
-
-    ...(theme.typography.caption as any),
-    // fontSize: "0.8125rem",
-    lineHeight: "inherit !important",
-
-    "& .rdg-cell": {
-      display: "flex",
-      alignItems: "center",
-      padding: 0,
-
-      overflow: "visible",
-      contain: "none",
-      position: "relative",
-
-      lineHeight: "calc(var(--row-height) - 1px)",
-    },
-
-    "& .rdg-cell-frozen": {
-      position: "sticky",
-    },
-    "& .rdg-cell-frozen-last": {
-      boxShadow: theme.shadows[2]
-        .replace(/, 0 (\d+px)/g, ", $1 0")
-        .split("),")
-        .slice(1)
-        .join("),"),
-
-      "&[aria-selected=true]": {
-        boxShadow:
-          theme.shadows[2]
-            .replace(/, 0 (\d+px)/g, ", $1 0")
-            .split("),")
-            .slice(1)
-            .join("),") + ", inset 0 0 0 2px var(--selection-color)",
-      },
-    },
-
-    "& .rdg-cell-copied": {
-      backgroundColor:
-        theme.palette.mode === "light"
-          ? lighten(theme.palette.primary.main, 0.7)
-          : darken(theme.palette.primary.main, 0.6),
-    },
-
-    "& .final-column-cell": {
-      backgroundColor: "var(--header-background-color)",
-      borderColor: "var(--header-background-color)",
-      color: theme.palette.text.disabled,
-      padding: "var(--cell-padding)",
-    },
-  },
-
-  ".rdg-row, .rdg-header-row": {
-    marginLeft: `max(env(safe-area-inset-left), ${theme.spacing(2)})`,
-    marginRight: `max(env(safe-area-inset-right), ${DRAWER_WIDTH}px)`,
-    display: "inline-grid", // Fix Safari not showing margin-right
-  },
-
-  ".rdg-header-row .rdg-cell:first-of-type": {
-    borderTopLeftRadius: theme.shape.borderRadius,
-  },
-  ".rdg-header-row .rdg-cell:last-of-type": {
-    borderTopRightRadius: theme.shape.borderRadius,
-  },
-
-  ".rdg-header-row .rdg-cell.final-column-header": {
-    border: "none",
-    padding: theme.spacing(0, 0.75),
-    borderBottomRightRadius: theme.shape.borderRadius,
-
-    display: "flex",
-    alignItems: "center",
-    justifyContent: "flex-start",
-
-    position: "relative",
-    "&::before": {
-      content: "''",
-      display: "block",
-      width: 88,
-      height: "100%",
-
-      position: "absolute",
-      top: 0,
-      left: 0,
-
-      border: "1px solid var(--border-color)",
-      borderLeftWidth: 0,
-      borderTopRightRadius: theme.shape.borderRadius,
-      borderBottomRightRadius: theme.shape.borderRadius,
-    },
-  },
-
-  ".rdg-row .rdg-cell:first-of-type, .rdg-header-row .rdg-cell:first-of-type": {
-    borderLeft: "1px solid var(--border-color)",
-  },
-
-  ".rdg-row:last-of-type": {
-    borderBottomLeftRadius: theme.shape.borderRadius,
-    borderBottomRightRadius: theme.shape.borderRadius,
-
-    "& .rdg-cell:first-of-type": {
-      borderBottomLeftRadius: theme.shape.borderRadius,
-    },
-    "& .rdg-cell:nth-last-of-type(2)": {
-      borderBottomRightRadius: theme.shape.borderRadius,
-    },
-  },
-
-  ".rdg-header-row .rdg-cell": {
-    borderTop: "1px solid var(--border-color)",
-  },
-
-  ".rdg-row:hover": { color: theme.palette.text.primary },
-
-  ".row-hover-iconButton": {
-    color: theme.palette.text.disabled,
-    transitionDuration: "0s",
-  },
-  ".rdg-row:hover .row-hover-iconButton": {
-    color: theme.palette.text.primary,
-    backgroundColor: alpha(
-      theme.palette.action.hover,
-      theme.palette.action.hoverOpacity * 1.5
-    ),
-  },
-
-  ".cell-collapse-padding": {
-    margin: theme.spacing(0, -1.25),
-    width: `calc(100% + ${theme.spacing(1.25 * 2)})`,
-  },
-
-  ".rdg-row.out-of-order": {
-    "--row-height": rowHeight + 1 + "px !important",
-    marginTop: -1,
-    marginBottom: OUT_OF_ORDER_MARGIN,
-    borderBottomLeftRadius: theme.shape.borderRadius,
-
-    "& .rdg-cell:not(:last-of-type)": {
-      borderTop: `1px solid var(--border-color)`,
-    },
-    "& .rdg-cell:first-of-type": {
-      borderBottomLeftRadius: theme.shape.borderRadius,
-    },
-    "& .rdg-cell:nth-last-of-type(2)": {
-      borderBottomRightRadius: theme.shape.borderRadius,
-    },
-    "&:not(:nth-of-type(4))": {
-      borderTopLeftRadius: theme.shape.borderRadius,
-
-      "& .rdg-cell:first-of-type": {
-        borderTopLeftRadius: theme.shape.borderRadius,
-      },
-      "& .rdg-cell:nth-last-of-type(2)": {
-        borderTopRightRadius: theme.shape.borderRadius,
-      },
-    },
-
-    "& + .rdg-row:not(.out-of-order)": {
-      "--row-height": rowHeight + 1 + "px !important",
-      marginTop: -1,
-      borderTopLeftRadius: theme.shape.borderRadius,
-
-      "& .rdg-cell:not(:last-of-type)": {
-        borderTop: `1px solid var(--border-color)`,
-      },
-      "& .rdg-cell:first-of-type": {
-        borderTopLeftRadius: theme.shape.borderRadius,
-      },
-      "& .rdg-cell:nth-last-of-type(2)": {
-        borderTopRightRadius: theme.shape.borderRadius,
-      },
-    },
-  },
-}));
-TableContainer.displayName = "TableContainer";
-
-export default TableContainer;
diff --git a/src/components/fields/File/DisplayCell.tsx b/src/components/fields/File/DisplayCell.tsx
new file mode 100644
index 00000000..73303ddf
--- /dev/null
+++ b/src/components/fields/File/DisplayCell.tsx
@@ -0,0 +1,36 @@
+import { IDisplayCellProps } from "@src/components/fields/types";
+
+import { Grid, Chip } from "@mui/material";
+import ChipList from "@src/components/Table/formatters/ChipList";
+
+import { FileIcon } from ".";
+import { FileValue } from "@src/types/table";
+
+export default function File_({ value, tabIndex }: IDisplayCellProps) {
+  return (
+    <ChipList>
+      {Array.isArray(value) &&
+        value.map((file: FileValue) => (
+          <Grid
+            item
+            key={file.downloadURL}
+            style={
+              // Truncate so multiple files still visible
+              value.length > 1 ? { maxWidth: `calc(100% - 12px)` } : {}
+            }
+          >
+            <Chip
+              icon={<FileIcon />}
+              label={file.name}
+              onClick={(e) => {
+                window.open(file.downloadURL);
+                e.stopPropagation();
+              }}
+              style={{ width: "100%" }}
+              tabIndex={tabIndex}
+            />
+          </Grid>
+        ))}
+    </ChipList>
+  );
+}
diff --git a/src/components/fields/File/TableCell.tsx b/src/components/fields/File/EditorCell.tsx
similarity index 89%
rename from src/components/fields/File/TableCell.tsx
rename to src/components/fields/File/EditorCell.tsx
index 685cf62e..deb5b5fa 100644
--- a/src/components/fields/File/TableCell.tsx
+++ b/src/components/fields/File/EditorCell.tsx
@@ -1,5 +1,5 @@
 import { useCallback } from "react";
-import { IHeavyCellProps } from "@src/components/fields/types";
+import { IEditorCellProps } from "@src/components/fields/types";
 import { useSetAtom } from "jotai";
 import { findIndex } from "lodash-es";
 
@@ -20,12 +20,13 @@ import { FileValue } from "@src/types/table";
 
 export default function File_({
   column,
-  row,
   value,
+  onChange,
   onSubmit,
   disabled,
-  docRef,
-}: IHeavyCellProps) {
+  _rowy_ref,
+  tabIndex,
+}: IEditorCellProps) {
   const confirm = useSetAtom(confirmDialogAtom, projectScope);
   const updateField = useSetAtom(updateFieldAtom, tableScope);
 
@@ -38,13 +39,13 @@ export default function File_({
 
       if (file) {
         upload({
-          docRef: docRef! as any,
+          docRef: _rowy_ref,
           fieldName: column.key,
           files: [file],
           previousValue: value,
           onComplete: (newValue) => {
             updateField({
-              path: docRef.path,
+              path: _rowy_ref.path,
               fieldName: column.key,
               value: newValue,
             });
@@ -60,7 +61,8 @@ export default function File_({
     const index = findIndex(newValue, ["ref", ref]);
     const toBeDeleted = newValue.splice(index, 1);
     toBeDeleted.length && deleteUpload(toBeDeleted[0]);
-    onSubmit(newValue);
+    onChange(newValue);
+    onSubmit();
   };
 
   const { getRootProps, getInputProps, isDragActive } = useDropzone({
@@ -73,11 +75,10 @@ export default function File_({
   return (
     <Stack
       direction="row"
-      className="cell-collapse-padding"
       alignItems="center"
       sx={{
+        width: "100%",
         height: "100%",
-        pr: 0.5,
 
         ...(isDragActive
           ? {
@@ -92,6 +93,7 @@ export default function File_({
           : {}),
       }}
       {...dropzoneProps}
+      tabIndex={tabIndex}
       onClick={undefined}
     >
       <ChipList>
@@ -130,6 +132,7 @@ export default function File_({
                             confirmColor: "error",
                           })
                   }
+                  tabIndex={tabIndex}
                   style={{ width: "100%" }}
                 />
               </Tooltip>
@@ -146,8 +149,9 @@ export default function File_({
               e.stopPropagation();
             }}
             style={{ display: "flex" }}
-            className={docRef && "row-hover-iconButton"}
-            disabled={!docRef}
+            className={_rowy_ref && "row-hover-iconButton end"}
+            disabled={!_rowy_ref}
+            tabIndex={tabIndex}
           >
             <UploadIcon />
           </IconButton>
@@ -163,7 +167,7 @@ export default function File_({
         </div>
       )}
 
-      <input {...getInputProps()} />
+      <input {...getInputProps()} tabIndex={tabIndex} />
     </Stack>
   );
 }
diff --git a/src/components/fields/File/index.tsx b/src/components/fields/File/index.tsx
index bdd0a323..2f883954 100644
--- a/src/components/fields/File/index.tsx
+++ b/src/components/fields/File/index.tsx
@@ -1,13 +1,12 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withHeavyCell from "@src/components/fields/_withTableCell/withHeavyCell";
+import withTableCell from "@src/components/Table/withTableCell";
 
 import FileIcon from "@mui/icons-material/AttachFile";
-import BasicCell from "@src/components/fields/_BasicCell/BasicCellNull";
-import NullEditor from "@src/components/Table/editors/NullEditor";
+import DisplayCell from "./DisplayCell";
 
-const TableCell = lazy(
-  () => import("./TableCell" /* webpackChunkName: "TableCell-File" */)
+const EditorCell = lazy(
+  () => import("./EditorCell" /* webpackChunkName: "EditorCell-File" */)
 );
 const SideDrawerField = lazy(
   () =>
@@ -23,8 +22,9 @@ export const config: IFieldConfig = {
   initialValue: [],
   icon: <FileIcon />,
   description: "File uploaded to Firebase Storage. Supports any file type.",
-  TableCell: withHeavyCell(BasicCell, TableCell),
-  TableEditor: NullEditor as any,
+  TableCell: withTableCell(DisplayCell, EditorCell, "inline", {
+    disablePadding: true,
+  }),
   SideDrawerField,
 };
 export default config;
diff --git a/src/components/fields/Image/DisplayCell.tsx b/src/components/fields/Image/DisplayCell.tsx
new file mode 100644
index 00000000..0a4f955f
--- /dev/null
+++ b/src/components/fields/Image/DisplayCell.tsx
@@ -0,0 +1,113 @@
+import { IDisplayCellProps } from "@src/components/fields/types";
+import { useAtom } from "jotai";
+
+import { alpha, Theme, Stack, Grid, ButtonBase } from "@mui/material";
+import OpenIcon from "@mui/icons-material/OpenInNewOutlined";
+
+import Thumbnail from "@src/components/Thumbnail";
+
+import { tableSchemaAtom, tableScope } from "@src/atoms/tableScope";
+import { DEFAULT_ROW_HEIGHT } from "@src/components/Table";
+import { FileValue } from "@src/types/table";
+
+// MULTIPLE
+export const imgSx = (rowHeight: number) => ({
+  position: "relative",
+  display: "flex",
+
+  width: (theme: Theme) => `calc(${rowHeight}px - ${theme.spacing(1)} - 1px)`,
+  height: (theme: Theme) => `calc(${rowHeight}px - ${theme.spacing(1)} - 1px)`,
+
+  backgroundSize: "contain",
+  backgroundPosition: "center center",
+  backgroundRepeat: "no-repeat",
+
+  borderRadius: 1,
+});
+export const thumbnailSx = {
+  position: "absolute",
+  top: 0,
+  left: 0,
+  width: "100%",
+  height: "100%",
+};
+export const deleteImgHoverSx = {
+  position: "absolute",
+  top: 0,
+  left: 0,
+  bottom: 0,
+  right: 0,
+
+  color: "text.secondary",
+  boxShadow: (theme: Theme) => `0 0 0 1px ${theme.palette.divider} inset`,
+  borderRadius: 1,
+
+  transition: (theme: Theme) =>
+    theme.transitions.create("background-color", {
+      duration: theme.transitions.duration.shortest,
+    }),
+
+  "& *": {
+    opacity: 0,
+    transition: (theme: Theme) =>
+      theme.transitions.create("opacity", {
+        duration: theme.transitions.duration.shortest,
+      }),
+  },
+
+  ".img:hover &, .img:focus &": {
+    backgroundColor: (theme: Theme) =>
+      alpha(theme.palette.background.paper, 0.8),
+    "& *": { opacity: 1 },
+  },
+};
+
+export default function Image_({ value, tabIndex }: IDisplayCellProps) {
+  const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
+
+  const rowHeight = tableSchema.rowHeight ?? DEFAULT_ROW_HEIGHT;
+  let thumbnailSize = "100x100";
+  if (rowHeight > 50) thumbnailSize = "200x200";
+  if (rowHeight > 100) thumbnailSize = "400x400";
+
+  return (
+    <Stack
+      direction="row"
+      sx={[{ py: 0, pl: 1, height: "100%" }]}
+      alignItems="center"
+    >
+      <Grid container spacing={0.5} wrap="nowrap">
+        {Array.isArray(value) &&
+          value.map((file: FileValue, i) => (
+            <Grid item key={file.downloadURL}>
+              {
+                <ButtonBase
+                  aria-label="Open"
+                  sx={imgSx(rowHeight)}
+                  className="img"
+                  onClick={() => window.open(file.downloadURL, "_blank")}
+                  tabIndex={tabIndex}
+                >
+                  <Thumbnail
+                    imageUrl={file.downloadURL}
+                    size={thumbnailSize}
+                    objectFit="contain"
+                    sx={thumbnailSx}
+                    tabIndex={tabIndex}
+                  />
+                  <Grid
+                    container
+                    justifyContent="center"
+                    alignItems="center"
+                    sx={deleteImgHoverSx}
+                  >
+                    <OpenIcon />
+                  </Grid>
+                </ButtonBase>
+              }
+            </Grid>
+          ))}
+      </Grid>
+    </Stack>
+  );
+}
diff --git a/src/components/fields/Image/TableCell.tsx b/src/components/fields/Image/EditorCell.tsx
similarity index 51%
rename from src/components/fields/Image/TableCell.tsx
rename to src/components/fields/Image/EditorCell.tsx
index 9455a059..6d7cdbe2 100644
--- a/src/components/fields/Image/TableCell.tsx
+++ b/src/components/fields/Image/EditorCell.tsx
@@ -1,23 +1,12 @@
 import { useCallback, useState } from "react";
-import { IHeavyCellProps } from "@src/components/fields/types";
+import { IEditorCellProps } from "@src/components/fields/types";
 import { useAtom, useSetAtom } from "jotai";
-import { findIndex } from "lodash-es";
 
 import { useDropzone } from "react-dropzone";
 
-import {
-  alpha,
-  Theme,
-  Box,
-  Stack,
-  Grid,
-  IconButton,
-  ButtonBase,
-  Tooltip,
-} from "@mui/material";
+import { alpha, Box, Stack, Grid, IconButton, ButtonBase } from "@mui/material";
 import AddIcon from "@mui/icons-material/AddAPhotoOutlined";
 import DeleteIcon from "@mui/icons-material/DeleteOutlined";
-import OpenIcon from "@mui/icons-material/OpenInNewOutlined";
 
 import Thumbnail from "@src/components/Thumbnail";
 import CircularProgressOptical from "@src/components/CircularProgressOptical";
@@ -32,66 +21,17 @@ import useUploader from "@src/hooks/useFirebaseStorageUploader";
 import { IMAGE_MIME_TYPES } from "./index";
 import { DEFAULT_ROW_HEIGHT } from "@src/components/Table";
 import { FileValue } from "@src/types/table";
-
-// MULTIPLE
-const imgSx = (rowHeight: number) => ({
-  position: "relative",
-  display: "flex",
-
-  width: (theme: Theme) => `calc(${rowHeight}px - ${theme.spacing(1)} - 1px)`,
-  height: (theme: Theme) => `calc(${rowHeight}px - ${theme.spacing(1)} - 1px)`,
-
-  backgroundSize: "contain",
-  backgroundPosition: "center center",
-  backgroundRepeat: "no-repeat",
-
-  borderRadius: 1,
-});
-const thumbnailSx = {
-  position: "absolute",
-  top: 0,
-  left: 0,
-  width: "100%",
-  height: "100%",
-};
-const deleteImgHoverSx = {
-  position: "absolute",
-  top: 0,
-  left: 0,
-  bottom: 0,
-  right: 0,
-
-  color: "text.secondary",
-  boxShadow: (theme: Theme) => `0 0 0 1px ${theme.palette.divider} inset`,
-  borderRadius: 1,
-
-  transition: (theme: Theme) =>
-    theme.transitions.create("background-color", {
-      duration: theme.transitions.duration.shortest,
-    }),
-
-  "& *": {
-    opacity: 0,
-    transition: (theme: Theme) =>
-      theme.transitions.create("opacity", {
-        duration: theme.transitions.duration.shortest,
-      }),
-  },
-
-  ".img:hover &": {
-    backgroundColor: (theme: Theme) =>
-      alpha(theme.palette.background.paper, 0.8),
-    "& *": { opacity: 1 },
-  },
-};
+import { imgSx, thumbnailSx, deleteImgHoverSx } from "./DisplayCell";
 
 export default function Image_({
   column,
   value,
+  onChange,
   onSubmit,
   disabled,
-  docRef,
-}: IHeavyCellProps) {
+  _rowy_ref,
+  tabIndex,
+}: IEditorCellProps) {
   const confirm = useSetAtom(confirmDialogAtom, projectScope);
   const updateField = useSetAtom(updateFieldAtom, tableScope);
   const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
@@ -107,13 +47,13 @@ export default function Image_({
 
       if (imageFile) {
         upload({
-          docRef: docRef! as any,
+          docRef: _rowy_ref,
           fieldName: column.key,
           files: [imageFile],
           previousValue: value,
           onComplete: (newValue) => {
             updateField({
-              path: docRef.path,
+              path: _rowy_ref.path,
               fieldName: column.key,
               value: newValue,
             });
@@ -130,7 +70,8 @@ export default function Image_({
     const newValue = [...value];
     const toBeDeleted = newValue.splice(index, 1);
     toBeDeleted.length && deleteUpload(toBeDeleted[0]);
-    onSubmit(newValue);
+    onChange(newValue);
+    onSubmit();
   };
 
   const { getRootProps, getInputProps, isDragActive } = useDropzone({
@@ -154,9 +95,8 @@ export default function Image_({
         {
           py: 0,
           pl: 1,
-          pr: 0.5,
-          outline: "none",
           height: "100%",
+          width: "100%",
         },
         isDragActive
           ? {
@@ -172,6 +112,7 @@ export default function Image_({
       ]}
       alignItems="center"
       {...dropzoneProps}
+      tabIndex={tabIndex}
       onClick={undefined}
     >
       <div
@@ -185,67 +126,37 @@ export default function Image_({
           {Array.isArray(value) &&
             value.map((file: FileValue, i) => (
               <Grid item key={file.downloadURL}>
-                {disabled ? (
-                  <Tooltip title="Open">
-                    <ButtonBase
-                      sx={imgSx(rowHeight)}
-                      className="img"
-                      onClick={() => window.open(file.downloadURL, "_blank")}
-                    >
-                      <Thumbnail
-                        imageUrl={file.downloadURL}
-                        size={thumbnailSize}
-                        objectFit="contain"
-                        sx={thumbnailSx}
-                      />
-                      <Grid
-                        container
-                        justifyContent="center"
-                        alignItems="center"
-                        sx={deleteImgHoverSx}
-                      >
-                        {disabled ? (
-                          <OpenIcon />
-                        ) : (
-                          <DeleteIcon color="inherit" />
-                        )}
-                      </Grid>
-                    </ButtonBase>
-                  </Tooltip>
-                ) : (
-                  <Tooltip title="Delete…">
-                    <div>
-                      <ButtonBase
-                        sx={imgSx(rowHeight)}
-                        className="img"
-                        onClick={() => {
-                          confirm({
-                            title: "Delete image?",
-                            body: "This image cannot be recovered after",
-                            confirm: "Delete",
-                            confirmColor: "error",
-                            handleConfirm: handleDelete(i),
-                          });
-                        }}
-                      >
-                        <Thumbnail
-                          imageUrl={file.downloadURL}
-                          size={thumbnailSize}
-                          objectFit="contain"
-                          sx={thumbnailSx}
-                        />
-                        <Grid
-                          container
-                          justifyContent="center"
-                          alignItems="center"
-                          sx={deleteImgHoverSx}
-                        >
-                          <DeleteIcon color="error" />
-                        </Grid>
-                      </ButtonBase>
-                    </div>
-                  </Tooltip>
-                )}
+                <ButtonBase
+                  aria-label="Delete…"
+                  sx={imgSx(rowHeight)}
+                  className="img"
+                  onClick={() => {
+                    confirm({
+                      title: "Delete image?",
+                      body: "This image cannot be recovered after",
+                      confirm: "Delete",
+                      confirmColor: "error",
+                      handleConfirm: handleDelete(i),
+                    });
+                  }}
+                  disabled={disabled}
+                  tabIndex={tabIndex}
+                >
+                  <Thumbnail
+                    imageUrl={file.downloadURL}
+                    size={thumbnailSize}
+                    objectFit="contain"
+                    sx={thumbnailSx}
+                  />
+                  <Grid
+                    container
+                    justifyContent="center"
+                    alignItems="center"
+                    sx={deleteImgHoverSx}
+                  >
+                    <DeleteIcon color="error" />
+                  </Grid>
+                </ButtonBase>
               </Grid>
             ))}
 
@@ -275,8 +186,9 @@ export default function Image_({
               e.stopPropagation();
             }}
             style={{ display: "flex" }}
-            className={docRef && "row-hover-iconButton"}
-            disabled={!docRef}
+            className={_rowy_ref && "row-hover-iconButton end"}
+            disabled={!_rowy_ref}
+            tabIndex={tabIndex}
           >
             <AddIcon />
           </IconButton>
@@ -292,7 +204,7 @@ export default function Image_({
         </div>
       )}
 
-      <input {...getInputProps()} />
+      <input {...getInputProps()} tabIndex={tabIndex} />
     </Stack>
   );
 }
diff --git a/src/components/fields/Image/index.tsx b/src/components/fields/Image/index.tsx
index b29a7dab..1dbcde26 100644
--- a/src/components/fields/Image/index.tsx
+++ b/src/components/fields/Image/index.tsx
@@ -1,14 +1,13 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withHeavyCell from "@src/components/fields/_withTableCell/withHeavyCell";
+import withTableCell from "@src/components/Table/withTableCell";
 
 import { Image as ImageIcon } from "@src/assets/icons";
-import BasicCell from "@src/components/fields/_BasicCell/BasicCellNull";
-import NullEditor from "@src/components/Table/editors/NullEditor";
+import DisplayCell from "./DisplayCell";
 import ContextMenuActions from "./ContextMenuActions";
 
-const TableCell = lazy(
-  () => import("./TableCell" /* webpackChunkName: "TableCell-Image" */)
+const EditorCell = lazy(
+  () => import("./EditorCell" /* webpackChunkName: "EditorCell-Image" */)
 );
 const SideDrawerField = lazy(
   () =>
@@ -24,8 +23,9 @@ export const config: IFieldConfig = {
   icon: <ImageIcon />,
   description:
     "Image file uploaded to Firebase Storage. Supports JPEG, PNG, SVG, GIF, WebP, AVIF, JPEG XL.",
-  TableCell: withHeavyCell(BasicCell, TableCell),
-  TableEditor: NullEditor as any,
+  TableCell: withTableCell(DisplayCell, EditorCell, "inline", {
+    disablePadding: true,
+  }),
   SideDrawerField,
   contextMenuActions: ContextMenuActions,
 };
diff --git a/src/components/fields/Rating/DisplayCell.tsx b/src/components/fields/Rating/DisplayCell.tsx
new file mode 100644
index 00000000..1e539ad4
--- /dev/null
+++ b/src/components/fields/Rating/DisplayCell.tsx
@@ -0,0 +1,68 @@
+import React, { forwardRef } from "react";
+import { IDisplayCellProps } from "@src/components/fields/types";
+
+import MuiRating, { RatingProps as MuiRatingProps } from "@mui/material/Rating";
+import RatingIcon from "@mui/icons-material/Star";
+import RatingOutlineIcon from "@mui/icons-material/StarBorder";
+import { get } from "lodash-es";
+
+export const getStateIcon = (config: any) => {
+  // only use the config to get the custom rating icon if enabled via toggle
+  if (!get(config, "customIcons.enabled")) {
+    return <RatingIcon />;
+  }
+  return get(config, "customIcons.rating") || <RatingIcon />;
+};
+
+export const getStateOutline = (config: any) => {
+  if (!get(config, "customIcons.enabled")) {
+    return <RatingOutlineIcon />;
+  }
+  return get(config, "customIcons.rating") || <RatingOutlineIcon />;
+};
+
+export const Rating = forwardRef(function Rating(
+  {
+    _rowy_ref,
+    column,
+    value,
+    disabled,
+    onChange,
+  }: IDisplayCellProps & Pick<MuiRatingProps, "onChange">,
+  ref: React.Ref<HTMLElement>
+) {
+  // Set max and precision from config
+  const {
+    max,
+    precision,
+  }: {
+    max: number;
+    precision: number;
+  } = {
+    max: 5,
+    precision: 1,
+    ...column.config,
+  };
+
+  return (
+    <MuiRating
+      ref={ref}
+      onChange={onChange}
+      name={`${_rowy_ref.path}-${column.key}`}
+      value={typeof value === "number" ? value : 0}
+      onClick={(e) => e.stopPropagation()}
+      onKeyDown={(e) => {
+        if (["ArrowLeft", "ArrowRight", "ArrowUp", "ArrowDown"].includes(e.key))
+          e.stopPropagation();
+      }}
+      icon={getStateIcon(column.config)}
+      size="small"
+      readOnly={disabled}
+      emptyIcon={getStateOutline(column.config)}
+      max={max}
+      precision={precision}
+      sx={{ mx: -0.25 }}
+    />
+  );
+});
+export default Rating;
diff --git a/src/components/fields/Rating/EditorCell.tsx b/src/components/fields/Rating/EditorCell.tsx
new file mode 100644
index 00000000..4d3c0c23
--- /dev/null
+++ b/src/components/fields/Rating/EditorCell.tsx
@@ -0,0 +1,27 @@
+import { useRef, useEffect } from "react";
+import { IEditorCellProps } from "@src/components/fields/types";
+import DisplayCell from "./DisplayCell";
+
+export default function Rating({
+  onChange,
+  tabIndex,
+  ...props
+}: IEditorCellProps) {
+  const ref = useRef<HTMLElement>(null);
+  useEffect(() => {
+    const el = ref.current;
+    if (!el) return;
+    const inputs = el.querySelectorAll("input");
+    for (const input of inputs)
+      input.setAttribute("tabindex", tabIndex.toString());
+  }, [tabIndex]);
+
+  return (
+    <DisplayCell
+      {...props}
+      tabIndex={tabIndex}
+      onChange={(_, newValue) => onChange(newValue)}
+      ref={ref}
+    />
+  );
+}
diff --git a/src/components/fields/Rating/SideDrawerField.tsx b/src/components/fields/Rating/SideDrawerField.tsx
index eb117dd4..389d3211 100644
--- a/src/components/fields/Rating/SideDrawerField.tsx
+++ b/src/components/fields/Rating/SideDrawerField.tsx
@@ -3,7 +3,7 @@ import { ISideDrawerFieldProps } from "@src/components/fields/types";
 import { Grid } from "@mui/material";
 import { Rating as MuiRating } from "@mui/material";
 import "@mui/lab";
-import { getStateIcon, getStateOutline } from "./TableCell";
+import { getStateIcon, getStateOutline } from "./DisplayCell";
 import { fieldSx } from "@src/components/SideDrawer/utils";
 
 export default function Rating({
@@ -24,7 +24,6 @@ export default function Rating({
         value={typeof value === "number" ? value : 0}
         disabled={disabled}
         onChange={(_, newValue) => {
-          console.log("onChange", newValue);
           onChange(newValue);
           onSubmit();
         }}
diff --git a/src/components/fields/Rating/TableCell.tsx b/src/components/fields/Rating/TableCell.tsx
deleted file mode 100644
index 2e7aee52..00000000
--- a/src/components/fields/Rating/TableCell.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import { IHeavyCellProps } from "@src/components/fields/types";
-
-import MuiRating from "@mui/material/Rating";
-import RatingIcon from "@mui/icons-material/Star";
-import RatingOutlineIcon from "@mui/icons-material/StarBorder"
-import { get } from "lodash-es";
-
-
-export const getStateIcon = (config: any) => {
-  // only use the config to get the custom rating icon if enabled via toggle
-  if (!get(config, "customIcons.enabled")) { return <RatingIcon /> }
-  return get(config, "customIcons.rating") || <RatingIcon />;
-};
-
-export const getStateOutline = (config: any) => {
-  if (!get(config, "customIcons.enabled")) { return <RatingOutlineIcon /> }
-  return get(config, "customIcons.rating") || <RatingOutlineIcon />;
-}
-
-export default function Rating({
-  row,
-  column,
-  value,
-  onSubmit,
-  disabled,
-}: IHeavyCellProps) {
-  // Set max and precision from config
-  const {
-    max,
-    precision,
-  }: {
-    max: number;
-    precision: number;
-  } = {
-    max: 5,
-    precision: 1,
-    ...column.config,
-  };
-
-  return (
-    <MuiRating
-      name={`${row.id}-${column.key}`}
-      value={typeof value === "number" ? value : 0}
-      onClick={(e) => e.stopPropagation()}
-      icon={getStateIcon(column.config)}
-      size="small"
-      disabled={disabled}
-      onChange={(_, newValue) => onSubmit(newValue)}
-      emptyIcon={getStateOutline(column.config)}
-      max={max}
-      precision={precision}
-      sx={{ mx: -0.25 }}
-    />
-  );
-}
diff --git a/src/components/fields/Rating/index.tsx b/src/components/fields/Rating/index.tsx
index 3cbc5108..eac10ed3 100644
--- a/src/components/fields/Rating/index.tsx
+++ b/src/components/fields/Rating/index.tsx
@@ -1,15 +1,12 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withHeavyCell from "@src/components/fields/_withTableCell/withHeavyCell";
+import withTableCell from "@src/components/Table/withTableCell";
 
 import RatingIcon from "@mui/icons-material/StarBorder";
-import BasicCell from "@src/components/fields/_BasicCell/BasicCellNull";
-import NullEditor from "@src/components/Table/editors/NullEditor";
+import DisplayCell from "./DisplayCell";
+import EditorCell from "./EditorCell";
 import { filterOperators } from "@src/components/fields/Number/Filter";
 
-const TableCell = lazy(
-  () => import("./TableCell" /* webpackChunkName: "TableCell-Rating" */)
-);
 const SideDrawerField = lazy(
   () =>
     import("./SideDrawerField" /* webpackChunkName: "SideDrawerField-Rating" */)
@@ -29,8 +26,7 @@ export const config: IFieldConfig = {
   requireConfiguration: true,
   description:
     "Rating displayed as stars. Max stars is configurable, default: 5 stars.",
-  TableCell: withHeavyCell(BasicCell, TableCell),
-  TableEditor: NullEditor as any,
+  TableCell: withTableCell(DisplayCell, EditorCell, "inline"),
   settings: Settings,
   SideDrawerField,
   filter: {
diff --git a/src/components/fields/SingleSelect/DisplayCell.tsx b/src/components/fields/SingleSelect/DisplayCell.tsx
new file mode 100644
index 00000000..ece750d1
--- /dev/null
+++ b/src/components/fields/SingleSelect/DisplayCell.tsx
@@ -0,0 +1,46 @@
+import { IDisplayCellProps } from "@src/components/fields/types";
+
+import { ButtonBase } from "@mui/material";
+import { ChevronDown } from "@src/assets/icons";
+
+import { sanitiseValue } from "./utils";
+
+export default function SingleSelect({
+  value,
+  showPopoverCell,
+  disabled,
+  tabIndex,
+}: IDisplayCellProps) {
+  const rendered = (
+    <div
+      style={{
+        flexGrow: 1,
+        overflow: "hidden",
+        paddingLeft: "var(--cell-padding)",
+      }}
+    >
+      {sanitiseValue(value)}
+    </div>
+  );
+
+  if (disabled) return rendered;
+
+  return (
+    <ButtonBase
+      onClick={() => showPopoverCell(true)}
+      style={{
+        width: "100%",
+        height: "100%",
+        font: "inherit",
+        color: "inherit !important",
+        letterSpacing: "inherit",
+        textAlign: "inherit",
+        justifyContent: "flex-start",
+      }}
+      tabIndex={tabIndex}
+    >
+      {rendered}
+      <ChevronDown className="row-hover-iconButton end" />
+    </ButtonBase>
+  );
+}
diff --git a/src/components/fields/SingleSelect/PopoverCell.tsx b/src/components/fields/SingleSelect/EditorCell.tsx
similarity index 54%
rename from src/components/fields/SingleSelect/PopoverCell.tsx
rename to src/components/fields/SingleSelect/EditorCell.tsx
index 4aafda6b..0fd1c317 100644
--- a/src/components/fields/SingleSelect/PopoverCell.tsx
+++ b/src/components/fields/SingleSelect/EditorCell.tsx
@@ -1,23 +1,24 @@
-import { IPopoverCellProps } from "@src/components/fields/types";
+import { IEditorCellProps } from "@src/components/fields/types";
 
-import MultiSelect_ from "@rowy/multiselect";
+import MultiSelectComponent from "@rowy/multiselect";
 
 import { sanitiseValue } from "./utils";
 
 export default function SingleSelect({
   value,
+  onChange,
   onSubmit,
   column,
   parentRef,
   showPopoverCell,
   disabled,
-}: IPopoverCellProps) {
+}: IEditorCellProps) {
   const config = column.config ?? {};
 
   return (
-    <MultiSelect_
+    <MultiSelectComponent
       value={sanitiseValue(value)}
-      onChange={onSubmit}
+      onChange={onChange}
       options={config.options ?? []}
       multiple={false}
       freeText={config.freeText}
@@ -30,12 +31,18 @@ export default function SingleSelect({
           open: true,
           MenuProps: {
             anchorEl: parentRef,
-            anchorOrigin: { vertical: "bottom", horizontal: "left" },
-            transformOrigin: { vertical: "top", horizontal: "left" },
+            anchorOrigin: { vertical: "bottom", horizontal: "center" },
+            transformOrigin: { vertical: "top", horizontal: "center" },
+            sx: {
+              "& .MuiPaper-root": { minWidth: `${column.width}px !important` },
+            },
           },
         },
       }}
-      onClose={() => showPopoverCell(false)}
+      onClose={() => {
+        showPopoverCell(false);
+        onSubmit();
+      }}
     />
   );
 }
diff --git a/src/components/fields/SingleSelect/InlineCell.tsx b/src/components/fields/SingleSelect/InlineCell.tsx
deleted file mode 100644
index d133b1cc..00000000
--- a/src/components/fields/SingleSelect/InlineCell.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import { forwardRef } from "react";
-import { IPopoverInlineCellProps } from "@src/components/fields/types";
-
-import { ButtonBase } from "@mui/material";
-import { ChevronDown } from "@src/assets/icons";
-
-import { sanitiseValue } from "./utils";
-
-export const SingleSelect = forwardRef(function SingleSelect(
-  { value, showPopoverCell, disabled }: IPopoverInlineCellProps,
-  ref: React.Ref<any>
-) {
-  return (
-    <ButtonBase
-      onClick={() => showPopoverCell(true)}
-      ref={ref}
-      disabled={disabled}
-      className="cell-collapse-padding"
-      style={{
-        padding: "var(--cell-padding)",
-        paddingRight: 0,
-        height: "100%",
-
-        font: "inherit",
-        color: "inherit !important",
-        letterSpacing: "inherit",
-        textAlign: "inherit",
-        justifyContent: "flex-start",
-      }}
-    >
-      <div style={{ flexGrow: 1, overflow: "hidden" }}>
-        {sanitiseValue(value)}
-      </div>
-
-      {!disabled && (
-        <ChevronDown
-          className="row-hover-iconButton"
-          sx={{
-            flexShrink: 0,
-            mr: 0.5,
-            borderRadius: 1,
-            p: (32 - 20) / 2 / 8,
-            boxSizing: "content-box !important",
-          }}
-        />
-      )}
-    </ButtonBase>
-  );
-});
-
-export default SingleSelect;
diff --git a/src/components/fields/SingleSelect/index.tsx b/src/components/fields/SingleSelect/index.tsx
index 9d396280..187be997 100644
--- a/src/components/fields/SingleSelect/index.tsx
+++ b/src/components/fields/SingleSelect/index.tsx
@@ -1,17 +1,12 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withPopoverCell from "@src/components/fields/_withTableCell/withPopoverCell";
+import withTableCell from "@src/components/Table/withTableCell";
 
 import { SingleSelect as SingleSelectIcon } from "@src/assets/icons";
-import BasicCell from "@src/components/fields/_BasicCell/BasicCellNull";
-import InlineCell from "./InlineCell";
-import NullEditor from "@src/components/Table/editors/NullEditor";
+import DisplayCell from "./DisplayCell";
+import EditorCell from "./EditorCell";
 import { filterOperators } from "@src/components/fields/ShortText/Filter";
 
-const PopoverCell = lazy(
-  () =>
-    import("./PopoverCell" /* webpackChunkName: "PopoverCell-SingleSelect" */)
-);
 const SideDrawerField = lazy(
   () =>
     import(
@@ -32,11 +27,10 @@ export const config: IFieldConfig = {
   icon: <SingleSelectIcon />,
   description:
     "Single value from predefined options. Options are searchable and users can optionally input custom values.",
-  TableCell: withPopoverCell(BasicCell, InlineCell, PopoverCell, {
-    anchorOrigin: { horizontal: "left", vertical: "bottom" },
-    transparent: true,
+  TableCell: withTableCell(DisplayCell, EditorCell, "popover", {
+    disablePadding: true,
+    transparentPopover: true,
   }),
-  TableEditor: NullEditor as any,
   SideDrawerField,
   settings: Settings,
   filter: { operators: filterOperators },
diff --git a/src/components/fields/Status/DisplayCell.tsx b/src/components/fields/Status/DisplayCell.tsx
new file mode 100644
index 00000000..9717a19c
--- /dev/null
+++ b/src/components/fields/Status/DisplayCell.tsx
@@ -0,0 +1,71 @@
+import { forwardRef, useMemo } from "react";
+import { IDisplayCellProps } from "@src/components/fields/types";
+
+import { ButtonBase } from "@mui/material";
+import { ChevronDown } from "@src/assets/icons";
+import getLabel from "./utils/getLabelHelper";
+
+export const StatusSingleSelect = forwardRef(function StatusSingleSelect({
+  column,
+  value,
+  showPopoverCell,
+  disabled,
+  tabIndex,
+}: IDisplayCellProps) {
+  const conditions = column.config?.conditions;
+
+  const rendered = useMemo(() => {
+    const lowPriorityOperator = ["<", "<=", ">=", ">"];
+    const otherOperator = (conditions ?? []).filter(
+      (c: any) => !lowPriorityOperator.includes(c.operator)
+    );
+
+    /**Revisit this  */
+    const sortLowPriorityList = (conditions ?? [])
+      .filter((c: any) => {
+        return lowPriorityOperator.includes(c.operator);
+      })
+      .sort((a: any, b: any) => {
+        const aDistFromValue = Math.abs(value - a.value);
+        const bDistFromValue = Math.abs(value - b.value);
+        //return the smallest distance
+        return aDistFromValue - bDistFromValue;
+      });
+    const sortedConditions = [...otherOperator, ...sortLowPriorityList];
+
+    return (
+      <div
+        style={{
+          flexGrow: 1,
+          overflow: "hidden",
+          paddingLeft: "var(--cell-padding)",
+        }}
+      >
+        {getLabel(value, sortedConditions)}
+      </div>
+    );
+  }, [value, conditions]);
+
+  if (disabled) return rendered;
+
+  return (
+    <ButtonBase
+      onClick={() => showPopoverCell(true)}
+      style={{
+        width: "100%",
+        height: "100%",
+        font: "inherit",
+        color: "inherit !important",
+        letterSpacing: "inherit",
+        textAlign: "inherit",
+        justifyContent: "flex-start",
+      }}
+      tabIndex={tabIndex}
+    >
+      {rendered}
+      <ChevronDown className="row-hover-iconButton end" />
+    </ButtonBase>
+  );
+});
+
+export default StatusSingleSelect;
diff --git a/src/components/fields/Status/PopoverCell.tsx b/src/components/fields/Status/EditorCell.tsx
similarity index 67%
rename from src/components/fields/Status/PopoverCell.tsx
rename to src/components/fields/Status/EditorCell.tsx
index 8ca1a63e..538aa4fc 100644
--- a/src/components/fields/Status/PopoverCell.tsx
+++ b/src/components/fields/Status/EditorCell.tsx
@@ -1,14 +1,15 @@
-import { IPopoverCellProps } from "@src/components/fields/types";
-import MultiSelect_ from "@rowy/multiselect";
+import { IEditorCellProps } from "@src/components/fields/types";
+import MultiSelectComponent from "@rowy/multiselect";
 
 export default function StatusSingleSelect({
   value,
+  onChange,
   onSubmit,
   column,
   parentRef,
   showPopoverCell,
   disabled,
-}: IPopoverCellProps) {
+}: IEditorCellProps) {
   const config = column.config ?? {};
   const conditions = config.conditions ?? [];
   /**Revisit eventually, can we abstract or use a helper function to clean this? */
@@ -22,9 +23,9 @@ export default function StatusSingleSelect({
   });
   return (
     // eslint-disable-next-line react/jsx-pascal-case
-    <MultiSelect_
+    <MultiSelectComponent
       value={value}
-      onChange={(v) => onSubmit(v)}
+      onChange={(v) => onChange(v)}
       options={conditions.length >= 1 ? reMappedConditions : []} // this handles when conditions are deleted
       multiple={false}
       freeText={config.freeText}
@@ -37,12 +38,18 @@ export default function StatusSingleSelect({
           open: true,
           MenuProps: {
             anchorEl: parentRef,
-            anchorOrigin: { vertical: "bottom", horizontal: "left" },
-            transformOrigin: { vertical: "top", horizontal: "left" },
+            anchorOrigin: { vertical: "bottom", horizontal: "center" },
+            transformOrigin: { vertical: "top", horizontal: "center" },
+            sx: {
+              "& .MuiPaper-root": { minWidth: `${column.width}px !important` },
+            },
           },
         },
       }}
-      onClose={() => showPopoverCell(false)}
+      onClose={() => {
+        showPopoverCell(false);
+        onSubmit();
+      }}
     />
   );
 }
diff --git a/src/components/fields/Status/InlineCell.tsx b/src/components/fields/Status/InlineCell.tsx
deleted file mode 100644
index 35176e3d..00000000
--- a/src/components/fields/Status/InlineCell.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import { forwardRef, useMemo } from "react";
-import { IPopoverInlineCellProps } from "@src/components/fields/types";
-
-import { ButtonBase } from "@mui/material";
-import { ChevronDown } from "@src/assets/icons";
-import getLabel from "./utils/getLabelHelper";
-
-export const StatusSingleSelect = forwardRef(function StatusSingleSelect(
-  { column, value, showPopoverCell, disabled }: IPopoverInlineCellProps,
-  ref: React.Ref<any>
-) {
-  const conditions = column.config?.conditions ?? [];
-  const lowPriorityOperator = ["<", "<=", ">=", ">"];
-  const otherOperator = conditions.filter(
-    (c: any) => !lowPriorityOperator.includes(c.operator)
-  );
-
-  /**Revisit this  */
-  const sortLowPriorityList = conditions
-    .filter((c: any) => {
-      return lowPriorityOperator.includes(c.operator);
-    })
-    .sort((a: any, b: any) => {
-      const aDistFromValue = Math.abs(value - a.value);
-      const bDistFromValue = Math.abs(value - b.value);
-      //return the smallest distance
-      return aDistFromValue - bDistFromValue;
-    });
-  const sortedConditions = [...otherOperator, ...sortLowPriorityList];
-  const label = useMemo(
-    () => getLabel(value, sortedConditions),
-    [value, sortedConditions]
-  );
-  return (
-    <ButtonBase
-      onClick={() => showPopoverCell(true)}
-      ref={ref}
-      disabled={disabled}
-      className="cell-collapse-padding"
-      style={{
-        padding: "var(--cell-padding)",
-        paddingRight: 0,
-        height: "100%",
-        font: "inherit",
-        color: "inherit !important",
-        letterSpacing: "inherit",
-        textAlign: "inherit",
-        justifyContent: "flex-start",
-      }}
-    >
-      <div style={{ flexGrow: 1, overflow: "hidden" }}>{label}</div>
-
-      {!disabled && (
-        <ChevronDown
-          className="row-hover-iconButton"
-          sx={{
-            flexShrink: 0,
-            mr: 0.5,
-            borderRadius: 1,
-            p: (32 - 20) / 2 / 8,
-            boxSizing: "content-box !important",
-          }}
-        />
-      )}
-    </ButtonBase>
-  );
-});
-
-export default StatusSingleSelect;
diff --git a/src/components/fields/Status/index.tsx b/src/components/fields/Status/index.tsx
index 16b1ecf8..d4d0e978 100644
--- a/src/components/fields/Status/index.tsx
+++ b/src/components/fields/Status/index.tsx
@@ -1,13 +1,11 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import { Status as StatusIcon } from "@src/assets/icons";
-import NullEditor from "@src/components/Table/editors/NullEditor";
+import withTableCell from "@src/components/Table/withTableCell";
 
+import { Status as StatusIcon } from "@src/assets/icons";
+import DisplayCell from "./DisplayCell";
+import EditorCell from "./EditorCell";
 import { filterOperators } from "./Filter";
-import BasicCell from "@src/components/fields/_BasicCell/BasicCellNull";
-import PopoverCell from "./PopoverCell";
-import InlineCell from "./InlineCell";
-import withPopoverCell from "@src/components/fields/_withTableCell/withPopoverCell";
 
 const SideDrawerField = lazy(
   () =>
@@ -25,12 +23,11 @@ export const config: IFieldConfig = {
   initialValue: undefined,
   initializable: true,
   icon: <StatusIcon />,
-  description: "Displays field value as custom status text. Read-only.	",
-  TableCell: withPopoverCell(BasicCell, InlineCell, PopoverCell, {
-    anchorOrigin: { horizontal: "left", vertical: "bottom" },
-    transparent: true,
+  description: "Displays field value as custom status text.",
+  TableCell: withTableCell(DisplayCell, EditorCell, "popover", {
+    disablePadding: true,
+    transparentPopover: true,
   }),
-  TableEditor: NullEditor as any,
   settings: Settings,
   SideDrawerField,
   requireConfiguration: true,
diff --git a/src/components/fields/SubTable/TableCell.tsx b/src/components/fields/SubTable/DisplayCell.tsx
similarity index 60%
rename from src/components/fields/SubTable/TableCell.tsx
rename to src/components/fields/SubTable/DisplayCell.tsx
index 72c2df42..f9c9c3e7 100644
--- a/src/components/fields/SubTable/TableCell.tsx
+++ b/src/components/fields/SubTable/DisplayCell.tsx
@@ -1,27 +1,31 @@
-import { IHeavyCellProps } from "@src/components/fields/types";
+import { IDisplayCellProps } from "@src/components/fields/types";
 import { Link } from "react-router-dom";
 
 import { Stack, IconButton } from "@mui/material";
-import LaunchIcon from "@mui/icons-material/Launch";
+import OpenIcon from "@mui/icons-material/OpenInBrowser";
 
 import { useSubTableData } from "./utils";
 
-export default function SubTable({ column, row }: IHeavyCellProps) {
+export default function SubTable({
+  column,
+  row,
+  _rowy_ref,
+  tabIndex,
+}: IDisplayCellProps) {
   const { documentCount, label, subTablePath } = useSubTableData(
     column as any,
     row,
-    row._rowy_ref
+    _rowy_ref
   );
 
-  if (!row._rowy_ref) return null;
+  if (!_rowy_ref) return null;
 
   return (
     <Stack
       direction="row"
       alignItems="center"
       justifyContent="space-between"
-      className="cell-collapse-padding"
-      sx={{ p: "var(--cell-padding)", pr: 0.5 }}
+      style={{ paddingLeft: "var(--cell-padding)", width: "100%" }}
     >
       <div style={{ flexGrow: 1, overflow: "hidden" }}>
         {documentCount} {column.name as string}: {label}
@@ -30,12 +34,12 @@ export default function SubTable({ column, row }: IHeavyCellProps) {
       <IconButton
         component={Link}
         to={subTablePath}
-        className="row-hover-iconButton"
+        className="row-hover-iconButton end"
         size="small"
         disabled={!subTablePath}
-        style={{ flexShrink: 0 }}
+        tabIndex={tabIndex}
       >
-        <LaunchIcon />
+        <OpenIcon />
       </IconButton>
     </Stack>
   );
diff --git a/src/components/fields/SubTable/SideDrawerField.tsx b/src/components/fields/SubTable/SideDrawerField.tsx
index 32f2b1f8..abf8e1e0 100644
--- a/src/components/fields/SubTable/SideDrawerField.tsx
+++ b/src/components/fields/SubTable/SideDrawerField.tsx
@@ -6,7 +6,7 @@ import { ISideDrawerFieldProps } from "@src/components/fields/types";
 import { Link } from "react-router-dom";
 
 import { Box, Stack, IconButton } from "@mui/material";
-import LaunchIcon from "@mui/icons-material/Launch";
+import OpenIcon from "@mui/icons-material/OpenInBrowser";
 
 import { tableScope, tableRowsAtom } from "@src/atoms/tableScope";
 import { fieldSx, getFieldId } from "@src/components/SideDrawer/utils";
@@ -46,7 +46,7 @@ export default function SubTable({ column, _rowy_ref }: ISideDrawerFieldProps) {
         sx={{ ml: 1 }}
         disabled={!subTablePath}
       >
-        <LaunchIcon />
+        <OpenIcon />
       </IconButton>
     </Stack>
   );
diff --git a/src/components/fields/SubTable/index.tsx b/src/components/fields/SubTable/index.tsx
index b7ce171e..84df815d 100644
--- a/src/components/fields/SubTable/index.tsx
+++ b/src/components/fields/SubTable/index.tsx
@@ -1,14 +1,10 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withHeavyCell from "@src/components/fields/_withTableCell/withHeavyCell";
+import withTableCell from "@src/components/Table/withTableCell";
 
 import { SubTable as SubTableIcon } from "@src/assets/icons";
-import BasicCell from "@src/components/fields/_BasicCell/BasicCellName";
-import NullEditor from "@src/components/Table/editors/NullEditor";
+import DisplayCell from "./DisplayCell";
 
-const TableCell = lazy(
-  () => import("./TableCell" /* webpackChunkName: "TableCell-SubTable" */)
-);
 const SideDrawerField = lazy(
   () =>
     import(
@@ -28,8 +24,10 @@ export const config: IFieldConfig = {
   settings: Settings,
   description:
     "Connects to a sub-table in the current row. Also displays number of rows inside the sub-table. Max sub-table depth: 100.",
-  TableCell: withHeavyCell(BasicCell, TableCell),
-  TableEditor: NullEditor as any,
+  TableCell: withTableCell(DisplayCell, null, "focus", {
+    usesRowData: true,
+    disablePadding: true,
+  }),
   SideDrawerField,
   initializable: false,
   requireConfiguration: true,
diff --git a/src/hooks/useFirebaseStorageUploader.tsx b/src/hooks/useFirebaseStorageUploader.tsx
index 16fbd521..ae0681fd 100644
--- a/src/hooks/useFirebaseStorageUploader.tsx
+++ b/src/hooks/useFirebaseStorageUploader.tsx
@@ -1,7 +1,6 @@
 import { useReducer } from "react";
 import { useAtom } from "jotai";
 import { useSnackbar } from "notistack";
-import type { DocumentReference } from "firebase/firestore";
 import {
   ref,
   uploadBytesResumable,
@@ -15,7 +14,7 @@ import InlineOpenInNewIcon from "@src/components/InlineOpenInNewIcon";
 import { projectScope } from "@src/atoms/projectScope";
 import { firebaseStorageAtom } from "@src/sources/ProjectSourceFirebase";
 import { WIKI_LINKS } from "@src/constants/externalLinks";
-import { FileValue } from "@src/types/table";
+import { FileValue, TableRowRef } from "@src/types/table";
 
 export type UploaderState = {
   progress: number;
@@ -30,7 +29,7 @@ const uploadReducer = (
 ) => ({ ...prevState, ...newProps });
 
 export type UploadProps = {
-  docRef: DocumentReference;
+  docRef: TableRowRef;
   fieldName: string;
   files: File[];
   previousValue?: FileValue[];

From 06049830ecc85d1ca90c91cc61c0f67c029b5548 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Fri, 11 Nov 2022 15:49:55 +1100
Subject: [PATCH 251/309] remove unused code

---
 .../BasicCellContextMenuActions.tsx           |   0
 src/components/Table/editors/NullEditor.tsx   |  25 ---
 src/components/Table/editors/styles.ts        |   9 --
 .../Table/editors/withNullEditor.tsx          |  44 -----
 .../Table/editors/withSideDrawerEditor.tsx    |  53 ------
 src/components/fields/Email/index.tsx         |   4 +-
 src/components/fields/LongText/index.tsx      |   2 +-
 src/components/fields/Number/index.tsx        |   2 +-
 src/components/fields/Percentage/index.tsx    |   2 +-
 src/components/fields/Phone/index.tsx         |   4 +-
 src/components/fields/RichText/index.tsx      |   2 +-
 .../fields/ShortText/DisplayCell.tsx          |   6 +
 src/components/fields/ShortText/index.tsx     |   6 +-
 src/components/fields/Url/index.tsx           |   2 +-
 .../fields/_BasicCell/BasicCellName.tsx       |   5 -
 .../fields/_BasicCell/BasicCellNull.tsx       |   3 -
 .../fields/_BasicCell/BasicCellValue.tsx      |   6 -
 .../fields/_withTableCell/withBasicCell.tsx   |  29 ----
 .../fields/_withTableCell/withHeavyCell.tsx   |  83 ----------
 .../fields/_withTableCell/withPopoverCell.tsx | 151 ------------------
 src/components/fields/types.ts                |  25 ---
 21 files changed, 18 insertions(+), 445 deletions(-)
 rename src/components/{fields/_BasicCell => Table/ContextMenu}/BasicCellContextMenuActions.tsx (100%)
 delete mode 100644 src/components/Table/editors/NullEditor.tsx
 delete mode 100644 src/components/Table/editors/styles.ts
 delete mode 100644 src/components/Table/editors/withNullEditor.tsx
 delete mode 100644 src/components/Table/editors/withSideDrawerEditor.tsx
 create mode 100644 src/components/fields/ShortText/DisplayCell.tsx
 delete mode 100644 src/components/fields/_BasicCell/BasicCellName.tsx
 delete mode 100644 src/components/fields/_BasicCell/BasicCellNull.tsx
 delete mode 100644 src/components/fields/_BasicCell/BasicCellValue.tsx
 delete mode 100644 src/components/fields/_withTableCell/withBasicCell.tsx
 delete mode 100644 src/components/fields/_withTableCell/withHeavyCell.tsx
 delete mode 100644 src/components/fields/_withTableCell/withPopoverCell.tsx

diff --git a/src/components/fields/_BasicCell/BasicCellContextMenuActions.tsx b/src/components/Table/ContextMenu/BasicCellContextMenuActions.tsx
similarity index 100%
rename from src/components/fields/_BasicCell/BasicCellContextMenuActions.tsx
rename to src/components/Table/ContextMenu/BasicCellContextMenuActions.tsx
diff --git a/src/components/Table/editors/NullEditor.tsx b/src/components/Table/editors/NullEditor.tsx
deleted file mode 100644
index 58a91fd1..00000000
--- a/src/components/Table/editors/NullEditor.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import React from "react";
-import { EditorProps } from "react-data-grid";
-import { GlobalStyles } from "tss-react";
-
-/**
- * Allow the cell to be editable, but disable react-data-grid’s default
- * text editor to show.
- *
- * Hides the editor container so the cell below remains editable inline.
- *
- * Use for cells that have inline editing and don’t need to be double-clicked.
- *
- * TODO: fix NullEditor overwriting the formatter component
- */
-export default class NullEditor extends React.Component<EditorProps<any, any>> {
-  getInputNode = () => null;
-  getValue = () => null;
-  render = () => (
-    <GlobalStyles
-      styles={{
-        ".rdg-editor-container": { display: "none" },
-      }}
-    />
-  );
-}
diff --git a/src/components/Table/editors/styles.ts b/src/components/Table/editors/styles.ts
deleted file mode 100644
index 0eb31315..00000000
--- a/src/components/Table/editors/styles.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { createStyles } from "@mui/material";
-
-export const styles = createStyles({
-  "@global": {
-    ".rdg-editor-container": { display: "none" },
-  },
-});
-
-export default styles;
diff --git a/src/components/Table/editors/withNullEditor.tsx b/src/components/Table/editors/withNullEditor.tsx
deleted file mode 100644
index 7d8ed000..00000000
--- a/src/components/Table/editors/withNullEditor.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import { get } from "lodash-es";
-import { EditorProps } from "react-data-grid";
-import { IHeavyCellProps } from "@src/components/fields/types";
-
-/**
- * Allow the cell to be editable, but disable react-data-grid’s default
- * text editor to show.
- *
- * Hides the editor container so the cell below remains editable inline.
- *
- * Use for cells that have inline editing and don’t need to be double-clicked.
- */
-export default function withNullEditor(
-  HeavyCell?: React.ComponentType<IHeavyCellProps>
-) {
-  return function NullEditor(props: EditorProps<any, any>) {
-    const { row, column } = props;
-
-    return HeavyCell ? (
-      <div
-        style={{
-          width: "100%",
-          height: "100%",
-          padding: "var(--cell-padding)",
-          position: "relative",
-          overflow: "hidden",
-          contain: "strict",
-          display: "flex",
-          alignItems: "center",
-        }}
-      >
-        <HeavyCell
-          {...(props as any)}
-          value={get(row, column.key)}
-          name={column.name as string}
-          type={(column as any).type}
-          docRef={props.row._rowy_ref}
-          onSubmit={() => {}}
-          disabled={props.column.editable === false}
-        />
-      </div>
-    ) : null;
-  };
-}
diff --git a/src/components/Table/editors/withSideDrawerEditor.tsx b/src/components/Table/editors/withSideDrawerEditor.tsx
deleted file mode 100644
index e7522f7e..00000000
--- a/src/components/Table/editors/withSideDrawerEditor.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import { useEffect } from "react";
-import { useSetAtom } from "jotai";
-import { EditorProps } from "react-data-grid";
-import { get } from "lodash-es";
-
-import { tableScope, sideDrawerOpenAtom } from "@src/atoms/tableScope";
-import { IHeavyCellProps } from "@src/components/fields/types";
-
-/**
- * Allow the cell to be editable, but disable react-data-grid’s default
- * text editor to show. Opens the side drawer in the appropriate position.
- *
- * Displays the current HeavyCell or HeavyCell since it overwrites cell contents.
- *
- * Use for cells that do not support any type of in-cell editing.
- */
-export default function withSideDrawerEditor(
-  HeavyCell?: React.ComponentType<IHeavyCellProps>
-) {
-  return function SideDrawerEditor(props: EditorProps<any, any>) {
-    const { row, column } = props;
-
-    const setSideDrawerOpen = useSetAtom(sideDrawerOpenAtom, tableScope);
-    useEffect(() => {
-      setSideDrawerOpen(true);
-    }, [setSideDrawerOpen]);
-
-    return HeavyCell ? (
-      <div
-        style={{
-          width: "100%",
-          height: "100%",
-          padding: "var(--cell-padding)",
-          position: "relative",
-          overflow: "hidden",
-          contain: "strict",
-          display: "flex",
-          alignItems: "center",
-        }}
-      >
-        <HeavyCell
-          {...(props as any)}
-          value={get(row, column.key)}
-          name={column.name as string}
-          type={(column as any).type}
-          docRef={props.row._rowy_ref}
-          onSubmit={() => {}}
-          disabled={props.column.editable === false}
-        />
-      </div>
-    ) : null;
-  };
-}
diff --git a/src/components/fields/Email/index.tsx b/src/components/fields/Email/index.tsx
index d8a461ac..1450f513 100644
--- a/src/components/fields/Email/index.tsx
+++ b/src/components/fields/Email/index.tsx
@@ -3,10 +3,10 @@ import { IFieldConfig, FieldType } from "@src/components/fields/types";
 import withTableCell from "@src/components/Table/withTableCell";
 
 import EmailIcon from "@mui/icons-material/MailOutlined";
-import DisplayCell from "@src/components/fields/_BasicCell/BasicCellValue";
+import DisplayCell from "@src/components/fields/ShortText/DisplayCell";
 import EditorCell from "./EditorCell";
 import { filterOperators } from "@src/components/fields/ShortText/Filter";
-import BasicContextMenuActions from "@src/components/fields/_BasicCell/BasicCellContextMenuActions";
+import BasicContextMenuActions from "@src/components/Table/ContextMenu/BasicCellContextMenuActions";
 
 const SideDrawerField = lazy(
   () =>
diff --git a/src/components/fields/LongText/index.tsx b/src/components/fields/LongText/index.tsx
index 6685d26c..00c79f31 100644
--- a/src/components/fields/LongText/index.tsx
+++ b/src/components/fields/LongText/index.tsx
@@ -7,7 +7,7 @@ import DisplayCell from "./DisplayCell";
 import EditorCell from "./EditorCell";
 
 import { filterOperators } from "./Filter";
-import BasicContextMenuActions from "@src/components/fields/_BasicCell/BasicCellContextMenuActions";
+import BasicContextMenuActions from "@src/components/Table/ContextMenu/BasicCellContextMenuActions";
 
 const SideDrawerField = lazy(
   () =>
diff --git a/src/components/fields/Number/index.tsx b/src/components/fields/Number/index.tsx
index 7bed8e43..0a25fca8 100644
--- a/src/components/fields/Number/index.tsx
+++ b/src/components/fields/Number/index.tsx
@@ -6,7 +6,7 @@ import { Number as NumberIcon } from "@src/assets/icons";
 import DisplayCell from "./DisplayCell";
 import EditorCell from "./EditorCell";
 import { filterOperators } from "./Filter";
-import BasicContextMenuActions from "@src/components/fields/_BasicCell/BasicCellContextMenuActions";
+import BasicContextMenuActions from "@src/components/Table/ContextMenu/BasicCellContextMenuActions";
 const SideDrawerField = lazy(
   () =>
     import("./SideDrawerField" /* webpackChunkName: "SideDrawerField-Number" */)
diff --git a/src/components/fields/Percentage/index.tsx b/src/components/fields/Percentage/index.tsx
index 99239f7c..86ff6fe6 100644
--- a/src/components/fields/Percentage/index.tsx
+++ b/src/components/fields/Percentage/index.tsx
@@ -6,7 +6,7 @@ import { Percentage as PercentageIcon } from "@src/assets/icons";
 import DisplayCell from "./DisplayCell";
 import EditorCell from "./EditorCell";
 import { filterOperators } from "@src/components/fields/Number/Filter";
-import BasicContextMenuActions from "@src/components/fields/_BasicCell/BasicCellContextMenuActions";
+import BasicContextMenuActions from "@src/components/Table/ContextMenu/BasicCellContextMenuActions";
 
 const SideDrawerField = lazy(
   () =>
diff --git a/src/components/fields/Phone/index.tsx b/src/components/fields/Phone/index.tsx
index 9e5c1ebe..ec8792a6 100644
--- a/src/components/fields/Phone/index.tsx
+++ b/src/components/fields/Phone/index.tsx
@@ -3,10 +3,10 @@ import { IFieldConfig, FieldType } from "@src/components/fields/types";
 import withTableCell from "@src/components/Table/withTableCell";
 
 import PhoneIcon from "@mui/icons-material/PhoneOutlined";
-import DisplayCell from "@src/components/fields/_BasicCell/BasicCellValue";
+import DisplayCell from "@src/components/fields/ShortText/DisplayCell";
 import EditorCell from "./EditorCell";
 import { filterOperators } from "@src/components/fields/ShortText/Filter";
-import BasicContextMenuActions from "@src/components/fields/_BasicCell/BasicCellContextMenuActions";
+import BasicContextMenuActions from "@src/components/Table/ContextMenu/BasicCellContextMenuActions";
 
 const SideDrawerField = lazy(
   () =>
diff --git a/src/components/fields/RichText/index.tsx b/src/components/fields/RichText/index.tsx
index 80202a98..bd53d610 100644
--- a/src/components/fields/RichText/index.tsx
+++ b/src/components/fields/RichText/index.tsx
@@ -4,7 +4,7 @@ import withTableCell from "@src/components/Table/withTableCell";
 
 import RichTextIcon from "@mui/icons-material/TextFormat";
 import DisplayCell from "./DisplayCell";
-import BasicContextMenuActions from "@src/components/fields/_BasicCell/BasicCellContextMenuActions";
+import BasicContextMenuActions from "@src/components/Table/ContextMenu/BasicCellContextMenuActions";
 
 const SideDrawerField = lazy(
   () =>
diff --git a/src/components/fields/ShortText/DisplayCell.tsx b/src/components/fields/ShortText/DisplayCell.tsx
new file mode 100644
index 00000000..f29adca6
--- /dev/null
+++ b/src/components/fields/ShortText/DisplayCell.tsx
@@ -0,0 +1,6 @@
+import { IDisplayCellProps } from "@src/components/fields/types";
+
+export default function DisplayCellValue({ value }: IDisplayCellProps) {
+  if (typeof value !== "string") return null;
+  return <>{value}</>;
+}
diff --git a/src/components/fields/ShortText/index.tsx b/src/components/fields/ShortText/index.tsx
index 7bd36ddc..0160a64a 100644
--- a/src/components/fields/ShortText/index.tsx
+++ b/src/components/fields/ShortText/index.tsx
@@ -3,11 +3,11 @@ import { IFieldConfig, FieldType } from "@src/components/fields/types";
 import withTableCell from "@src/components/Table/withTableCell";
 
 import ShortTextIcon from "@mui/icons-material/ShortText";
-import BasicCell from "@src/components/fields/_BasicCell/BasicCellValue";
+import DisplayCell from "@src/components/fields/ShortText/DisplayCell";
 import EditorCell from "./EditorCell";
 
 import { filterOperators } from "./Filter";
-import BasicContextMenuActions from "@src/components/fields/_BasicCell/BasicCellContextMenuActions";
+import BasicContextMenuActions from "@src/components/Table/ContextMenu/BasicCellContextMenuActions";
 
 const SideDrawerField = lazy(
   () =>
@@ -30,7 +30,7 @@ export const config: IFieldConfig = {
   icon: <ShortTextIcon />,
   description: "Text displayed on a single line.",
   contextMenuActions: BasicContextMenuActions,
-  TableCell: withTableCell(BasicCell, EditorCell),
+  TableCell: withTableCell(DisplayCell, EditorCell),
   SideDrawerField,
   settings: Settings,
   filter: {
diff --git a/src/components/fields/Url/index.tsx b/src/components/fields/Url/index.tsx
index c6fb3fd7..612423d0 100644
--- a/src/components/fields/Url/index.tsx
+++ b/src/components/fields/Url/index.tsx
@@ -6,7 +6,7 @@ import UrlIcon from "@mui/icons-material/Link";
 import DisplayCell from "./DisplayCell";
 import EditorCell from "./EditorCell";
 import { filterOperators } from "@src/components/fields/ShortText/Filter";
-import BasicContextMenuActions from "@src/components/fields/_BasicCell/BasicCellContextMenuActions";
+import BasicContextMenuActions from "@src/components/Table/ContextMenu/BasicCellContextMenuActions";
 
 const SideDrawerField = lazy(
   () =>
diff --git a/src/components/fields/_BasicCell/BasicCellName.tsx b/src/components/fields/_BasicCell/BasicCellName.tsx
deleted file mode 100644
index 5d93cd7b..00000000
--- a/src/components/fields/_BasicCell/BasicCellName.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import { IBasicCellProps } from "@src/components/fields/types";
-
-export default function BasicCellName({ name }: IBasicCellProps) {
-  return <>{name}</>;
-}
diff --git a/src/components/fields/_BasicCell/BasicCellNull.tsx b/src/components/fields/_BasicCell/BasicCellNull.tsx
deleted file mode 100644
index 6b8471b3..00000000
--- a/src/components/fields/_BasicCell/BasicCellNull.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-export default function BasicCellNull(props: any) {
-  return <div {...props} style={{ position: "absolute", inset: 0 }} />;
-}
diff --git a/src/components/fields/_BasicCell/BasicCellValue.tsx b/src/components/fields/_BasicCell/BasicCellValue.tsx
deleted file mode 100644
index 8d8b0445..00000000
--- a/src/components/fields/_BasicCell/BasicCellValue.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-import { IBasicCellProps } from "@src/components/fields/types";
-
-export default function BasicCellValue({ value }: IBasicCellProps) {
-  if (typeof value !== "string") return null;
-  return <>{value}</>;
-}
diff --git a/src/components/fields/_withTableCell/withBasicCell.tsx b/src/components/fields/_withTableCell/withBasicCell.tsx
deleted file mode 100644
index a268bf2e..00000000
--- a/src/components/fields/_withTableCell/withBasicCell.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import type { TableCellProps } from "@src/components/Table";
-import { ErrorBoundary } from "react-error-boundary";
-import { IBasicCellProps } from "@src/components/fields/types";
-
-import { InlineErrorFallback } from "@src/components/ErrorFallback";
-import CellValidation from "@src/components/Table/CellValidation";
-
-/**
- * HOC to wrap around table cell components.
- * Renders read-only BasicCell only.
- * @param BasicCellComponent - The light cell component to display at all times
- */
-export default function withBasicCell(
-  BasicCellComponent: React.ComponentType<IBasicCellProps>
-) {
-  return function BasicCell({ row, column, getValue }: TableCellProps) {
-    const columnConfig = column.columnDef.meta!;
-    const { name } = columnConfig;
-    const value = getValue();
-
-    return (
-      <BasicCellComponent
-        value={value}
-        name={name as string}
-        type={columnConfig.type}
-      />
-    );
-  };
-}
diff --git a/src/components/fields/_withTableCell/withHeavyCell.tsx b/src/components/fields/_withTableCell/withHeavyCell.tsx
deleted file mode 100644
index 64c612fb..00000000
--- a/src/components/fields/_withTableCell/withHeavyCell.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-import { Suspense, useState, useEffect, startTransition } from "react";
-import { useSetAtom } from "jotai";
-import { get } from "lodash-es";
-import type { TableCellProps } from "@src/components/Table";
-import { IBasicCellProps, IHeavyCellProps } from "@src/components/fields/types";
-
-import { tableScope, updateFieldAtom } from "@src/atoms/tableScope";
-import { FieldType } from "@src/constants/fields";
-
-/**
- * HOC to wrap table cell components.
- * Renders read-only BasicCell while scrolling for better scroll performance.
- * @param BasicCellComponent - The lighter cell component to display while scrolling
- * @param HeavyCellComponent - The read/write cell component to display
- * @param readOnly - Prevent the component from updating the cell value
- */
-export default function withHeavyCell(
-  BasicCellComponent: React.ComponentType<IBasicCellProps>,
-  HeavyCellComponent: React.ComponentType<IHeavyCellProps>,
-  readOnly: boolean = false
-) {
-  return function HeavyCell({ row, column, getValue }: TableCellProps) {
-    const updateField = useSetAtom(updateFieldAtom, tableScope);
-
-    // const displayedComponent = "heavy";
-    // Initially display BasicCell to improve scroll performance
-    const [displayedComponent, setDisplayedComponent] = useState<
-      "basic" | "heavy"
-    >("basic");
-    // Then switch to HeavyCell once completed
-    useEffect(() => {
-      startTransition(() => {
-        setDisplayedComponent("heavy");
-      });
-    }, []);
-
-    // TODO: Investigate if this still needs to be a state
-    const value = getValue();
-    const [localValue, setLocalValue] = useState(value);
-    useEffect(() => {
-      setLocalValue(value);
-    }, [value]);
-
-    // Declare basicCell here so props can be reused by HeavyCellComponent
-    const basicCellProps = {
-      value: localValue,
-      name: column.columnDef.meta!.name,
-      type: column.columnDef.meta!.type,
-      onMouseOver: () => setDisplayedComponent("heavy"),
-      onMouseLeave: () => setDisplayedComponent("basic"),
-    };
-    const basicCell = <BasicCellComponent {...basicCellProps} />;
-
-    if (displayedComponent === "basic") return basicCell;
-
-    const handleSubmit = (value: any) => {
-      if (readOnly) return;
-      updateField({
-        path: row.original._rowy_ref.path,
-        fieldName: column.id,
-        value,
-      });
-      setLocalValue(value);
-    };
-
-    if (displayedComponent === "heavy")
-      return (
-        <Suspense fallback={basicCell}>
-          <HeavyCellComponent
-            {...basicCellProps}
-            row={row.original}
-            column={column.columnDef.meta!}
-            docRef={row.original._rowy_ref}
-            onSubmit={handleSubmit}
-            disabled={column.columnDef.meta!.editable === false}
-          />
-        </Suspense>
-      );
-
-    // Should not reach this line
-    return null;
-  };
-}
diff --git a/src/components/fields/_withTableCell/withPopoverCell.tsx b/src/components/fields/_withTableCell/withPopoverCell.tsx
deleted file mode 100644
index 8a1f6b20..00000000
--- a/src/components/fields/_withTableCell/withPopoverCell.tsx
+++ /dev/null
@@ -1,151 +0,0 @@
-import { Suspense, useState, useEffect, useRef } from "react";
-import { useSetAtom } from "jotai";
-import { get } from "lodash-es";
-import type { TableCellProps } from "@src/components/Table";
-import {
-  IBasicCellProps,
-  IPopoverInlineCellProps,
-  IPopoverCellProps,
-} from "@src/components/fields/types";
-
-import { Popover, PopoverProps } from "@mui/material";
-
-import { tableScope, updateFieldAtom } from "@src/atoms/tableScope";
-import { FieldType } from "@src/constants/fields";
-
-export interface IPopoverCellOptions extends Partial<PopoverProps> {
-  transparent?: boolean;
-  readOnly?: boolean;
-}
-
-/**
- * HOC to wrap around table cell formatters.
- * Renders read-only BasicCell while scrolling for better scroll performance.
- * When the user clicks the heavier inline cell, it displays PopoverCell.
- * @param BasicCellComponent - The lighter cell component to display while scrolling
- * @param InlineCellComponent - The heavier cell component to display inline
- * @param PopoverCellComponent - The heavy read/write cell component to display in Popover
- * @param options - {@link IPopoverCellOptions}
- */
-export default function withPopoverCell(
-  BasicCellComponent: React.ComponentType<IBasicCellProps>,
-  InlineCellComponent: React.ForwardRefExoticComponent<
-    IPopoverInlineCellProps & React.RefAttributes<any>
-  >,
-  PopoverCellComponent: React.ComponentType<IPopoverCellProps>,
-  options?: IPopoverCellOptions
-) {
-  return function PopoverCell({ row, column, getValue }: TableCellProps) {
-    const { transparent, ...popoverProps } = options ?? {};
-
-    const updateField = useSetAtom(updateFieldAtom, tableScope);
-
-    // Initially display BasicCell to improve scroll performance
-    const [displayedComponent, setDisplayedComponent] = useState<
-      "basic" | "inline" | "popover"
-    >("inline");
-    // Then switch to heavier InlineCell once completed
-    // useEffect(() => {
-    //   setTimeout(() => {
-    //     setDisplayedComponent("inline");
-    //   });
-    // }, []);
-
-    // Store Popover open state here so we can add delay for close transition
-    const [popoverOpen, setPopoverOpen] = useState(false);
-
-    // Store ref to rendered InlineCell here to get positioning for PopoverCell
-    const inlineCellRef = useRef<any>(null);
-
-    // TODO: Investigate if this still needs to be a state
-    const value = getValue();
-    const [localValue, setLocalValue] = useState(value);
-    useEffect(() => {
-      setLocalValue(value);
-    }, [value]);
-
-    // Declare basicCell here so props can be reused by HeavyCellComponent
-    const basicCellProps = {
-      value: localValue,
-      name: column.columnDef.meta!.name,
-      type: column.columnDef.meta!.type,
-    };
-
-    if (displayedComponent === "basic")
-      return <BasicCellComponent {...basicCellProps} />;
-
-    // This is where we update the documents
-    const handleSubmit = (value: any) => {
-      if (options?.readOnly) return;
-      updateField({
-        path: row.original._rowy_ref.path,
-        fieldName: column.id,
-        value,
-        deleteField: value === undefined,
-      });
-      setLocalValue(value);
-    };
-    const showPopoverCell: any = (popover: boolean) => {
-      if (popover) {
-        setPopoverOpen(true);
-        setDisplayedComponent("popover");
-      } else {
-        setPopoverOpen(false);
-        setTimeout(() => setDisplayedComponent("inline"), 300);
-      }
-    };
-
-    // Declare inlineCell and props here so it can be reused later
-    const commonCellProps = {
-      ...basicCellProps,
-      row: row.original,
-      column: column.columnDef.meta!,
-      onSubmit: handleSubmit,
-      disabled: column.columnDef.meta!.editable === false,
-      docRef: row.original._rowy_ref,
-      showPopoverCell,
-      ref: inlineCellRef,
-    };
-    const inlineCell = (
-      <InlineCellComponent {...commonCellProps} ref={inlineCellRef} />
-    );
-
-    if (displayedComponent === "inline") return inlineCell;
-
-    const parentRef = inlineCellRef.current?.parentElement;
-
-    if (displayedComponent === "popover")
-      return (
-        <>
-          {inlineCell}
-
-          <Suspense fallback={null}>
-            <Popover
-              open={popoverOpen}
-              anchorEl={parentRef}
-              onClose={() => showPopoverCell(false)}
-              {...popoverProps}
-              sx={
-                transparent
-                  ? {
-                      "& .MuiPopover-paper": { backgroundColor: "transparent" },
-                    }
-                  : {}
-              }
-              onClick={(e) => e.stopPropagation()}
-              onDoubleClick={(e) => e.stopPropagation()}
-              onKeyDown={(e) => e.stopPropagation()}
-            >
-              <PopoverCellComponent
-                {...commonCellProps}
-                parentRef={parentRef}
-              />
-            </Popover>
-          </Suspense>
-        </>
-      );
-
-    // Should not reach this line
-    return null;
-  };
-}
diff --git a/src/components/fields/types.ts b/src/components/fields/types.ts
index 95e57c68..8897e003 100644
--- a/src/components/fields/types.ts
+++ b/src/components/fields/types.ts
@@ -30,8 +30,6 @@ export interface IFieldConfig {
     reset: () => void
   ) => IContextMenuItem[];
   TableCell: React.ComponentType<TableCellProps>;
-  /** @deprecated TODO: REMOVE */
-  TableEditor?: React.ComponentType<EditorProps<TableRow, any>>;
   SideDrawerField: React.ComponentType<ISideDrawerFieldProps>;
   settings?: React.ComponentType<ISettingsProps>;
   settingsValidator?: (config: Record<string, any>) => Record<string, string>;
@@ -46,29 +44,6 @@ export interface IFieldConfig {
   csvImportParser?: (value: string, config?: any) => any;
 }
 
-/** @deprecated TODO: REMOVE */
-export interface IBasicCellProps {
-  value: any;
-  type: FieldType;
-  name: string;
-}
-/** @deprecated TODO: REMOVE */
-export interface IHeavyCellProps extends IBasicCellProps {
-  row: TableRow;
-  column: ColumnConfig;
-  onSubmit: (value: any) => void;
-  docRef: TableRowRef;
-  disabled: boolean;
-}
-/** @deprecated TODO: REMOVE */
-export interface IPopoverInlineCellProps extends IHeavyCellProps {
-  showPopoverCell: React.Dispatch<React.SetStateAction<boolean>>;
-}
-/** @deprecated TODO: REMOVE */
-export interface IPopoverCellProps extends IPopoverInlineCellProps {
-  parentRef: PopoverProps["anchorEl"];
-}
-
 export interface IDisplayCellProps<T = any> {
   value: T;
   type: FieldType;

From 69226d69108d6055ee4e565a855580fb1c55fe10 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Fri, 11 Nov 2022 15:50:10 +1100
Subject: [PATCH 252/309] ButtonBase: show ripple on focus by default

---
 src/theme/components.tsx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/theme/components.tsx b/src/theme/components.tsx
index 4b4f9a0d..2bc4b2e5 100644
--- a/src/theme/components.tsx
+++ b/src/theme/components.tsx
@@ -680,6 +680,12 @@ export const components = (theme: Theme): ThemeOptions => {
         },
       },
 
+      MuiButtonBase: {
+        defaultProps: {
+          focusRipple: true,
+        },
+      },
+
       MuiButton: {
         defaultProps: {
           variant: "outlined",

From 6321e17c954461ac06f919bcc563d83910400a03 Mon Sep 17 00:00:00 2001
From: Ganesh Mani <ganeshmani@Ganeshs-MacBook-Pro.local>
Date: Sat, 12 Nov 2022 17:38:50 +0530
Subject: [PATCH 253/309] fix: log snack collapse by default

---
 .../TableModals/CloudLogsModal/BuildLogs/BuildLogsSnack.tsx   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/TableModals/CloudLogsModal/BuildLogs/BuildLogsSnack.tsx b/src/components/TableModals/CloudLogsModal/BuildLogs/BuildLogsSnack.tsx
index 9cc98650..209cd2bc 100644
--- a/src/components/TableModals/CloudLogsModal/BuildLogs/BuildLogsSnack.tsx
+++ b/src/components/TableModals/CloudLogsModal/BuildLogs/BuildLogsSnack.tsx
@@ -94,7 +94,7 @@ export default function BuildLogsSnack({
         borderRadius: 1,
         zIndex: 1,
         transition: (theme) => theme.transitions.create("height"),
-        height: expanded ? "calc(100% - 300px)" : 300,
+        height: expanded ? "calc(100% - 300px)" : 50,
       }}
     >
       <Box display="flex" justifyContent="space-between" alignItems="center">
@@ -165,7 +165,7 @@ export default function BuildLogsSnack({
         height={"calc(100% - 25px)"}
         id="live-stream-scroll-box-snack"
       >
-        {latestActiveLog && (
+        {latestActiveLog && expanded && (
           <>
             {logs?.map((log: any, index: number) => (
               <BuildLogRow logRecord={log} index={index} key={index} />

From 0b75d60813ecd91e0d644c9efcae7b6dfee87e26 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 14 Nov 2022 13:01:09 +1100
Subject: [PATCH 254/309] fix JSON side drawer field crashing if value is a
 firestore ref

---
 src/components/fields/Json/SideDrawerField.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/fields/Json/SideDrawerField.tsx b/src/components/fields/Json/SideDrawerField.tsx
index d6b15595..42c161b6 100644
--- a/src/components/fields/Json/SideDrawerField.tsx
+++ b/src/components/fields/Json/SideDrawerField.tsx
@@ -40,13 +40,14 @@ export default function Json({
   const [editor, setEditor] = useAtom(jsonEditorAtom, projectScope);
   const [codeValid, setCodeValid] = useState(true);
 
-  const sanitizedValue =
+  const baseValue =
     value !== undefined && isValidJson(value)
       ? value
       : column.config?.isArray
       ? []
       : {};
-  const formattedJson = stringify(sanitizedValue, { space: 2 });
+  const formattedJson = stringify(baseValue, { space: 2 });
+  const sanitizedValue = JSON.parse(formattedJson);
 
   if (disabled)
     return (

From e9bc4a5a9b84b42ec5fa88ba5fa98a43d817fdc0 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 14 Nov 2022 16:09:01 +1100
Subject: [PATCH 255/309] Merge branch 'develop' into
 feature/rowy-706-table-upgrade

---
 .github/workflows/deploy-preview.yml          |   4 +-
 src/atoms/tableScope/columnActions.ts         |  43 ++-
 src/components/ColumnMenu/ColumnMenu.tsx      |  80 ++++-
 src/components/ErrorFallback.tsx              |  58 ++--
 .../TableInformationDrawer/Details.tsx        | 294 ++++++++++++------
 .../ExportModal/ModalContentsDownload.tsx     |   6 +-
 .../ExtensionsModal/ExtensionsModal.tsx       |  80 +++--
 .../ExtensionsModal/RuntimeOptions.tsx        | 117 +++++++
 .../TableModals/ExtensionsModal/utils.ts      |   6 +
 .../TableSettingsDialog/TableDetails.tsx      |  23 +-
 .../TableToolbar/TableToolbarButton.tsx       |  41 ++-
 src/components/fields/Action/EditorCell.tsx   |  11 +-
 src/components/fields/Action/Settings.tsx     |  50 ++-
 .../fields/Action/SideDrawerField.tsx         |   3 +-
 src/components/fields/Color/filters.ts        |  21 ++
 src/components/fields/Color/index.tsx         |   5 +
 .../fields/Json/SideDrawerField.tsx           |   5 +-
 src/components/fields/Rating/DisplayCell.tsx  |  24 +-
 src/components/fields/Rating/Icon.tsx         |  31 ++
 src/components/fields/Rating/Settings.tsx     |  33 +-
 .../fields/Rating/SideDrawerField.tsx         |   6 +-
 src/constants/externalLinks.ts                |   4 +-
 src/hooks/useFirestoreCollectionWithAtom.ts   |  12 +-
 src/index.tsx                                 |  10 +-
 src/pages/Table/ProvidedTablePage.tsx         |  50 ++-
 src/theme/components.tsx                      |   3 +-
 src/types/table.d.ts                          |  16 +-
 27 files changed, 789 insertions(+), 247 deletions(-)
 create mode 100644 src/components/TableModals/ExtensionsModal/RuntimeOptions.tsx
 create mode 100644 src/components/fields/Color/filters.ts
 create mode 100644 src/components/fields/Rating/Icon.tsx

diff --git a/.github/workflows/deploy-preview.yml b/.github/workflows/deploy-preview.yml
index ed7b8fd7..9ca97e44 100644
--- a/.github/workflows/deploy-preview.yml
+++ b/.github/workflows/deploy-preview.yml
@@ -8,7 +8,7 @@ on:
 env:
   REACT_APP_FIREBASE_PROJECT_ID: rowyio
   REACT_APP_FIREBASE_PROJECT_WEB_API_KEY:
-    "${{ secrets.FIREBASE_WEB_API_KEY_ROWYIO }}"
+    "${{ secrets.FIREBASE_WEB_API_KEY_TRYROWY }}"
   CI: ""
 jobs:
   build_and_preview:
@@ -27,6 +27,6 @@ jobs:
         with:
           repoToken: "${{ secrets.GITHUB_TOKEN }}"
           firebaseServiceAccount:
-            "${{ secrets.FIREBASE_SERVICE_ACCOUNT_ROWYIO }}"
+            "${{ secrets.FIREBASE_SERVICE_ACCOUNT_TRYROWY }}"
           expires: 14d
           projectId: rowyio
diff --git a/src/atoms/tableScope/columnActions.ts b/src/atoms/tableScope/columnActions.ts
index 96a37d2a..2f3926e8 100644
--- a/src/atoms/tableScope/columnActions.ts
+++ b/src/atoms/tableScope/columnActions.ts
@@ -1,10 +1,12 @@
 import { atom } from "jotai";
 import { findIndex } from "lodash-es";
+import { FieldType } from "@src/constants/fields";
 
 import {
   tableColumnsOrderedAtom,
   tableColumnsReducer,
   updateTableSchemaAtom,
+  tableSchemaAtom,
 } from "./table";
 import { ColumnConfig } from "@src/types/table";
 
@@ -14,6 +16,7 @@ export interface IAddColumnOptions {
   /** Index to add column at. If undefined, adds to end */
   index?: number;
 }
+
 /**
  * Set function adds a column to tableSchema, to the end or by index.
  * Also fixes any issues with column indexes, so they go from 0 to length - 1
@@ -52,6 +55,7 @@ export interface IUpdateColumnOptions {
   /** If passed, reorders the column to the index */
   index?: number;
 }
+
 /**
  * Set function updates a column in tableSchema
  * @throws Error if column not found
@@ -110,13 +114,50 @@ export const updateColumnAtom = atom(
  * ```
  */
 export const deleteColumnAtom = atom(null, async (get, _set, key: string) => {
+  const tableSchema = get(tableSchemaAtom);
   const tableColumnsOrdered = [...get(tableColumnsOrderedAtom)];
   const updateTableSchema = get(updateTableSchemaAtom);
   if (!updateTableSchema) throw new Error("Cannot update table schema");
 
   const updatedColumns = tableColumnsOrdered
     .filter((c) => c.key !== key)
+    .map((c) => {
+      // remove column from derivatives listener fields
+      if (c.type === FieldType.derivative) {
+        return {
+          ...c,
+          config: {
+            ...c.config,
+            listenerFields:
+              c.config?.listenerFields?.filter((f) => f !== key) ?? [],
+          },
+        };
+      } else if (c.type === FieldType.action) {
+        return {
+          ...c,
+          config: {
+            ...c.config,
+            requiredFields:
+              c.config?.requiredFields?.filter((f) => f !== key) ?? [],
+          },
+        };
+      } else {
+        return c;
+      }
+    })
     .reduce(tableColumnsReducer, {});
 
-  await updateTableSchema({ columns: updatedColumns }, [`columns.${key}`]);
+  const updatedExtensionObjects = tableSchema?.extensionObjects?.map(
+    (extension) => {
+      return {
+        ...extension,
+        requiredFields: extension.requiredFields.filter((f) => f !== key),
+      };
+    }
+  );
+
+  await updateTableSchema(
+    { columns: updatedColumns, extensionObjects: updatedExtensionObjects },
+    [`columns.${key}`]
+  );
 });
diff --git a/src/components/ColumnMenu/ColumnMenu.tsx b/src/components/ColumnMenu/ColumnMenu.tsx
index 9d193179..54f6e0c3 100644
--- a/src/components/ColumnMenu/ColumnMenu.tsx
+++ b/src/components/ColumnMenu/ColumnMenu.tsx
@@ -7,6 +7,7 @@ import {
   ListItemIcon,
   ListItemText,
   Typography,
+  Divider,
 } from "@mui/material";
 import FilterIcon from "@mui/icons-material/FilterList";
 import LockOpenIcon from "@mui/icons-material/LockOpen";
@@ -50,12 +51,18 @@ import {
   columnModalAtom,
   tableFiltersPopoverAtom,
   tableNextPageAtom,
+  tableSchemaAtom,
 } from "@src/atoms/tableScope";
 import { FieldType } from "@src/constants/fields";
 import { getFieldProp } from "@src/components/fields";
 import { analytics, logEvent } from "@src/analytics";
-import { formatSubTableName, getTableSchemaPath } from "@src/utils/table";
+import {
+  formatSubTableName,
+  getTableBuildFunctionPathname,
+  getTableSchemaPath,
+} from "@src/utils/table";
 import { runRoutes } from "@src/constants/runRoutes";
+import { useSnackLogContext } from "@src/contexts/SnackLogContext";
 
 export interface IMenuModalProps {
   name: string;
@@ -91,6 +98,8 @@ export default function ColumnMenu() {
     tableScope
   );
   const [tableNextPage] = useAtom(tableNextPageAtom, tableScope);
+  const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
+  const snackLogContext = useSnackLogContext();
 
   const [altPress] = useAtom(altPressAtom, projectScope);
   const { enqueueSnackbar, closeSnackbar } = useSnackbar();
@@ -117,8 +126,42 @@ export default function ColumnMenu() {
   const userDocHiddenFields =
     userSettings.tables?.[formatSubTableName(tableId)]?.hiddenFields ?? [];
 
+  let referencedColumns: string[] = [];
+  let referencedExtensions: string[] = [];
+  Object.entries(tableSchema?.columns ?? {}).forEach(([key, c], index) => {
+    if (
+      c.config?.listenerFields?.includes(column.key) ||
+      c.config?.requiredFields?.includes(column.key)
+    ) {
+      referencedColumns.push(c.name);
+    }
+  });
+  tableSchema?.extensionObjects?.forEach((extension) => {
+    if (extension.requiredFields.includes(column.key)) {
+      referencedExtensions.push(extension.name);
+    }
+  });
+  const requireRebuild =
+    referencedColumns.length || referencedExtensions.length;
+
   const handleDeleteColumn = () => {
     deleteColumn(column.key);
+    if (requireRebuild) {
+      snackLogContext.requestSnackLog();
+      rowyRun({
+        route: runRoutes.buildFunction,
+        body: {
+          tablePath: tableSettings.collection,
+          // pathname must match old URL format
+          pathname: getTableBuildFunctionPathname(
+            tableSettings.id,
+            tableSettings.tableType
+          ),
+          tableConfigPath: getTableSchemaPath(tableSettings),
+        },
+      });
+      logEvent(analytics, "deployed_extensions");
+    }
     logEvent(analytics, "delete_column", { type: column.type });
     handleClose();
   };
@@ -360,8 +403,8 @@ export default function ColumnMenu() {
       icon: <ColumnRemoveIcon />,
       onClick: altPress
         ? handleDeleteColumn
-        : () =>
-            confirm({
+        : () => {
+            return confirm({
               title: "Delete column?",
               body: (
                 <>
@@ -373,12 +416,39 @@ export default function ColumnMenu() {
                   <Typography sx={{ mt: 1 }}>
                     Key: <code style={{ userSelect: "all" }}>{column.key}</code>
                   </Typography>
+                  {requireRebuild ? (
+                    <>
+                      <Divider sx={{ my: 2 }} />
+                      {referencedColumns.length ? (
+                        <Typography sx={{ mt: 1 }}>
+                          This column will be removed as a dependency of the
+                          following columns:{" "}
+                          <Typography fontWeight="bold" component="span">
+                            {referencedColumns.join(", ")}
+                          </Typography>
+                        </Typography>
+                      ) : null}
+                      {referencedExtensions.length ? (
+                        <Typography sx={{ mt: 1 }}>
+                          This column will be removed as a dependency from the
+                          following Extensions:{" "}
+                          <Typography fontWeight="bold" component="span">
+                            {referencedExtensions.join(", ")}
+                          </Typography>
+                        </Typography>
+                      ) : null}
+                      <Typography sx={{ mt: 1, fontWeight: "bold" }}>
+                        You need to re-deploy this table’s cloud function.
+                      </Typography>
+                    </>
+                  ) : null}
                 </>
               ),
-              confirm: "Delete",
+              confirm: requireRebuild ? "Delete & re-deploy" : "Delete",
               confirmColor: "error",
               handleConfirm: handleDeleteColumn,
-            }),
+            });
+          },
       color: "error" as "error",
     },
   ];
diff --git a/src/components/ErrorFallback.tsx b/src/components/ErrorFallback.tsx
index 83f8fb7a..3d7f130a 100644
--- a/src/components/ErrorFallback.tsx
+++ b/src/components/ErrorFallback.tsx
@@ -1,21 +1,17 @@
 import { useState, useEffect } from "react";
 import { FallbackProps } from "react-error-boundary";
-import { useLocation, Link } from "react-router-dom";
+import { useLocation } from "react-router-dom";
 import useOffline from "@src/hooks/useOffline";
 
 import { Typography, Button } from "@mui/material";
 import ReloadIcon from "@mui/icons-material/Refresh";
 import InlineOpenInNewIcon from "@src/components/InlineOpenInNewIcon";
 import OfflineIcon from "@mui/icons-material/CloudOff";
-import { Tables as TablesIcon } from "@src/assets/icons";
 
 import EmptyState, { IEmptyStateProps } from "@src/components/EmptyState";
 import AccessDenied from "@src/components/AccessDenied";
 
-import { ROUTES } from "@src/constants/routes";
-import meta from "@root/package.json";
-
-export const ERROR_TABLE_NOT_FOUND = "Table not found";
+import { EXTERNAL_LINKS } from "@src/constants/externalLinks";
 
 export interface IErrorFallbackProps extends FallbackProps, IEmptyStateProps {}
 
@@ -43,9 +39,22 @@ export function ErrorFallbackContents({
         <Button
           size={props.basic ? "small" : "medium"}
           href={
-            meta.repository.url.replace(".git", "") +
-            "/issues/new?labels=bug&template=bug_report.md&title=Error: " +
-            error.message.replace("\n", " ")
+            EXTERNAL_LINKS.gitHub +
+            "/discussions/new?" +
+            new URLSearchParams({
+              labels: "bug",
+              category: "support-q-a",
+              title: [
+                "Error",
+                (error as any).code,
+                (error as any).status,
+                error.message,
+              ]
+                .filter(Boolean)
+                .join(": ")
+                .replace(/\n/g, " "),
+              body: "👉 **Please describe the steps that you took that led to this bug.**",
+            }).toString()
           }
           target="_blank"
           rel="noopener noreferrer"
@@ -57,37 +66,6 @@ export function ErrorFallbackContents({
     ),
   };
 
-  if (error.message.startsWith(ERROR_TABLE_NOT_FOUND)) {
-    if (isOffline) {
-      renderProps = { Icon: OfflineIcon, message: "You’re offline" };
-    } else {
-      renderProps = {
-        message: ERROR_TABLE_NOT_FOUND,
-        description: (
-          <>
-            <Typography variant="inherit">
-              Make sure you have the right ID
-            </Typography>
-            <code>
-              {error.message.replace(ERROR_TABLE_NOT_FOUND + ": ", "")}
-            </code>
-            <Button
-              size={props.basic ? "small" : "medium"}
-              variant="outlined"
-              color="secondary"
-              component={Link}
-              to={ROUTES.tables}
-              startIcon={<TablesIcon />}
-              onClick={() => resetErrorBoundary()}
-            >
-              All tables
-            </Button>
-          </>
-        ),
-      };
-    }
-  }
-
   if (error.message.startsWith("Loading chunk")) {
     if (isOffline) {
       renderProps = { Icon: OfflineIcon, message: "You’re offline" };
diff --git a/src/components/TableInformationDrawer/Details.tsx b/src/components/TableInformationDrawer/Details.tsx
index 3f93721b..78dd0236 100644
--- a/src/components/TableInformationDrawer/Details.tsx
+++ b/src/components/TableInformationDrawer/Details.tsx
@@ -1,134 +1,244 @@
-import { useMemo } from "react";
+import { useMemo, useState } from "react";
 import { format } from "date-fns";
-import { find } from "lodash-es";
+import { find, isEqual } from "lodash-es";
 import MDEditor from "@uiw/react-md-editor";
 
-import { Box, IconButton, Stack, Typography } from "@mui/material";
+import {
+  Box,
+  IconButton,
+  Stack,
+  TextField,
+  Typography,
+  useTheme,
+} from "@mui/material";
 
 import EditIcon from "@mui/icons-material/EditOutlined";
+import EditOffIcon from "@mui/icons-material/EditOffOutlined";
 
 import { tableScope, tableSettingsAtom } from "@src/atoms/tableScope";
-import { useAtom, useSetAtom } from "jotai";
+import { useAtom } from "jotai";
 import {
   projectScope,
   tablesAtom,
-  tableSettingsDialogAtom,
+  updateTableAtom,
   userRolesAtom,
 } from "@src/atoms/projectScope";
 import { DATE_TIME_FORMAT } from "@src/constants/dates";
+import SaveState from "@src/components/SideDrawer/SaveState";
 
 export default function Details() {
   const [userRoles] = useAtom(userRolesAtom, projectScope);
   const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
   const [tables] = useAtom(tablesAtom, projectScope);
-  const openTableSettingsDialog = useSetAtom(
-    tableSettingsDialogAtom,
-    projectScope
-  );
+  const [updateTable] = useAtom(updateTableAtom, projectScope);
+  const theme = useTheme();
 
   const settings = useMemo(
     () => find(tables, ["id", tableSettings.id]),
     [tables, tableSettings.id]
   );
 
+  const { description, details, _createdBy } = settings ?? {};
+
+  const [editDescription, setEditDescription] = useState(false);
+  const [localDescription, setLocalDescription] = useState(description ?? "");
+  const [localDetails, setLocalDetails] = useState(details ?? "");
+  const [editDetails, setEditDetails] = useState(false);
+  const [mdFullScreen, setMdFullScreen] = useState(false);
+
+  const [saveState, setSaveState] = useState<
+    "" | "unsaved" | "saving" | "saved"
+  >("");
+
   if (!settings) {
     return null;
   }
 
-  const editButton = userRoles.includes("ADMIN") && (
-    <IconButton
-      aria-label="Edit"
-      onClick={() =>
-        openTableSettingsDialog({
-          mode: "update",
-          data: settings,
-        })
-      }
-      disabled={!openTableSettingsDialog || settings.id.includes("/")}
-    >
-      <EditIcon />
-    </IconButton>
-  );
+  const handleSave = async () => {
+    setSaveState("saving");
+    await updateTable!({
+      ...settings,
+      description: localDescription,
+      details: localDetails,
+    });
+    setSaveState("saved");
+  };
 
-  const { description, details, _createdBy } = settings;
+  const isAdmin = userRoles.includes("ADMIN");
 
   return (
-    <Stack
-      direction="column"
-      gap={3}
-      sx={{
-        paddingTop: 3,
-        paddingRight: 3,
-        paddingBottom: 5,
-        "& > .MuiGrid-root": {
-          position: "relative",
-        },
-      }}
-    >
-      {/* Description */}
-      <Stack direction="column" gap={1}>
-        <Stack
-          direction="row"
-          justifyContent="space-between"
-          alignItems="flex-end"
-        >
-          <Typography variant="subtitle1" component="h3">
-            Description
-          </Typography>
-          {editButton}
+    <>
+      <Box
+        sx={{
+          paddingTop: 3,
+          paddingRight: 4,
+          position: "fixed",
+          right: 0,
+          zIndex: 1,
+        }}
+      >
+        <SaveState state={saveState} />
+      </Box>
+      <Stack
+        gap={3}
+        sx={{
+          paddingTop: 3,
+          paddingRight: 3,
+          paddingBottom: 5,
+        }}
+      >
+        {/* Description */}
+        <Stack gap={1}>
+          <Stack
+            direction="row"
+            justifyContent="space-between"
+            alignItems="flex-end"
+          >
+            <Typography variant="subtitle1" component="h3">
+              Description
+            </Typography>
+            {isAdmin && (
+              <IconButton
+                aria-label="Edit description"
+                onClick={() => {
+                  setEditDescription(!editDescription);
+                }}
+                sx={{ top: 4 }}
+              >
+                {editDescription ? <EditOffIcon /> : <EditIcon />}
+              </IconButton>
+            )}
+          </Stack>
+          {editDescription ? (
+            <TextField
+              sx={{
+                color: "text.secondary",
+              }}
+              autoFocus={true}
+              value={localDescription}
+              onChange={(e) => {
+                setLocalDescription(e.target.value);
+                saveState !== "unsaved" && setSaveState("unsaved");
+              }}
+              onBlur={() =>
+                isEqual(description, localDescription)
+                  ? setSaveState("")
+                  : handleSave()
+              }
+              rows={2}
+              minRows={2}
+            />
+          ) : (
+            <Typography variant="body2" color="text.secondary">
+              {localDescription ? localDescription : "No description"}
+            </Typography>
+          )}
         </Stack>
-        <Typography variant="body2" color="text.secondary">
-          {description ? description : "No description"}
-        </Typography>
-      </Stack>
-
-      {/* Details */}
-      <Stack direction="column" gap={1}>
-        <Stack
-          direction="row"
-          justifyContent="space-between"
-          alignItems="flex-end"
-        >
-          <Typography variant="subtitle1" component="h3">
-            Details
-          </Typography>
-          {editButton}
-        </Stack>
-        {!details ? (
-          <Typography variant="body2" color="text.secondary">
-            No details
-          </Typography>
-        ) : (
+        {/* Details */}
+        <Stack gap={1}>
+          <Stack
+            direction="row"
+            justifyContent="space-between"
+            alignItems="flex-end"
+          >
+            <Typography variant="subtitle1" component="h3">
+              Details
+            </Typography>
+            {isAdmin && (
+              <IconButton
+                aria-label="Edit details"
+                onClick={() => {
+                  setEditDetails(!editDetails);
+                }}
+                sx={{ top: 4 }}
+              >
+                {editDetails ? <EditOffIcon /> : <EditIcon />}
+              </IconButton>
+            )}
+          </Stack>
           <Box
+            data-color-mode={theme.palette.mode}
             sx={{
               color: "text.secondary",
+              ...theme.typography.body2,
+              "& .w-md-editor": {
+                backgroundColor: `${theme.palette.action.input} !important`,
+              },
+              "& .w-md-editor-fullscreen": {
+                backgroundColor: `${theme.palette.background.paper} !important`,
+              },
+              "& .w-md-editor-toolbar": {
+                display: "flex",
+                gap: 1,
+              },
+              "& .w-md-editor-toolbar > ul": {
+                display: "flex",
+                alignItems: "center",
+              },
+              "& .w-md-editor-toolbar > ul:first-of-type": {
+                overflowX: "auto",
+                marginRight: theme.spacing(1),
+              },
+              "& :is(h1, h2, h3, h4, h5, h6)": {
+                marginY: `${theme.spacing(1.5)} !important`,
+                borderBottom: "none !important",
+              },
+              "& details summary": {
+                marginBottom: theme.spacing(1),
+              },
             }}
           >
-            <MDEditor.Markdown source={details} />
+            {editDetails ? (
+              <MDEditor
+                style={{ margin: 1 }}
+                value={localDetails}
+                preview={mdFullScreen ? "live" : "edit"}
+                commandsFilter={(command) => {
+                  if (command.name === "fullscreen") {
+                    command.execute = () => setMdFullScreen(!mdFullScreen);
+                  }
+                  return command;
+                }}
+                textareaProps={{
+                  autoFocus: true,
+                  onChange: (e) => {
+                    setLocalDetails(e.target.value ?? "");
+                    saveState !== "unsaved" && setSaveState("unsaved");
+                  },
+                  onBlur: () =>
+                    isEqual(details, localDetails)
+                      ? setSaveState("")
+                      : handleSave(),
+                }}
+              />
+            ) : !localDetails ? (
+              <Typography variant="body2">No details</Typography>
+            ) : (
+              <MDEditor.Markdown source={localDetails} />
+            )}
           </Box>
+        </Stack>
+        {/* Table Audits */}
+        {_createdBy && (
+          <Stack>
+            <Typography
+              variant="caption"
+              color="text.secondary"
+              component="div"
+              style={{ whiteSpace: "normal" }}
+            >
+              Created by{" "}
+              <Typography variant="caption" color="text.primary">
+                {_createdBy.displayName}
+              </Typography>{" "}
+              on{" "}
+              <Typography variant="caption" color="text.primary">
+                {format(_createdBy.timestamp.toDate(), DATE_TIME_FORMAT)}
+              </Typography>
+            </Typography>
+          </Stack>
         )}
       </Stack>
-
-      {/* Table Audits */}
-      {_createdBy && (
-        <Stack>
-          <Typography
-            variant="caption"
-            color="text.secondary"
-            component="div"
-            style={{ whiteSpace: "normal" }}
-          >
-            Created by{" "}
-            <Typography variant="caption" color="text.primary">
-              {_createdBy.displayName}
-            </Typography>{" "}
-            on{" "}
-            <Typography variant="caption" color="text.primary">
-              {format(_createdBy.timestamp.toDate(), DATE_TIME_FORMAT)}
-            </Typography>
-          </Typography>
-        </Stack>
-      )}
-    </Stack>
+    </>
   );
 }
diff --git a/src/components/TableModals/ExportModal/ModalContentsDownload.tsx b/src/components/TableModals/ExportModal/ModalContentsDownload.tsx
index 468d52cc..8b6690dd 100644
--- a/src/components/TableModals/ExportModal/ModalContentsDownload.tsx
+++ b/src/components/TableModals/ExportModal/ModalContentsDownload.tsx
@@ -137,7 +137,11 @@ export default function Export({
       <ColumnSelect
         value={columns.map((x) => x.key)}
         onChange={handleChange(setColumns)}
-        filterColumns={(column) => DOWNLOADABLE_COLUMNS.includes(column.type)}
+        filterColumns={(column) =>
+          column.type === FieldType.derivative
+            ? DOWNLOADABLE_COLUMNS.includes(column.config?.renderFieldType)
+            : DOWNLOADABLE_COLUMNS.includes(column.type)
+        }
         label="Columns to export"
         labelPlural="columns"
         TextFieldProps={{
diff --git a/src/components/TableModals/ExtensionsModal/ExtensionsModal.tsx b/src/components/TableModals/ExtensionsModal/ExtensionsModal.tsx
index 57f6fbee..71146804 100644
--- a/src/components/TableModals/ExtensionsModal/ExtensionsModal.tsx
+++ b/src/components/TableModals/ExtensionsModal/ExtensionsModal.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useState } from "react";
 import { useAtom, useSetAtom } from "jotai";
-import { isEqual } from "lodash-es";
+import { isEqual, isUndefined } from "lodash-es";
 import { ITableModalProps } from "@src/components/TableModals";
 
 import Modal from "@src/components/Modal";
@@ -23,7 +23,6 @@ import {
 } from "@src/atoms/tableScope";
 import { useSnackLogContext } from "@src/contexts/SnackLogContext";
 
-import { emptyExtensionObject, IExtension, ExtensionType } from "./utils";
 import { runRoutes } from "@src/constants/runRoutes";
 import { analytics, logEvent } from "@src/analytics";
 import {
@@ -31,6 +30,14 @@ import {
   getTableBuildFunctionPathname,
 } from "@src/utils/table";
 
+import {
+  emptyExtensionObject,
+  IExtension,
+  ExtensionType,
+  IRuntimeOptions,
+} from "./utils";
+import RuntimeOptions from "./RuntimeOptions";
+
 export default function ExtensionsModal({ onClose }: ITableModalProps) {
   const [currentUser] = useAtom(currentUserAtom, projectScope);
   const [rowyRun] = useAtom(rowyRunAtom, projectScope);
@@ -39,12 +46,25 @@ export default function ExtensionsModal({ onClose }: ITableModalProps) {
   const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
   const [updateTableSchema] = useAtom(updateTableSchemaAtom, tableScope);
 
-  const currentExtensionObjects = (tableSchema.extensionObjects ??
-    []) as IExtension[];
   const [localExtensionsObjects, setLocalExtensionsObjects] = useState(
-    currentExtensionObjects
+    tableSchema.extensionObjects ?? []
   );
 
+  const [localRuntimeOptions, setLocalRuntimeOptions] = useState(
+    tableSchema.runtimeOptions ?? {}
+  );
+
+  const errors = {
+    runtimeOptions: {
+      timeoutSeconds:
+        !isUndefined(localRuntimeOptions.timeoutSeconds) &&
+        !(
+          localRuntimeOptions.timeoutSeconds! > 0 &&
+          localRuntimeOptions.timeoutSeconds! <= 540
+        ),
+    },
+  };
+
   const [openMigrationGuide, setOpenMigrationGuide] = useState(false);
   useEffect(() => {
     if (tableSchema.sparks) setOpenMigrationGuide(true);
@@ -57,7 +77,9 @@ export default function ExtensionsModal({ onClose }: ITableModalProps) {
   } | null>(null);
 
   const snackLogContext = useSnackLogContext();
-  const edited = !isEqual(currentExtensionObjects, localExtensionsObjects);
+  const edited =
+    !isEqual(tableSchema.extensionObjects ?? [], localExtensionsObjects) ||
+    !isEqual(tableSchema.runtimeOptions ?? {}, localRuntimeOptions);
 
   const handleClose = (
     _setOpen: React.Dispatch<React.SetStateAction<boolean>>
@@ -70,7 +92,8 @@ export default function ExtensionsModal({ onClose }: ITableModalProps) {
         cancel: "Keep",
         handleConfirm: () => {
           _setOpen(false);
-          setLocalExtensionsObjects(currentExtensionObjects);
+          setLocalExtensionsObjects(tableSchema.extensionObjects ?? []);
+          setLocalRuntimeOptions(tableSchema.runtimeOptions ?? {});
           onClose();
         },
       });
@@ -79,15 +102,18 @@ export default function ExtensionsModal({ onClose }: ITableModalProps) {
     }
   };
 
-  const handleSaveExtensions = async (callback?: Function) => {
+  const handleSave = async (callback?: Function) => {
     if (updateTableSchema)
-      await updateTableSchema({ extensionObjects: localExtensionsObjects });
+      await updateTableSchema({
+        extensionObjects: localExtensionsObjects,
+        runtimeOptions: localRuntimeOptions,
+      });
     if (callback) callback();
     onClose();
   };
 
   const handleSaveDeploy = async () => {
-    handleSaveExtensions(() => {
+    handleSave(() => {
       try {
         snackLogContext.requestSnackLog();
         rowyRun({
@@ -132,6 +158,13 @@ export default function ExtensionsModal({ onClose }: ITableModalProps) {
     setExtensionModal(null);
   };
 
+  const handleUpdateRuntimeOptions = (update: IRuntimeOptions) => {
+    setLocalRuntimeOptions((runtimeOptions) => ({
+      ...runtimeOptions,
+      ...update,
+    }));
+  };
+
   const handleUpdateActive = (index: number, active: boolean) => {
     setLocalExtensionsObjects(
       localExtensionsObjects.map((extensionObject, i) => {
@@ -217,24 +250,31 @@ export default function ExtensionsModal({ onClose }: ITableModalProps) {
           />
         }
         children={
-          <ExtensionList
-            extensions={localExtensionsObjects}
-            handleUpdateActive={handleUpdateActive}
-            handleEdit={handleEdit}
-            handleDuplicate={handleDuplicate}
-            handleDelete={handleDelete}
-          />
+          <>
+            <ExtensionList
+              extensions={localExtensionsObjects}
+              handleUpdateActive={handleUpdateActive}
+              handleEdit={handleEdit}
+              handleDuplicate={handleDuplicate}
+              handleDelete={handleDelete}
+            />
+            <RuntimeOptions
+              runtimeOptions={localRuntimeOptions}
+              handleUpdate={handleUpdateRuntimeOptions}
+              errors={errors.runtimeOptions}
+            />
+          </>
         }
         actions={{
           primary: {
             children: "Save & Deploy",
             onClick: handleSaveDeploy,
-            disabled: !edited,
+            disabled: !edited || errors.runtimeOptions.timeoutSeconds,
           },
           secondary: {
             children: "Save",
-            onClick: () => handleSaveExtensions(),
-            disabled: !edited,
+            onClick: () => handleSave(),
+            disabled: !edited || errors.runtimeOptions.timeoutSeconds,
           },
         }}
       />
diff --git a/src/components/TableModals/ExtensionsModal/RuntimeOptions.tsx b/src/components/TableModals/ExtensionsModal/RuntimeOptions.tsx
new file mode 100644
index 00000000..90ca584c
--- /dev/null
+++ b/src/components/TableModals/ExtensionsModal/RuntimeOptions.tsx
@@ -0,0 +1,117 @@
+import { useState } from "react";
+import { useAtom, useSetAtom } from "jotai";
+
+import {
+  Accordion,
+  AccordionDetails,
+  AccordionSummary,
+  Button,
+  Grid,
+  InputAdornment,
+  TextField,
+  Typography,
+} from "@mui/material";
+import { ChevronDown } from "@src/assets/icons";
+import MultiSelect from "@rowy/multiselect";
+
+import {
+  compatibleRowyRunVersionAtom,
+  projectScope,
+  rowyRunModalAtom,
+} from "@src/atoms/projectScope";
+
+import { IRuntimeOptions } from "./utils";
+
+export default function RuntimeOptions({
+  runtimeOptions,
+  handleUpdate,
+  errors,
+}: {
+  runtimeOptions: IRuntimeOptions;
+  handleUpdate: (runtimeOptions: IRuntimeOptions) => void;
+  errors: { timeoutSeconds: boolean };
+}) {
+  const [compatibleRowyRunVersion] = useAtom(
+    compatibleRowyRunVersionAtom,
+    projectScope
+  );
+  const openRowyRunModal = useSetAtom(rowyRunModalAtom, projectScope);
+
+  const [expanded, setExpanded] = useState(false);
+
+  const isCompatibleRowyRun = compatibleRowyRunVersion({ minVersion: "1.6.4" });
+
+  return (
+    <Accordion
+      sx={{
+        padding: 0,
+        boxShadow: "none",
+        backgroundImage: "inherit",
+        backgroundColor: "inherit",
+      }}
+      expanded={isCompatibleRowyRun && expanded}
+    >
+      <AccordionSummary
+        sx={{ padding: 0 }}
+        expandIcon={
+          isCompatibleRowyRun ? (
+            <ChevronDown />
+          ) : (
+            <Button>Update Rowy Run</Button>
+          )
+        }
+        onClick={() =>
+          isCompatibleRowyRun
+            ? setExpanded(!expanded)
+            : openRowyRunModal({
+                version: "1.6.4",
+                feature: "Runtime options",
+              })
+        }
+      >
+        <Typography variant="subtitle1">Runtime options</Typography>
+      </AccordionSummary>
+      <AccordionDetails sx={{ padding: 0 }}>
+        <Grid container spacing={2}>
+          <Grid item xs={12} md={6}>
+            <MultiSelect
+              label="Memory Allocated"
+              value={runtimeOptions.memory ?? "256MB"}
+              onChange={(value) => handleUpdate({ memory: value ?? "256MB" })}
+              multiple={false}
+              options={["128MB", "256MB", "512MB", "1GB", "2GB", "4GB", "8GB"]}
+            />
+          </Grid>
+
+          <Grid item xs={12} md={6}>
+            <TextField
+              value={runtimeOptions.timeoutSeconds ?? 60}
+              label="Timeout"
+              fullWidth
+              InputProps={{
+                endAdornment: (
+                  <InputAdornment position="end">seconds</InputAdornment>
+                ),
+              }}
+              onChange={(e) =>
+                !isNaN(Number(e.target.value)) &&
+                handleUpdate({
+                  timeoutSeconds: Number(e.target.value),
+                })
+              }
+              inputProps={{
+                inputMode: "numeric",
+              }}
+              error={errors.timeoutSeconds}
+              helperText={
+                errors.timeoutSeconds
+                  ? "Timeout must be an integer between 1 and 540"
+                  : "The maximum timeout that can be specified is 9 mins (540 seconds)"
+              }
+            />
+          </Grid>
+        </Grid>
+      </AccordionDetails>
+    </Accordion>
+  );
+}
diff --git a/src/components/TableModals/ExtensionsModal/utils.ts b/src/components/TableModals/ExtensionsModal/utils.ts
index 117ef381..28d24fda 100644
--- a/src/components/TableModals/ExtensionsModal/utils.ts
+++ b/src/components/TableModals/ExtensionsModal/utils.ts
@@ -52,6 +52,12 @@ export interface IExtension {
   trackedFields?: string[];
 }
 
+// https://firebase.google.com/docs/functions/manage-functions#set_runtime_options
+export interface IRuntimeOptions {
+  memory?: "128MB" | "256MB" | "512MB" | "1GB" | "2GB" | "4GB" | "8GB";
+  timeoutSeconds?: number;
+}
+
 export const triggerTypes: ExtensionTrigger[] = ["create", "update", "delete"];
 
 const extensionBodyTemplate = {
diff --git a/src/components/TableSettingsDialog/TableDetails.tsx b/src/components/TableSettingsDialog/TableDetails.tsx
index 705233b8..c4cdbe05 100644
--- a/src/components/TableSettingsDialog/TableDetails.tsx
+++ b/src/components/TableSettingsDialog/TableDetails.tsx
@@ -14,19 +14,40 @@ export default function TableDetails({ ...props }) {
         {props.label ?? ""}
       </InputLabel>
       <Box
+        data-color-mode={theme.palette.mode}
         sx={{
+          color: "text.secondary",
+          ...theme.typography.body2,
           "& .w-md-editor": {
             backgroundColor: `${theme.palette.action.input} !important`,
           },
           "& .w-md-editor-fullscreen": {
             backgroundColor: `${theme.palette.background.paper} !important`,
           },
+          "& .w-md-editor-toolbar": {
+            display: "flex",
+            gap: 1,
+          },
+          "& .w-md-editor-toolbar > ul": {
+            display: "flex",
+            alignItems: "center",
+          },
+          "& .w-md-editor-toolbar > ul:first-of-type": {
+            overflowX: "auto",
+            marginRight: theme.spacing(1),
+          },
+          "& :is(h1, h2, h3, h4, h5, h6)": {
+            marginY: `${theme.spacing(1.5)} !important`,
+            borderBottom: "none !important",
+          },
+          "& details summary": {
+            marginBottom: theme.spacing(1),
+          },
         }}
       >
         <MDEditor
           style={{ margin: 1 }}
           preview="live"
-          toolbarHeight={52}
           height={150}
           value={value}
           onChange={onChange}
diff --git a/src/components/TableToolbar/TableToolbarButton.tsx b/src/components/TableToolbar/TableToolbarButton.tsx
index 40f4b065..81f7dc64 100644
--- a/src/components/TableToolbar/TableToolbarButton.tsx
+++ b/src/components/TableToolbar/TableToolbarButton.tsx
@@ -4,27 +4,38 @@ import { Tooltip, Button, ButtonProps } from "@mui/material";
 export interface ITableToolbarButtonProps extends Partial<ButtonProps> {
   title: string;
   icon: React.ReactNode;
+  tooltip?: string;
 }
 
 export const TableToolbarButton = forwardRef(function TableToolbarButton_(
-  { title, icon, ...props }: ITableToolbarButtonProps,
+  { title, icon, tooltip, ...props }: ITableToolbarButtonProps,
   ref: React.Ref<HTMLButtonElement>
 ) {
+  // https://mui.com/material-ui/react-tooltip/#accessibility
+  const tooltipIsDescription = Boolean(tooltip);
+
+  const button = (
+    <Button
+      variant="outlined"
+      color="secondary"
+      size="small"
+      style={{ minWidth: 40, height: 32, padding: 0 }}
+      {...props}
+      {...(tooltipIsDescription
+        ? {
+            "aria-label": title, // Actual button label
+            title: tooltip, // Tooltip text, used to describe button e.g. why it’s disabled
+          }
+        : {})}
+      ref={ref}
+    >
+      {icon}
+    </Button>
+  );
+
   return (
-    <Tooltip title={title}>
-      <span>
-        <Button
-          variant="outlined"
-          color="secondary"
-          size="small"
-          style={{ minWidth: 40, height: 32, padding: 0 }}
-          aria-label={title}
-          {...props}
-          ref={ref}
-        >
-          {icon}
-        </Button>
-      </span>
+    <Tooltip title={tooltip || title} describeChild={tooltipIsDescription}>
+      {props.disabled ? <span title="">{button}</span> : button}
     </Tooltip>
   );
 });
diff --git a/src/components/fields/Action/EditorCell.tsx b/src/components/fields/Action/EditorCell.tsx
index 1706c4e2..2f458e86 100644
--- a/src/components/fields/Action/EditorCell.tsx
+++ b/src/components/fields/Action/EditorCell.tsx
@@ -4,6 +4,15 @@ import { Stack } from "@mui/material";
 
 import ActionFab from "./ActionFab";
 import { sanitiseCallableName, isUrl } from "./utils";
+import { get } from "lodash-es";
+
+export const getActionName = (column: any) => {
+  const config = get(column, "config");
+  if (!get(config, "customName.enabled")) {
+    return get(column, "name");
+  }
+  return get(config, "customName.actionName") || get(column, "name");
+};
 
 export default function Action({
   column,
@@ -28,7 +37,7 @@ export default function Action({
         ) : hasRan ? (
           value.status
         ) : (
-          sanitiseCallableName(column.key)
+          sanitiseCallableName(getActionName(column))
         )}
       </div>
 
diff --git a/src/components/fields/Action/Settings.tsx b/src/components/fields/Action/Settings.tsx
index 0c0655b1..a40a3c54 100644
--- a/src/components/fields/Action/Settings.tsx
+++ b/src/components/fields/Action/Settings.tsx
@@ -559,20 +559,46 @@ const Settings = ({ config, onChange, fieldName }: ISettingsProps) => {
           title: "Customization",
           content: (
             <>
-              <FormControlLabel
-                control={
-                  <Checkbox
-                    checked={config.customIcons?.enabled}
+              <Stack>
+                <FormControlLabel
+                  control={
+                    <Checkbox
+                      checked={config.customName?.enabled}
+                      onChange={(e) =>
+                        onChange("customName.enabled")(e.target.checked)
+                      }
+                      name="customName.enabled"
+                    />
+                  }
+                  label="Customize label for action"
+                  style={{ marginLeft: -11 }}
+                />
+                {config.customName?.enabled && (
+                  <TextField
+                    id="customName.actionName"
+                    value={get(config, "customName.actionName")}
                     onChange={(e) =>
-                      onChange("customIcons.enabled")(e.target.checked)
+                      onChange("customName.actionName")(e.target.value)
                     }
-                    name="customIcons.enabled"
-                  />
-                }
-                label="Customize button icons with emoji"
-                style={{ marginLeft: -11 }}
-              />
-
+                    label="Action name:"
+                    className="labelHorizontal"
+                    inputProps={{ style: { width: "10ch" } }}
+                  ></TextField>
+                )}
+                <FormControlLabel
+                  control={
+                    <Checkbox
+                      checked={config.customIcons?.enabled}
+                      onChange={(e) =>
+                        onChange("customIcons.enabled")(e.target.checked)
+                      }
+                      name="customIcons.enabled"
+                    />
+                  }
+                  label="Customize button icons with emoji"
+                  style={{ marginLeft: -11 }}
+                />
+              </Stack>
               {config.customIcons?.enabled && (
                 <Grid container spacing={2} sx={{ mt: { xs: 0, sm: -1 } }}>
                   <Grid item xs={12} sm={true}>
diff --git a/src/components/fields/Action/SideDrawerField.tsx b/src/components/fields/Action/SideDrawerField.tsx
index f17dcb7e..1f13e6d4 100644
--- a/src/components/fields/Action/SideDrawerField.tsx
+++ b/src/components/fields/Action/SideDrawerField.tsx
@@ -10,6 +10,7 @@ import ActionFab from "./ActionFab";
 import { tableScope, tableRowsAtom } from "@src/atoms/tableScope";
 import { fieldSx, getFieldId } from "@src/components/SideDrawer/utils";
 import { sanitiseCallableName, isUrl } from "./utils";
+import { getActionName } from "./TableCell";
 
 export default function Action({
   column,
@@ -58,7 +59,7 @@ export default function Action({
         ) : hasRan ? (
           value.status
         ) : (
-          sanitiseCallableName(column.key)
+          sanitiseCallableName(getActionName(column))
         )}
       </Box>
 
diff --git a/src/components/fields/Color/filters.ts b/src/components/fields/Color/filters.ts
new file mode 100644
index 00000000..0a2732be
--- /dev/null
+++ b/src/components/fields/Color/filters.ts
@@ -0,0 +1,21 @@
+import { IFilterOperator } from "@src/components/fields/types";
+
+export const filterOperators: IFilterOperator[] = [
+  {
+    label: "is",
+    secondaryLabel: "==",
+    value: "color-equal",
+  },
+  {
+    label: "is not",
+    secondaryLabel: "!=",
+    value: "color-not-equal",
+  },
+];
+
+export const valueFormatter = (value: any) => {
+  if (value && value.hex) {
+    return value.hex.toString();
+  }
+  return "";
+};
diff --git a/src/components/fields/Color/index.tsx b/src/components/fields/Color/index.tsx
index cb266301..140593a3 100644
--- a/src/components/fields/Color/index.tsx
+++ b/src/components/fields/Color/index.tsx
@@ -5,6 +5,7 @@ import { toColor } from "react-color-palette";
 
 import ColorIcon from "@mui/icons-material/Colorize";
 import DisplayCell from "./DisplayCell";
+import { filterOperators, valueFormatter } from "./filters";
 
 const EditorCell = lazy(
   () => import("./EditorCell" /* webpackChunkName: "EditorCell-Color" */)
@@ -28,6 +29,10 @@ export const config: IFieldConfig = {
     disablePadding: true,
   }),
   SideDrawerField,
+  filter: {
+    operators: filterOperators,
+    valueFormatter,
+  },
   csvImportParser: (value: string) => {
     try {
       const obj = JSON.parse(value);
diff --git a/src/components/fields/Json/SideDrawerField.tsx b/src/components/fields/Json/SideDrawerField.tsx
index 89ddbc1e..4c0fbc96 100644
--- a/src/components/fields/Json/SideDrawerField.tsx
+++ b/src/components/fields/Json/SideDrawerField.tsx
@@ -40,13 +40,14 @@ export default function Json({
   const [editor, setEditor] = useAtom(jsonEditorAtom, projectScope);
   const [codeValid, setCodeValid] = useState(true);
 
-  const sanitizedValue =
+  const baseValue =
     value !== undefined && isValidJson(value)
       ? value
       : column.config?.isArray
       ? []
       : {};
-  const formattedJson = stringify(sanitizedValue, { space: 2 });
+  const formattedJson = stringify(baseValue, { space: 2 });
+  const sanitizedValue = JSON.parse(formattedJson);
 
   if (disabled)
     return (
diff --git a/src/components/fields/Rating/DisplayCell.tsx b/src/components/fields/Rating/DisplayCell.tsx
index 1e539ad4..b5d28471 100644
--- a/src/components/fields/Rating/DisplayCell.tsx
+++ b/src/components/fields/Rating/DisplayCell.tsx
@@ -2,24 +2,7 @@ import React, { forwardRef } from "react";
 import { IDisplayCellProps } from "@src/components/fields/types";
 
 import MuiRating, { RatingProps as MuiRatingProps } from "@mui/material/Rating";
-import RatingIcon from "@mui/icons-material/Star";
-import RatingOutlineIcon from "@mui/icons-material/StarBorder";
-import { get } from "lodash-es";
-
-export const getStateIcon = (config: any) => {
-  // only use the config to get the custom rating icon if enabled via toggle
-  if (!get(config, "customIcons.enabled")) {
-    return <RatingIcon />;
-  }
-  return get(config, "customIcons.rating") || <RatingIcon />;
-};
-
-export const getStateOutline = (config: any) => {
-  if (!get(config, "customIcons.enabled")) {
-    return <RatingOutlineIcon />;
-  }
-  return get(config, "customIcons.rating") || <RatingOutlineIcon />;
-};
+import Icon from "./Icon";
 
 export const Rating = forwardRef(function Rating(
   {
@@ -55,14 +38,15 @@ export const Rating = forwardRef(function Rating(
         if (["ArrowLeft", "ArrowRight", "ArrowUp", "ArrowDown"].includes(e.key))
           e.stopPropagation();
       }}
-      icon={getStateIcon(column.config)}
+      icon={<Icon config={column.config} isEmpty={false} />}
+      emptyIcon={<Icon config={column.config} isEmpty={true} />}
       size="small"
       readOnly={disabled}
-      emptyIcon={getStateOutline(column.config)}
       max={max}
       precision={precision}
       sx={{ mx: -0.25 }}
     />
   );
 });
+
 export default Rating;
diff --git a/src/components/fields/Rating/Icon.tsx b/src/components/fields/Rating/Icon.tsx
new file mode 100644
index 00000000..e65b8f3d
--- /dev/null
+++ b/src/components/fields/Rating/Icon.tsx
@@ -0,0 +1,31 @@
+import RatingIcon from "@mui/icons-material/Star";
+import RatingOutlineIcon from "@mui/icons-material/StarBorder";
+import { get } from "lodash-es";
+
+export interface IIconProps {
+  config: any;
+  isEmpty: boolean;
+}
+
+export default function Icon({ config, isEmpty }: IIconProps) {
+  if (isEmpty) {
+    return getStateOutline(config);
+  } else {
+    return getStateIcon(config);
+  }
+}
+
+const getStateIcon = (config: any) => {
+  // only use the config to get the custom rating icon if enabled via toggle
+  if (!get(config, "customIcons.enabled")) {
+    return <RatingIcon />;
+  }
+  console.log(get(config, "customIcons.rating"));
+  return get(config, "customIcons.rating") || <RatingIcon />;
+};
+const getStateOutline = (config: any) => {
+  if (!get(config, "customIcons.enabled")) {
+    return <RatingOutlineIcon />;
+  }
+  return get(config, "customIcons.rating") || <RatingOutlineIcon />;
+};
diff --git a/src/components/fields/Rating/Settings.tsx b/src/components/fields/Rating/Settings.tsx
index 6134b530..7bf99d5b 100644
--- a/src/components/fields/Rating/Settings.tsx
+++ b/src/components/fields/Rating/Settings.tsx
@@ -1,11 +1,17 @@
 import { ISettingsProps } from "@src/components/fields/types";
-import RatingIcon from "@mui/icons-material/Star";
-import RatingOutlineIcon from "@mui/icons-material/StarBorder"
-import { InputLabel, TextField, Grid, FormControlLabel, Checkbox, Stack } from "@mui/material";
+import {
+  InputLabel,
+  TextField,
+  Grid,
+  FormControlLabel,
+  Checkbox,
+  Stack,
+} from "@mui/material";
 import ToggleButton from "@mui/material/ToggleButton";
 import ToggleButtonGroup from "@mui/material/ToggleButtonGroup";
 import MuiRating from "@mui/material/Rating";
 import { get } from "lodash-es";
+import Icon from "./Icon";
 
 export default function Settings({ onChange, config }: ISettingsProps) {
   return (
@@ -18,10 +24,13 @@ export default function Settings({ onChange, config }: ISettingsProps) {
           fullWidth
           error={false}
           onChange={(e) => {
-            let input = parseInt(e.target.value) || 0
-            if (input > 20) { input = 20 }
+            let input = parseInt(e.target.value) || 0;
+            if (input > 20) {
+              input = 20;
+            }
             onChange("max")(input);
           }}
+          inputProps={{ min: 1, max: 20 }}
         />
       </Grid>
       <Grid item xs={6}>
@@ -68,28 +77,26 @@ export default function Settings({ onChange, config }: ISettingsProps) {
             <TextField
               id="customIcons.rating"
               value={get(config, "customIcons.rating")}
-              onChange={(e) =>
-                onChange("customIcons.rating")(e.target.value)
-              }
+              onChange={(e) => onChange("customIcons.rating")(e.target.value)}
               label="Custom icon preview:"
               className="labelHorizontal"
               inputProps={{ style: { width: "2ch" } }}
             />
 
-            <MuiRating aria-label="Preview of the rating field with custom icon"
+            <MuiRating
+              aria-label="Preview of the rating field with custom icon"
               name="Preview"
               onClick={(e) => e.stopPropagation()}
-              icon={get(config, "customIcons.rating") || <RatingIcon />}
+              icon={<Icon config={config} isEmpty={false} />}
               size="small"
-              emptyIcon={get(config, "customIcons.rating") || <RatingOutlineIcon />}
+              emptyIcon={<Icon config={config} isEmpty={true} />}
               max={get(config, "max")}
               precision={get(config, "precision")}
               sx={{ pt: 0.5 }}
             />
           </Stack>
-
         </Grid>
       )}
     </Grid>
   );
-}
\ No newline at end of file
+}
diff --git a/src/components/fields/Rating/SideDrawerField.tsx b/src/components/fields/Rating/SideDrawerField.tsx
index 389d3211..ea69325e 100644
--- a/src/components/fields/Rating/SideDrawerField.tsx
+++ b/src/components/fields/Rating/SideDrawerField.tsx
@@ -3,8 +3,8 @@ import { ISideDrawerFieldProps } from "@src/components/fields/types";
 import { Grid } from "@mui/material";
 import { Rating as MuiRating } from "@mui/material";
 import "@mui/lab";
-import { getStateIcon, getStateOutline } from "./DisplayCell";
 import { fieldSx } from "@src/components/SideDrawer/utils";
+import Icon from "./Icon";
 
 export default function Rating({
   column,
@@ -27,8 +27,8 @@ export default function Rating({
           onChange(newValue);
           onSubmit();
         }}
-        icon={getStateIcon(column.config)}
-        emptyIcon={getStateOutline(column.config)}
+        icon={<Icon config={column.config} isEmpty={false} />}
+        emptyIcon={<Icon config={column.config} isEmpty={true} />}
         size="small"
         max={max}
         precision={precision}
diff --git a/src/constants/externalLinks.ts b/src/constants/externalLinks.ts
index bf2f41ab..4625d6ba 100644
--- a/src/constants/externalLinks.ts
+++ b/src/constants/externalLinks.ts
@@ -15,8 +15,8 @@ export const EXTERNAL_LINKS = {
   twitter: "https://twitter.com/rowyio",
   productHunt: "https://www.producthunt.com/products/rowy-2",
 
-  rowyRun: meta.repository.url.replace(".git", "Run"),
-  rowyRunGitHub: meta.repository.url.replace(".git", "Run"),
+  rowyRun: meta.repository.url.replace("rowy.git", "backend"),
+  rowyRunGitHub: meta.repository.url.replace("rowy.git", "backend"),
   // prettier-ignore
   rowyRunDeploy: `https://deploy.cloud.run/?git_repo=${meta.repository.url.replace(".git", "Run")}.git`,
 
diff --git a/src/hooks/useFirestoreCollectionWithAtom.ts b/src/hooks/useFirestoreCollectionWithAtom.ts
index 43f7165a..cf5d648c 100644
--- a/src/hooks/useFirestoreCollectionWithAtom.ts
+++ b/src/hooks/useFirestoreCollectionWithAtom.ts
@@ -376,12 +376,20 @@ export const tableFiltersToFirestoreFilters = (filters: TableFilter[]) => {
     } else if (filter.operator === "id-equal") {
       firestoreFilters.push(where(documentId(), "==", filter.value));
       continue;
+    } else if (filter.operator === "color-equal") {
+      firestoreFilters.push(
+        where(filter.key.concat(".hex"), "==", filter.value.hex.toString())
+      );
+      continue;
+    } else if (filter.operator === "color-not-equal") {
+      firestoreFilters.push(
+        where(filter.key.concat(".hex"), "!=", filter.value.hex.toString())
+      );
+      continue;
     }
-
     firestoreFilters.push(
       where(filter.key, filter.operator as WhereFilterOp, filter.value)
     );
   }
-
   return firestoreFilters;
 };
diff --git a/src/index.tsx b/src/index.tsx
index 5d545f47..f4d7b2c9 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -8,11 +8,11 @@ import reportWebVitals from "./reportWebVitals";
 const container = document.getElementById("root")!;
 const root = createRoot(container);
 root.render(
-  <StrictMode>
-    <Providers>
-      <App />
-    </Providers>
-  </StrictMode>
+  // <StrictMode>
+  <Providers>
+    <App />
+  </Providers>
+  // </StrictMode>
 );
 
 // If you want to start measuring performance in your app, pass a function
diff --git a/src/pages/Table/ProvidedTablePage.tsx b/src/pages/Table/ProvidedTablePage.tsx
index ab2b7614..8f86be90 100644
--- a/src/pages/Table/ProvidedTablePage.tsx
+++ b/src/pages/Table/ProvidedTablePage.tsx
@@ -1,16 +1,20 @@
 import { lazy, Suspense } from "react";
 import { useAtom, Provider } from "jotai";
 import { DebugAtoms } from "@src/atoms/utils";
-import { useParams, useOutlet } from "react-router-dom";
+import { useParams, useOutlet, Link } from "react-router-dom";
 import { ErrorBoundary } from "react-error-boundary";
 import { find, isEmpty } from "lodash-es";
+import useOffline from "@src/hooks/useOffline";
 
-import ErrorFallback, {
-  ERROR_TABLE_NOT_FOUND,
-} from "@src/components/ErrorFallback";
+import { Typography, Button } from "@mui/material";
+
+import ErrorFallback from "@src/components/ErrorFallback";
 import TableSourceFirestore from "@src/sources/TableSourceFirestore";
 import TableToolbarSkeleton from "@src/components/TableToolbar/TableToolbarSkeleton";
 import TableSkeleton from "@src/components/Table/TableSkeleton";
+import EmptyState from "@src/components/EmptyState";
+import OfflineIcon from "@mui/icons-material/CloudOff";
+import { Tables as TablesIcon } from "@src/assets/icons";
 
 import {
   projectScope,
@@ -25,6 +29,7 @@ import {
   tableSettingsAtom,
 } from "@src/atoms/tableScope";
 import { SyncAtomValue } from "@src/atoms/utils";
+import { ROUTES } from "@src/constants/routes";
 import useDocumentTitle from "@src/hooks/useDocumentTitle";
 
 // prettier-ignore
@@ -41,6 +46,7 @@ export default function ProvidedTablePage() {
   const [currentUser] = useAtom(currentUserAtom, projectScope);
   const [projectSettings] = useAtom(projectSettingsAtom, projectScope);
   const [tables] = useAtom(tablesAtom, projectScope);
+  const isOffline = useOffline();
 
   const tableSettings = find(tables, ["id", id]);
   useDocumentTitle(projectId, tableSettings ? tableSettings.name : "Not found");
@@ -54,7 +60,41 @@ export default function ProvidedTablePage() {
         </>
       );
     } else {
-      throw new Error(ERROR_TABLE_NOT_FOUND + ": " + id);
+      if (isOffline) {
+        return (
+          <EmptyState
+            role="alert"
+            fullScreen
+            Icon={OfflineIcon}
+            message="You’re offline"
+          />
+        );
+      } else {
+        return (
+          <EmptyState
+            role="alert"
+            fullScreen
+            message="Table not found"
+            description={
+              <>
+                <Typography variant="inherit">
+                  Make sure you have the right ID
+                </Typography>
+                <code>{id}</code>
+                <Button
+                  variant="outlined"
+                  color="secondary"
+                  component={Link}
+                  to={ROUTES.tables}
+                  startIcon={<TablesIcon />}
+                >
+                  All tables
+                </Button>
+              </>
+            }
+          />
+        );
+      }
     }
   }
 
diff --git a/src/theme/components.tsx b/src/theme/components.tsx
index 2bc4b2e5..374dc25b 100644
--- a/src/theme/components.tsx
+++ b/src/theme/components.tsx
@@ -1381,11 +1381,12 @@ export const components = (theme: Theme): ThemeOptions => {
 
       MuiRating: {
         styleOverrides: {
-          iconFilled: { color: theme.palette.text.secondary },
           icon: {
             // https://github.com/mui/material-ui/issues/32557
             "& .MuiSvgIcon-root": { pointerEvents: "auto" },
+            color: theme.palette.text.secondary,
           },
+          iconEmpty: { opacity: 0.38 },
         },
       },
 
diff --git a/src/types/table.d.ts b/src/types/table.d.ts
index 5b54b9be..b9753c41 100644
--- a/src/types/table.d.ts
+++ b/src/types/table.d.ts
@@ -4,7 +4,10 @@ import type {
   DocumentData,
   DocumentReference,
 } from "firebase/firestore";
-import { IExtension } from "@src/components/TableModals/ExtensionsModal/utils";
+import {
+  IExtension,
+  IRuntimeOptions,
+} from "@src/components/TableModals/ExtensionsModal/utils";
 import { IWebhook } from "@src/components/TableModals/WebhooksModal/utils";
 
 /**
@@ -104,6 +107,7 @@ export type TableSchema = {
   extensionObjects?: IExtension[];
   compiledExtension?: string;
   webhooks?: IWebhook[];
+  runtimeOptions?: IRuntimeOptions;
 
   /** @deprecated Migrate to Extensions */
   sparks?: string;
@@ -146,7 +150,11 @@ export type ColumnConfig = {
     /** Regex used in CellValidation */
     validationRegex: string;
     /** FieldType to render for Derivative fields */
-    renderFieldType: FieldType;
+    renderFieldType?: FieldType;
+    /** Used in Derivative fields */
+    listenerFields?: string[];
+    /** Used in Derivative and Action fields */
+    requiredFields?: string[];
     /** For sub-table fields */
     parentLabel: string[];
 
@@ -167,7 +175,9 @@ export type TableFilter = {
     | "date-before-equal"
     | "date-after-equal"
     | "time-minute-equal"
-    | "id-equal";
+    | "id-equal"
+    | "color-equal"
+    | "color-not-equal";
   value: any;
 };
 

From 282268989703516a63137b88ac86e53c8b2526ea Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 14 Nov 2022 16:11:34 +1100
Subject: [PATCH 256/309] move Action getActionName util fn to DisplayCell.tsx

---
 src/components/fields/Action/DisplayCell.tsx     | 13 +++++++++++--
 src/components/fields/Action/EditorCell.tsx      | 10 +---------
 src/components/fields/Action/SideDrawerField.tsx |  2 +-
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/components/fields/Action/DisplayCell.tsx b/src/components/fields/Action/DisplayCell.tsx
index f852ce6b..78871401 100644
--- a/src/components/fields/Action/DisplayCell.tsx
+++ b/src/components/fields/Action/DisplayCell.tsx
@@ -1,5 +1,14 @@
 import { IDisplayCellProps } from "@src/components/fields/types";
+import { get } from "lodash-es";
 
-export default function Action({ name, value }: IDisplayCellProps) {
-  return <>{value ? value.status : name}</>;
+export const getActionName = (column: IDisplayCellProps["column"]) => {
+  const config = get(column, "config");
+  if (!get(config, "customName.enabled")) {
+    return get(column, "name");
+  }
+  return get(config, "customName.actionName") || get(column, "name");
+};
+
+export default function Action({ value, column }: IDisplayCellProps) {
+  return <>{value ? value.status : getActionName(column)}</>;
 }
diff --git a/src/components/fields/Action/EditorCell.tsx b/src/components/fields/Action/EditorCell.tsx
index 2f458e86..35a04cb6 100644
--- a/src/components/fields/Action/EditorCell.tsx
+++ b/src/components/fields/Action/EditorCell.tsx
@@ -4,15 +4,7 @@ import { Stack } from "@mui/material";
 
 import ActionFab from "./ActionFab";
 import { sanitiseCallableName, isUrl } from "./utils";
-import { get } from "lodash-es";
-
-export const getActionName = (column: any) => {
-  const config = get(column, "config");
-  if (!get(config, "customName.enabled")) {
-    return get(column, "name");
-  }
-  return get(config, "customName.actionName") || get(column, "name");
-};
+import { getActionName } from "./DisplayCell";
 
 export default function Action({
   column,
diff --git a/src/components/fields/Action/SideDrawerField.tsx b/src/components/fields/Action/SideDrawerField.tsx
index 1f13e6d4..200fc05f 100644
--- a/src/components/fields/Action/SideDrawerField.tsx
+++ b/src/components/fields/Action/SideDrawerField.tsx
@@ -10,7 +10,7 @@ import ActionFab from "./ActionFab";
 import { tableScope, tableRowsAtom } from "@src/atoms/tableScope";
 import { fieldSx, getFieldId } from "@src/components/SideDrawer/utils";
 import { sanitiseCallableName, isUrl } from "./utils";
-import { getActionName } from "./TableCell";
+import { getActionName } from "./DisplayCell";
 
 export default function Action({
   column,

From f5754af73f99a2b7e1d582382879011e77849d35 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 14 Nov 2022 16:11:46 +1100
Subject: [PATCH 257/309] Rating: remove expensive @mui/lab import

---
 src/components/fields/Rating/SideDrawerField.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/fields/Rating/SideDrawerField.tsx b/src/components/fields/Rating/SideDrawerField.tsx
index ea69325e..24f1a8d6 100644
--- a/src/components/fields/Rating/SideDrawerField.tsx
+++ b/src/components/fields/Rating/SideDrawerField.tsx
@@ -2,7 +2,6 @@ import { ISideDrawerFieldProps } from "@src/components/fields/types";
 
 import { Grid } from "@mui/material";
 import { Rating as MuiRating } from "@mui/material";
-import "@mui/lab";
 import { fieldSx } from "@src/components/SideDrawer/utils";
 import Icon from "./Icon";
 

From 315f3c7d29456127bb63355ed254418bf4439ee8 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 14 Nov 2022 17:04:14 +1100
Subject: [PATCH 258/309] improve visual affordance for column drag reorder

---
 src/assets/icons/index.ts                     |  3 ++
 .../Table/ColumnHeader/ColumnHeader.tsx       |  5 ++-
 src/components/Table/Table.tsx                | 40 ++++++++++++++++---
 3 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/src/assets/icons/index.ts b/src/assets/icons/index.ts
index 3503e99b..372af8ff 100644
--- a/src/assets/icons/index.ts
+++ b/src/assets/icons/index.ts
@@ -103,6 +103,9 @@ export { FileTableBoxOutline as Project };
 import { TableColumn } from "mdi-material-ui";
 export { TableColumn };
 
+import { DragVertical } from "mdi-material-ui";
+export { DragVertical };
+
 export * from "./AddRow";
 export * from "./AddRowTop";
 export * from "./ChevronDown";
diff --git a/src/components/Table/ColumnHeader/ColumnHeader.tsx b/src/components/Table/ColumnHeader/ColumnHeader.tsx
index 1a01c9dd..345e856b 100644
--- a/src/components/Table/ColumnHeader/ColumnHeader.tsx
+++ b/src/components/Table/ColumnHeader/ColumnHeader.tsx
@@ -166,13 +166,13 @@ export const ColumnHeader = forwardRef(function ColumnHeader(
           placement="bottom-start"
           disableInteractive
           TransitionComponent={Fade}
+          sx={{ "& .MuiTooltip-tooltip": { marginTop: "-28px !important" } }}
         >
           <Typography
             noWrap
             sx={{
               typography: "caption",
               fontWeight: "fontWeightMedium",
-              lineHeight: `${COLUMN_HEADER_HEIGHT}px`,
               textOverflow: "clip",
               position: "relative",
               zIndex: 1,
@@ -218,7 +218,8 @@ export const ColumnHeader = forwardRef(function ColumnHeader(
                 }),
 
               color: "text.disabled",
-              ".column-header:hover &, &:focus": { color: "text.primary" },
+              "[role='columnheader']:hover &, [role='columnheader']:focus &, [role='columnheader']:focus-within &, &:focus":
+                { color: "text.primary" },
             }}
           >
             <DropdownIcon />
diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index ad26cb42..5271e90d 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -16,6 +16,7 @@ import {
 } from "react-beautiful-dnd";
 import { get } from "lodash-es";
 import { ErrorBoundary } from "react-error-boundary";
+import { DragVertical } from "@src/assets/icons";
 
 import StyledTable from "./Styled/StyledTable";
 import StyledRow from "./Styled/StyledRow";
@@ -44,12 +45,9 @@ import {
   selectedCellAtom,
   contextMenuTargetAtom,
 } from "@src/atoms/tableScope";
-import { COLLECTION_PAGE_SIZE } from "@src/config/db";
 
 import { getFieldType, getFieldProp } from "@src/components/fields";
-import { FieldType } from "@src/constants/fields";
 import { TableRow, ColumnConfig } from "@src/types/table";
-import { StyledCell } from "./Styled/StyledCell";
 import { useKeyboardNavigation } from "./useKeyboardNavigation";
 import { useSaveColumnSizing } from "./useSaveColumnSizing";
 import useVirtualization from "./useVirtualization";
@@ -89,7 +87,6 @@ export default function Table({
   hiddenColumns,
   emptyState,
 }: ITableProps) {
-  const [tableSettings] = useAtom(tableSettingsAtom, tableScope);
   const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
   const [tableColumnsOrdered] = useAtom(tableColumnsOrderedAtom, tableScope);
   const [tableRows] = useAtom(tableRowsAtom, tableScope);
@@ -100,7 +97,6 @@ export default function Table({
   const focusInsideCell = selectedCell?.focusInside ?? false;
 
   const updateColumn = useSetAtom(updateColumnAtom, tableScope);
-  const updateField = useSetAtom(updateFieldAtom, tableScope);
 
   const containerRef = useRef<HTMLDivElement>(null);
   const gridRef = useRef<HTMLDivElement>(null);
@@ -365,8 +361,40 @@ export default function Table({
                                   position: "absolute",
                                   inset: 0,
                                   zIndex: 0,
+                                  display: "flex",
+                                  alignItems: "center",
+                                  outline: "none",
                                 }}
-                              />
+                                className="column-drag-handle"
+                              >
+                                <DragVertical
+                                  sx={{
+                                    opacity: 0,
+                                    borderRadius: 2,
+                                    transition: (theme) =>
+                                      theme.transitions.create(["opacity"]),
+                                    "[role='columnheader']:hover &, [role='columnheader']:focus-within &":
+                                      {
+                                        opacity: 0.5,
+                                      },
+                                    ".column-drag-handle:hover &": {
+                                      opacity: 1,
+                                    },
+                                    ".column-drag-handle:active &": {
+                                      opacity: 1,
+                                      color: "primary.main",
+                                    },
+                                    ".column-drag-handle:focus &": {
+                                      opacity: 1,
+                                      color: "primary.main",
+                                      outline: "2px solid",
+                                      outlineColor: "primary.main",
+                                    },
+                                  }}
+                                  style={{ width: 8 }}
+                                  preserveAspectRatio="xMidYMid slice"
+                                />
+                              </div>
 
                               {header.column.getCanResize() && (
                                 <StyledResizer

From 8ca2b198ccee45e06550002a25b2eee2b40ebdaa Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Tue, 15 Nov 2022 08:30:43 +0300
Subject: [PATCH 259/309] enable multi files for image&file fields

---
 src/atoms/tableScope/rowActions.ts            |  42 ++-
 .../SideDrawer/SideDrawerFields.tsx           |  15 +-
 .../fields/File/SideDrawerField.tsx           |  68 ++---
 src/components/fields/File/TableCell.tsx      |  70 ++---
 src/components/fields/File/useFileUpload.ts   |  61 +++++
 .../fields/Image/SideDrawerField.tsx          | 116 ++++----
 src/components/fields/Image/TableCell.tsx     |  87 +++---
 src/hooks/useFirebaseStorageUploader.tsx      | 256 ++++++++++--------
 8 files changed, 402 insertions(+), 313 deletions(-)
 create mode 100644 src/components/fields/File/useFileUpload.ts

diff --git a/src/atoms/tableScope/rowActions.ts b/src/atoms/tableScope/rowActions.ts
index 37d1f9de..eb462498 100644
--- a/src/atoms/tableScope/rowActions.ts
+++ b/src/atoms/tableScope/rowActions.ts
@@ -6,6 +6,7 @@ import {
   set as _set,
   isEqual,
   unset,
+  filter,
 } from "lodash-es";
 
 import { currentUserAtom } from "@src/atoms/projectScope";
@@ -29,6 +30,7 @@ import {
   updateRowData,
   omitRowyFields,
 } from "@src/utils/table";
+import { arrayRemove, arrayUnion } from "firebase/firestore";
 
 export interface IAddRowOptions {
   /** The row or array of rows to add */
@@ -306,6 +308,10 @@ export interface IUpdateFieldOptions {
   ignoreRequiredFields?: boolean;
   /** Optionally, disable checking if the updated value is equal to the current value. By default, we skip the update if they’re equal. */
   disableCheckEquality?: boolean;
+  /** Optionally, uses firestore's arrayUnion with the given value. Appends given value items to the existing array */
+  useArrayUnion?: boolean;
+  /** Optionally, uses firestore's arrayRemove with the given value. Removes given value items from the existing array */
+  useArrayRemove?: boolean;
 }
 /**
  * Set function updates or deletes a field in a row.
@@ -331,6 +337,8 @@ export const updateFieldAtom = atom(
       deleteField,
       ignoreRequiredFields,
       disableCheckEquality,
+      useArrayUnion,
+      useArrayRemove,
     }: IUpdateFieldOptions
   ) => {
     const updateRowDb = get(_updateRowDbAtom);
@@ -367,8 +375,36 @@ export const updateFieldAtom = atom(
       _set(update, fieldName, value);
     }
 
+    const localUpdate = cloneDeep(update);
+    const dbUpdate = cloneDeep(update);
+    // apply arrayUnion
+    if (useArrayUnion) {
+      if (!Array.isArray(update[fieldName]))
+        throw new Error("Field must be an array");
+
+      // use basic array merge on local row value
+      localUpdate[fieldName] = [
+        ...(row[fieldName] ?? []),
+        ...localUpdate[fieldName],
+      ];
+      dbUpdate[fieldName] = arrayUnion(...dbUpdate[fieldName]);
+    }
+
+    //apply arrayRemove
+    if (useArrayRemove) {
+      if (!Array.isArray(update[fieldName]))
+        throw new Error("Field must be an array");
+
+      // use basic array filter on local row value
+      localUpdate[fieldName] = filter(
+        row[fieldName] ?? [],
+        (el) => !find(localUpdate[fieldName], el)
+      );
+      dbUpdate[fieldName] = arrayRemove(...dbUpdate[fieldName]);
+    }
+
     // Check for required fields
-    const newRowValues = updateRowData(cloneDeep(row), update);
+    const newRowValues = updateRowData(cloneDeep(row), dbUpdate);
     const requiredFields = ignoreRequiredFields
       ? []
       : tableColumnsOrdered
@@ -383,7 +419,7 @@ export const updateFieldAtom = atom(
       set(tableRowsLocalAtom, {
         type: "update",
         path,
-        row: update,
+        row: localUpdate,
         deleteFields: deleteField ? [fieldName] : [],
       });
 
@@ -403,7 +439,7 @@ export const updateFieldAtom = atom(
     else {
       await updateRowDb(
         row._rowy_ref.path,
-        omitRowyFields(update),
+        omitRowyFields(dbUpdate),
         deleteField ? [fieldName] : []
       );
     }
diff --git a/src/components/SideDrawer/SideDrawerFields.tsx b/src/components/SideDrawer/SideDrawerFields.tsx
index 7b6a6578..937d5b44 100644
--- a/src/components/SideDrawer/SideDrawerFields.tsx
+++ b/src/components/SideDrawer/SideDrawerFields.tsx
@@ -23,7 +23,8 @@ import {
   sideDrawerShowHiddenFieldsAtom,
 } from "@src/atoms/tableScope";
 import { formatSubTableName } from "@src/utils/table";
-import { TableRow } from "@src/types/table";
+import { ColumnConfig, TableRow } from "@src/types/table";
+import { FieldType } from "@src/components/fields/types";
 
 export interface ISideDrawerFieldsProps {
   row: TableRow;
@@ -66,7 +67,17 @@ export default function SideDrawerFields({ row }: ISideDrawerFieldsProps) {
 
       setSaveState("saving");
       try {
-        await updateField({ path: selectedCell!.path, fieldName, value });
+        const { type } = tableColumnsOrdered.find(
+          (c) => c.key === selectedCell.columnKey
+        ) as ColumnConfig;
+        const useArrayUnion = [FieldType.file, FieldType.image].includes(type);
+
+        await updateField({
+          path: selectedCell!.path,
+          fieldName,
+          value,
+          useArrayUnion,
+        });
         setSaveState("saved");
       } catch (e) {
         enqueueSnackbar((e as Error).message, { variant: "error" });
diff --git a/src/components/fields/File/SideDrawerField.tsx b/src/components/fields/File/SideDrawerField.tsx
index cad34d9b..af3f6168 100644
--- a/src/components/fields/File/SideDrawerField.tsx
+++ b/src/components/fields/File/SideDrawerField.tsx
@@ -1,10 +1,9 @@
-import { useCallback, useState } from "react";
+import { useState } from "react";
 import { ISideDrawerFieldProps } from "@src/components/fields/types";
 import { useSetAtom } from "jotai";
 import { format } from "date-fns";
 
 import { useDropzone } from "react-dropzone";
-import useUploader from "@src/hooks/useFirebaseStorageUploader";
 
 import {
   alpha,
@@ -23,52 +22,30 @@ import { DATE_TIME_FORMAT } from "@src/constants/dates";
 import { fieldSx, getFieldId } from "@src/components/SideDrawer/utils";
 import { projectScope, confirmDialogAtom } from "@src/atoms/projectScope";
 import { FileValue } from "@src/types/table";
-import { arrayUnion } from "firebase/firestore";
+import useFileUpload from "./useFileUpload";
 
 export default function File_({
   column,
   _rowy_ref,
   value,
-  onChange,
-  onSubmit,
   disabled,
 }: ISideDrawerFieldProps) {
   const confirm = useSetAtom(confirmDialogAtom, projectScope);
-
-  const { uploaderState, upload, deleteUpload } = useUploader();
-
-  // Store a preview image locally while uploading
-  const [localFiles, setLocalFiles] = useState<string[]>([]);
-
-  const onDrop = useCallback(
-    (acceptedFiles: File[]) => {
-      if (_rowy_ref && acceptedFiles.length > 0) {
-        upload({
-          docRef: _rowy_ref! as any,
-          fieldName: column.key,
-          files: acceptedFiles,
-          onComplete: (newUploads) => {
-            onChange(arrayUnion(newUploads));
-            onSubmit();
-            setLocalFiles([]);
-          },
-        });
-        setLocalFiles(acceptedFiles.map((file) => file.name));
-      }
-    },
-    [_rowy_ref, value]
+  const { loading, progress, handleUpload, handleDelete } = useFileUpload(
+    _rowy_ref,
+    column.key
   );
 
-  const handleDelete = (index: number) => {
-    const newValue = [...value];
-    const toBeDeleted = newValue.splice(index, 1);
-    toBeDeleted.length && deleteUpload(toBeDeleted[0]);
-    onChange(newValue);
-    onSubmit();
-  };
+  const [localFiles, setLocalFiles] = useState<File[]>([]);
 
   const { getRootProps, getInputProps, isDragActive } = useDropzone({
-    onDrop,
+    onDrop: async (acceptedFiles: File[]) => {
+      if (acceptedFiles.length > 0) {
+        setLocalFiles(acceptedFiles);
+        await handleUpload(acceptedFiles);
+        setLocalFiles([]);
+      }
+    },
     multiple: true,
   });
 
@@ -76,6 +53,7 @@ export default function File_({
     <>
       {!disabled && (
         <ButtonBase
+          disabled={loading}
           sx={[
             fieldSx,
             {
@@ -99,13 +77,21 @@ export default function File_({
           <Typography color="inherit" style={{ flexGrow: 1 }}>
             Click to upload or drop file here
           </Typography>
-          <UploadIcon sx={{ ml: 1, mr: 2 / 8 }} />
+          {loading ? (
+            <CircularProgressOptical
+              size={20}
+              variant={progress === 0 ? "indeterminate" : "determinate"}
+              value={progress}
+            />
+          ) : (
+            <UploadIcon sx={{ ml: 1, mr: 2 / 8 }} />
+          )}
         </ButtonBase>
       )}
 
       <Grid container spacing={0.5} style={{ marginTop: 2 }}>
         {Array.isArray(value) &&
-          value.map((file: FileValue, i) => (
+          value.map((file: FileValue) => (
             <Grid item key={file.name}>
               <Tooltip
                 title={`File last modified ${format(
@@ -126,7 +112,7 @@ export default function File_({
                               body: "This file cannot be recovered after",
                               confirm: "Delete",
                               confirmColor: "error",
-                              handleConfirm: () => handleDelete(i),
+                              handleConfirm: () => handleDelete(file),
                             })
                         : undefined
                     }
@@ -137,11 +123,11 @@ export default function File_({
           ))}
 
         {localFiles &&
-          localFiles.map((fileName) => (
+          localFiles.map((file) => (
             <Grid item>
               <Chip
                 icon={<FileIcon />}
-                label={fileName}
+                label={file.name}
                 deleteIcon={
                   <CircularProgressOptical size={20} color="inherit" />
                 }
diff --git a/src/components/fields/File/TableCell.tsx b/src/components/fields/File/TableCell.tsx
index a4f96c0a..eee9a330 100644
--- a/src/components/fields/File/TableCell.tsx
+++ b/src/components/fields/File/TableCell.tsx
@@ -1,7 +1,6 @@
-import { useCallback, useState } from "react";
+import { useState } from "react";
 import { IHeavyCellProps } from "@src/components/fields/types";
 import { useSetAtom } from "jotai";
-import { findIndex } from "lodash-es";
 
 import { useDropzone } from "react-dropzone";
 import { format } from "date-fns";
@@ -12,58 +11,33 @@ import ChipList from "@src/components/Table/formatters/ChipList";
 import CircularProgressOptical from "@src/components/CircularProgressOptical";
 
 import { projectScope, confirmDialogAtom } from "@src/atoms/projectScope";
-import { tableScope, updateFieldAtom } from "@src/atoms/tableScope";
-import useUploader from "@src/hooks/useFirebaseStorageUploader";
 import { FileIcon } from ".";
 import { DATE_TIME_FORMAT } from "@src/constants/dates";
 import { FileValue } from "@src/types/table";
-import { arrayUnion } from "firebase/firestore";
+import useFileUpload from "./useFileUpload";
 
 export default function File_({
   column,
-  row,
   value,
-  onSubmit,
   disabled,
   docRef,
 }: IHeavyCellProps) {
   const confirm = useSetAtom(confirmDialogAtom, projectScope);
-  const updateField = useSetAtom(updateFieldAtom, tableScope);
-  const [localFiles, setLocalFiles] = useState<string[]>([]);
-  const { uploaderState, upload, deleteUpload } = useUploader();
-  const { progress, isLoading } = uploaderState;
-  const onDrop = useCallback(
-    (acceptedFiles: File[]) => {
-      if (acceptedFiles.length > 0) {
-        upload({
-          docRef: docRef! as any,
-          fieldName: column.key,
-          files: acceptedFiles,
-          onComplete: (newUploads) => {
-            updateField({
-              path: docRef.path,
-              fieldName: column.key,
-              value: arrayUnion(newUploads),
-            });
-            setLocalFiles([]);
-          },
-        });
-        setLocalFiles(acceptedFiles.map((file) => file.name));
-      }
-    },
-    [value]
+  const [localFiles, setLocalFiles] = useState<File[]>([]);
+
+  const { loading, progress, handleUpload, handleDelete } = useFileUpload(
+    docRef,
+    column.key
   );
 
-  const handleDelete = (ref: string) => {
-    const newValue = [...value];
-    const index = findIndex(newValue, ["ref", ref]);
-    const toBeDeleted = newValue.splice(index, 1);
-    toBeDeleted.length && deleteUpload(toBeDeleted[0]);
-    onSubmit(newValue);
-  };
-
   const { getRootProps, getInputProps, isDragActive } = useDropzone({
-    onDrop,
+    onDrop: async (acceptedFiles: File[]) => {
+      if (acceptedFiles.length > 0) {
+        setLocalFiles(acceptedFiles);
+        await handleUpload(acceptedFiles);
+        setLocalFiles([]);
+      }
+    },
     multiple: true,
   });
 
@@ -111,8 +85,13 @@ export default function File_({
                 )}`}
               >
                 <Chip
-                  icon={<FileIcon />}
                   label={file.name}
+                  icon={<FileIcon />}
+                  sx={{
+                    "& .MuiChip-label": {
+                      lineHeight: 5 / 3,
+                    },
+                  }}
                   onClick={(e) => {
                     window.open(file.downloadURL);
                     e.stopPropagation();
@@ -122,24 +101,23 @@ export default function File_({
                       ? undefined
                       : () =>
                           confirm({
-                            handleConfirm: () => handleDelete(file.ref),
+                            handleConfirm: () => handleDelete(file),
                             title: "Delete file?",
                             body: "This file cannot be recovered after",
                             confirm: "Delete",
                             confirmColor: "error",
                           })
                   }
-                  style={{ width: "100%" }}
                 />
               </Tooltip>
             </Grid>
           ))}
         {localFiles &&
-          localFiles.map((fileName) => (
+          localFiles.map((file) => (
             <Grid item>
               <Chip
                 icon={<FileIcon />}
-                label={fileName}
+                label={file.name}
                 deleteIcon={
                   <CircularProgressOptical size={20} color="inherit" />
                 }
@@ -148,7 +126,7 @@ export default function File_({
           ))}
       </ChipList>
 
-      {!isLoading ? (
+      {!loading ? (
         !disabled && (
           <IconButton
             size="small"
diff --git a/src/components/fields/File/useFileUpload.ts b/src/components/fields/File/useFileUpload.ts
new file mode 100644
index 00000000..2869f708
--- /dev/null
+++ b/src/components/fields/File/useFileUpload.ts
@@ -0,0 +1,61 @@
+import { useCallback } from "react";
+import { useSetAtom } from "jotai";
+import { some } from "lodash-es";
+
+import { tableScope, updateFieldAtom } from "@src/atoms/tableScope";
+import useUploader from "@src/hooks/useFirebaseStorageUploader";
+import { FileValue } from "@src/types/table";
+
+export default function useFileUpload(docRef: any, fieldName: string) {
+  const updateField = useSetAtom(updateFieldAtom, tableScope);
+  const { uploaderState, upload, deleteUpload } = useUploader();
+
+  const uploadingFiles = Object.keys(uploaderState);
+
+  const progress =
+    uploadingFiles.length > 0
+      ? uploadingFiles.reduce((sum, fileName) => {
+          const fileState = uploaderState[fileName];
+          return sum + fileState.progress;
+        }, 0) / uploadingFiles.length
+      : 0;
+
+  const loading = some(
+    uploadingFiles,
+    (fileName) => uploaderState[fileName].loading
+  );
+
+  const handleUpload = useCallback(
+    async (files: File[]) => {
+      const { uploads, failures } = await upload({
+        docRef,
+        fieldName,
+        files,
+      });
+      updateField({
+        path: docRef.path,
+        fieldName,
+        value: uploads,
+        useArrayUnion: true,
+      });
+      return { uploads, failures };
+    },
+    [docRef, fieldName, updateField, upload]
+  );
+
+  const handleDelete = useCallback(
+    (file: FileValue) => {
+      updateField({
+        path: docRef.path,
+        fieldName,
+        value: [file],
+        useArrayRemove: true,
+        disableCheckEquality: true,
+      });
+      deleteUpload(file);
+    },
+    [deleteUpload, docRef, fieldName, updateField]
+  );
+
+  return { progress, loading, uploaderState, handleUpload, handleDelete };
+}
diff --git a/src/components/fields/Image/SideDrawerField.tsx b/src/components/fields/Image/SideDrawerField.tsx
index 304e0555..531ba7e7 100644
--- a/src/components/fields/Image/SideDrawerField.tsx
+++ b/src/components/fields/Image/SideDrawerField.tsx
@@ -1,10 +1,9 @@
 import { ISideDrawerFieldProps } from "@src/components/fields/types";
-import { useCallback, useState } from "react";
+import { useState } from "react";
 import { useSetAtom } from "jotai";
+import { assignIn } from "lodash-es";
 
 import { useDropzone } from "react-dropzone";
-// TODO: GENERALIZE
-import useUploader from "@src/hooks/useFirebaseStorageUploader";
 
 import {
   alpha,
@@ -20,13 +19,14 @@ import AddIcon from "@mui/icons-material/AddAPhotoOutlined";
 import DeleteIcon from "@mui/icons-material/DeleteOutlined";
 import OpenIcon from "@mui/icons-material/OpenInNewOutlined";
 
+import { FileValue } from "@src/types/table";
 import Thumbnail from "@src/components/Thumbnail";
 import CircularProgressOptical from "@src/components/CircularProgressOptical";
 
 import { projectScope, confirmDialogAtom } from "@src/atoms/projectScope";
-import { IMAGE_MIME_TYPES } from ".";
 import { fieldSx, getFieldId } from "@src/components/SideDrawer/utils";
-import { arrayUnion } from "firebase/firestore";
+import useFileUpload from "@src/components/fields/File/useFileUpload";
+import { IMAGE_MIME_TYPES } from ".";
 
 const imgSx = {
   position: "relative",
@@ -85,46 +85,29 @@ export default function Image_({
   column,
   _rowy_ref,
   value,
-  onChange,
-  onSubmit,
   disabled,
 }: ISideDrawerFieldProps) {
   const confirm = useSetAtom(confirmDialogAtom, projectScope);
-  const { uploaderState, upload, deleteUpload } = useUploader();
-  const { progress } = uploaderState;
 
-  // Store a preview image locally while uploading
-  const [localImages, setLocalImages] = useState<string[]>([]);
+  const { loading, progress, handleUpload, handleDelete, uploaderState } =
+    useFileUpload(_rowy_ref, column.key);
 
-  const onDrop = useCallback(
-    (acceptedFiles: File[]) => {
-      if (_rowy_ref && acceptedFiles.length > 0) {
-        upload({
-          docRef: _rowy_ref! as any,
-          fieldName: column.key,
-          files: acceptedFiles,
-          onComplete: (newUploads) => {
-            onChange(arrayUnion(newUploads));
-            onSubmit();
-            setLocalImages([]);
-          },
-        });
-        setLocalImages(acceptedFiles.map((file) => URL.createObjectURL(file)));
-      }
-    },
-    [_rowy_ref, value]
-  );
-
-  const handleDelete = (index: number) => {
-    const newValue = [...value];
-    const toBeDeleted = newValue.splice(index, 1);
-    toBeDeleted.length && deleteUpload(toBeDeleted[0]);
-    onChange(newValue);
-    onSubmit();
-  };
+  const [localImages, setLocalImages] = useState<
+    (File & { localURL: string })[]
+  >([]);
 
   const { getRootProps, getInputProps, isDragActive } = useDropzone({
-    onDrop,
+    onDrop: async (acceptedFiles: File[]) => {
+      if (acceptedFiles.length > 0) {
+        setLocalImages(
+          acceptedFiles.map((file) =>
+            assignIn(file, { localURL: URL.createObjectURL(file) })
+          )
+        );
+        await handleUpload(acceptedFiles);
+        setLocalImages([]);
+      }
+    },
     multiple: true,
     accept: IMAGE_MIME_TYPES,
   });
@@ -133,6 +116,7 @@ export default function Image_({
     <>
       {!disabled && (
         <ButtonBase
+          disabled={loading}
           sx={[
             fieldSx,
             {
@@ -158,14 +142,22 @@ export default function Image_({
               ? "Drop image here"
               : "Click to upload or drop image here"}
           </Typography>
-          <AddIcon sx={{ ml: 1, mr: 2 / 8 }} />
+          {loading ? (
+            <CircularProgressOptical
+              size={20}
+              variant={progress === 0 ? "indeterminate" : "determinate"}
+              value={progress}
+            />
+          ) : (
+            <AddIcon sx={{ ml: 1, mr: 2 / 8 }} />
+          )}
         </ButtonBase>
       )}
 
       <Grid container spacing={1} style={{ marginTop: 0 }}>
         {Array.isArray(value) &&
-          value.map((image, i) => (
-            <Grid item key={image.downloadURL}>
+          value.map((image: FileValue) => (
+            <Grid item key={image.name}>
               {disabled ? (
                 <Tooltip title="Open">
                   <ButtonBase
@@ -212,7 +204,7 @@ export default function Image_({
                               body: "This image cannot be recovered after",
                               confirm: "Delete",
                               confirmColor: "error",
-                              handleConfirm: () => handleDelete(i),
+                              handleConfirm: () => handleDelete(image),
                             })
                           }
                         >
@@ -236,26 +228,34 @@ export default function Image_({
           ))}
 
         {localImages &&
-          localImages.map((image, i) => (
-            <Grid item>
+          localImages.map((image) => (
+            <Grid item key={image.name}>
               <ButtonBase
                 sx={imgSx}
-                style={{ backgroundImage: `url("${image}")` }}
+                style={{
+                  backgroundImage: `url("${image.localURL}")`,
+                }}
                 className="img"
               >
-                <Grid
-                  container
-                  justifyContent="center"
-                  alignItems="center"
-                  sx={overlaySx}
-                >
-                  <CircularProgressOptical
-                    color="inherit"
-                    size={48}
-                    variant={progress === 0 ? "indeterminate" : "determinate"}
-                    value={progress}
-                  />
-                </Grid>
+                {uploaderState[image.name] && (
+                  <Grid
+                    container
+                    justifyContent="center"
+                    alignItems="center"
+                    sx={overlaySx}
+                  >
+                    <CircularProgressOptical
+                      color="inherit"
+                      size={48}
+                      variant={
+                        uploaderState[image.name].progress === 0
+                          ? "indeterminate"
+                          : "determinate"
+                      }
+                      value={uploaderState[image.name].progress}
+                    />
+                  </Grid>
+                )}
               </ButtonBase>
             </Grid>
           ))}
diff --git a/src/components/fields/Image/TableCell.tsx b/src/components/fields/Image/TableCell.tsx
index 471a6f37..f8f31861 100644
--- a/src/components/fields/Image/TableCell.tsx
+++ b/src/components/fields/Image/TableCell.tsx
@@ -1,8 +1,7 @@
-import { useCallback, useState } from "react";
+import { useState } from "react";
 import { IHeavyCellProps } from "@src/components/fields/types";
 import { useAtom, useSetAtom } from "jotai";
-import { findIndex } from "lodash-es";
-
+import { assignIn } from "lodash-es";
 import { useDropzone } from "react-dropzone";
 
 import {
@@ -23,16 +22,11 @@ import Thumbnail from "@src/components/Thumbnail";
 import CircularProgressOptical from "@src/components/CircularProgressOptical";
 
 import { projectScope, confirmDialogAtom } from "@src/atoms/projectScope";
-import {
-  tableSchemaAtom,
-  tableScope,
-  updateFieldAtom,
-} from "@src/atoms/tableScope";
-import useUploader from "@src/hooks/useFirebaseStorageUploader";
-import { IMAGE_MIME_TYPES } from "./index";
+import { tableSchemaAtom, tableScope } from "@src/atoms/tableScope";
 import { DEFAULT_ROW_HEIGHT } from "@src/components/Table";
 import { FileValue } from "@src/types/table";
-import { arrayUnion } from "firebase/firestore";
+import useFileUpload from "@src/components/fields/File/useFileUpload";
+import { IMAGE_MIME_TYPES } from "./index";
 
 // MULTIPLE
 const imgSx = (rowHeight: number) => ({
@@ -89,50 +83,33 @@ const deleteImgHoverSx = {
 export default function Image_({
   column,
   value,
-  onSubmit,
   disabled,
   docRef,
 }: IHeavyCellProps) {
   const confirm = useSetAtom(confirmDialogAtom, projectScope);
-  const updateField = useSetAtom(updateFieldAtom, tableScope);
   const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
-  const { uploaderState, upload, deleteUpload } = useUploader();
-  const { progress, isLoading } = uploaderState;
 
-  // Store a preview image locally while uploading
-  const [localImages, setLocalImages] = useState<string[]>([]);
-
-  const onDrop = useCallback(
-    (acceptedFiles: File[]) => {
-      if (acceptedFiles.length > 0) {
-        upload({
-          docRef: docRef! as any,
-          fieldName: column.key,
-          files: acceptedFiles,
-          onComplete: (newUploads) => {
-            updateField({
-              path: docRef.path,
-              fieldName: column.key,
-              value: arrayUnion(newUploads),
-            });
-            setLocalImages([]);
-          },
-        });
-        setLocalImages(acceptedFiles.map((file) => URL.createObjectURL(file)));
-      }
-    },
-    [value]
+  const { loading, progress, handleUpload, handleDelete } = useFileUpload(
+    docRef,
+    column.key
   );
 
-  const handleDelete = (index: number) => () => {
-    const newValue = [...value];
-    const toBeDeleted = newValue.splice(index, 1);
-    toBeDeleted.length && deleteUpload(toBeDeleted[0]);
-    onSubmit(newValue);
-  };
+  const [localImages, setLocalImages] = useState<
+    (File & { localURL: string })[]
+  >([]);
 
   const { getRootProps, getInputProps, isDragActive } = useDropzone({
-    onDrop,
+    onDrop: async (acceptedFiles: File[]) => {
+      if (acceptedFiles.length > 0) {
+        setLocalImages(
+          acceptedFiles.map((file) =>
+            assignIn(file, { localURL: URL.createObjectURL(file) })
+          )
+        );
+        await handleUpload(acceptedFiles);
+        setLocalImages([]);
+      }
+    },
     multiple: true,
     accept: IMAGE_MIME_TYPES,
   });
@@ -181,17 +158,17 @@ export default function Image_({
       >
         <Grid container spacing={0.5} wrap="nowrap">
           {Array.isArray(value) &&
-            value.map((file: FileValue, i) => (
-              <Grid item key={file.downloadURL}>
+            value.map((image: FileValue) => (
+              <Grid item key={image.downloadURL}>
                 {disabled ? (
                   <Tooltip title="Open">
                     <ButtonBase
                       sx={imgSx(rowHeight)}
                       className="img"
-                      onClick={() => window.open(file.downloadURL, "_blank")}
+                      onClick={() => window.open(image.downloadURL, "_blank")}
                     >
                       <Thumbnail
-                        imageUrl={file.downloadURL}
+                        imageUrl={image.downloadURL}
                         size={thumbnailSize}
                         objectFit="contain"
                         sx={thumbnailSx}
@@ -222,12 +199,12 @@ export default function Image_({
                             body: "This image cannot be recovered after",
                             confirm: "Delete",
                             confirmColor: "error",
-                            handleConfirm: handleDelete(i),
+                            handleConfirm: () => handleDelete(image),
                           });
                         }}
                       >
                         <Thumbnail
-                          imageUrl={file.downloadURL}
+                          imageUrl={image.downloadURL}
                           size={thumbnailSize}
                           objectFit="contain"
                           sx={thumbnailSx}
@@ -248,7 +225,7 @@ export default function Image_({
             ))}
 
           {localImages &&
-            localImages.map((url) => (
+            localImages.map((image) => (
               <Grid item>
                 <Box
                   sx={[
@@ -258,14 +235,16 @@ export default function Image_({
                         `0 0 0 1px ${theme.palette.divider} inset`,
                     },
                   ]}
-                  style={{ backgroundImage: `url("${url}")` }}
+                  style={{
+                    backgroundImage: `url("${image.localURL}")`,
+                  }}
                 />
               </Grid>
             ))}
         </Grid>
       </div>
 
-      {!isLoading ? (
+      {!loading ? (
         !disabled && (
           <IconButton
             size="small"
diff --git a/src/hooks/useFirebaseStorageUploader.tsx b/src/hooks/useFirebaseStorageUploader.tsx
index 97c1ff2b..03e0503f 100644
--- a/src/hooks/useFirebaseStorageUploader.tsx
+++ b/src/hooks/useFirebaseStorageUploader.tsx
@@ -17,23 +17,48 @@ import { firebaseStorageAtom } from "@src/sources/ProjectSourceFirebase";
 import { WIKI_LINKS } from "@src/constants/externalLinks";
 import { FileValue } from "@src/types/table";
 
-export type UploaderState = {
+export type UploadState = {
   progress: number;
-  isLoading: boolean;
+  loading: boolean;
   error?: string;
 };
 
-const initialState: UploaderState = { progress: 0, isLoading: false };
+export type UploaderState = {
+  [fileName: string]: UploadState;
+};
+
 const uploadReducer = (
   prevState: UploaderState,
-  newProps: Partial<UploaderState>
-) => ({ ...prevState, ...newProps });
+  action: {
+    type: "reset" | "file_update";
+    data?: { fileName: string; newProps: Partial<UploadState> };
+  }
+) => {
+  switch (action.type) {
+    case "reset":
+      return {};
+    case "file_update":
+      const { fileName, newProps } = action.data!;
+      const nextState = { ...prevState };
+      nextState[fileName] = {
+        ...nextState[fileName],
+        ...newProps,
+      };
+      return nextState;
+  }
+};
 
 export type UploadProps = {
   docRef: DocumentReference;
   fieldName: string;
   files: File[];
-  onComplete?: (value: FileValue) => void;
+  onComplete?: ({
+    uploads,
+    failures,
+  }: {
+    uploads: FileValue[];
+    failures: string[];
+  }) => void;
 };
 
 // TODO: GENERALIZE INTO ATOM
@@ -41,116 +66,129 @@ const useFirebaseStorageUploader = () => {
   const [firebaseStorage] = useAtom(firebaseStorageAtom, projectScope);
   const { enqueueSnackbar } = useSnackbar();
 
-  const [uploaderState, uploaderDispatch] = useReducer(uploadReducer, {
-    ...initialState,
-  });
+  const [uploaderState, uploaderDispatch] = useReducer(uploadReducer, {});
 
-  const upload = ({ docRef, fieldName, files, onComplete }: UploadProps) => {
-    uploaderDispatch({ isLoading: true });
+  const upload = ({ docRef, fieldName, files }: UploadProps) => {
+    const uploads = [] as FileValue[];
+    const failures = [] as string[];
+    const isCompleted = () => uploads.length + failures.length === files.length;
 
-    files.forEach((file) => {
-      const storageRef = ref(
-        firebaseStorage,
-        `${docRef.path}/${fieldName}/${file.name}`
-      );
-      const uploadTask = uploadBytesResumable(storageRef, file, {
-        cacheControl: "public, max-age=31536000",
-      });
-      uploadTask.on(
-        // event
-        "state_changed",
-        // observer
-        (snapshot) => {
-          // Get task progress, including the number of bytes uploaded and the total number of bytes to be uploaded
-          const progress =
-            (snapshot.bytesTransferred / snapshot.totalBytes) * 100;
-          uploaderDispatch({ progress });
-          console.log("Upload is " + progress + "% done");
+    return new Promise((resolve) =>
+      files.forEach((file) => {
+        uploaderDispatch({
+          type: "file_update",
+          data: {
+            fileName: file.name,
+            newProps: { loading: true, progress: 0 },
+          },
+        });
 
-          switch (snapshot.state) {
-            case "paused":
-              console.log("Upload is paused");
-              break;
-            case "running":
-              console.log("Upload is running");
-              break;
-          }
-        },
+        const storageRef = ref(
+          firebaseStorage,
+          `${docRef.path}/${fieldName}/${file.name}`
+        );
+        const uploadTask = uploadBytesResumable(storageRef, file, {
+          cacheControl: "public, max-age=31536000",
+        });
+        uploadTask.on(
+          // event
+          "state_changed",
+          // observer
+          (snapshot) => {
+            // Get task progress, including the number of bytes uploaded and the total number of bytes to be uploaded
+            const progress =
+              (snapshot.bytesTransferred / snapshot.totalBytes) * 100;
+            uploaderDispatch({
+              type: "file_update",
+              data: { fileName: file.name, newProps: { progress } },
+            });
+          },
 
-        // error – must be any to access error.code
-        (error: any) => {
-          // A full list of error codes is available at
-          // https://firebase.google.com/docs/storage/web/handle-errors
-          switch (error.code) {
-            case "storage/unknown":
-              // Unknown error occurred, inspect error.serverResponse
-              enqueueSnackbar("Unknown error occurred", { variant: "error" });
-              uploaderDispatch({ error: error.serverResponse });
-              break;
+          // error – must be any to access error.code
+          (error: any) => {
+            // A full list of error codes is available at
+            // https://firebase.google.com/docs/storage/web/handle-errors
+            const errorAction = {
+              fileName: file.name,
+              newProps: { loading: false } as Partial<UploadState>,
+            };
+            switch (error.code) {
+              case "storage/unknown":
+                // Unknown error occurred, inspect error.serverResponse
+                enqueueSnackbar("Unknown error occurred", { variant: "error" });
+                errorAction.newProps.error = error.serverResponse;
+                break;
 
-            case "storage/unauthorized":
-              // User doesn't have permission to access the object
-              enqueueSnackbar("You don’t have permissions to upload files", {
-                variant: "error",
-                action: (
-                  <Paper elevation={0} sx={{ borderRadius: 1 }}>
-                    <Button
-                      color="primary"
-                      href={
-                        WIKI_LINKS.setupRoles +
-                        "#write-firebase-storage-security-rules"
-                      }
-                      target="_blank"
-                      rel="noopener noreferrer"
-                    >
-                      Fix
-                      <InlineOpenInNewIcon />
-                    </Button>
-                  </Paper>
-                ),
-              });
-              uploaderDispatch({ error: error.code });
-              break;
+              case "storage/unauthorized":
+                // User doesn't have permission to access the object
+                enqueueSnackbar("You don’t have permissions to upload files", {
+                  variant: "error",
+                  action: (
+                    <Paper elevation={0} sx={{ borderRadius: 1 }}>
+                      <Button
+                        color="primary"
+                        href={
+                          WIKI_LINKS.setupRoles +
+                          "#write-firebase-storage-security-rules"
+                        }
+                        target="_blank"
+                        rel="noopener noreferrer"
+                      >
+                        Fix
+                        <InlineOpenInNewIcon />
+                      </Button>
+                    </Paper>
+                  ),
+                });
+                errorAction.newProps.error = error.code;
+                break;
 
-            case "storage/canceled":
-              // User canceled the upload
-              uploaderDispatch({ error: error.code });
-              break;
-
-            default:
-              uploaderDispatch({ error: error.code });
-              // Unknown error occurred, inspect error.serverResponse
-              break;
-          }
-
-          uploaderDispatch({ isLoading: false });
-        },
-
-        // complete
-        () => {
-          uploaderDispatch({ isLoading: false });
-
-          // Upload completed successfully, now we can get the download URL
-          getDownloadURL(uploadTask.snapshot.ref).then(
-            (downloadURL: string) => {
-              // STore in the document if docRef provided
-              // if (docRef && docRef.update)docRef.update({ [fieldName]: newValue });
-              // Also call callback if it exists
-              // IMPORTANT: SideDrawer form may not update its local values after this
-              // function updates the doc, so you MUST update it manually
-              // using this callback
-              const obj = {
-                ref: uploadTask.snapshot.ref.fullPath,
-                downloadURL,
-                name: file.name,
-                type: file.type,
-                lastModifiedTS: file.lastModified,
-              };
-              if (onComplete) onComplete(obj);
+              case "storage/canceled":
+              default:
+                errorAction.newProps.error = error.code;
+                break;
             }
-          );
-        }
-      );
+            failures.push(file.name);
+            uploaderDispatch({ type: "file_update", data: errorAction });
+            if (isCompleted()) resolve(true);
+          },
+
+          // complete
+          () => {
+            uploaderDispatch({
+              type: "file_update",
+              data: {
+                fileName: file.name,
+                newProps: { loading: false },
+              },
+            });
+
+            // Upload completed successfully, now we can get the download URL
+            getDownloadURL(uploadTask.snapshot.ref).then(
+              (downloadURL: string) => {
+                // Store in the document if docRef provided
+                // if (docRef && docRef.update)docRef.update({ [fieldName]: newValue });
+                // Also call callback if it exists
+                // IMPORTANT: SideDrawer form may not update its local values after this
+                // function updates the doc, so you MUST update it manually
+                // using this callback
+                const obj = {
+                  ref: uploadTask.snapshot.ref.fullPath,
+                  downloadURL,
+                  name: file.name,
+                  type: file.type,
+                  lastModifiedTS: file.lastModified,
+                };
+                uploads.push(obj);
+                if (isCompleted()) resolve(true);
+              }
+            );
+          }
+        );
+      })
+    ).then(() => {
+      uploaderDispatch({ type: "reset" });
+      return { uploads, failures };
     });
   };
 

From bdfce19af0afbaf7363e97fc76b1eb6bd62d0952 Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Tue, 15 Nov 2022 08:35:25 +0300
Subject: [PATCH 260/309] remove unneccessary arrayUnion flag

---
 src/components/SideDrawer/SideDrawerFields.tsx | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/components/SideDrawer/SideDrawerFields.tsx b/src/components/SideDrawer/SideDrawerFields.tsx
index 937d5b44..7b6a6578 100644
--- a/src/components/SideDrawer/SideDrawerFields.tsx
+++ b/src/components/SideDrawer/SideDrawerFields.tsx
@@ -23,8 +23,7 @@ import {
   sideDrawerShowHiddenFieldsAtom,
 } from "@src/atoms/tableScope";
 import { formatSubTableName } from "@src/utils/table";
-import { ColumnConfig, TableRow } from "@src/types/table";
-import { FieldType } from "@src/components/fields/types";
+import { TableRow } from "@src/types/table";
 
 export interface ISideDrawerFieldsProps {
   row: TableRow;
@@ -67,17 +66,7 @@ export default function SideDrawerFields({ row }: ISideDrawerFieldsProps) {
 
       setSaveState("saving");
       try {
-        const { type } = tableColumnsOrdered.find(
-          (c) => c.key === selectedCell.columnKey
-        ) as ColumnConfig;
-        const useArrayUnion = [FieldType.file, FieldType.image].includes(type);
-
-        await updateField({
-          path: selectedCell!.path,
-          fieldName,
-          value,
-          useArrayUnion,
-        });
+        await updateField({ path: selectedCell!.path, fieldName, value });
         setSaveState("saved");
       } catch (e) {
         enqueueSnackbar((e as Error).message, { variant: "error" });

From 059c6164146de40c7929c4b7f8ed18b06d7fcf28 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 15 Nov 2022 16:53:20 +1100
Subject: [PATCH 261/309] memoize more components

---
 src/components/Table/CellValidation.tsx       | 186 ++++++++---
 .../Table/FinalColumn/FinalColumn.tsx         |   4 +-
 .../Table/FinalColumn/FinalColumnHeader.tsx   |   4 +-
 src/components/Table/Table.tsx                | 298 ++----------------
 src/components/Table/TableHeaderGroup.tsx     | 193 ++++++++++++
 src/components/Table/formatters/ChipList.tsx  |  13 +-
 .../Table/useKeyboardNavigation.tsx           | 205 ++++++------
 src/components/Table/useSaveColumnSizing.tsx  |   6 +-
 src/components/Table/withTableCell.tsx        |  23 +-
 .../fields/ConnectService/DisplayCell.tsx     |   3 +-
 .../fields/ConnectTable/DisplayCell.tsx       |   3 +-
 .../fields/Connector/DisplayCell.tsx          |   3 +-
 src/components/fields/File/DisplayCell.tsx    |   8 +-
 src/components/fields/File/EditorCell.tsx     |   3 +-
 src/components/fields/Id/DisplayCell.tsx      |   4 +-
 .../fields/MultiSelect/DisplayCell.tsx        |   3 +-
 src/components/fields/SubTable/utils.ts       |   4 +-
 src/components/fields/types.ts                |  17 +-
 src/pages/Table/TablePage.tsx                 |  12 +-
 19 files changed, 535 insertions(+), 457 deletions(-)
 create mode 100644 src/components/Table/TableHeaderGroup.tsx

diff --git a/src/components/Table/CellValidation.tsx b/src/components/Table/CellValidation.tsx
index 02284cb3..e19dde1b 100644
--- a/src/components/Table/CellValidation.tsx
+++ b/src/components/Table/CellValidation.tsx
@@ -1,11 +1,25 @@
 import { memo } from "react";
+import { useAtom, useSetAtom } from "jotai";
+import { ErrorBoundary } from "react-error-boundary";
+import { flexRender } from "@tanstack/react-table";
+import type { Row, Cell } from "@tanstack/react-table";
+
 import { styled } from "@mui/material/styles";
 import ErrorIcon from "@mui/icons-material/ErrorOutline";
 import WarningIcon from "@mui/icons-material/WarningAmber";
 
 import StyledCell from "./Styled/StyledCell";
+import { InlineErrorFallback } from "@src/components/ErrorFallback";
 import RichTooltip from "@src/components/RichTooltip";
 
+import {
+  tableScope,
+  selectedCellAtom,
+  contextMenuTargetAtom,
+} from "@src/atoms/tableScope";
+import { TABLE_PADDING } from "./Table";
+import type { TableRow } from "@src/types/table";
+
 const Dot = styled("div")(({ theme }) => ({
   position: "absolute",
   right: -5,
@@ -25,55 +39,147 @@ const Dot = styled("div")(({ theme }) => ({
   },
 }));
 
-export interface ICellValidationProps
-  extends React.DetailedHTMLProps<
-    React.HTMLAttributes<HTMLDivElement>,
-    HTMLDivElement
-  > {
-  value: any;
-  required?: boolean;
-  validationRegex?: string;
+export interface ICellValidationProps {
+  row: Row<TableRow>;
+  cell: Cell<TableRow, any>;
+  index: number;
+  isSelectedCell: boolean;
+  isReadOnlyCell: boolean;
+  canEditCells: boolean;
+  rowHeight: number;
+  lastFrozen?: string;
+  left?: number;
 }
 
 export const CellValidation = memo(function MemoizedCellValidation({
-  value,
-  required,
-  validationRegex,
-  children,
-  ...props
+  row,
+  cell,
+  index,
+  isSelectedCell,
+  isReadOnlyCell,
+  canEditCells,
+  rowHeight,
+  lastFrozen,
+  left,
 }: ICellValidationProps) {
+  const [selectedCell, setSelectedCell] = useAtom(selectedCellAtom, tableScope);
+  const focusInsideCell = selectedCell?.focusInside ?? false;
+  const setContextMenuTarget = useSetAtom(contextMenuTargetAtom, tableScope);
+
+  const value = cell.getValue();
+  const required = cell.column.columnDef.meta?.config?.required;
+  const validationRegex = cell.column.columnDef.meta?.config?.validationRegex;
+
   const isInvalid = validationRegex && !new RegExp(validationRegex).test(value);
   const isMissing = required && value === undefined;
 
-  if (isInvalid)
-    return (
-      <StyledCell aria-invalid="true" {...props}>
-        <RichTooltip
-          icon={<ErrorIcon fontSize="inherit" color="error" />}
-          title="Invalid data"
-          message="This row will not be saved until all the required fields contain valid data"
-          placement="right"
-          render={({ openTooltip }) => <Dot onClick={openTooltip} />}
-        />
-        {children}
-      </StyledCell>
-    );
+  const renderedCell = (
+    <ErrorBoundary fallbackRender={InlineErrorFallback}>
+      {flexRender(cell.column.columnDef.cell, {
+        ...cell.getContext(),
+        focusInsideCell: isSelectedCell && focusInsideCell,
+        setFocusInsideCell: (focusInside: boolean) =>
+          setSelectedCell({
+            path: row.original._rowy_ref.path,
+            columnKey: cell.column.id,
+            focusInside,
+          }),
+        disabled:
+          !canEditCells || cell.column.columnDef.meta?.editable === false,
+        rowHeight,
+      })}
+    </ErrorBoundary>
+  );
 
-  if (isMissing)
-    return (
-      <StyledCell aria-invalid="true" {...props}>
-        <RichTooltip
-          icon={<WarningIcon fontSize="inherit" color="warning" />}
-          title="Required field"
-          message="This row will not be saved until all the required fields contain valid data"
-          placement="right"
-          render={({ openTooltip }) => <Dot onClick={openTooltip} />}
-        />
-        {children}
-      </StyledCell>
-    );
+  // if (isInvalid)
+  //   return (
+  //     <StyledCell aria-invalid="true" {...props}>
+  //       <RichTooltip
+  //         icon={<ErrorIcon fontSize="inherit" color="error" />}
+  //         title="Invalid data"
+  //         message="This row will not be saved until all the required fields contain valid data"
+  //         placement="right"
+  //         render={({ openTooltip }) => <Dot onClick={openTooltip} />}
+  //       />
+  //       {children}
+  //     </StyledCell>
+  //   );
 
-  return <StyledCell {...props}>{children}</StyledCell>;
+  // if (isMissing)
+  //   return (
+  //     <StyledCell aria-invalid="true" {...props}>
+  //       <RichTooltip
+  //         icon={<WarningIcon fontSize="inherit" color="warning" />}
+  //         title="Required field"
+  //         message="This row will not be saved until all the required fields contain valid data"
+  //         placement="right"
+  //         render={({ openTooltip }) => <Dot onClick={openTooltip} />}
+  //       />
+  //       {children}
+  //     </StyledCell>
+  //   );
+
+  return (
+    <StyledCell
+      key={cell.id}
+      data-row-id={row.id}
+      data-col-id={cell.column.id}
+      data-frozen={cell.column.getIsPinned() || undefined}
+      data-frozen-last={lastFrozen === cell.column.id || undefined}
+      role="gridcell"
+      tabIndex={isSelectedCell && !focusInsideCell ? 0 : -1}
+      aria-colindex={index + 1}
+      aria-readonly={
+        !canEditCells || cell.column.columnDef.meta?.editable === false
+      }
+      aria-required={Boolean(cell.column.columnDef.meta?.config?.required)}
+      aria-selected={isSelectedCell}
+      aria-describedby={
+        canEditCells && !isReadOnlyCell
+          ? "rowy-table-editable-cell-description"
+          : undefined
+      }
+      style={{
+        width: cell.column.getSize(),
+        height: rowHeight,
+        left,
+        backgroundColor:
+          cell.column.id === "_rowy_column_actions" ? "transparent" : undefined,
+        borderBottomWidth:
+          cell.column.id === "_rowy_column_actions" ? 0 : undefined,
+        borderRightWidth:
+          cell.column.id === "_rowy_column_actions" ? 0 : undefined,
+      }}
+      onClick={(e) => {
+        setSelectedCell({
+          path: row.original._rowy_ref.path,
+          columnKey: cell.column.id,
+          focusInside: false,
+        });
+        (e.target as HTMLDivElement).focus();
+      }}
+      onDoubleClick={(e) => {
+        setSelectedCell({
+          path: row.original._rowy_ref.path,
+          columnKey: cell.column.id,
+          focusInside: true,
+        });
+        (e.target as HTMLDivElement).focus();
+      }}
+      onContextMenu={(e) => {
+        e.preventDefault();
+        setSelectedCell({
+          path: row.original._rowy_ref.path,
+          columnKey: cell.column.id,
+          focusInside: false,
+        });
+        (e.target as HTMLDivElement).focus();
+        setContextMenuTarget(e.target as HTMLElement);
+      }}
+    >
+      {renderedCell}
+    </StyledCell>
+  );
 });
 
 export default CellValidation;
diff --git a/src/components/Table/FinalColumn/FinalColumn.tsx b/src/components/Table/FinalColumn/FinalColumn.tsx
index 4b7c8bd0..6f058eda 100644
--- a/src/components/Table/FinalColumn/FinalColumn.tsx
+++ b/src/components/Table/FinalColumn/FinalColumn.tsx
@@ -1,6 +1,6 @@
 import { memo } from "react";
 import { useAtom, useSetAtom } from "jotai";
-import type { TableCellProps } from "@src/components/Table";
+import type { ITableCellProps } from "@src/components/Table/withTableCell";
 
 import { Stack, Tooltip, IconButton, alpha } from "@mui/material";
 import { CopyCells as CopyCellsIcon } from "@src/assets/icons";
@@ -25,7 +25,7 @@ import {
 export const FinalColumn = memo(function FinalColumn({
   row,
   focusInsideCell,
-}: TableCellProps) {
+}: ITableCellProps) {
   const [userRoles] = useAtom(userRolesAtom, projectScope);
   const [addRowIdType] = useAtom(tableAddRowIdTypeAtom, projectScope);
   const confirm = useSetAtom(confirmDialogAtom, projectScope);
diff --git a/src/components/Table/FinalColumn/FinalColumnHeader.tsx b/src/components/Table/FinalColumn/FinalColumnHeader.tsx
index 416cab5c..a1989f53 100644
--- a/src/components/Table/FinalColumn/FinalColumnHeader.tsx
+++ b/src/components/Table/FinalColumn/FinalColumnHeader.tsx
@@ -9,12 +9,12 @@ import { spreadSx } from "@src/utils/ui";
 
 export interface IFinalColumnHeaderProps extends Partial<BoxProps> {
   focusInsideCell: boolean;
-  canAddColumn: boolean;
+  canAddColumns: boolean;
 }
 
 export default function FinalColumnHeader({
   focusInsideCell,
-  canAddColumn,
+  canAddColumns,
   ...props
 }: IFinalColumnHeaderProps) {
   const [userRoles] = useAtom(userRolesAtom, projectScope);
diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index 5271e90d..74c14a40 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -20,6 +20,7 @@ import { DragVertical } from "@src/assets/icons";
 
 import StyledTable from "./Styled/StyledTable";
 import StyledRow from "./Styled/StyledRow";
+import TableHeaderGroup from "./TableHeaderGroup";
 import ColumnHeader from "./ColumnHeader";
 import StyledResizer from "./Styled/StyledResizer";
 import FinalColumnHeader from "./FinalColumn/FinalColumnHeader";
@@ -59,12 +60,6 @@ export const TABLE_PADDING = 16;
 export const OUT_OF_ORDER_MARGIN = 8;
 export const DEBOUNCE_DELAY = 500;
 
-export type TableCellProps = CellContext<TableRow, any> & {
-  focusInsideCell: boolean;
-  setFocusInsideCell: (focusInside: boolean) => void;
-  disabled: boolean;
-};
-
 declare module "@tanstack/table-core" {
   interface ColumnMeta<TData, TValue> extends ColumnConfig {}
 }
@@ -73,17 +68,17 @@ const columnHelper = createColumnHelper<TableRow>();
 const getRowId = (row: TableRow) => row._rowy_ref.path || row._rowy_ref.id;
 
 export interface ITableProps {
-  canAddColumn: boolean;
-  canEditColumn: boolean;
-  canEditCell: boolean;
+  canAddColumns: boolean;
+  canEditColumns: boolean;
+  canEditCells: boolean;
   hiddenColumns?: string[];
   emptyState?: React.ReactNode;
 }
 
 export default function Table({
-  canAddColumn,
-  canEditColumn,
-  canEditCell,
+  canAddColumns,
+  canEditColumns,
+  canEditCells,
   hiddenColumns,
   emptyState,
 }: ITableProps) {
@@ -118,7 +113,7 @@ export default function Table({
         })
       );
 
-    if (canAddColumn || canEditCell) {
+    if (canAddColumns || canEditCells) {
       _columns.push(
         columnHelper.display({
           id: "_rowy_column_actions",
@@ -128,7 +123,7 @@ export default function Table({
     }
 
     return _columns;
-  }, [tableColumnsOrdered, canAddColumn, canEditCell]);
+  }, [tableColumnsOrdered, canAddColumns, canEditCells]);
 
   // Get user’s hidden columns from props and memoize into a VisibilityState
   const columnVisibility = useMemo(() => {
@@ -183,7 +178,7 @@ export default function Table({
     paddingLeft,
     paddingRight,
   } = useVirtualization(containerRef, leafColumns);
-  useSaveColumnSizing(columnSizing, canEditColumn);
+  useSaveColumnSizing(columnSizing, canEditColumns);
 
   const handleDropColumn = useCallback(
     (result: DropResult) => {
@@ -227,7 +222,7 @@ export default function Table({
       <StyledTable
         ref={gridRef}
         role="grid"
-        aria-readonly={!canEditCell}
+        aria-readonly={!canEditCells}
         aria-colcount={columns.length}
         aria-rowcount={tableRows.length + 1}
         style={
@@ -249,171 +244,13 @@ export default function Table({
             padding: `0 ${TABLE_PADDING}px`,
           }}
         >
-          <DragDropContext onDragEnd={handleDropColumn}>
-            {table.getHeaderGroups().map((headerGroup) => (
-              <Droppable droppableId="droppable-column" direction="horizontal">
-                {(provided) => (
-                  <StyledRow
-                    key={headerGroup.id}
-                    role="row"
-                    aria-rowindex={1}
-                    style={{ height: DEFAULT_ROW_HEIGHT + 1 }}
-                    {...provided.droppableProps}
-                    ref={provided.innerRef}
-                  >
-                    {headerGroup.headers.map((header) => {
-                      const isSelectedCell =
-                        (!selectedCell && header.index === 0) ||
-                        (selectedCell?.path === "_rowy_header" &&
-                          selectedCell?.columnKey === header.id);
-
-                      if (header.id === "_rowy_column_actions")
-                        return (
-                          <FinalColumnHeader
-                            key={header.id}
-                            data-row-id={"_rowy_header"}
-                            data-col-id={header.id}
-                            tabIndex={isSelectedCell ? 0 : -1}
-                            focusInsideCell={isSelectedCell && focusInsideCell}
-                            aria-colindex={header.index + 1}
-                            aria-readonly={!canEditColumn}
-                            aria-selected={isSelectedCell}
-                            canAddColumn={canAddColumn}
-                          />
-                        );
-
-                      if (!header.column.columnDef.meta) return null;
-
-                      return (
-                        <Draggable
-                          key={header.id}
-                          draggableId={header.id}
-                          index={header.index}
-                          isDragDisabled={!canEditColumn}
-                          disableInteractiveElementBlocking
-                        >
-                          {(provided, snapshot) => (
-                            <ColumnHeader
-                              key={header.id}
-                              data-row-id={"_rowy_header"}
-                              data-col-id={header.id}
-                              data-frozen={
-                                header.column.getIsPinned() || undefined
-                              }
-                              data-frozen-last={
-                                lastFrozen === header.id || undefined
-                              }
-                              ref={provided.innerRef}
-                              {...provided.draggableProps}
-                              tabIndex={isSelectedCell ? 0 : -1}
-                              aria-colindex={header.index + 1}
-                              aria-readonly={!canEditColumn}
-                              aria-selected={isSelectedCell}
-                              column={header.column.columnDef.meta!}
-                              style={{
-                                width: header.getSize(),
-                                left: header.column.getIsPinned()
-                                  ? virtualCols[header.index].start -
-                                    TABLE_PADDING
-                                  : undefined,
-                                ...provided.draggableProps.style,
-                                zIndex: header.column.getIsPinned() ? 11 : 10,
-                              }}
-                              width={header.getSize()}
-                              sx={
-                                snapshot.isDragging
-                                  ? undefined
-                                  : { "& + &": { borderLeft: "none" } }
-                              }
-                              onClick={(e) => {
-                                setSelectedCell({
-                                  path: "_rowy_header",
-                                  columnKey: header.id,
-                                  focusInside: false,
-                                });
-                                (e.target as HTMLDivElement).focus();
-                              }}
-                              onDoubleClick={(e) => {
-                                setSelectedCell({
-                                  path: "_rowy_header",
-                                  columnKey: header.id,
-                                  focusInside: true,
-                                });
-                                (e.target as HTMLDivElement).focus();
-                              }}
-                              focusInsideCell={
-                                isSelectedCell && focusInsideCell
-                              }
-                            >
-                              <div
-                                {...provided.dragHandleProps}
-                                tabIndex={
-                                  isSelectedCell && focusInsideCell ? 0 : -1
-                                }
-                                aria-describedby={
-                                  isSelectedCell && focusInsideCell
-                                    ? provided.dragHandleProps?.[
-                                        "aria-describedby"
-                                      ]
-                                    : undefined
-                                }
-                                style={{
-                                  position: "absolute",
-                                  inset: 0,
-                                  zIndex: 0,
-                                  display: "flex",
-                                  alignItems: "center",
-                                  outline: "none",
-                                }}
-                                className="column-drag-handle"
-                              >
-                                <DragVertical
-                                  sx={{
-                                    opacity: 0,
-                                    borderRadius: 2,
-                                    transition: (theme) =>
-                                      theme.transitions.create(["opacity"]),
-                                    "[role='columnheader']:hover &, [role='columnheader']:focus-within &":
-                                      {
-                                        opacity: 0.5,
-                                      },
-                                    ".column-drag-handle:hover &": {
-                                      opacity: 1,
-                                    },
-                                    ".column-drag-handle:active &": {
-                                      opacity: 1,
-                                      color: "primary.main",
-                                    },
-                                    ".column-drag-handle:focus &": {
-                                      opacity: 1,
-                                      color: "primary.main",
-                                      outline: "2px solid",
-                                      outlineColor: "primary.main",
-                                    },
-                                  }}
-                                  style={{ width: 8 }}
-                                  preserveAspectRatio="xMidYMid slice"
-                                />
-                              </div>
-
-                              {header.column.getCanResize() && (
-                                <StyledResizer
-                                  isResizing={header.column.getIsResizing()}
-                                  onMouseDown={header.getResizeHandler()}
-                                  onTouchStart={header.getResizeHandler()}
-                                />
-                              )}
-                            </ColumnHeader>
-                          )}
-                        </Draggable>
-                      );
-                    })}
-                    {provided.placeholder}
-                  </StyledRow>
-                )}
-              </Droppable>
-            ))}
-          </DragDropContext>
+          <TableHeaderGroup
+            headerGroups={table.getHeaderGroups()}
+            handleDropColumn={handleDropColumn}
+            canAddColumns={canAddColumns}
+            canEditColumns={canEditColumns}
+            lastFrozen={lastFrozen}
+          />
         </div>
 
         <div className="tbody" role="rowgroup">
@@ -464,95 +301,20 @@ export default function Table({
                   return (
                     <CellValidation
                       key={cell.id}
-                      data-row-id={row.id}
-                      data-col-id={cell.column.id}
-                      data-frozen={cell.column.getIsPinned() || undefined}
-                      data-frozen-last={
-                        lastFrozen === cell.column.id || undefined
-                      }
-                      role="gridcell"
-                      tabIndex={isSelectedCell && !focusInsideCell ? 0 : -1}
-                      aria-colindex={cellIndex + 1}
-                      aria-readonly={
-                        !canEditCell ||
-                        cell.column.columnDef.meta?.editable === false
-                      }
-                      aria-required={Boolean(
-                        cell.column.columnDef.meta?.config?.required
-                      )}
-                      aria-selected={isSelectedCell}
-                      aria-describedby={
-                        canEditCell && !isReadOnlyCell
-                          ? "rowy-table-editable-cell-description"
+                      row={row}
+                      cell={cell}
+                      index={cellIndex}
+                      left={
+                        cell.column.getIsPinned()
+                          ? virtualCell.start - TABLE_PADDING
                           : undefined
                       }
-                      style={{
-                        width: cell.column.getSize(),
-                        height: tableSchema.rowHeight,
-                        left: cell.column.getIsPinned()
-                          ? virtualCell.start - TABLE_PADDING
-                          : undefined,
-                        backgroundColor:
-                          cell.column.id === "_rowy_column_actions"
-                            ? "transparent"
-                            : undefined,
-                        borderBottomWidth:
-                          cell.column.id === "_rowy_column_actions"
-                            ? 0
-                            : undefined,
-                        borderRightWidth:
-                          cell.column.id === "_rowy_column_actions"
-                            ? 0
-                            : undefined,
-                      }}
-                      onClick={(e) => {
-                        setSelectedCell({
-                          path: row.original._rowy_ref.path,
-                          columnKey: cell.column.id,
-                          focusInside: false,
-                        });
-                        (e.target as HTMLDivElement).focus();
-                      }}
-                      onDoubleClick={(e) => {
-                        setSelectedCell({
-                          path: row.original._rowy_ref.path,
-                          columnKey: cell.column.id,
-                          focusInside: true,
-                        });
-                        (e.target as HTMLDivElement).focus();
-                      }}
-                      onContextMenu={(e) => {
-                        e.preventDefault();
-                        setSelectedCell({
-                          path: row.original._rowy_ref.path,
-                          columnKey: cell.column.id,
-                          focusInside: false,
-                        });
-                        (e.target as HTMLDivElement).focus();
-                        setContextMenuTarget(e.target as HTMLElement);
-                      }}
-                      value={cell.getValue()}
-                      required={cell.column.columnDef.meta?.config?.required}
-                      validationRegex={
-                        cell.column.columnDef.meta?.config?.validationRegex
-                      }
-                    >
-                      <ErrorBoundary fallbackRender={InlineErrorFallback}>
-                        {flexRender(cell.column.columnDef.cell, {
-                          ...cell.getContext(),
-                          focusInsideCell: isSelectedCell && focusInsideCell,
-                          setFocusInsideCell: (focusInside: boolean) =>
-                            setSelectedCell({
-                              path: row.original._rowy_ref.path,
-                              columnKey: cell.column.id,
-                              focusInside,
-                            }),
-                          disabled:
-                            !canEditCell ||
-                            cell.column.columnDef.meta?.editable === false,
-                        })}
-                      </ErrorBoundary>
-                    </CellValidation>
+                      isSelectedCell={isSelectedCell}
+                      isReadOnlyCell={isReadOnlyCell}
+                      canEditCells={canEditCells}
+                      lastFrozen={lastFrozen}
+                      rowHeight={tableSchema.rowHeight || DEFAULT_ROW_HEIGHT}
+                    />
                   );
                 })}
 
diff --git a/src/components/Table/TableHeaderGroup.tsx b/src/components/Table/TableHeaderGroup.tsx
new file mode 100644
index 00000000..9f2e0a23
--- /dev/null
+++ b/src/components/Table/TableHeaderGroup.tsx
@@ -0,0 +1,193 @@
+import { memo } from "react";
+import { useAtom } from "jotai";
+import { DragDropContext, Droppable, Draggable } from "react-beautiful-dnd";
+import type { DropResult } from "react-beautiful-dnd";
+import type { HeaderGroup } from "@tanstack/react-table";
+import type { TableRow } from "@src/types/table";
+
+import StyledRow from "./Styled/StyledRow";
+import ColumnHeader from "./ColumnHeader";
+import StyledResizer from "./Styled/StyledResizer";
+import FinalColumnHeader from "./FinalColumn/FinalColumnHeader";
+import { DragVertical } from "@src/assets/icons";
+
+import { tableScope, selectedCellAtom } from "@src/atoms/tableScope";
+import { DEFAULT_ROW_HEIGHT, TABLE_PADDING } from "@src/components/Table";
+
+export interface ITableHeaderGroupProps {
+  headerGroups: HeaderGroup<TableRow>[];
+  handleDropColumn: (result: DropResult) => void;
+  canAddColumns: boolean;
+  canEditColumns: boolean;
+  lastFrozen?: string;
+}
+
+export const TableHeaderGroup = memo(function TableHeaderGroup({
+  headerGroups,
+  handleDropColumn,
+  canAddColumns,
+  canEditColumns,
+  lastFrozen,
+}: ITableHeaderGroupProps) {
+  const [selectedCell, setSelectedCell] = useAtom(selectedCellAtom, tableScope);
+  const focusInsideCell = selectedCell?.focusInside ?? false;
+
+  return (
+    <DragDropContext onDragEnd={handleDropColumn}>
+      {headerGroups.map((headerGroup) => (
+        <Droppable droppableId="droppable-column" direction="horizontal">
+          {(provided) => (
+            <StyledRow
+              key={headerGroup.id}
+              role="row"
+              aria-rowindex={1}
+              style={{ height: DEFAULT_ROW_HEIGHT + 1 }}
+              {...provided.droppableProps}
+              ref={provided.innerRef}
+            >
+              {headerGroup.headers.map((header) => {
+                const isSelectedCell =
+                  (!selectedCell && header.index === 0) ||
+                  (selectedCell?.path === "_rowy_header" &&
+                    selectedCell?.columnKey === header.id);
+
+                if (header.id === "_rowy_column_actions")
+                  return (
+                    <FinalColumnHeader
+                      key={header.id}
+                      data-row-id={"_rowy_header"}
+                      data-col-id={header.id}
+                      tabIndex={isSelectedCell ? 0 : -1}
+                      focusInsideCell={isSelectedCell && focusInsideCell}
+                      aria-colindex={header.index + 1}
+                      aria-readonly={!canEditColumns}
+                      aria-selected={isSelectedCell}
+                      canAddColumns={canAddColumns}
+                    />
+                  );
+
+                if (!header.column.columnDef.meta) return null;
+
+                return (
+                  <Draggable
+                    key={header.id}
+                    draggableId={header.id}
+                    index={header.index}
+                    isDragDisabled={!canEditColumns}
+                    disableInteractiveElementBlocking
+                  >
+                    {(provided, snapshot) => (
+                      <ColumnHeader
+                        key={header.id}
+                        data-row-id={"_rowy_header"}
+                        data-col-id={header.id}
+                        data-frozen={header.column.getIsPinned() || undefined}
+                        data-frozen-last={lastFrozen === header.id || undefined}
+                        ref={provided.innerRef}
+                        {...provided.draggableProps}
+                        tabIndex={isSelectedCell ? 0 : -1}
+                        aria-colindex={header.index + 1}
+                        aria-readonly={!canEditColumns}
+                        aria-selected={isSelectedCell}
+                        column={header.column.columnDef.meta!}
+                        style={{
+                          width: header.getSize(),
+                          left: header.column.getIsPinned()
+                            ? header.column.getStart() - TABLE_PADDING
+                            : undefined,
+                          ...provided.draggableProps.style,
+                          zIndex: header.column.getIsPinned() ? 11 : 10,
+                        }}
+                        width={header.getSize()}
+                        sx={
+                          snapshot.isDragging
+                            ? undefined
+                            : { "& + &": { borderLeft: "none" } }
+                        }
+                        onClick={(e) => {
+                          setSelectedCell({
+                            path: "_rowy_header",
+                            columnKey: header.id,
+                            focusInside: false,
+                          });
+                          (e.target as HTMLDivElement).focus();
+                        }}
+                        onDoubleClick={(e) => {
+                          setSelectedCell({
+                            path: "_rowy_header",
+                            columnKey: header.id,
+                            focusInside: true,
+                          });
+                          (e.target as HTMLDivElement).focus();
+                        }}
+                        focusInsideCell={isSelectedCell && focusInsideCell}
+                      >
+                        <div
+                          {...provided.dragHandleProps}
+                          tabIndex={isSelectedCell && focusInsideCell ? 0 : -1}
+                          aria-describedby={
+                            isSelectedCell && focusInsideCell
+                              ? provided.dragHandleProps?.["aria-describedby"]
+                              : undefined
+                          }
+                          style={{
+                            position: "absolute",
+                            inset: 0,
+                            zIndex: 0,
+                            display: "flex",
+                            alignItems: "center",
+                            outline: "none",
+                          }}
+                          className="column-drag-handle"
+                        >
+                          <DragVertical
+                            sx={{
+                              opacity: 0,
+                              borderRadius: 2,
+                              transition: (theme) =>
+                                theme.transitions.create(["opacity"]),
+                              "[role='columnheader']:hover &, [role='columnheader']:focus-within &":
+                                {
+                                  opacity: 0.5,
+                                },
+                              ".column-drag-handle:hover &": {
+                                opacity: 1,
+                              },
+                              ".column-drag-handle:active &": {
+                                opacity: 1,
+                                color: "primary.main",
+                              },
+                              ".column-drag-handle:focus &": {
+                                opacity: 1,
+                                color: "primary.main",
+                                outline: "2px solid",
+                                outlineColor: "primary.main",
+                              },
+                            }}
+                            style={{ width: 8 }}
+                            preserveAspectRatio="xMidYMid slice"
+                          />
+                        </div>
+
+                        {header.column.getCanResize() && (
+                          <StyledResizer
+                            isResizing={header.column.getIsResizing()}
+                            onMouseDown={header.getResizeHandler()}
+                            onTouchStart={header.getResizeHandler()}
+                          />
+                        )}
+                      </ColumnHeader>
+                    )}
+                  </Draggable>
+                );
+              })}
+              {provided.placeholder}
+            </StyledRow>
+          )}
+        </Droppable>
+      ))}
+    </DragDropContext>
+  );
+});
+
+export default TableHeaderGroup;
diff --git a/src/components/Table/formatters/ChipList.tsx b/src/components/Table/formatters/ChipList.tsx
index 5a6945d2..42f06264 100644
--- a/src/components/Table/formatters/ChipList.tsx
+++ b/src/components/Table/formatters/ChipList.tsx
@@ -1,14 +1,9 @@
-import { useAtom } from "jotai";
-
 import { Grid } from "@mui/material";
 
-import { tableScope, tableSchemaAtom } from "@src/atoms/tableScope";
-import { DEFAULT_ROW_HEIGHT } from "@src/components/Table";
-
-export default function ChipList({ children }: React.PropsWithChildren<{}>) {
-  const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
-
-  const rowHeight = tableSchema.rowHeight ?? DEFAULT_ROW_HEIGHT;
+export default function ChipList({
+  children,
+  rowHeight,
+}: React.PropsWithChildren<{ rowHeight: number }>) {
   const canWrap = rowHeight > 24 * 2 + 4;
 
   return (
diff --git a/src/components/Table/useKeyboardNavigation.tsx b/src/components/Table/useKeyboardNavigation.tsx
index 57c8829c..3353d23f 100644
--- a/src/components/Table/useKeyboardNavigation.tsx
+++ b/src/components/Table/useKeyboardNavigation.tsx
@@ -1,3 +1,4 @@
+import { useCallback } from "react";
 import { useSetAtom } from "jotai";
 import { Column } from "@tanstack/react-table";
 
@@ -23,123 +24,129 @@ export function useKeyboardNavigation({
 }: IUseKeyboardNavigationProps) {
   const setSelectedCell = useSetAtom(selectedCellAtom, tableScope);
 
-  const handleKeyDown = (e: React.KeyboardEvent<HTMLDivElement>) => {
-    // Block default browser behavior for arrow keys (scroll) and other keys
-    const LISTENED_KEYS = [
-      "ArrowUp",
-      "ArrowDown",
-      "ArrowLeft",
-      "ArrowRight",
-      "Enter",
-      "Escape",
-      "Home",
-      "End",
-      "PageUp",
-      "PageDown",
-    ];
-    if (LISTENED_KEYS.includes(e.key)) e.preventDefault();
+  const handleKeyDown = useCallback(
+    (e: React.KeyboardEvent<HTMLDivElement>) => {
+      // Block default browser behavior for arrow keys (scroll) and other keys
+      const LISTENED_KEYS = [
+        "ArrowUp",
+        "ArrowDown",
+        "ArrowLeft",
+        "ArrowRight",
+        "Enter",
+        "Escape",
+        "Home",
+        "End",
+        "PageUp",
+        "PageDown",
+      ];
+      if (LISTENED_KEYS.includes(e.key)) e.preventDefault();
 
-    // Esc: exit cell
-    if (e.key === "Escape") {
-      setSelectedCell((c) => ({ ...c!, focusInside: false }));
-      (
-        gridRef.current?.querySelector("[aria-selected=true]") as HTMLDivElement
-      )?.focus();
-      return;
-    }
+      // Esc: exit cell
+      if (e.key === "Escape") {
+        setSelectedCell((c) => ({ ...c!, focusInside: false }));
+        (
+          gridRef.current?.querySelector(
+            "[aria-selected=true]"
+          ) as HTMLDivElement
+        )?.focus();
+        return;
+      }
 
-    // If event target is not a cell, ignore
-    const target = e.target as HTMLDivElement;
-    if (
-      target.getAttribute("role") !== "columnheader" &&
-      target.getAttribute("role") !== "gridcell"
-    )
-      return;
+      // If event target is not a cell, ignore
+      const target = e.target as HTMLDivElement;
+      if (
+        target.getAttribute("role") !== "columnheader" &&
+        target.getAttribute("role") !== "gridcell"
+      )
+        return;
 
-    // If Tab, ignore so we can exit the table
-    if (e.key === "Tab") return;
+      // If Tab, ignore so we can exit the table
+      if (e.key === "Tab") return;
 
-    // Enter: enter cell
-    if (e.key === "Enter") {
-      setSelectedCell((c) => ({ ...c!, focusInside: true }));
-      (target.querySelector("[tabindex]") as HTMLElement)?.focus();
-      return;
-    }
+      // Enter: enter cell
+      if (e.key === "Enter") {
+        setSelectedCell((c) => ({ ...c!, focusInside: true }));
+        (target.querySelector("[tabindex]") as HTMLElement)?.focus();
+        return;
+      }
 
-    const colIndex = Number(target.getAttribute("aria-colindex")) - 1;
-    const rowIndex =
-      Number(target.parentElement!.getAttribute("aria-rowindex")) - 2;
+      const colIndex = Number(target.getAttribute("aria-colindex")) - 1;
+      const rowIndex =
+        Number(target.parentElement!.getAttribute("aria-rowindex")) - 2;
 
-    let newColIndex = colIndex;
-    let newRowIndex = rowIndex;
+      let newColIndex = colIndex;
+      let newRowIndex = rowIndex;
 
-    switch (e.key) {
-      case "ArrowUp":
-        if (e.ctrlKey || e.metaKey) newRowIndex = -1;
-        else if (rowIndex > -1) newRowIndex = rowIndex - 1;
-        break;
+      switch (e.key) {
+        case "ArrowUp":
+          if (e.ctrlKey || e.metaKey) newRowIndex = -1;
+          else if (rowIndex > -1) newRowIndex = rowIndex - 1;
+          break;
 
-      case "ArrowDown":
-        if (e.ctrlKey || e.metaKey) newRowIndex = tableRows.length - 1;
-        else if (rowIndex < tableRows.length - 1) newRowIndex = rowIndex + 1;
-        break;
+        case "ArrowDown":
+          if (e.ctrlKey || e.metaKey) newRowIndex = tableRows.length - 1;
+          else if (rowIndex < tableRows.length - 1) newRowIndex = rowIndex + 1;
+          break;
 
-      case "ArrowLeft":
-        if (e.ctrlKey || e.metaKey) newColIndex = 0;
-        else if (colIndex > 0) newColIndex = colIndex - 1;
-        break;
+        case "ArrowLeft":
+          if (e.ctrlKey || e.metaKey) newColIndex = 0;
+          else if (colIndex > 0) newColIndex = colIndex - 1;
+          break;
 
-      case "ArrowRight":
-        if (e.ctrlKey || e.metaKey) newColIndex = leafColumns.length - 1;
-        else if (colIndex < leafColumns.length - 1) newColIndex = colIndex + 1;
-        break;
+        case "ArrowRight":
+          if (e.ctrlKey || e.metaKey) newColIndex = leafColumns.length - 1;
+          else if (colIndex < leafColumns.length - 1)
+            newColIndex = colIndex + 1;
+          break;
 
-      case "PageUp":
-        newRowIndex = Math.max(0, rowIndex - COLLECTION_PAGE_SIZE);
-        break;
+        case "PageUp":
+          newRowIndex = Math.max(0, rowIndex - COLLECTION_PAGE_SIZE);
+          break;
 
-      case "PageDown":
-        newRowIndex = Math.min(
-          tableRows.length - 1,
-          rowIndex + COLLECTION_PAGE_SIZE
-        );
-        break;
+        case "PageDown":
+          newRowIndex = Math.min(
+            tableRows.length - 1,
+            rowIndex + COLLECTION_PAGE_SIZE
+          );
+          break;
 
-      case "Home":
-        newColIndex = 0;
-        if (e.ctrlKey || e.metaKey) newRowIndex = -1;
-        break;
+        case "Home":
+          newColIndex = 0;
+          if (e.ctrlKey || e.metaKey) newRowIndex = -1;
+          break;
 
-      case "End":
-        newColIndex = leafColumns.length - 1;
-        if (e.ctrlKey || e.metaKey) newRowIndex = tableRows.length - 1;
-        break;
-    }
+        case "End":
+          newColIndex = leafColumns.length - 1;
+          if (e.ctrlKey || e.metaKey) newRowIndex = tableRows.length - 1;
+          break;
+      }
 
-    // Get `path` and `columnKey` from `tableRows` and `leafColumns` respectively
-    const newSelectedCell = {
-      path:
-        newRowIndex > -1
-          ? tableRows[newRowIndex]._rowy_ref.path
-          : "_rowy_header",
-      columnKey: leafColumns[newColIndex].id! || leafColumns[0].id!,
-      // When selected cell changes, exit current cell
-      focusInside: false,
-    };
+      // Get `path` and `columnKey` from `tableRows` and `leafColumns` respectively
+      const newSelectedCell = {
+        path:
+          newRowIndex > -1
+            ? tableRows[newRowIndex]._rowy_ref.path
+            : "_rowy_header",
+        columnKey: leafColumns[newColIndex].id! || leafColumns[0].id!,
+        // When selected cell changes, exit current cell
+        focusInside: false,
+      };
 
-    // Store in selectedCellAtom
-    setSelectedCell(newSelectedCell);
+      // Store in selectedCellAtom
+      setSelectedCell(newSelectedCell);
 
-    // Find matching DOM element for the cell
-    const newCellEl = gridRef.current?.querySelector(
-      `[aria-rowindex="${newRowIndex + 2}"] [aria-colindex="${
-        newColIndex + 1
-      }"]`
-    );
+      // Find matching DOM element for the cell
+      const newCellEl = gridRef.current?.querySelector(
+        `[aria-rowindex="${newRowIndex + 2}"] [aria-colindex="${
+          newColIndex + 1
+        }"]`
+      );
 
-    // Focus the cell
-    if (newCellEl) setTimeout(() => (newCellEl as HTMLDivElement).focus());
-  };
+      // Focus the cell
+      if (newCellEl) setTimeout(() => (newCellEl as HTMLDivElement).focus());
+    },
+    [gridRef, leafColumns, setSelectedCell, tableRows]
+  );
 
   return { handleKeyDown } as const;
 }
diff --git a/src/components/Table/useSaveColumnSizing.tsx b/src/components/Table/useSaveColumnSizing.tsx
index 2ea940ac..d957ac14 100644
--- a/src/components/Table/useSaveColumnSizing.tsx
+++ b/src/components/Table/useSaveColumnSizing.tsx
@@ -19,7 +19,7 @@ import { ColumnSizingState } from "@tanstack/react-table";
 /** Debounces columnSizing and asks admins if they want to save for all users */
 export function useSaveColumnSizing(
   columnSizing: ColumnSizingState,
-  canEditColumn: boolean
+  canEditColumns: boolean
 ) {
   const { enqueueSnackbar, closeSnackbar } = useSnackbar();
   const updateColumn = useSetAtom(updateColumnAtom, tableScope);
@@ -30,7 +30,7 @@ export function useSaveColumnSizing(
   });
   // Offer to save when column sizing changes
   useEffect(() => {
-    if (!canEditColumn || isEmpty(debouncedColumnSizing)) return;
+    if (!canEditColumns || isEmpty(debouncedColumnSizing)) return;
 
     const snackbarId = enqueueSnackbar("Save column sizes for all users?", {
       action: (
@@ -45,7 +45,7 @@ export function useSaveColumnSizing(
     return () => closeSnackbar(snackbarId);
   }, [
     debouncedColumnSizing,
-    canEditColumn,
+    canEditColumns,
     enqueueSnackbar,
     closeSnackbar,
     updateColumn,
diff --git a/src/components/Table/withTableCell.tsx b/src/components/Table/withTableCell.tsx
index 28a7d3bd..bd5b4b41 100644
--- a/src/components/Table/withTableCell.tsx
+++ b/src/components/Table/withTableCell.tsx
@@ -9,16 +9,17 @@ import {
 import useStateRef from "react-usestateref";
 import { useSetAtom } from "jotai";
 import { get, isEqual } from "lodash-es";
-import type { TableCellProps } from "@src/components/Table";
-import {
-  IDisplayCellProps,
-  IEditorCellProps,
-} from "@src/components/fields/types";
+import type { CellContext } from "@tanstack/react-table";
 
 import { Popover, PopoverProps } from "@mui/material";
 
 import { tableScope, updateFieldAtom } from "@src/atoms/tableScope";
 import { spreadSx } from "@src/utils/ui";
+import type { TableRow } from "@src/types/table";
+import type {
+  IDisplayCellProps,
+  IEditorCellProps,
+} from "@src/components/fields/types";
 
 export interface ICellOptions {
   /** If the rest of the row’s data is used, set this to true for memoization */
@@ -31,6 +32,13 @@ export interface ICellOptions {
   popoverProps?: Partial<PopoverProps>;
 }
 
+export interface ITableCellProps extends CellContext<TableRow, any> {
+  focusInsideCell: boolean;
+  setFocusInsideCell: (focusInside: boolean) => void;
+  disabled: boolean;
+  rowHeight: number;
+}
+
 /**
  * HOC to render table cells.
  * Renders read-only DisplayCell while scrolling for scroll performance.
@@ -57,7 +65,8 @@ export default function withTableCell(
       focusInsideCell,
       setFocusInsideCell,
       disabled,
-    }: TableCellProps) {
+      rowHeight,
+    }: ITableCellProps) {
       const value = getValue();
 
       // Store ref to rendered DisplayCell to get positioning for PopoverCell
@@ -93,12 +102,12 @@ export default function withTableCell(
         type: column.columnDef.meta!.type,
         row: row.original,
         column: column.columnDef.meta!,
-        docRef: row.original._rowy_ref,
         _rowy_ref: row.original._rowy_ref,
         disabled: column.columnDef.meta!.editable === false,
         tabIndex: focusInsideCell ? 0 : -1,
         showPopoverCell,
         setFocusInsideCell,
+        rowHeight,
       };
 
       // Show display cell, unless if editorMode is inline
diff --git a/src/components/fields/ConnectService/DisplayCell.tsx b/src/components/fields/ConnectService/DisplayCell.tsx
index e4d08055..e7d267c0 100644
--- a/src/components/fields/ConnectService/DisplayCell.tsx
+++ b/src/components/fields/ConnectService/DisplayCell.tsx
@@ -12,12 +12,13 @@ export default function ConnectService({
   disabled,
   column,
   tabIndex,
+  rowHeight,
 }: IDisplayCellProps) {
   const config = column.config ?? {};
   const displayKey = config.titleKey ?? config.primaryKey;
 
   const rendered = (
-    <ChipList>
+    <ChipList rowHeight={rowHeight}>
       {Array.isArray(value) &&
         value.map((snapshot) => (
           <Grid item key={get(snapshot, config.primaryKey)}>
diff --git a/src/components/fields/ConnectTable/DisplayCell.tsx b/src/components/fields/ConnectTable/DisplayCell.tsx
index 75c0da2b..efde15bc 100644
--- a/src/components/fields/ConnectTable/DisplayCell.tsx
+++ b/src/components/fields/ConnectTable/DisplayCell.tsx
@@ -11,11 +11,12 @@ export default function ConnectTable({
   disabled,
   column,
   tabIndex,
+  rowHeight,
 }: IDisplayCellProps) {
   const config = column.config ?? {};
 
   const rendered = (
-    <ChipList>
+    <ChipList rowHeight={rowHeight}>
       {Array.isArray(value) ? (
         value.map((item: any) => (
           <Grid item key={item.docPath}>
diff --git a/src/components/fields/Connector/DisplayCell.tsx b/src/components/fields/Connector/DisplayCell.tsx
index 8c6316bc..cd707d80 100644
--- a/src/components/fields/Connector/DisplayCell.tsx
+++ b/src/components/fields/Connector/DisplayCell.tsx
@@ -13,9 +13,10 @@ export default function Connector({
   disabled,
   column,
   tabIndex,
+  rowHeight,
 }: IDisplayCellProps) {
   const rendered = (
-    <ChipList>
+    <ChipList rowHeight={rowHeight}>
       {Array.isArray(value) &&
         value.map((item) => (
           <Grid item key={get(item, column.config?.id)}>
diff --git a/src/components/fields/File/DisplayCell.tsx b/src/components/fields/File/DisplayCell.tsx
index 73303ddf..ea3a6382 100644
--- a/src/components/fields/File/DisplayCell.tsx
+++ b/src/components/fields/File/DisplayCell.tsx
@@ -6,9 +6,13 @@ import ChipList from "@src/components/Table/formatters/ChipList";
 import { FileIcon } from ".";
 import { FileValue } from "@src/types/table";
 
-export default function File_({ value, tabIndex }: IDisplayCellProps) {
+export default function File_({
+  value,
+  tabIndex,
+  rowHeight,
+}: IDisplayCellProps) {
   return (
-    <ChipList>
+    <ChipList rowHeight={rowHeight}>
       {Array.isArray(value) &&
         value.map((file: FileValue) => (
           <Grid
diff --git a/src/components/fields/File/EditorCell.tsx b/src/components/fields/File/EditorCell.tsx
index deb5b5fa..2b8692d3 100644
--- a/src/components/fields/File/EditorCell.tsx
+++ b/src/components/fields/File/EditorCell.tsx
@@ -26,6 +26,7 @@ export default function File_({
   disabled,
   _rowy_ref,
   tabIndex,
+  rowHeight,
 }: IEditorCellProps) {
   const confirm = useSetAtom(confirmDialogAtom, projectScope);
   const updateField = useSetAtom(updateFieldAtom, tableScope);
@@ -96,7 +97,7 @@ export default function File_({
       tabIndex={tabIndex}
       onClick={undefined}
     >
-      <ChipList>
+      <ChipList rowHeight={rowHeight}>
         {Array.isArray(value) &&
           value.map((file: FileValue) => (
             <Grid
diff --git a/src/components/fields/Id/DisplayCell.tsx b/src/components/fields/Id/DisplayCell.tsx
index fe86e927..7ca074aa 100644
--- a/src/components/fields/Id/DisplayCell.tsx
+++ b/src/components/fields/Id/DisplayCell.tsx
@@ -2,7 +2,7 @@ import { IDisplayCellProps } from "@src/components/fields/types";
 
 import { useTheme } from "@mui/material";
 
-export default function Id({ docRef }: IDisplayCellProps) {
+export default function Id({ _rowy_ref }: IDisplayCellProps) {
   const theme = useTheme();
 
   return (
@@ -13,7 +13,7 @@ export default function Id({ docRef }: IDisplayCellProps) {
         userSelect: "all",
       }}
     >
-      {docRef?.id}
+      {_rowy_ref?.id}
     </span>
   );
 }
diff --git a/src/components/fields/MultiSelect/DisplayCell.tsx b/src/components/fields/MultiSelect/DisplayCell.tsx
index eb5e8267..b439c4b9 100644
--- a/src/components/fields/MultiSelect/DisplayCell.tsx
+++ b/src/components/fields/MultiSelect/DisplayCell.tsx
@@ -13,6 +13,7 @@ export default function MultiSelect({
   showPopoverCell,
   disabled,
   tabIndex,
+  rowHeight,
 }: IDisplayCellProps) {
   const rendered =
     typeof value === "string" && value !== "" ? (
@@ -24,7 +25,7 @@ export default function MultiSelect({
         {value}
       </div>
     ) : (
-      <ChipList>
+      <ChipList rowHeight={rowHeight}>
         {sanitiseValue(value).map(
           (item) =>
             typeof item === "string" && (
diff --git a/src/components/fields/SubTable/utils.ts b/src/components/fields/SubTable/utils.ts
index e62e0a45..6f6c7746 100644
--- a/src/components/fields/SubTable/utils.ts
+++ b/src/components/fields/SubTable/utils.ts
@@ -6,7 +6,7 @@ import { ColumnConfig, TableRow, TableRowRef } from "@src/types/table";
 export const useSubTableData = (
   column: ColumnConfig,
   row: TableRow,
-  docRef: TableRowRef
+  _rowy_ref: TableRowRef
 ) => {
   const label = (column.config?.parentLabel ?? []).reduce((acc, curr) => {
     if (acc !== "") return `${acc} - ${row[curr]}`;
@@ -24,7 +24,7 @@ export const useSubTableData = (
   let subTablePath = [
     rootTablePath,
     ROUTES.subTable,
-    encodeURIComponent(docRef.path),
+    encodeURIComponent(_rowy_ref.path),
     column.key,
   ].join("/");
 
diff --git a/src/components/fields/types.ts b/src/components/fields/types.ts
index 8897e003..e4084365 100644
--- a/src/components/fields/types.ts
+++ b/src/components/fields/types.ts
@@ -1,16 +1,14 @@
 import { FieldType } from "@src/constants/fields";
-import type { TableCellProps } from "@src/components/Table";
-import { FormatterProps, EditorProps } from "react-data-grid";
-import { Control, UseFormReturn } from "react-hook-form";
-import { PopoverProps } from "@mui/material";
-import {
+import type { ITableCellProps } from "@src/components/Table/withTableCell";
+import type { PopoverProps } from "@mui/material";
+import type {
   ColumnConfig,
   TableRow,
   TableRowRef,
   TableFilter,
 } from "@src/types/table";
-import { SelectedCell } from "@src/atoms/tableScope";
-import { IContextMenuItem } from "@src/components/Table/ContextMenu/ContextMenuItem";
+import type { SelectedCell } from "@src/atoms/tableScope";
+import type { IContextMenuItem } from "@src/components/Table/ContextMenu/ContextMenuItem";
 
 export { FieldType };
 
@@ -29,7 +27,7 @@ export interface IFieldConfig {
     selectedCell: SelectedCell,
     reset: () => void
   ) => IContextMenuItem[];
-  TableCell: React.ComponentType<TableCellProps>;
+  TableCell: React.ComponentType<ITableCellProps>;
   SideDrawerField: React.ComponentType<ISideDrawerFieldProps>;
   settings?: React.ComponentType<ISettingsProps>;
   settingsValidator?: (config: Record<string, any>) => Record<string, string>;
@@ -50,14 +48,13 @@ export interface IDisplayCellProps<T = any> {
   name: string;
   row: TableRow;
   column: ColumnConfig;
-  /** @deprecated */
-  docRef: TableRowRef;
   /** The row’s _rowy_ref object */
   _rowy_ref: TableRowRef;
   disabled: boolean;
   tabIndex: number;
   showPopoverCell: (value: boolean) => void;
   setFocusInsideCell: (focusInside: boolean) => void;
+  rowHeight: number;
 }
 export interface IEditorCellProps<T = any> extends IDisplayCellProps<T> {
   /** Call when the user has input but changes have not been saved */
diff --git a/src/pages/Table/TablePage.tsx b/src/pages/Table/TablePage.tsx
index 234be866..da455666 100644
--- a/src/pages/Table/TablePage.tsx
+++ b/src/pages/Table/TablePage.tsx
@@ -70,9 +70,9 @@ export default function TablePage({
 
   // Set permissions here so we can pass them to the Table component, which
   // shouldn’t access projectScope at all, to separate concerns.
-  const canAddColumn = userRoles.includes("ADMIN");
-  const canEditColumn = userRoles.includes("ADMIN");
-  const canEditCell =
+  const canAddColumns = userRoles.includes("ADMIN");
+  const canEditColumns = userRoles.includes("ADMIN");
+  const canEditCells =
     userRoles.includes("ADMIN") ||
     (!tableSettings.readOnly &&
       intersection(userRoles, tableSettings.roles).length > 0);
@@ -135,9 +135,9 @@ export default function TablePage({
             }}
           >
             <Table
-              canAddColumn={canAddColumn}
-              canEditColumn={canEditColumn}
-              canEditCell={canEditCell}
+              canAddColumns={canAddColumns}
+              canEditColumns={canEditColumns}
+              canEditCells={canEditCells}
               hiddenColumns={
                 userSettings.tables?.[formatSubTableName(tableId)]?.hiddenFields
               }

From 3ca6f8d06855b9f74938c4da74feace2ae413524 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 15 Nov 2022 17:36:48 +1100
Subject: [PATCH 262/309] move ChipList.tsx

---
 src/components/Table/{formatters => }/ChipList.tsx   | 0
 src/components/fields/ConnectService/DisplayCell.tsx | 2 +-
 src/components/fields/ConnectTable/DisplayCell.tsx   | 2 +-
 src/components/fields/Connector/DisplayCell.tsx      | 2 +-
 src/components/fields/File/DisplayCell.tsx           | 2 +-
 src/components/fields/File/EditorCell.tsx            | 2 +-
 src/components/fields/MultiSelect/DisplayCell.tsx    | 2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename src/components/Table/{formatters => }/ChipList.tsx (100%)

diff --git a/src/components/Table/formatters/ChipList.tsx b/src/components/Table/ChipList.tsx
similarity index 100%
rename from src/components/Table/formatters/ChipList.tsx
rename to src/components/Table/ChipList.tsx
diff --git a/src/components/fields/ConnectService/DisplayCell.tsx b/src/components/fields/ConnectService/DisplayCell.tsx
index e7d267c0..2dd91bd8 100644
--- a/src/components/fields/ConnectService/DisplayCell.tsx
+++ b/src/components/fields/ConnectService/DisplayCell.tsx
@@ -3,7 +3,7 @@ import { IDisplayCellProps } from "@src/components/fields/types";
 import { ButtonBase, Grid, Chip } from "@mui/material";
 import { ChevronDown } from "@src/assets/icons";
 
-import ChipList from "@src/components/Table/formatters/ChipList";
+import ChipList from "@src/components/Table/ChipList";
 import { get } from "lodash-es";
 
 export default function ConnectService({
diff --git a/src/components/fields/ConnectTable/DisplayCell.tsx b/src/components/fields/ConnectTable/DisplayCell.tsx
index efde15bc..90ca35af 100644
--- a/src/components/fields/ConnectTable/DisplayCell.tsx
+++ b/src/components/fields/ConnectTable/DisplayCell.tsx
@@ -3,7 +3,7 @@ import { IDisplayCellProps } from "@src/components/fields/types";
 import { ButtonBase, Grid, Chip } from "@mui/material";
 import { ChevronDown } from "@src/assets/icons";
 
-import ChipList from "@src/components/Table/formatters/ChipList";
+import ChipList from "@src/components/Table/ChipList";
 
 export default function ConnectTable({
   value,
diff --git a/src/components/fields/Connector/DisplayCell.tsx b/src/components/fields/Connector/DisplayCell.tsx
index cd707d80..6576204a 100644
--- a/src/components/fields/Connector/DisplayCell.tsx
+++ b/src/components/fields/Connector/DisplayCell.tsx
@@ -3,7 +3,7 @@ import { IDisplayCellProps } from "@src/components/fields/types";
 import { ButtonBase, Grid, Chip } from "@mui/material";
 import { ChevronDown } from "@src/assets/icons";
 
-import ChipList from "@src/components/Table/formatters/ChipList";
+import ChipList from "@src/components/Table/ChipList";
 import { get } from "lodash-es";
 import { getLabel } from "./utils";
 
diff --git a/src/components/fields/File/DisplayCell.tsx b/src/components/fields/File/DisplayCell.tsx
index ea3a6382..2183f902 100644
--- a/src/components/fields/File/DisplayCell.tsx
+++ b/src/components/fields/File/DisplayCell.tsx
@@ -1,7 +1,7 @@
 import { IDisplayCellProps } from "@src/components/fields/types";
 
 import { Grid, Chip } from "@mui/material";
-import ChipList from "@src/components/Table/formatters/ChipList";
+import ChipList from "@src/components/Table/ChipList";
 
 import { FileIcon } from ".";
 import { FileValue } from "@src/types/table";
diff --git a/src/components/fields/File/EditorCell.tsx b/src/components/fields/File/EditorCell.tsx
index 2b8692d3..ed5ba74b 100644
--- a/src/components/fields/File/EditorCell.tsx
+++ b/src/components/fields/File/EditorCell.tsx
@@ -8,7 +8,7 @@ import { format } from "date-fns";
 
 import { alpha, Stack, Grid, Tooltip, Chip, IconButton } from "@mui/material";
 import { Upload as UploadIcon } from "@src/assets/icons";
-import ChipList from "@src/components/Table/formatters/ChipList";
+import ChipList from "@src/components/Table/ChipList";
 import CircularProgressOptical from "@src/components/CircularProgressOptical";
 
 import { projectScope, confirmDialogAtom } from "@src/atoms/projectScope";
diff --git a/src/components/fields/MultiSelect/DisplayCell.tsx b/src/components/fields/MultiSelect/DisplayCell.tsx
index b439c4b9..7554330a 100644
--- a/src/components/fields/MultiSelect/DisplayCell.tsx
+++ b/src/components/fields/MultiSelect/DisplayCell.tsx
@@ -5,7 +5,7 @@ import WarningIcon from "@mui/icons-material/WarningAmber";
 import { ChevronDown } from "@src/assets/icons";
 
 import { sanitiseValue } from "./utils";
-import ChipList from "@src/components/Table/formatters/ChipList";
+import ChipList from "@src/components/Table/ChipList";
 import FormattedChip from "@src/components/FormattedChip";
 
 export default function MultiSelect({

From 1b454de85a0edd33928dc1801da5ad8843f0a840 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 15 Nov 2022 17:36:58 +1100
Subject: [PATCH 263/309] extract TableBody out of Table

---
 src/components/Table/Table.tsx               | 130 +++----------------
 src/components/Table/TableBody.tsx           | 125 ++++++++++++++++++
 src/components/Table/useSaveColumnSizing.tsx |   4 +-
 3 files changed, 143 insertions(+), 116 deletions(-)
 create mode 100644 src/components/Table/TableBody.tsx

diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index 74c14a40..c7395447 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -3,55 +3,35 @@ import { useAtom, useSetAtom } from "jotai";
 import { useThrottledCallback } from "use-debounce";
 import {
   createColumnHelper,
-  flexRender,
   getCoreRowModel,
   useReactTable,
-  CellContext,
 } from "@tanstack/react-table";
-import {
-  DragDropContext,
-  DropResult,
-  Droppable,
-  Draggable,
-} from "react-beautiful-dnd";
+import { DropResult } from "react-beautiful-dnd";
 import { get } from "lodash-es";
-import { ErrorBoundary } from "react-error-boundary";
-import { DragVertical } from "@src/assets/icons";
 
 import StyledTable from "./Styled/StyledTable";
-import StyledRow from "./Styled/StyledRow";
 import TableHeaderGroup from "./TableHeaderGroup";
-import ColumnHeader from "./ColumnHeader";
-import StyledResizer from "./Styled/StyledResizer";
-import FinalColumnHeader from "./FinalColumn/FinalColumnHeader";
+import TableBody from "./TableBody";
 import FinalColumn from "./FinalColumn/FinalColumn";
-import OutOfOrderIndicator from "./OutOfOrderIndicator";
 import ContextMenu from "./ContextMenu";
-import CellValidation from "./CellValidation";
 
 import EmptyState from "@src/components/EmptyState";
-import { InlineErrorFallback } from "@src/components/ErrorFallback";
 // import BulkActions from "./BulkActions";
 
 import {
   tableScope,
-  tableSettingsAtom,
   tableSchemaAtom,
   tableColumnsOrderedAtom,
   tableRowsAtom,
   tableNextPageAtom,
   tablePageAtom,
   updateColumnAtom,
-  updateFieldAtom,
-  selectedCellAtom,
-  contextMenuTargetAtom,
 } from "@src/atoms/tableScope";
 
 import { getFieldType, getFieldProp } from "@src/components/fields";
 import { TableRow, ColumnConfig } from "@src/types/table";
 import { useKeyboardNavigation } from "./useKeyboardNavigation";
 import { useSaveColumnSizing } from "./useSaveColumnSizing";
-import useVirtualization from "./useVirtualization";
 
 export const DEFAULT_ROW_HEIGHT = 41;
 export const DEFAULT_COL_WIDTH = 150;
@@ -61,6 +41,7 @@ export const OUT_OF_ORDER_MARGIN = 8;
 export const DEBOUNCE_DELAY = 500;
 
 declare module "@tanstack/table-core" {
+  /** The `column.meta` property contains the column config from tableSchema */
   interface ColumnMeta<TData, TValue> extends ColumnConfig {}
 }
 
@@ -87,9 +68,6 @@ export default function Table({
   const [tableRows] = useAtom(tableRowsAtom, tableScope);
   const [tableNextPage] = useAtom(tableNextPageAtom, tableScope);
   const [tablePage, setTablePage] = useAtom(tablePageAtom, tableScope);
-  const [selectedCell, setSelectedCell] = useAtom(selectedCellAtom, tableScope);
-  const setContextMenuTarget = useSetAtom(contextMenuTargetAtom, tableScope);
-  const focusInsideCell = selectedCell?.focusInside ?? false;
 
   const updateColumn = useSetAtom(updateColumnAtom, tableScope);
 
@@ -170,14 +148,7 @@ export default function Table({
     tableRows,
     leafColumns,
   });
-  const {
-    virtualRows,
-    virtualCols,
-    paddingTop,
-    paddingBottom,
-    paddingLeft,
-    paddingRight,
-  } = useVirtualization(containerRef, leafColumns);
+
   useSaveColumnSizing(columnSizing, canEditColumns);
 
   const handleDropColumn = useCallback(
@@ -253,88 +224,17 @@ export default function Table({
           />
         </div>
 
-        <div className="tbody" role="rowgroup">
-          {paddingTop > 0 && (
-            <div role="presentation" style={{ height: `${paddingTop}px` }} />
-          )}
-
-          {virtualRows.map((virtualRow) => {
-            const row = rows[virtualRow.index];
-            const outOfOrder = row.original._rowy_outOfOrder;
-
-            return (
-              <StyledRow
-                key={row.id}
-                role="row"
-                aria-rowindex={row.index + 2}
-                style={{
-                  height: "auto",
-                  marginBottom: outOfOrder ? OUT_OF_ORDER_MARGIN : 0,
-                }}
-                data-out-of-order={outOfOrder || undefined}
-              >
-                {paddingLeft > 0 && (
-                  <div
-                    role="presentation"
-                    style={{ width: `${paddingLeft}px` }}
-                  />
-                )}
-
-                {outOfOrder && <OutOfOrderIndicator />}
-
-                {virtualCols.map((virtualCell) => {
-                  const cellIndex = virtualCell.index;
-                  const cell = row.getVisibleCells()[cellIndex];
-
-                  const isSelectedCell =
-                    selectedCell?.path === row.original._rowy_ref.path &&
-                    selectedCell?.columnKey === cell.column.id;
-
-                  const fieldTypeGroup = getFieldProp(
-                    "group",
-                    cell.column.columnDef.meta?.type
-                  );
-                  const isReadOnlyCell =
-                    fieldTypeGroup === "Auditing" ||
-                    fieldTypeGroup === "Metadata";
-
-                  return (
-                    <CellValidation
-                      key={cell.id}
-                      row={row}
-                      cell={cell}
-                      index={cellIndex}
-                      left={
-                        cell.column.getIsPinned()
-                          ? virtualCell.start - TABLE_PADDING
-                          : undefined
-                      }
-                      isSelectedCell={isSelectedCell}
-                      isReadOnlyCell={isReadOnlyCell}
-                      canEditCells={canEditCells}
-                      lastFrozen={lastFrozen}
-                      rowHeight={tableSchema.rowHeight || DEFAULT_ROW_HEIGHT}
-                    />
-                  );
-                })}
-
-                {paddingRight > 0 && (
-                  <div
-                    role="presentation"
-                    style={{ width: `${paddingRight}px` }}
-                  />
-                )}
-              </StyledRow>
-            );
-          })}
-
-          {paddingBottom > 0 && (
-            <div role="presentation" style={{ height: `${paddingBottom}px` }} />
-          )}
-
-          {tableRows.length === 0 &&
-            (emptyState ?? <EmptyState sx={{ py: 8 }} />)}
-        </div>
+        {tableRows.length === 0 ? (
+          emptyState ?? <EmptyState sx={{ py: 8 }} />
+        ) : (
+          <TableBody
+            containerRef={containerRef}
+            leafColumns={leafColumns}
+            rows={rows}
+            canEditCells={canEditCells}
+            lastFrozen={lastFrozen}
+          />
+        )}
       </StyledTable>
 
       <div
diff --git a/src/components/Table/TableBody.tsx b/src/components/Table/TableBody.tsx
new file mode 100644
index 00000000..76a1d597
--- /dev/null
+++ b/src/components/Table/TableBody.tsx
@@ -0,0 +1,125 @@
+import { useAtom } from "jotai";
+import type { Column, Row } from "@tanstack/react-table";
+
+import StyledRow from "./Styled/StyledRow";
+import OutOfOrderIndicator from "./OutOfOrderIndicator";
+import CellValidation from "./CellValidation";
+
+import {
+  tableScope,
+  tableSchemaAtom,
+  selectedCellAtom,
+} from "@src/atoms/tableScope";
+
+import { getFieldProp } from "@src/components/fields";
+import type { TableRow } from "@src/types/table";
+import useVirtualization from "./useVirtualization";
+import {
+  TABLE_PADDING,
+  DEFAULT_ROW_HEIGHT,
+  OUT_OF_ORDER_MARGIN,
+} from "./Table";
+
+export interface ITableBodyProps {
+  containerRef: React.RefObject<HTMLDivElement>;
+  leafColumns: Column<TableRow, unknown>[];
+  rows: Row<TableRow>[];
+
+  canEditCells: boolean;
+  lastFrozen?: string;
+}
+
+export default function TableBody({
+  containerRef,
+  leafColumns,
+  rows,
+  canEditCells,
+  lastFrozen,
+}: ITableBodyProps) {
+  const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
+  const [selectedCell] = useAtom(selectedCellAtom, tableScope);
+
+  const {
+    virtualRows,
+    virtualCols,
+    paddingTop,
+    paddingBottom,
+    paddingLeft,
+    paddingRight,
+  } = useVirtualization(containerRef, leafColumns);
+
+  return (
+    <div className="tbody" role="rowgroup">
+      {paddingTop > 0 && (
+        <div role="presentation" style={{ height: `${paddingTop}px` }} />
+      )}
+
+      {virtualRows.map((virtualRow) => {
+        const row = rows[virtualRow.index];
+        const outOfOrder = row.original._rowy_outOfOrder;
+
+        return (
+          <StyledRow
+            key={row.id}
+            role="row"
+            aria-rowindex={row.index + 2}
+            style={{
+              height: "auto",
+              marginBottom: outOfOrder ? OUT_OF_ORDER_MARGIN : 0,
+            }}
+            data-out-of-order={outOfOrder || undefined}
+          >
+            {paddingLeft > 0 && (
+              <div role="presentation" style={{ width: `${paddingLeft}px` }} />
+            )}
+
+            {outOfOrder && <OutOfOrderIndicator />}
+
+            {virtualCols.map((virtualCell) => {
+              const cellIndex = virtualCell.index;
+              const cell = row.getVisibleCells()[cellIndex];
+
+              const isSelectedCell =
+                selectedCell?.path === row.original._rowy_ref.path &&
+                selectedCell?.columnKey === cell.column.id;
+
+              const fieldTypeGroup = getFieldProp(
+                "group",
+                cell.column.columnDef.meta?.type
+              );
+              const isReadOnlyCell =
+                fieldTypeGroup === "Auditing" || fieldTypeGroup === "Metadata";
+
+              return (
+                <CellValidation
+                  key={cell.id}
+                  row={row}
+                  cell={cell}
+                  index={cellIndex}
+                  left={
+                    cell.column.getIsPinned()
+                      ? virtualCell.start - TABLE_PADDING
+                      : undefined
+                  }
+                  isSelectedCell={isSelectedCell}
+                  isReadOnlyCell={isReadOnlyCell}
+                  canEditCells={canEditCells}
+                  lastFrozen={lastFrozen}
+                  rowHeight={tableSchema.rowHeight || DEFAULT_ROW_HEIGHT}
+                />
+              );
+            })}
+
+            {paddingRight > 0 && (
+              <div role="presentation" style={{ width: `${paddingRight}px` }} />
+            )}
+          </StyledRow>
+        );
+      })}
+
+      {paddingBottom > 0 && (
+        <div role="presentation" style={{ height: `${paddingBottom}px` }} />
+      )}
+    </div>
+  );
+}
diff --git a/src/components/Table/useSaveColumnSizing.tsx b/src/components/Table/useSaveColumnSizing.tsx
index d957ac14..2bcf9c59 100644
--- a/src/components/Table/useSaveColumnSizing.tsx
+++ b/src/components/Table/useSaveColumnSizing.tsx
@@ -16,7 +16,9 @@ import {
 import { DEBOUNCE_DELAY } from "./Table";
 import { ColumnSizingState } from "@tanstack/react-table";
 
-/** Debounces columnSizing and asks admins if they want to save for all users */
+/**
+ * Debounces columnSizing and asks admins if they want to save for all users
+ */
 export function useSaveColumnSizing(
   columnSizing: ColumnSizingState,
   canEditColumns: boolean

From ea8019e1e3284dc2148c55f4df171307ccb9c02f Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 15 Nov 2022 18:02:30 +1100
Subject: [PATCH 264/309] render inline editor cell after timeout on mount to
 improve scroll performance

---
 src/components/Table/withTableCell.tsx | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/components/Table/withTableCell.tsx b/src/components/Table/withTableCell.tsx
index bd5b4b41..d959e408 100644
--- a/src/components/Table/withTableCell.tsx
+++ b/src/components/Table/withTableCell.tsx
@@ -67,8 +67,17 @@ export default function withTableCell(
       disabled,
       rowHeight,
     }: ITableCellProps) {
+      // Get the latest value on every re-render of this component
       const value = getValue();
 
+      // Render inline editor cell after timeout on mount
+      // to improve scroll performance
+      const [inlineEditorReady, setInlineEditorReady] = useState(false);
+      useEffect(() => {
+        if (editorMode === "inline")
+          setTimeout(() => setInlineEditorReady(true));
+      }, []);
+
       // Store ref to rendered DisplayCell to get positioning for PopoverCell
       const displayCellRef = useRef<HTMLDivElement>(null);
       const parentRef = displayCellRef.current?.parentElement;
@@ -110,6 +119,9 @@ export default function withTableCell(
         rowHeight,
       };
 
+      // If the inline editor cell is not ready to be rendered, display nothing
+      if (editorMode === "inline" && !inlineEditorReady) return null;
+
       // Show display cell, unless if editorMode is inline
       const displayCell = (
         <div

From 39dc84a38cf158a0052bd40cab3f18eca8db98e2 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 15 Nov 2022 18:14:44 +1100
Subject: [PATCH 265/309] re-enable cell validation tooltips

---
 src/components/Table/CellValidation.tsx       | 85 +++++++++----------
 src/components/Table/Table.tsx                |  4 +-
 .../{TableHeaderGroup.tsx => TableHeader.tsx} |  8 +-
 3 files changed, 45 insertions(+), 52 deletions(-)
 rename src/components/Table/{TableHeaderGroup.tsx => TableHeader.tsx} (97%)

diff --git a/src/components/Table/CellValidation.tsx b/src/components/Table/CellValidation.tsx
index e19dde1b..6e566487 100644
--- a/src/components/Table/CellValidation.tsx
+++ b/src/components/Table/CellValidation.tsx
@@ -17,7 +17,6 @@ import {
   selectedCellAtom,
   contextMenuTargetAtom,
 } from "@src/atoms/tableScope";
-import { TABLE_PADDING } from "./Table";
 import type { TableRow } from "@src/types/table";
 
 const Dot = styled("div")(({ theme }) => ({
@@ -73,51 +72,29 @@ export const CellValidation = memo(function MemoizedCellValidation({
   const isInvalid = validationRegex && !new RegExp(validationRegex).test(value);
   const isMissing = required && value === undefined;
 
-  const renderedCell = (
-    <ErrorBoundary fallbackRender={InlineErrorFallback}>
-      {flexRender(cell.column.columnDef.cell, {
-        ...cell.getContext(),
-        focusInsideCell: isSelectedCell && focusInsideCell,
-        setFocusInsideCell: (focusInside: boolean) =>
-          setSelectedCell({
-            path: row.original._rowy_ref.path,
-            columnKey: cell.column.id,
-            focusInside,
-          }),
-        disabled:
-          !canEditCells || cell.column.columnDef.meta?.editable === false,
-        rowHeight,
-      })}
-    </ErrorBoundary>
-  );
+  let renderedValidationTooltip = null;
 
-  // if (isInvalid)
-  //   return (
-  //     <StyledCell aria-invalid="true" {...props}>
-  //       <RichTooltip
-  //         icon={<ErrorIcon fontSize="inherit" color="error" />}
-  //         title="Invalid data"
-  //         message="This row will not be saved until all the required fields contain valid data"
-  //         placement="right"
-  //         render={({ openTooltip }) => <Dot onClick={openTooltip} />}
-  //       />
-  //       {children}
-  //     </StyledCell>
-  //   );
-
-  // if (isMissing)
-  //   return (
-  //     <StyledCell aria-invalid="true" {...props}>
-  //       <RichTooltip
-  //         icon={<WarningIcon fontSize="inherit" color="warning" />}
-  //         title="Required field"
-  //         message="This row will not be saved until all the required fields contain valid data"
-  //         placement="right"
-  //         render={({ openTooltip }) => <Dot onClick={openTooltip} />}
-  //       />
-  //       {children}
-  //     </StyledCell>
-  //   );
+  if (isInvalid) {
+    renderedValidationTooltip = (
+      <RichTooltip
+        icon={<ErrorIcon fontSize="inherit" color="error" />}
+        title="Invalid data"
+        message="This row will not be saved until all the required fields contain valid data"
+        placement="right"
+        render={({ openTooltip }) => <Dot onClick={openTooltip} />}
+      />
+    );
+  } else if (isMissing) {
+    renderedValidationTooltip = (
+      <RichTooltip
+        icon={<WarningIcon fontSize="inherit" color="warning" />}
+        title="Required field"
+        message="This row will not be saved until all the required fields contain valid data"
+        placement="right"
+        render={({ openTooltip }) => <Dot onClick={openTooltip} />}
+      />
+    );
+  }
 
   return (
     <StyledCell
@@ -139,6 +116,7 @@ export const CellValidation = memo(function MemoizedCellValidation({
           ? "rowy-table-editable-cell-description"
           : undefined
       }
+      aria-invalid={isInvalid || isMissing}
       style={{
         width: cell.column.getSize(),
         height: rowHeight,
@@ -177,7 +155,22 @@ export const CellValidation = memo(function MemoizedCellValidation({
         setContextMenuTarget(e.target as HTMLElement);
       }}
     >
-      {renderedCell}
+      {renderedValidationTooltip}
+      <ErrorBoundary fallbackRender={InlineErrorFallback}>
+        {flexRender(cell.column.columnDef.cell, {
+          ...cell.getContext(),
+          focusInsideCell: isSelectedCell && focusInsideCell,
+          setFocusInsideCell: (focusInside: boolean) =>
+            setSelectedCell({
+              path: row.original._rowy_ref.path,
+              columnKey: cell.column.id,
+              focusInside,
+            }),
+          disabled:
+            !canEditCells || cell.column.columnDef.meta?.editable === false,
+          rowHeight,
+        })}
+      </ErrorBoundary>
     </StyledCell>
   );
 });
diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index c7395447..886fdcff 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -10,7 +10,7 @@ import { DropResult } from "react-beautiful-dnd";
 import { get } from "lodash-es";
 
 import StyledTable from "./Styled/StyledTable";
-import TableHeaderGroup from "./TableHeaderGroup";
+import TableHeader from "./TableHeader";
 import TableBody from "./TableBody";
 import FinalColumn from "./FinalColumn/FinalColumn";
 import ContextMenu from "./ContextMenu";
@@ -215,7 +215,7 @@ export default function Table({
             padding: `0 ${TABLE_PADDING}px`,
           }}
         >
-          <TableHeaderGroup
+          <TableHeader
             headerGroups={table.getHeaderGroups()}
             handleDropColumn={handleDropColumn}
             canAddColumns={canAddColumns}
diff --git a/src/components/Table/TableHeaderGroup.tsx b/src/components/Table/TableHeader.tsx
similarity index 97%
rename from src/components/Table/TableHeaderGroup.tsx
rename to src/components/Table/TableHeader.tsx
index 9f2e0a23..555b6d82 100644
--- a/src/components/Table/TableHeaderGroup.tsx
+++ b/src/components/Table/TableHeader.tsx
@@ -14,7 +14,7 @@ import { DragVertical } from "@src/assets/icons";
 import { tableScope, selectedCellAtom } from "@src/atoms/tableScope";
 import { DEFAULT_ROW_HEIGHT, TABLE_PADDING } from "@src/components/Table";
 
-export interface ITableHeaderGroupProps {
+export interface ITableHeaderProps {
   headerGroups: HeaderGroup<TableRow>[];
   handleDropColumn: (result: DropResult) => void;
   canAddColumns: boolean;
@@ -22,13 +22,13 @@ export interface ITableHeaderGroupProps {
   lastFrozen?: string;
 }
 
-export const TableHeaderGroup = memo(function TableHeaderGroup({
+export const TableHeader = memo(function TableHeader({
   headerGroups,
   handleDropColumn,
   canAddColumns,
   canEditColumns,
   lastFrozen,
-}: ITableHeaderGroupProps) {
+}: ITableHeaderProps) {
   const [selectedCell, setSelectedCell] = useAtom(selectedCellAtom, tableScope);
   const focusInsideCell = selectedCell?.focusInside ?? false;
 
@@ -190,4 +190,4 @@ export const TableHeaderGroup = memo(function TableHeaderGroup({
   );
 });
 
-export default TableHeaderGroup;
+export default TableHeader;

From d81b4fc3c81f994259dee7674244b3a6bd899abf Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 15 Nov 2022 18:23:57 +1100
Subject: [PATCH 266/309] display RowsSkeleton when loading next page

---
 src/components/Table/TableBody.tsx     |  5 +++++
 src/components/Table/TableSkeleton.tsx | 15 +++------------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/components/Table/TableBody.tsx b/src/components/Table/TableBody.tsx
index 76a1d597..ae119011 100644
--- a/src/components/Table/TableBody.tsx
+++ b/src/components/Table/TableBody.tsx
@@ -4,11 +4,13 @@ import type { Column, Row } from "@tanstack/react-table";
 import StyledRow from "./Styled/StyledRow";
 import OutOfOrderIndicator from "./OutOfOrderIndicator";
 import CellValidation from "./CellValidation";
+import { RowsSkeleton } from "./TableSkeleton";
 
 import {
   tableScope,
   tableSchemaAtom,
   selectedCellAtom,
+  tableNextPageAtom,
 } from "@src/atoms/tableScope";
 
 import { getFieldProp } from "@src/components/fields";
@@ -38,6 +40,7 @@ export default function TableBody({
 }: ITableBodyProps) {
   const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
   const [selectedCell] = useAtom(selectedCellAtom, tableScope);
+  const [tableNextPage] = useAtom(tableNextPageAtom, tableScope);
 
   const {
     virtualRows,
@@ -117,6 +120,8 @@ export default function TableBody({
         );
       })}
 
+      {tableNextPage.loading && <RowsSkeleton />}
+
       {paddingBottom > 0 && (
         <div role="presentation" style={{ height: `${paddingBottom}px` }} />
       )}
diff --git a/src/components/Table/TableSkeleton.tsx b/src/components/Table/TableSkeleton.tsx
index e264fde7..065770fc 100644
--- a/src/components/Table/TableSkeleton.tsx
+++ b/src/components/Table/TableSkeleton.tsx
@@ -13,7 +13,7 @@ import {
   tableSchemaAtom,
   tableColumnsOrderedAtom,
 } from "@src/atoms/tableScope";
-import { DEFAULT_ROW_HEIGHT, DEFAULT_COL_WIDTH } from "./Table";
+import { DEFAULT_ROW_HEIGHT, DEFAULT_COL_WIDTH, TABLE_PADDING } from "./Table";
 import { COLLECTION_PAGE_SIZE } from "@src/config/db";
 import { formatSubTableName } from "@src/utils/table";
 
@@ -129,17 +129,7 @@ export function RowsSkeleton() {
         <Stack
           key={i}
           direction="row"
-          sx={{
-            px: 2,
-            mt: -1 / 8,
-
-            "&:last-of-type > div:first-of-type": {
-              borderBottomLeftRadius: (theme) => theme.shape.borderRadius,
-            },
-            "&:last-of-type > div:last-of-type": {
-              borderBottomRightRadius: (theme) => theme.shape.borderRadius,
-            },
-          }}
+          style={{ padding: `0 ${TABLE_PADDING}px`, marginTop: -1 }}
         >
           {columns.map((col, j) => (
             <Skeleton
@@ -156,6 +146,7 @@ export function RowsSkeleton() {
                 border: "1px solid",
                 borderColor: "divider",
                 borderLeftWidth: j === 0 ? 1 : 0,
+                borderRadius: 0,
                 width: col.width || DEFAULT_COL_WIDTH,
                 flexShrink: 0,
                 height: rowHeight + 1,

From fda6ff2db71d4ef713a9d939b43c13811507ea4f Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 15 Nov 2022 18:39:08 +1100
Subject: [PATCH 267/309] =?UTF-8?q?=F0=9F=8E=89=20remove=20react-data-grid?=
 =?UTF-8?q?=20dependency?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                             |  1 -
 src/components/SideDrawer/SideDrawer.tsx | 46 ++----------------------
 src/pages/Table/TablePage.tsx            |  8 ++---
 yarn.lock                                |  7 ----
 4 files changed, 4 insertions(+), 58 deletions(-)

diff --git a/package.json b/package.json
index baf6cda0..0ea80114 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,6 @@
     "react": "^18.0.0",
     "react-beautiful-dnd": "^13.1.0",
     "react-color-palette": "^6.2.0",
-    "react-data-grid": "7.0.0-beta.5",
     "react-detect-offline": "^2.4.5",
     "react-div-100vh": "^0.7.0",
     "react-dnd": "^16.0.1",
diff --git a/src/components/SideDrawer/SideDrawer.tsx b/src/components/SideDrawer/SideDrawer.tsx
index 04f896bd..ef676bd1 100644
--- a/src/components/SideDrawer/SideDrawer.tsx
+++ b/src/components/SideDrawer/SideDrawer.tsx
@@ -1,10 +1,8 @@
 import { useEffect } from "react";
-import useMemoValue from "use-memo-value";
 import clsx from "clsx";
 import { useAtom } from "jotai";
-import { find, findIndex, isEqual } from "lodash-es";
+import { find, findIndex } from "lodash-es";
 import { ErrorBoundary } from "react-error-boundary";
-import { DataGridHandle } from "react-data-grid";
 import { TransitionGroup } from "react-transition-group";
 
 import { Fab, Fade } from "@mui/material";
@@ -16,34 +14,20 @@ import ErrorFallback from "@src/components/ErrorFallback";
 import StyledDrawer from "./StyledDrawer";
 import SideDrawerFields from "./SideDrawerFields";
 
-import { projectScope, userSettingsAtom } from "@src/atoms/projectScope";
 import {
   tableScope,
-  tableIdAtom,
-  tableColumnsOrderedAtom,
   tableRowsAtom,
   sideDrawerOpenAtom,
   selectedCellAtom,
 } from "@src/atoms/tableScope";
 import { analytics, logEvent } from "@src/analytics";
-import { formatSubTableName } from "@src/utils/table";
 
 export const DRAWER_WIDTH = 512;
 export const DRAWER_COLLAPSED_WIDTH = 36;
 
-export default function SideDrawer({
-  dataGridRef,
-}: {
-  dataGridRef?: React.MutableRefObject<DataGridHandle | null>;
-}) {
-  const [userSettings] = useAtom(userSettingsAtom, projectScope);
-  const [tableId] = useAtom(tableIdAtom, tableScope);
-  const [tableColumnsOrdered] = useAtom(tableColumnsOrderedAtom, tableScope);
+export default function SideDrawer() {
   const [tableRows] = useAtom(tableRowsAtom, tableScope);
 
-  const userDocHiddenFields =
-    userSettings.tables?.[formatSubTableName(tableId)]?.hiddenFields ?? [];
-
   const [cell, setCell] = useAtom(selectedCellAtom, tableScope);
   const [open, setOpen] = useAtom(sideDrawerOpenAtom, tableScope);
   const selectedRow = find(tableRows, ["_rowy_ref.path", cell?.path]);
@@ -51,26 +35,6 @@ export default function SideDrawer({
     "_rowy_ref.path",
     cell?.path,
   ]);
-  // Memo a list of visible column keys for useEffect dependencies
-  const visibleColumnKeys = useMemoValue(
-    tableColumnsOrdered
-      .filter((col) => !userDocHiddenFields.includes(col.key))
-      .map((col) => col.key),
-    isEqual
-  );
-
-  // When side drawer is opened, select the cell in the table
-  // in case we’ve scrolled and selected cell was reset
-  useEffect(() => {
-    if (open) {
-      const columnIndex = visibleColumnKeys.indexOf(cell?.columnKey || "");
-      if (columnIndex === -1 || selectedCellRowIndex === -1) return;
-      dataGridRef?.current?.selectCell(
-        { rowIdx: selectedCellRowIndex, idx: columnIndex },
-        false
-      );
-    }
-  }, [open, visibleColumnKeys, selectedCellRowIndex, cell, dataGridRef]);
 
   const handleNavigate = (direction: "up" | "down") => () => {
     if (!tableRows || !cell) return;
@@ -84,12 +48,6 @@ export default function SideDrawer({
       path: newPath,
       focusInside: false,
     }));
-
-    const columnIndex = visibleColumnKeys.indexOf(cell!.columnKey || "");
-    dataGridRef?.current?.selectCell(
-      { rowIdx: rowIndex, idx: columnIndex },
-      false
-    );
   };
 
   // const [urlDocState, dispatchUrlDoc] = useDoc({});
diff --git a/src/pages/Table/TablePage.tsx b/src/pages/Table/TablePage.tsx
index da455666..5959376e 100644
--- a/src/pages/Table/TablePage.tsx
+++ b/src/pages/Table/TablePage.tsx
@@ -1,6 +1,5 @@
-import { useRef, Suspense, lazy } from "react";
+import { Suspense, lazy } from "react";
 import { useAtom } from "jotai";
-import { DataGridHandle } from "react-data-grid";
 import { ErrorBoundary } from "react-error-boundary";
 import { isEmpty, intersection } from "lodash-es";
 
@@ -81,9 +80,6 @@ export default function TablePage({
   useBeforeUnload(columnModalAtom, tableScope);
   useBeforeUnload(tableModalAtom, tableScope);
 
-  // A ref to the data grid. Contains data grid functions
-  const dataGridRef = useRef<DataGridHandle | null>(null);
-
   if (!(tableSchema as any)._rowy_ref)
     return (
       <>
@@ -161,7 +157,7 @@ export default function TablePage({
 
       <ErrorBoundary FallbackComponent={InlineErrorFallback}>
         <Suspense fallback={null}>
-          {!disableSideDrawer && <SideDrawer dataGridRef={dataGridRef} />}
+          {!disableSideDrawer && <SideDrawer />}
         </Suspense>
       </ErrorBoundary>
 
diff --git a/yarn.lock b/yarn.lock
index aa25b7ed..8f82ba40 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9970,13 +9970,6 @@ react-color-palette@^6.2.0:
   resolved "https://registry.yarnpkg.com/react-color-palette/-/react-color-palette-6.2.0.tgz#aa3be88f6953d57502c00f4433692129ffbad3e7"
   integrity sha512-9rIboaRJNoeF8aCI2f3J8wgMyhl74SnGmZLDjor3bKf0iDBhP2EBv0/jGmm0hrj6OackGCqtWl5ZvM89XUc3sg==
 
-react-data-grid@7.0.0-beta.5:
-  version "7.0.0-beta.5"
-  resolved "https://registry.yarnpkg.com/react-data-grid/-/react-data-grid-7.0.0-beta.5.tgz#bc39ce45b7a7f42ebfb66840e0ec1c8619d60f10"
-  integrity sha512-rtN4wnePrQ80UN6lYF/zUQqVVJMT3HW5bTLx9nR5XOKQiG72cGzX2d2+b+e82vUh23zTFBicEnuWSlN9Fa/83Q==
-  dependencies:
-    clsx "^1.1.1"
-
 react-detect-offline@^2.4.5:
   version "2.4.5"
   resolved "https://registry.yarnpkg.com/react-detect-offline/-/react-detect-offline-2.4.5.tgz#3c242516c37b6789cf89102881031f87e70b80e6"

From 2d2cd424f349b948adc5447d38d27008b998a916 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 16 Nov 2022 16:14:40 +1100
Subject: [PATCH 268/309] fix table styles

---
 src/components/Table/Styled/StyledCell.tsx  | 5 +++--
 src/components/Table/TableHeader.tsx        | 4 ++--
 src/components/fields/MultiSelect/index.tsx | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/components/Table/Styled/StyledCell.tsx b/src/components/Table/Styled/StyledCell.tsx
index c11fee62..5423e8e3 100644
--- a/src/components/Table/Styled/StyledCell.tsx
+++ b/src/components/Table/Styled/StyledCell.tsx
@@ -33,8 +33,9 @@ export const StyledCell = styled("div")(({ theme }) => ({
     borderTop: `1px solid ${theme.palette.divider}`,
   },
 
-  "&[aria-invalid='true']": {
-    boxShadow: `inset 0 0 0 2px ${theme.palette.error.main}`,
+  "&[aria-invalid='true'] .cell-contents": {
+    outline: `2px dotted ${theme.palette.error.main}`,
+    outlineOffset: -2,
   },
 }));
 StyledCell.displayName = "StyledCell";
diff --git a/src/components/Table/TableHeader.tsx b/src/components/Table/TableHeader.tsx
index 555b6d82..b90bf178 100644
--- a/src/components/Table/TableHeader.tsx
+++ b/src/components/Table/TableHeader.tsx
@@ -12,7 +12,7 @@ import FinalColumnHeader from "./FinalColumn/FinalColumnHeader";
 import { DragVertical } from "@src/assets/icons";
 
 import { tableScope, selectedCellAtom } from "@src/atoms/tableScope";
-import { DEFAULT_ROW_HEIGHT, TABLE_PADDING } from "@src/components/Table";
+import { DEFAULT_ROW_HEIGHT } from "@src/components/Table";
 
 export interface ITableHeaderProps {
   headerGroups: HeaderGroup<TableRow>[];
@@ -93,7 +93,7 @@ export const TableHeader = memo(function TableHeader({
                         style={{
                           width: header.getSize(),
                           left: header.column.getIsPinned()
-                            ? header.column.getStart() - TABLE_PADDING
+                            ? header.column.getStart()
                             : undefined,
                           ...provided.draggableProps.style,
                           zIndex: header.column.getIsPinned() ? 11 : 10,
diff --git a/src/components/fields/MultiSelect/index.tsx b/src/components/fields/MultiSelect/index.tsx
index cdda43c0..f6400d1b 100644
--- a/src/components/fields/MultiSelect/index.tsx
+++ b/src/components/fields/MultiSelect/index.tsx
@@ -34,7 +34,7 @@ export const config: IFieldConfig = {
     "Multiple values from predefined options. Options are searchable and users can optionally input custom values.",
   TableCell: withTableCell(DisplayCell, EditorCell, "popover", {
     disablePadding: true,
-    transparentPopover: true,
+    transparentPopover: false,
   }),
   SideDrawerField,
   settings: Settings,

From c7cca89622ebb5dba9faa515d98ea65585acb890 Mon Sep 17 00:00:00 2001
From: Miriam Shams-Rainey <miriam.shams.rainey@duke.edu>
Date: Wed, 16 Nov 2022 01:09:59 -0500
Subject: [PATCH 269/309] Changed default Action to script from cloud func
 (#913)

* Changed default Action to script from cloud func

* Apply suggestions from code review

Co-authored-by: Sidney Alcantara <sidney@sidney.me>

* Updated to use falsy undefined value

Co-authored-by: Sidney Alcantara <sidney@sidney.me>
---
 src/components/fields/Action/Settings.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/fields/Action/Settings.tsx b/src/components/fields/Action/Settings.tsx
index 74e64aaa..9c2562a1 100644
--- a/src/components/fields/Action/Settings.tsx
+++ b/src/components/fields/Action/Settings.tsx
@@ -303,7 +303,7 @@ const Settings = ({ config, onChange, fieldName }: ISettingsProps) => {
                   aria-label="Action will run"
                   name="isActionScript"
                   value={
-                    config.isActionScript ? "actionScript" : "cloudFunction"
+                    config.isActionScript !== false ? "actionScript" : "cloudFunction"
                   }
                   onChange={(e) =>
                     onChange("isActionScript")(
@@ -359,7 +359,7 @@ const Settings = ({ config, onChange, fieldName }: ISettingsProps) => {
                 </RadioGroup>
               </FormControl>
 
-              {!config.isActionScript ? (
+              {config.isActionScript === false ? (
                 <TextField
                   id="callableName"
                   label="Callable name"
@@ -492,7 +492,7 @@ const Settings = ({ config, onChange, fieldName }: ISettingsProps) => {
             </Stack>
           ),
         },
-        config.isActionScript &&
+        config.isActionScript !== false &&
           get(config, "undo.enabled") && {
             id: "undo",
             title: "Undo action",

From 47ebcfd6b38cb052cc218b186094d76add1c4046 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Nov 2022 06:21:10 +0000
Subject: [PATCH 270/309] Bump loader-utils from 2.0.0 to 2.0.4

Bumps [loader-utils](https://github.com/webpack/loader-utils) from 2.0.0 to 2.0.4.
- [Release notes](https://github.com/webpack/loader-utils/releases)
- [Changelog](https://github.com/webpack/loader-utils/blob/v2.0.4/CHANGELOG.md)
- [Commits](https://github.com/webpack/loader-utils/compare/v2.0.0...v2.0.4)

---
updated-dependencies:
- dependency-name: loader-utils
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index da7f9913..fd46ce16 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8697,7 +8697,7 @@ json2csv@^5.0.7:
     jsonparse "^1.3.1"
     lodash.get "^4.4.2"
 
-json5@2.x, json5@^2.2.0, json5@^2.2.1:
+json5@2.x, json5@^2.1.2, json5@^2.2.0, json5@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
   integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
@@ -8709,13 +8709,6 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.2:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
-  integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
-  dependencies:
-    minimist "^1.2.5"
-
 jsonc-parser@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.0.0.tgz#abdd785701c7e7eaca8a9ec8cf070ca51a745a22"
@@ -8958,9 +8951,9 @@ loader-runner@^4.2.0:
   integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==
 
 loader-utils@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0"
-  integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c"
+  integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==
   dependencies:
     big.js "^5.2.2"
     emojis-list "^3.0.0"

From b2747ddddf0ca3791bd2d4b90200d15cc6dbb6d7 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 16 Nov 2022 18:12:30 +1100
Subject: [PATCH 271/309] fix editorMode: inline cells waiting to render even
 when disabled

---
 src/components/Table/withTableCell.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/Table/withTableCell.tsx b/src/components/Table/withTableCell.tsx
index d959e408..d91eda98 100644
--- a/src/components/Table/withTableCell.tsx
+++ b/src/components/Table/withTableCell.tsx
@@ -119,9 +119,6 @@ export default function withTableCell(
         rowHeight,
       };
 
-      // If the inline editor cell is not ready to be rendered, display nothing
-      if (editorMode === "inline" && !inlineEditorReady) return null;
-
       // Show display cell, unless if editorMode is inline
       const displayCell = (
         <div
@@ -135,6 +132,9 @@ export default function withTableCell(
       if (disabled || (editorMode !== "inline" && !focusInsideCell))
         return displayCell;
 
+      // If the inline editor cell is not ready to be rendered, display nothing
+      if (editorMode === "inline" && !inlineEditorReady) return null;
+
       // Show displayCell as a fallback if intentionally null
       const editorCell = EditorCellComponent ? (
         <Suspense fallback={null}>

From a3d22474c9f6adbca39785c75ddc9224b691f2d8 Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Wed, 16 Nov 2022 11:07:05 +0300
Subject: [PATCH 272/309] extract localFiles and dropzoneState into
 useFileUploader

---
 .../fields/File/SideDrawerField.tsx           | 27 +++---------
 src/components/fields/File/TableCell.tsx      | 22 ++--------
 src/components/fields/File/useFileUpload.ts   | 32 +++++++++++++--
 .../fields/Image/SideDrawerField.tsx          | 41 +++++++++----------
 src/components/fields/Image/TableCell.tsx     | 39 +++++++-----------
 5 files changed, 70 insertions(+), 91 deletions(-)

diff --git a/src/components/fields/File/SideDrawerField.tsx b/src/components/fields/File/SideDrawerField.tsx
index af3f6168..00287c23 100644
--- a/src/components/fields/File/SideDrawerField.tsx
+++ b/src/components/fields/File/SideDrawerField.tsx
@@ -1,10 +1,6 @@
-import { useState } from "react";
-import { ISideDrawerFieldProps } from "@src/components/fields/types";
 import { useSetAtom } from "jotai";
 import { format } from "date-fns";
 
-import { useDropzone } from "react-dropzone";
-
 import {
   alpha,
   ButtonBase,
@@ -14,15 +10,15 @@ import {
   Chip,
 } from "@mui/material";
 import { Upload as UploadIcon } from "@src/assets/icons";
-import { FileIcon } from ".";
 
+import { ISideDrawerFieldProps } from "@src/components/fields/types";
 import CircularProgressOptical from "@src/components/CircularProgressOptical";
 import { DATE_TIME_FORMAT } from "@src/constants/dates";
-
 import { fieldSx, getFieldId } from "@src/components/SideDrawer/utils";
 import { projectScope, confirmDialogAtom } from "@src/atoms/projectScope";
 import { FileValue } from "@src/types/table";
 import useFileUpload from "./useFileUpload";
+import { FileIcon } from ".";
 
 export default function File_({
   column,
@@ -31,23 +27,10 @@ export default function File_({
   disabled,
 }: ISideDrawerFieldProps) {
   const confirm = useSetAtom(confirmDialogAtom, projectScope);
-  const { loading, progress, handleUpload, handleDelete } = useFileUpload(
-    _rowy_ref,
-    column.key
-  );
+  const { loading, progress, handleDelete, localFiles, dropzoneState } =
+    useFileUpload(_rowy_ref, column.key, { multiple: true });
 
-  const [localFiles, setLocalFiles] = useState<File[]>([]);
-
-  const { getRootProps, getInputProps, isDragActive } = useDropzone({
-    onDrop: async (acceptedFiles: File[]) => {
-      if (acceptedFiles.length > 0) {
-        setLocalFiles(acceptedFiles);
-        await handleUpload(acceptedFiles);
-        setLocalFiles([]);
-      }
-    },
-    multiple: true,
-  });
+  const { isDragActive, getRootProps, getInputProps } = dropzoneState;
 
   return (
     <>
diff --git a/src/components/fields/File/TableCell.tsx b/src/components/fields/File/TableCell.tsx
index eee9a330..d35a8c6f 100644
--- a/src/components/fields/File/TableCell.tsx
+++ b/src/components/fields/File/TableCell.tsx
@@ -1,8 +1,6 @@
-import { useState } from "react";
 import { IHeavyCellProps } from "@src/components/fields/types";
 import { useSetAtom } from "jotai";
 
-import { useDropzone } from "react-dropzone";
 import { format } from "date-fns";
 
 import { alpha, Stack, Grid, Tooltip, Chip, IconButton } from "@mui/material";
@@ -23,26 +21,12 @@ export default function File_({
   docRef,
 }: IHeavyCellProps) {
   const confirm = useSetAtom(confirmDialogAtom, projectScope);
-  const [localFiles, setLocalFiles] = useState<File[]>([]);
 
-  const { loading, progress, handleUpload, handleDelete } = useFileUpload(
-    docRef,
-    column.key
-  );
-
-  const { getRootProps, getInputProps, isDragActive } = useDropzone({
-    onDrop: async (acceptedFiles: File[]) => {
-      if (acceptedFiles.length > 0) {
-        setLocalFiles(acceptedFiles);
-        await handleUpload(acceptedFiles);
-        setLocalFiles([]);
-      }
-    },
-    multiple: true,
-  });
+  const { loading, progress, handleDelete, localFiles, dropzoneState } =
+    useFileUpload(docRef, column.key, { multiple: true });
 
+  const { isDragActive, getRootProps, getInputProps } = dropzoneState;
   const dropzoneProps = getRootProps();
-
   return (
     <Stack
       direction="row"
diff --git a/src/components/fields/File/useFileUpload.ts b/src/components/fields/File/useFileUpload.ts
index 2869f708..8f2d634d 100644
--- a/src/components/fields/File/useFileUpload.ts
+++ b/src/components/fields/File/useFileUpload.ts
@@ -1,15 +1,33 @@
-import { useCallback } from "react";
+import { useCallback, useState } from "react";
 import { useSetAtom } from "jotai";
 import { some } from "lodash-es";
 
 import { tableScope, updateFieldAtom } from "@src/atoms/tableScope";
 import useUploader from "@src/hooks/useFirebaseStorageUploader";
 import { FileValue } from "@src/types/table";
+import { DropzoneOptions, useDropzone } from "react-dropzone";
 
-export default function useFileUpload(docRef: any, fieldName: string) {
+export default function useFileUpload(
+  docRef: any,
+  fieldName: string,
+  dropzoneOptions: DropzoneOptions = {}
+) {
   const updateField = useSetAtom(updateFieldAtom, tableScope);
   const { uploaderState, upload, deleteUpload } = useUploader();
 
+  const [localFiles, setLocalFiles] = useState<File[]>([]);
+
+  const dropzoneState = useDropzone({
+    onDrop: async (acceptedFiles: File[]) => {
+      if (acceptedFiles.length > 0) {
+        setLocalFiles(acceptedFiles);
+        await handleUpload(acceptedFiles);
+        setLocalFiles([]);
+      }
+    },
+    ...dropzoneOptions,
+  });
+
   const uploadingFiles = Object.keys(uploaderState);
 
   const progress =
@@ -57,5 +75,13 @@ export default function useFileUpload(docRef: any, fieldName: string) {
     [deleteUpload, docRef, fieldName, updateField]
   );
 
-  return { progress, loading, uploaderState, handleUpload, handleDelete };
+  return {
+    localFiles,
+    progress,
+    loading,
+    uploaderState,
+    handleUpload,
+    handleDelete,
+    dropzoneState,
+  };
 }
diff --git a/src/components/fields/Image/SideDrawerField.tsx b/src/components/fields/Image/SideDrawerField.tsx
index 531ba7e7..70c58b88 100644
--- a/src/components/fields/Image/SideDrawerField.tsx
+++ b/src/components/fields/Image/SideDrawerField.tsx
@@ -1,10 +1,8 @@
 import { ISideDrawerFieldProps } from "@src/components/fields/types";
-import { useState } from "react";
+import { useMemo } from "react";
 import { useSetAtom } from "jotai";
 import { assignIn } from "lodash-es";
 
-import { useDropzone } from "react-dropzone";
-
 import {
   alpha,
   ButtonBase,
@@ -89,29 +87,28 @@ export default function Image_({
 }: ISideDrawerFieldProps) {
   const confirm = useSetAtom(confirmDialogAtom, projectScope);
 
-  const { loading, progress, handleUpload, handleDelete, uploaderState } =
-    useFileUpload(_rowy_ref, column.key);
-
-  const [localImages, setLocalImages] = useState<
-    (File & { localURL: string })[]
-  >([]);
-
-  const { getRootProps, getInputProps, isDragActive } = useDropzone({
-    onDrop: async (acceptedFiles: File[]) => {
-      if (acceptedFiles.length > 0) {
-        setLocalImages(
-          acceptedFiles.map((file) =>
-            assignIn(file, { localURL: URL.createObjectURL(file) })
-          )
-        );
-        await handleUpload(acceptedFiles);
-        setLocalImages([]);
-      }
-    },
+  const {
+    loading,
+    progress,
+    handleDelete,
+    uploaderState,
+    localFiles,
+    dropzoneState,
+  } = useFileUpload(_rowy_ref, column.key, {
     multiple: true,
     accept: IMAGE_MIME_TYPES,
   });
 
+  const localImages = useMemo(
+    () =>
+      localFiles.map((file) =>
+        assignIn(file, { localURL: URL.createObjectURL(file) })
+      ),
+    [localFiles]
+  );
+
+  const { getRootProps, getInputProps, isDragActive } = dropzoneState;
+
   return (
     <>
       {!disabled && (
diff --git a/src/components/fields/Image/TableCell.tsx b/src/components/fields/Image/TableCell.tsx
index f8f31861..a903f955 100644
--- a/src/components/fields/Image/TableCell.tsx
+++ b/src/components/fields/Image/TableCell.tsx
@@ -1,8 +1,7 @@
-import { useState } from "react";
+import { useMemo } from "react";
 import { IHeavyCellProps } from "@src/components/fields/types";
 import { useAtom, useSetAtom } from "jotai";
 import { assignIn } from "lodash-es";
-import { useDropzone } from "react-dropzone";
 
 import {
   alpha,
@@ -89,31 +88,21 @@ export default function Image_({
   const confirm = useSetAtom(confirmDialogAtom, projectScope);
   const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
 
-  const { loading, progress, handleUpload, handleDelete } = useFileUpload(
-    docRef,
-    column.key
+  const { loading, progress, handleDelete, localFiles, dropzoneState } =
+    useFileUpload(docRef, column.key, {
+      multiple: true,
+      accept: IMAGE_MIME_TYPES,
+    });
+
+  const localImages = useMemo(
+    () =>
+      localFiles.map((file) =>
+        assignIn(file, { localURL: URL.createObjectURL(file) })
+      ),
+    [localFiles]
   );
 
-  const [localImages, setLocalImages] = useState<
-    (File & { localURL: string })[]
-  >([]);
-
-  const { getRootProps, getInputProps, isDragActive } = useDropzone({
-    onDrop: async (acceptedFiles: File[]) => {
-      if (acceptedFiles.length > 0) {
-        setLocalImages(
-          acceptedFiles.map((file) =>
-            assignIn(file, { localURL: URL.createObjectURL(file) })
-          )
-        );
-        await handleUpload(acceptedFiles);
-        setLocalImages([]);
-      }
-    },
-    multiple: true,
-    accept: IMAGE_MIME_TYPES,
-  });
-
+  const { getRootProps, getInputProps, isDragActive } = dropzoneState;
   const dropzoneProps = getRootProps();
 
   const rowHeight = tableSchema.rowHeight ?? DEFAULT_ROW_HEIGHT;

From 969809df8ba552ad366ebde86955ec2f8aaa27ee Mon Sep 17 00:00:00 2001
From: Han Tuerker <burhan.tuerker@gmail.com>
Date: Wed, 16 Nov 2022 11:15:10 +0300
Subject: [PATCH 273/309] append generated id to file name

---
 src/hooks/useFirebaseStorageUploader.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/hooks/useFirebaseStorageUploader.tsx b/src/hooks/useFirebaseStorageUploader.tsx
index 03e0503f..bad0ff46 100644
--- a/src/hooks/useFirebaseStorageUploader.tsx
+++ b/src/hooks/useFirebaseStorageUploader.tsx
@@ -16,6 +16,7 @@ import { projectScope } from "@src/atoms/projectScope";
 import { firebaseStorageAtom } from "@src/sources/ProjectSourceFirebase";
 import { WIKI_LINKS } from "@src/constants/externalLinks";
 import { FileValue } from "@src/types/table";
+import { generateId } from "@src/utils/table";
 
 export type UploadState = {
   progress: number;
@@ -85,7 +86,7 @@ const useFirebaseStorageUploader = () => {
 
         const storageRef = ref(
           firebaseStorage,
-          `${docRef.path}/${fieldName}/${file.name}`
+          `${docRef.path}/${fieldName}/${generateId()}-${file.name}`
         );
         const uploadTask = uploadBytesResumable(storageRef, file, {
           cacheControl: "public, max-age=31536000",

From 5e4ae43155f7fc24189c57f644596b2b961d2d50 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Nov 2022 08:39:40 +0000
Subject: [PATCH 274/309] Bump loader-utils from 2.0.0 to 2.0.4

Bumps [loader-utils](https://github.com/webpack/loader-utils) from 2.0.0 to 2.0.4.
- [Release notes](https://github.com/webpack/loader-utils/releases)
- [Changelog](https://github.com/webpack/loader-utils/blob/v2.0.4/CHANGELOG.md)
- [Commits](https://github.com/webpack/loader-utils/compare/v2.0.0...v2.0.4)

---
updated-dependencies:
- dependency-name: loader-utils
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index da7f9913..fd46ce16 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8697,7 +8697,7 @@ json2csv@^5.0.7:
     jsonparse "^1.3.1"
     lodash.get "^4.4.2"
 
-json5@2.x, json5@^2.2.0, json5@^2.2.1:
+json5@2.x, json5@^2.1.2, json5@^2.2.0, json5@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
   integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
@@ -8709,13 +8709,6 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.2:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
-  integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
-  dependencies:
-    minimist "^1.2.5"
-
 jsonc-parser@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.0.0.tgz#abdd785701c7e7eaca8a9ec8cf070ca51a745a22"
@@ -8958,9 +8951,9 @@ loader-runner@^4.2.0:
   integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==
 
 loader-utils@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0"
-  integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c"
+  integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==
   dependencies:
     big.js "^5.2.2"
     emojis-list "^3.0.0"

From 5e8cff26e59752e39c7447101cd206e16e2d7018 Mon Sep 17 00:00:00 2001
From: Miriam Shams-Rainey <miriam.shams.rainey@duke.edu>
Date: Wed, 16 Nov 2022 22:03:55 -0500
Subject: [PATCH 275/309] Enhancement/show total rows in db (#918)

* Added customization for action name/label

* Update Firebase version

* Created doc count atom and used in table status UI

* Improved syntax

* Fixed linting error

* Used query w/o limit for doc count

* Add guard for optional SetServerDocCountAtom

Co-authored-by: Sidney Alcantara <sidney@sidney.me>
---
 package.json                                  |   2 +-
 src/atoms/tableScope/table.ts                 |   3 +
 .../TableToolbar/LoadedRowsStatus.tsx         |   8 +-
 src/hooks/useFirestoreCollectionWithAtom.ts   |  18 +-
 .../TableSourceFirestore.tsx                  |   2 +
 yarn.lock                                     | 529 +++++++++---------
 6 files changed, 291 insertions(+), 271 deletions(-)

diff --git a/package.json b/package.json
index fb029fc7..4783c433 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "date-fns": "^2.28.0",
     "dompurify": "^2.3.6",
     "file-saver": "^2.0.5",
-    "firebase": "^9.6.11",
+    "firebase": "^9.12.1",
     "firebaseui": "^6.0.1",
     "jotai": "^1.8.4",
     "json-stable-stringify-without-jsonify": "^1.0.1",
diff --git a/src/atoms/tableScope/table.ts b/src/atoms/tableScope/table.ts
index 0018202f..6681af87 100644
--- a/src/atoms/tableScope/table.ts
+++ b/src/atoms/tableScope/table.ts
@@ -238,3 +238,6 @@ export type AuditChangeFunction = (
  * @param data - Optional additional data to log
  */
 export const auditChangeAtom = atom<AuditChangeFunction | undefined>(undefined);
+
+/** Store total  number of rows in firestore collection */
+export const serverDocCountAtom = atom(0)
\ No newline at end of file
diff --git a/src/components/TableToolbar/LoadedRowsStatus.tsx b/src/components/TableToolbar/LoadedRowsStatus.tsx
index f27531d9..c57ab80d 100644
--- a/src/components/TableToolbar/LoadedRowsStatus.tsx
+++ b/src/components/TableToolbar/LoadedRowsStatus.tsx
@@ -10,6 +10,7 @@ import {
   tableScope,
   tableRowsAtom,
   tableNextPageAtom,
+  serverDocCountAtom
 } from "@src/atoms/tableScope";
 import { spreadSx } from "@src/utils/ui";
 
@@ -56,18 +57,21 @@ const loadingIcon = (
 );
 
 function LoadedRowsStatus() {
-  const [tableRows] = useAtom(tableRowsAtom, tableScope);
   const [tableNextPage] = useAtom(tableNextPageAtom, tableScope);
+  const [serverDocCount] = useAtom(serverDocCountAtom, tableScope)
+  const [tableRows] = useAtom(tableRowsAtom, tableScope)
+
 
   if (tableNextPage.loading)
     return <StatusText>{loadingIcon}Loading more…</StatusText>;
 
+
   return (
     <Tooltip title="Syncing with database in realtime" describeChild>
       <StatusText>
         <SyncIcon style={{ transform: "rotate(45deg)" }} />
         Loaded {!tableNextPage.available && "all "}
-        {tableRows.length} row{tableRows.length !== 1 && "s"}
+        {tableRows.length} {tableNextPage.available && `of ${serverDocCount}`} row{serverDocCount !== 1 && "s"}
       </StatusText>
     </Tooltip>
   );
diff --git a/src/hooks/useFirestoreCollectionWithAtom.ts b/src/hooks/useFirestoreCollectionWithAtom.ts
index f8dada5f..4896a609 100644
--- a/src/hooks/useFirestoreCollectionWithAtom.ts
+++ b/src/hooks/useFirestoreCollectionWithAtom.ts
@@ -22,6 +22,7 @@ import {
   QueryConstraint,
   WhereFilterOp,
   documentId,
+  getCountFromServer
 } from "firebase/firestore";
 import { useErrorHandler } from "react-error-boundary";
 
@@ -62,6 +63,8 @@ interface IUseFirestoreCollectionWithAtomOptions<T> {
   deleteDocAtom?: PrimitiveAtom<DeleteCollectionDocFunction | undefined>;
   /** Update this atom when we’re loading the next page, and if there is a next page available. Uses same scope as `dataScope`. */
   nextPageAtom?: PrimitiveAtom<NextPageState>;
+  /** Set this atom's value to the number of docs in the collection on each new snapshot */
+  serverDocCountAtom?: PrimitiveAtom<number> | undefined;
 }
 
 /**
@@ -93,6 +96,7 @@ export function useFirestoreCollectionWithAtom<T = TableRow>(
     updateDocAtom,
     deleteDocAtom,
     nextPageAtom,
+    serverDocCountAtom
   } = options || {};
 
   const [firebaseDb] = useAtom(firebaseDbAtom, projectScope);
@@ -116,9 +120,10 @@ export function useFirestoreCollectionWithAtom<T = TableRow>(
     void
   >(nextPageAtom || (dataAtom as any), dataScope);
 
+  const setServerDocCountAtom = useSetAtom(serverDocCountAtom || (dataAtom as any), dataScope)
+
   // Store if we’re at the last page to prevent a new query from being created
   const [isLastPage, setIsLastPage] = useState(false);
-
   // Create the query and memoize using Firestore’s queryEqual
   const memoizedQuery = useMemoValue(
     getQuery<T>(
@@ -190,6 +195,12 @@ export function useFirestoreCollectionWithAtom<T = TableRow>(
               available: docs.length >= memoizedQuery.limit,
             }));
           }
+          // on each new snapshot, use the query to get and set the document count from the server
+          if (serverDocCountAtom) {
+            getCountFromServer(memoizedQuery.unlimitedQuery).then((value) => {
+              setServerDocCountAtom(value.data().count)
+            })
+          }
         } catch (error) {
           if (onError) onError(error as FirestoreError);
           else handleError(error);
@@ -221,6 +232,7 @@ export function useFirestoreCollectionWithAtom<T = TableRow>(
     handleError,
     nextPageAtom,
     setNextPageAtom,
+    setServerDocCountAtom
   ]);
 
   // Create variable for validity of query to pass to useEffect dependencies
@@ -313,14 +325,13 @@ const getQuery = <T>(
     }
 
     if (!collectionRef) return null;
-
     const limit = (page + 1) * pageSize;
     const firestoreFilters = tableFiltersToFirestoreFilters(filters || []);
 
     return {
       query: query<T>(
         collectionRef,
-        queryLimit((page + 1) * pageSize),
+        queryLimit(limit),
         ...firestoreFilters,
         ...(sorts?.map((order) => orderBy(order.key, order.direction)) || [])
       ),
@@ -328,6 +339,7 @@ const getQuery = <T>(
       limit,
       firestoreFilters,
       sorts,
+      unlimitedQuery: query<T>(collectionRef, ...firestoreFilters)
     };
   } catch (e) {
     if (onError) onError(e as FirestoreError);
diff --git a/src/sources/TableSourceFirestore/TableSourceFirestore.tsx b/src/sources/TableSourceFirestore/TableSourceFirestore.tsx
index f028ab26..87949768 100644
--- a/src/sources/TableSourceFirestore/TableSourceFirestore.tsx
+++ b/src/sources/TableSourceFirestore/TableSourceFirestore.tsx
@@ -14,6 +14,7 @@ import {
   _updateRowDbAtom,
   _deleteRowDbAtom,
   tableNextPageAtom,
+  serverDocCountAtom
 } from "@src/atoms/tableScope";
 import useFirestoreDocWithAtom from "@src/hooks/useFirestoreDocWithAtom";
 import useFirestoreCollectionWithAtom from "@src/hooks/useFirestoreCollectionWithAtom";
@@ -77,6 +78,7 @@ export const TableSourceFirestore = memo(function TableSourceFirestore() {
       updateDocAtom: _updateRowDbAtom,
       deleteDocAtom: _deleteRowDbAtom,
       nextPageAtom: tableNextPageAtom,
+      serverDocCountAtom: serverDocCountAtom
     }
   );
 
diff --git a/yarn.lock b/yarn.lock
index 0769f919..91bc54a8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1403,15 +1403,15 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@firebase/analytics-compat@0.1.9":
-  version "0.1.9"
-  resolved "https://registry.yarnpkg.com/@firebase/analytics-compat/-/analytics-compat-0.1.9.tgz#d4a724f78a7333abe8ee8b00f4a4d8b8c392b46c"
-  integrity sha512-HYKMAZvfU589WVvK5XKY9Pl+axXFISabouAFw2VHpJm/TO1mAXAy0+eIjqQ3j8z3L1OEfCeOV/oY9eh8rpJZ5w==
+"@firebase/analytics-compat@0.1.16":
+  version "0.1.16"
+  resolved "https://registry.yarnpkg.com/@firebase/analytics-compat/-/analytics-compat-0.1.16.tgz#7a2c57c37a39efe52c476fa8878dd5a6b93b2155"
+  integrity sha512-mDAhE33WiyCrqSQZvzyZtQCCdf4ipn5tsEpTbIUruk7MbThQ1EbNAbPBiEk9NDLD3sUyLABZGFctvym/hc8H+w==
   dependencies:
-    "@firebase/analytics" "0.7.8"
+    "@firebase/analytics" "0.8.3"
     "@firebase/analytics-types" "0.7.0"
-    "@firebase/component" "0.5.13"
-    "@firebase/util" "1.5.2"
+    "@firebase/component" "0.5.20"
+    "@firebase/util" "1.7.2"
     tslib "^2.1.0"
 
 "@firebase/analytics-types@0.7.0":
@@ -1419,27 +1419,27 @@
   resolved "https://registry.yarnpkg.com/@firebase/analytics-types/-/analytics-types-0.7.0.tgz#91960e7c87ce8bf18cf8dd9e55ccbf5dc3989b5d"
   integrity sha512-DNE2Waiwy5+zZnCfintkDtBfaW6MjIG883474v6Z0K1XZIvl76cLND4iv0YUb48leyF+PJK1KO2XrgHb/KpmhQ==
 
-"@firebase/analytics@0.7.8":
-  version "0.7.8"
-  resolved "https://registry.yarnpkg.com/@firebase/analytics/-/analytics-0.7.8.tgz#8f163437adb9b6b3f866e3744410aae931b97453"
-  integrity sha512-W38Zy/jf64LKpPi+mGNNETIjz4eq/YXBE0Uu2bzstqUwlhvFn1WlRBK4vzgtZMRaGW04CQp9FXYv6ZTRo/Xbyw==
+"@firebase/analytics@0.8.3":
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/@firebase/analytics/-/analytics-0.8.3.tgz#d8c6d71c3aa09d2ae5041db5b3778e4f66a832cb"
+  integrity sha512-viGhc57JW9zHp/0JKpLBUthdpOrEjbPETQFz8oNfaNma+cHA6FtIrtg4Sla52DgqatbATcE9aIDBiPCGrCtNjw==
   dependencies:
-    "@firebase/component" "0.5.13"
-    "@firebase/installations" "0.5.8"
-    "@firebase/logger" "0.3.2"
-    "@firebase/util" "1.5.2"
+    "@firebase/component" "0.5.20"
+    "@firebase/installations" "0.5.15"
+    "@firebase/logger" "0.3.3"
+    "@firebase/util" "1.7.2"
     tslib "^2.1.0"
 
-"@firebase/app-check-compat@0.2.6":
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/@firebase/app-check-compat/-/app-check-compat-0.2.6.tgz#34c4bd20d385909789a83c40815925176cc15fb1"
-  integrity sha512-DBzLHg/uuoNhDdwPEj8zQcqPaZSBFn8I0hATKyoX6SiAQKCi+4ugqeyQ6qGCyDpfNOyxL4PPxPMisXRhPzV2jw==
+"@firebase/app-check-compat@0.2.15":
+  version "0.2.15"
+  resolved "https://registry.yarnpkg.com/@firebase/app-check-compat/-/app-check-compat-0.2.15.tgz#d61255996b23f3e91ffd8eab7391877a3a993dca"
+  integrity sha512-EgD1WEFwwq7aP7DxPSYuUpMt8eAhClA57976D3BaHDbH/IXEuw0DfaeT0LtBb+xJD7J8uxy+YKpudCC8gzUu8g==
   dependencies:
-    "@firebase/app-check" "0.5.6"
+    "@firebase/app-check" "0.5.15"
     "@firebase/app-check-types" "0.4.0"
-    "@firebase/component" "0.5.13"
-    "@firebase/logger" "0.3.2"
-    "@firebase/util" "1.5.2"
+    "@firebase/component" "0.5.20"
+    "@firebase/logger" "0.3.3"
+    "@firebase/util" "1.7.2"
     tslib "^2.1.0"
 
 "@firebase/app-check-interop-types@0.1.0":
@@ -1452,53 +1452,54 @@
   resolved "https://registry.yarnpkg.com/@firebase/app-check-types/-/app-check-types-0.4.0.tgz#7007a9d1d720db20bcf466fe6785c96feaa0a82d"
   integrity sha512-SsWafqMABIOu7zLgWbmwvHGOeQQVQlwm42kwwubsmfLmL4Sf5uGpBfDhQ0CAkpi7bkJ/NwNFKafNDL9prRNP0Q==
 
-"@firebase/app-check@0.5.6":
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/@firebase/app-check/-/app-check-0.5.6.tgz#e3b6d4d352875078ee32757d0adb125f3cc13a26"
-  integrity sha512-wdR/DCSdSDM0ka4nvMlGSiaknFxJO/gBuwn7G0iHO2vwj/2oSqjyG+QdJnoiIe1P1vOdqGNLxb1j10LPkR3TQQ==
+"@firebase/app-check@0.5.15":
+  version "0.5.15"
+  resolved "https://registry.yarnpkg.com/@firebase/app-check/-/app-check-0.5.15.tgz#a57830b00864f792eddf45d581d256b1513643ab"
+  integrity sha512-ifQalGXkXMwGR3F8Glmo1XtDg0UjkwCmI/ff05mxnKGMfs5ZDyw8DikQfna//a/KdYuOBqxlBwS2BhHiobqUUg==
   dependencies:
-    "@firebase/component" "0.5.13"
-    "@firebase/logger" "0.3.2"
-    "@firebase/util" "1.5.2"
+    "@firebase/component" "0.5.20"
+    "@firebase/logger" "0.3.3"
+    "@firebase/util" "1.7.2"
     tslib "^2.1.0"
 
-"@firebase/app-compat@0.1.22":
-  version "0.1.22"
-  resolved "https://registry.yarnpkg.com/@firebase/app-compat/-/app-compat-0.1.22.tgz#7190c50f3fd5d794e508bfcebe42a9b159f73890"
-  integrity sha512-InzQWdIKXsioZb6Ll/uynvopFbq9k3Qpi3gEUq+f8q0yr8/KQVuH2lIDmN70z11LRKXlsziU49qRwtV9tcEYhA==
+"@firebase/app-compat@0.1.37":
+  version "0.1.37"
+  resolved "https://registry.yarnpkg.com/@firebase/app-compat/-/app-compat-0.1.37.tgz#338fead261344529ad7fcedd5ca014d463d6679b"
+  integrity sha512-doTKYGlVc8ZiQNOl66rpkU/YItRyOxCgMp4YWThXkPM4T/pTi4a9IMCe8K88gVNeYWd8sKW4vSnxjcOG5hQXEA==
   dependencies:
-    "@firebase/app" "0.7.21"
-    "@firebase/component" "0.5.13"
-    "@firebase/logger" "0.3.2"
-    "@firebase/util" "1.5.2"
+    "@firebase/app" "0.8.2"
+    "@firebase/component" "0.5.20"
+    "@firebase/logger" "0.3.3"
+    "@firebase/util" "1.7.2"
     tslib "^2.1.0"
 
-"@firebase/app-types@0.7.0":
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/@firebase/app-types/-/app-types-0.7.0.tgz#c9e16d1b8bed1a991840b8d2a725fb58d0b5899f"
-  integrity sha512-6fbHQwDv2jp/v6bXhBw2eSRbNBpxHcd1NBF864UksSMVIqIyri9qpJB1Mn6sGZE+bnDsSQBC5j2TbMxYsJQkQg==
+"@firebase/app-types@0.8.0":
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/@firebase/app-types/-/app-types-0.8.0.tgz#50a539a0a20bef8c50494d0615592fe2a384851f"
+  integrity sha512-Lec3VVquUwXPn2UReGSsfTxuMBVRmzGIwA/CJnF0LQuPgv9kOmXk9mVqsDMfHxHtqjai0n6wWHR2TqjdVV/bYA==
 
-"@firebase/app@0.7.21":
-  version "0.7.21"
-  resolved "https://registry.yarnpkg.com/@firebase/app/-/app-0.7.21.tgz#c31077bd4c61f130eb00b6546835ed9cf8da69ab"
-  integrity sha512-b1COyw4HwajJ4zQCtL7w+d4GCQDmEaVO957eLLlBwz4QuDlx3eQIirpQhzkkPH17BJFZ6x0qyYEt6Wbhakn0kg==
+"@firebase/app@0.8.2":
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/@firebase/app/-/app-0.8.2.tgz#705fcbdd82d4720038a2eb9af7277c73ebd9e9d5"
+  integrity sha512-ByNDCe8h9O/szO3XVTrS484MtqBOKriVaNCQC7Y7KgZSaiA0OOWmIY5vwi63mBTYetqMNN5VGiG/6ZSmGIZyoQ==
   dependencies:
-    "@firebase/component" "0.5.13"
-    "@firebase/logger" "0.3.2"
-    "@firebase/util" "1.5.2"
+    "@firebase/component" "0.5.20"
+    "@firebase/logger" "0.3.3"
+    "@firebase/util" "1.7.2"
+    idb "7.0.1"
     tslib "^2.1.0"
 
-"@firebase/auth-compat@0.2.12":
-  version "0.2.12"
-  resolved "https://registry.yarnpkg.com/@firebase/auth-compat/-/auth-compat-0.2.12.tgz#a13bd42c4ee36ddbf764ae24958cf4c64ddba5b5"
-  integrity sha512-LKeKylktRj03xgW5ilSOW1c4AsMig15ogf5hDKa820t6Bp6MNabj8yq2TV0/Q4SP4Ox/yrTISJGVvk+TJuBecQ==
+"@firebase/auth-compat@0.2.23":
+  version "0.2.23"
+  resolved "https://registry.yarnpkg.com/@firebase/auth-compat/-/auth-compat-0.2.23.tgz#72a2d5163f4688bd85b0db58ded13db68f34b0a2"
+  integrity sha512-r9YEXaL7YKoFOWHRvVoQ6d5klP+hkSsAtt21UIvP3/BxDDU+yLXN5vVvFHr38apuUeMGN34M7zkY6SihnLutIQ==
   dependencies:
-    "@firebase/auth" "0.19.12"
+    "@firebase/auth" "0.20.10"
     "@firebase/auth-types" "0.11.0"
-    "@firebase/component" "0.5.13"
-    "@firebase/util" "1.5.2"
+    "@firebase/component" "0.5.20"
+    "@firebase/util" "1.7.2"
     node-fetch "2.6.7"
-    selenium-webdriver "^4.0.0-beta.2"
+    selenium-webdriver "4.1.2"
     tslib "^2.1.0"
 
 "@firebase/auth-interop-types@0.1.6":
@@ -1511,67 +1512,67 @@
   resolved "https://registry.yarnpkg.com/@firebase/auth-types/-/auth-types-0.11.0.tgz#b9c73c60ca07945b3bbd7a097633e5f78fa9e886"
   integrity sha512-q7Bt6cx+ySj9elQHTsKulwk3+qDezhzRBFC9zlQ1BjgMueUOnGMcvqmU0zuKlQ4RhLSH7MNAdBV2znVaoN3Vxw==
 
-"@firebase/auth@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@firebase/auth/-/auth-0.19.12.tgz#df201b456bfb2c846b22513fc5798476e0730adc"
-  integrity sha512-39/eJBmq5Ne+HoCJuQXlhaOH2e8qySxYUa5Z25mhcam8nmAMrBh7Ph1yZjUeSfLsSJiSXANMHK5dnVE+1TROXw==
+"@firebase/auth@0.20.10":
+  version "0.20.10"
+  resolved "https://registry.yarnpkg.com/@firebase/auth/-/auth-0.20.10.tgz#4dbd6cb24906e11f78bf65100a71b45b028b607b"
+  integrity sha512-uAZypmVv/4nijaPVtR/ipjKBmSDPLQ7sNScLHs2DVhdvCklgUUF5+zsEdPlMfKDIfmVQHFwHbUgeKyXDYSRMwQ==
   dependencies:
-    "@firebase/component" "0.5.13"
-    "@firebase/logger" "0.3.2"
-    "@firebase/util" "1.5.2"
+    "@firebase/component" "0.5.20"
+    "@firebase/logger" "0.3.3"
+    "@firebase/util" "1.7.2"
     node-fetch "2.6.7"
-    selenium-webdriver "4.0.0-rc-1"
+    selenium-webdriver "4.1.2"
     tslib "^2.1.0"
 
-"@firebase/component@0.5.13":
-  version "0.5.13"
-  resolved "https://registry.yarnpkg.com/@firebase/component/-/component-0.5.13.tgz#65a382e83bddd109380c9aa1f280791b1b4567c4"
-  integrity sha512-hxhJtpD8Ppf/VU2Rlos6KFCEV77TGIGD5bJlkPK1+B/WUe0mC6dTjW7KhZtXTc+qRBp9nFHWcsIORnT8liHP9w==
+"@firebase/component@0.5.20":
+  version "0.5.20"
+  resolved "https://registry.yarnpkg.com/@firebase/component/-/component-0.5.20.tgz#52165b5f7d25c4ac9c679e4e48d6f7fa7bf722cf"
+  integrity sha512-wP51tQBlPFprfAWxWjzC/56hG4APhl43jFsgwuqCl3bhVbiKcr278QbrbGNmIXDeGKo4sGZLAnH9whl2apeCmA==
   dependencies:
-    "@firebase/util" "1.5.2"
+    "@firebase/util" "1.7.2"
     tslib "^2.1.0"
 
-"@firebase/database-compat@0.1.8":
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/@firebase/database-compat/-/database-compat-0.1.8.tgz#ab627f2bdbe94367f515d5bded880c86886bbd28"
-  integrity sha512-dhXr5CSieBuKNdU96HgeewMQCT9EgOIkfF1GNy+iRrdl7BWLxmlKuvLfK319rmIytSs/vnCzcD9uqyxTeU/A3A==
+"@firebase/database-compat@0.2.9":
+  version "0.2.9"
+  resolved "https://registry.yarnpkg.com/@firebase/database-compat/-/database-compat-0.2.9.tgz#a1b4ecf94e11eadfc21aa48121b3ba7ea18a57ae"
+  integrity sha512-zzyFM3+jW/qYtHojiQirHXGXYyElbqVngEEn/i2gXoSzcK0Y2AL5oHAqGYXLaaW0+t4Zwnssh3HnQJM8C1D0fw==
   dependencies:
-    "@firebase/component" "0.5.13"
-    "@firebase/database" "0.12.8"
-    "@firebase/database-types" "0.9.7"
-    "@firebase/logger" "0.3.2"
-    "@firebase/util" "1.5.2"
+    "@firebase/component" "0.5.20"
+    "@firebase/database" "0.13.9"
+    "@firebase/database-types" "0.9.16"
+    "@firebase/logger" "0.3.3"
+    "@firebase/util" "1.7.2"
     tslib "^2.1.0"
 
-"@firebase/database-types@0.9.7":
-  version "0.9.7"
-  resolved "https://registry.yarnpkg.com/@firebase/database-types/-/database-types-0.9.7.tgz#c5ee0ea9bb2703a13c1c47fe880fc577d5ce7f33"
-  integrity sha512-EFhgL89Fz6DY3kkB8TzdHvdu8XaqqvzcF2DLVOXEnQ3Ms7L755p5EO42LfxXoJqb9jKFvgLpFmKicyJG25WFWw==
+"@firebase/database-types@0.9.16":
+  version "0.9.16"
+  resolved "https://registry.yarnpkg.com/@firebase/database-types/-/database-types-0.9.16.tgz#4f7f612c00346641a641ac689005857190e91ebc"
+  integrity sha512-dK/uFgHisrVijSoHf9RLJ7NwvlOul2rO/z9ufOSbGd8/TqFVASXz+19mynhDIoSEnyQtJC/NTyBzSPfjz0w61w==
   dependencies:
-    "@firebase/app-types" "0.7.0"
-    "@firebase/util" "1.5.2"
+    "@firebase/app-types" "0.8.0"
+    "@firebase/util" "1.7.2"
 
-"@firebase/database@0.12.8":
-  version "0.12.8"
-  resolved "https://registry.yarnpkg.com/@firebase/database/-/database-0.12.8.tgz#11a1b6752ba0614892af15c71958e00ce16f5824"
-  integrity sha512-JBQVfFLzfhxlQbl4OU6ov9fdsddkytBQdtSSR49cz48homj38ccltAhK6seum+BI7f28cV2LFHF9672lcN+qxA==
+"@firebase/database@0.13.9":
+  version "0.13.9"
+  resolved "https://registry.yarnpkg.com/@firebase/database/-/database-0.13.9.tgz#8cf8c77fb837ed1a6fa85565ac8c28864b0957fb"
+  integrity sha512-raQEBgQQybaEoMloJL8wWHQywGQ9mF2VbitvHydsbSNn+KL/xRDjXeQZPuuSbRjkYV6mR8jvQB7gpnzQQNE8Qg==
   dependencies:
     "@firebase/auth-interop-types" "0.1.6"
-    "@firebase/component" "0.5.13"
-    "@firebase/logger" "0.3.2"
-    "@firebase/util" "1.5.2"
+    "@firebase/component" "0.5.20"
+    "@firebase/logger" "0.3.3"
+    "@firebase/util" "1.7.2"
     faye-websocket "0.11.4"
     tslib "^2.1.0"
 
-"@firebase/firestore-compat@0.1.17":
-  version "0.1.17"
-  resolved "https://registry.yarnpkg.com/@firebase/firestore-compat/-/firestore-compat-0.1.17.tgz#8851d52717ac468b242fd9752706c2be12d15c30"
-  integrity sha512-hTLgq2WXUE6bb3/IqYlwY0Q6FdbZB2JwDoZHexIQmK69XuuK3j+JbE/NixV3mBo232tNSU+QeamfbAd6A1Agfw==
+"@firebase/firestore-compat@0.2.1":
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/@firebase/firestore-compat/-/firestore-compat-0.2.1.tgz#15fac47547e2c2fe2c4d3ddd8af63591009436af"
+  integrity sha512-XiiTpmUfyZ6QU3Dw9BCT4T+KPvqzada1GsUNX49HmriWHpIn3jTAjsagkigRAnmNDlxS3ki6Yzg9Cs60tpD0tw==
   dependencies:
-    "@firebase/component" "0.5.13"
-    "@firebase/firestore" "3.4.8"
+    "@firebase/component" "0.5.20"
+    "@firebase/firestore" "3.7.1"
     "@firebase/firestore-types" "2.5.0"
-    "@firebase/util" "1.5.2"
+    "@firebase/util" "1.7.2"
     tslib "^2.1.0"
 
 "@firebase/firestore-types@2.5.0":
@@ -1579,29 +1580,29 @@
   resolved "https://registry.yarnpkg.com/@firebase/firestore-types/-/firestore-types-2.5.0.tgz#16fca40b6980fdb000de86042d7a96635f2bcdd7"
   integrity sha512-I6c2m1zUhZ5SH0cWPmINabDyH5w0PPFHk2UHsjBpKdZllzJZ2TwTkXbDtpHUZNmnc/zAa0WNMNMvcvbb/xJLKA==
 
-"@firebase/firestore@3.4.8":
-  version "3.4.8"
-  resolved "https://registry.yarnpkg.com/@firebase/firestore/-/firestore-3.4.8.tgz#ca7395c81929c79e30a28ff5d19a567713e27f77"
-  integrity sha512-qjrI22TrqSGsOVBkYpRcpY48eSFj+hvleWEaFn3bDxy+QNUiZS08cicSlBOxdosKi5LRMQVGyHKcqHExup02+A==
+"@firebase/firestore@3.7.1":
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/@firebase/firestore/-/firestore-3.7.1.tgz#68d6c35ba16702942577afe4607a5acf6d62d912"
+  integrity sha512-sDZ79cUf4cwCyRzN74zODgaeUvyt0lGA8YwaasVVqojgznwMG/bIz+/Tny4ZEnLZFrlniCqt2tStWsiC6s3u7g==
   dependencies:
-    "@firebase/component" "0.5.13"
-    "@firebase/logger" "0.3.2"
-    "@firebase/util" "1.5.2"
-    "@firebase/webchannel-wrapper" "0.6.1"
+    "@firebase/component" "0.5.20"
+    "@firebase/logger" "0.3.3"
+    "@firebase/util" "1.7.2"
+    "@firebase/webchannel-wrapper" "0.8.0"
     "@grpc/grpc-js" "^1.3.2"
-    "@grpc/proto-loader" "^0.6.0"
+    "@grpc/proto-loader" "^0.6.13"
     node-fetch "2.6.7"
     tslib "^2.1.0"
 
-"@firebase/functions-compat@0.1.12":
-  version "0.1.12"
-  resolved "https://registry.yarnpkg.com/@firebase/functions-compat/-/functions-compat-0.1.12.tgz#b1e53630bf56816355f775216f34e24a2371ca8b"
-  integrity sha512-pKianAWF9vv3u9DazbRExYQFjEu/b9gxTWVCPjq+FiLK39xULT01dZz4Zrr2KzFnb54wHHbRmU1BAWNAkQTmmQ==
+"@firebase/functions-compat@0.2.7":
+  version "0.2.7"
+  resolved "https://registry.yarnpkg.com/@firebase/functions-compat/-/functions-compat-0.2.7.tgz#fc43b1ab79f2c63209ea69db87b121f18b63a973"
+  integrity sha512-bcUst8ZDJHeVy2Wox4KEM5EizsrrqLzbwFIwJD7KkuSYP8XrlV2gaqJnCvIXXc0Nc4JRGvbXcvFFMXDjhsEp4Q==
   dependencies:
-    "@firebase/component" "0.5.13"
-    "@firebase/functions" "0.7.11"
+    "@firebase/component" "0.5.20"
+    "@firebase/functions" "0.8.7"
     "@firebase/functions-types" "0.5.0"
-    "@firebase/util" "1.5.2"
+    "@firebase/util" "1.7.2"
     tslib "^2.1.0"
 
 "@firebase/functions-types@0.5.0":
@@ -1609,43 +1610,60 @@
   resolved "https://registry.yarnpkg.com/@firebase/functions-types/-/functions-types-0.5.0.tgz#b50ba95ccce9e96f7cda453228ffe1684645625b"
   integrity sha512-qza0M5EwX+Ocrl1cYI14zoipUX4gI/Shwqv0C1nB864INAD42Dgv4v94BCyxGHBg2kzlWy8PNafdP7zPO8aJQA==
 
-"@firebase/functions@0.7.11":
-  version "0.7.11"
-  resolved "https://registry.yarnpkg.com/@firebase/functions/-/functions-0.7.11.tgz#ab65a20503d7a4bfeb4bc571c976cc37dc781184"
-  integrity sha512-o9pmN1TWHDEpmB6IYbqeIIG6Wllcfw6jSNm8UZYnOYM8oDay1FW6OeN/fA0GlGmwF4cPdxA3oKXbLn3ObYFxXQ==
+"@firebase/functions@0.8.7":
+  version "0.8.7"
+  resolved "https://registry.yarnpkg.com/@firebase/functions/-/functions-0.8.7.tgz#b5571c50b849a31f8825a08f535419b2c2f3e9d8"
+  integrity sha512-JHSKdAOzlFJ9NdKoOaq4x6S1q6B3GmYZDg13KIDsE6BC0E9o/eWxOWOjSFJRCP/lpfFwa0rYBRayfUvZxW3BLw==
   dependencies:
     "@firebase/app-check-interop-types" "0.1.0"
     "@firebase/auth-interop-types" "0.1.6"
-    "@firebase/component" "0.5.13"
+    "@firebase/component" "0.5.20"
     "@firebase/messaging-interop-types" "0.1.0"
-    "@firebase/util" "1.5.2"
+    "@firebase/util" "1.7.2"
     node-fetch "2.6.7"
     tslib "^2.1.0"
 
-"@firebase/installations@0.5.8":
-  version "0.5.8"
-  resolved "https://registry.yarnpkg.com/@firebase/installations/-/installations-0.5.8.tgz#7a12c4367bc932303d4651f46196262e38aaae58"
-  integrity sha512-u/lAOVhgYFg1e38rNrVzFrWxdKzTOIromx574Hi2AccFA230hSlXFY7pRaCpgs11VDzmpt4lhhOrQOX7886cKw==
+"@firebase/installations-compat@0.1.15":
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/@firebase/installations-compat/-/installations-compat-0.1.15.tgz#95b13a2fa55ba1aa05094b8b54ccd09fc046cc11"
+  integrity sha512-m0atyudsVj6ekmM+djhhzzInMC3Y233YJky9vXUVt5MHQY0mHhqDds9+UIrCa6cpbl+ntI2fOuoYV7y01s3sfw==
   dependencies:
-    "@firebase/component" "0.5.13"
-    "@firebase/util" "1.5.2"
+    "@firebase/component" "0.5.20"
+    "@firebase/installations" "0.5.15"
+    "@firebase/installations-types" "0.4.0"
+    "@firebase/util" "1.7.2"
     tslib "^2.1.0"
 
-"@firebase/logger@0.3.2":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@firebase/logger/-/logger-0.3.2.tgz#5046ffa8295c577846d54b6ca95645a03809800e"
-  integrity sha512-lzLrcJp9QBWpo40OcOM9B8QEtBw2Fk1zOZQdvv+rWS6gKmhQBCEMc4SMABQfWdjsylBcDfniD1Q+fUX1dcBTXA==
+"@firebase/installations-types@0.4.0":
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/@firebase/installations-types/-/installations-types-0.4.0.tgz#256782ff9adfb390ac658c25bc32f89635ddce7c"
+  integrity sha512-nXxWKQDvBGctuvsizbUEJKfxXU9WAaDhon+j0jpjIfOJkvkj3YHqlLB/HeYjpUn85Pb22BjplpTnDn4Gm9pc3A==
+
+"@firebase/installations@0.5.15":
+  version "0.5.15"
+  resolved "https://registry.yarnpkg.com/@firebase/installations/-/installations-0.5.15.tgz#c037152c1b6a21e8ed54ecf7439ec50820962aa4"
+  integrity sha512-RVm2nc2d+bEDFzFzQDTTU1Z13fjAD0v88yDLjtRZuT2R7JwvAegQ4F7CupBvnnf7nftkd3kBwdOi8MhMthb3jQ==
+  dependencies:
+    "@firebase/component" "0.5.20"
+    "@firebase/util" "1.7.2"
+    idb "7.0.1"
+    tslib "^2.1.0"
+
+"@firebase/logger@0.3.3":
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/@firebase/logger/-/logger-0.3.3.tgz#0f724b1e0b166d17ac285aac5c8ec14d136beed4"
+  integrity sha512-POTJl07jOKTOevLXrTvJD/VZ0M6PnJXflbAh5J9VGkmtXPXNG6MdZ9fmRgqYhXKTaDId6AQenQ262uwgpdtO0Q==
   dependencies:
     tslib "^2.1.0"
 
-"@firebase/messaging-compat@0.1.12":
-  version "0.1.12"
-  resolved "https://registry.yarnpkg.com/@firebase/messaging-compat/-/messaging-compat-0.1.12.tgz#239c1148f1cd5bf507613c431ff6fe7fc096ab3c"
-  integrity sha512-Cfv4ZQaxiMx4DcpDkFX1yKHFGQtnyMA6pcLplcC3uHkSVCyNRW6pFYSoO0/Uae03ixxIYNwle1ZVaVUZ2L5ddA==
+"@firebase/messaging-compat@0.1.19":
+  version "0.1.19"
+  resolved "https://registry.yarnpkg.com/@firebase/messaging-compat/-/messaging-compat-0.1.19.tgz#4de2dcb0768846cd889e5ba89742dd5232afb8a5"
+  integrity sha512-h5tx4nxfSILeRquk5mKE8Onu7WtL6b7rfB6GKNJKecvkPs3nnq5Z4cp2Av4JUR2Wtt9UxCTfO0iRbbmtrt2bZQ==
   dependencies:
-    "@firebase/component" "0.5.13"
-    "@firebase/messaging" "0.9.12"
-    "@firebase/util" "1.5.2"
+    "@firebase/component" "0.5.20"
+    "@firebase/messaging" "0.9.19"
+    "@firebase/util" "1.7.2"
     tslib "^2.1.0"
 
 "@firebase/messaging-interop-types@0.1.0":
@@ -1653,27 +1671,28 @@
   resolved "https://registry.yarnpkg.com/@firebase/messaging-interop-types/-/messaging-interop-types-0.1.0.tgz#bdac02dd31edd5cb9eec37b1db698ea5e2c1a631"
   integrity sha512-DbvUl/rXAZpQeKBnwz0NYY5OCqr2nFA0Bj28Fmr3NXGqR4PAkfTOHuQlVtLO1Nudo3q0HxAYLa68ZDAcuv2uKQ==
 
-"@firebase/messaging@0.9.12":
-  version "0.9.12"
-  resolved "https://registry.yarnpkg.com/@firebase/messaging/-/messaging-0.9.12.tgz#8ef7a76de17921eac68e79952006604d01dda138"
-  integrity sha512-qfLW7SZRZVKscI1GSyWc3WPtjAUDUk3gcEfPkdz9fzzQwj98V8xF++g4wL+9cuEuRzYf8ki2kCN/aqKRYUrxag==
+"@firebase/messaging@0.9.19":
+  version "0.9.19"
+  resolved "https://registry.yarnpkg.com/@firebase/messaging/-/messaging-0.9.19.tgz#868916ed20e2bd3ecb58d13e1adb186714cfcbfa"
+  integrity sha512-xu99y/7/P+y3txGtgjsVJZyvx7T5/KdvFgDWS7oZwhKYG0o+DXFvvw3SBMK82LFGFOoyHlJUPqv45EyCPnOPCA==
   dependencies:
-    "@firebase/component" "0.5.13"
-    "@firebase/installations" "0.5.8"
+    "@firebase/component" "0.5.20"
+    "@firebase/installations" "0.5.15"
     "@firebase/messaging-interop-types" "0.1.0"
-    "@firebase/util" "1.5.2"
+    "@firebase/util" "1.7.2"
+    idb "7.0.1"
     tslib "^2.1.0"
 
-"@firebase/performance-compat@0.1.8":
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/@firebase/performance-compat/-/performance-compat-0.1.8.tgz#9a22286ee20b421b871ac2534223e01327df689a"
-  integrity sha512-lMLKFcOB99+tb6dVHJlJ8s19JFjxqpAqPGXCG8evTODPUW3BluBbfG4YS7JRESVA7wc/6kkuQIOx9q7l+bBZtQ==
+"@firebase/performance-compat@0.1.15":
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/@firebase/performance-compat/-/performance-compat-0.1.15.tgz#9ba68c6696a5ccd9ea5022ead43c1246017015bf"
+  integrity sha512-mryHr5eBEpWxBo8b3KM/53SwwVjMVahwdEnhfx1r+zAvmEPEzXUOGBzAC1l5WQ4DrwtDR87uMZ5soiQ/0jl9QQ==
   dependencies:
-    "@firebase/component" "0.5.13"
-    "@firebase/logger" "0.3.2"
-    "@firebase/performance" "0.5.8"
+    "@firebase/component" "0.5.20"
+    "@firebase/logger" "0.3.3"
+    "@firebase/performance" "0.5.15"
     "@firebase/performance-types" "0.1.0"
-    "@firebase/util" "1.5.2"
+    "@firebase/util" "1.7.2"
     tslib "^2.1.0"
 
 "@firebase/performance-types@0.1.0":
@@ -1681,36 +1700,27 @@
   resolved "https://registry.yarnpkg.com/@firebase/performance-types/-/performance-types-0.1.0.tgz#5e6efa9dc81860aee2cb7121b39ae8fa137e69fc"
   integrity sha512-6p1HxrH0mpx+622Ql6fcxFxfkYSBpE3LSuwM7iTtYU2nw91Hj6THC8Bc8z4nboIq7WvgsT/kOTYVVZzCSlXl8w==
 
-"@firebase/performance@0.5.8":
-  version "0.5.8"
-  resolved "https://registry.yarnpkg.com/@firebase/performance/-/performance-0.5.8.tgz#c7e1c73122975d3364203829839a78d9371d9530"
-  integrity sha512-IN5MWdGRn0jglSdv1UHEDMklm1SOfF1IZ1pGNxVyO5CpF3a08I54I60fuwEfMUcsU6OAfzMl3zI+bnW5IgKdPg==
+"@firebase/performance@0.5.15":
+  version "0.5.15"
+  resolved "https://registry.yarnpkg.com/@firebase/performance/-/performance-0.5.15.tgz#094856ab0b5799a81d57c4998cda6d363d315a07"
+  integrity sha512-YnnkUehXXzqQefNE5PlPEsXeJYSeY7cMWEdHYTj6u0/F5ntLSAhVZC8jl3Y0fTU1W8a9USQhml6NaXyWiVGmjQ==
   dependencies:
-    "@firebase/component" "0.5.13"
-    "@firebase/installations" "0.5.8"
-    "@firebase/logger" "0.3.2"
-    "@firebase/util" "1.5.2"
+    "@firebase/component" "0.5.20"
+    "@firebase/installations" "0.5.15"
+    "@firebase/logger" "0.3.3"
+    "@firebase/util" "1.7.2"
     tslib "^2.1.0"
 
-"@firebase/polyfill@0.3.36":
-  version "0.3.36"
-  resolved "https://registry.yarnpkg.com/@firebase/polyfill/-/polyfill-0.3.36.tgz#c057cce6748170f36966b555749472b25efdb145"
-  integrity sha512-zMM9oSJgY6cT2jx3Ce9LYqb0eIpDE52meIzd/oe/y70F+v9u1LDqk5kUF5mf16zovGBWMNFmgzlsh6Wj0OsFtg==
+"@firebase/remote-config-compat@0.1.15":
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/@firebase/remote-config-compat/-/remote-config-compat-0.1.15.tgz#91343411085468a6c65b77acbbabc8791ea984f5"
+  integrity sha512-jGUrZXIxQRMeSrqEaCi3MtMF33NN12TNTQDZlbex2+T2+yTMI/sn3Mq52T/OccCo86DK17WVlXSWQCH1zCD13g==
   dependencies:
-    core-js "3.6.5"
-    promise-polyfill "8.1.3"
-    whatwg-fetch "2.0.4"
-
-"@firebase/remote-config-compat@0.1.8":
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/@firebase/remote-config-compat/-/remote-config-compat-0.1.8.tgz#25c079fa8737d824add05337049dca17e078358f"
-  integrity sha512-lU9t7PMVpgE6q1vG8AuFenFhfUnx0H+eeiIQTi4dtuLDMx9BsI14c9VuiVjRIi7xC2DCDRNQCRL1kRD8bzgJNg==
-  dependencies:
-    "@firebase/component" "0.5.13"
-    "@firebase/logger" "0.3.2"
-    "@firebase/remote-config" "0.3.7"
+    "@firebase/component" "0.5.20"
+    "@firebase/logger" "0.3.3"
+    "@firebase/remote-config" "0.3.14"
     "@firebase/remote-config-types" "0.2.0"
-    "@firebase/util" "1.5.2"
+    "@firebase/util" "1.7.2"
     tslib "^2.1.0"
 
 "@firebase/remote-config-types@0.2.0":
@@ -1718,26 +1728,26 @@
   resolved "https://registry.yarnpkg.com/@firebase/remote-config-types/-/remote-config-types-0.2.0.tgz#1e2759fc01f20b58c564db42196f075844c3d1fd"
   integrity sha512-hqK5sCPeZvcHQ1D6VjJZdW6EexLTXNMJfPdTwbD8NrXUw6UjWC4KWhLK/TSlL0QPsQtcKRkaaoP+9QCgKfMFPw==
 
-"@firebase/remote-config@0.3.7":
-  version "0.3.7"
-  resolved "https://registry.yarnpkg.com/@firebase/remote-config/-/remote-config-0.3.7.tgz#743fcb00501b9eca24728cf4caabea974ba3396b"
-  integrity sha512-gQaGzQCBOkS35b/aXC5Y9/zsPenqs6+axnChYYyfU7CqMG5FGfNbVi2rezYwB4G3+fH4rGO1s6xqcI535Fvy/A==
+"@firebase/remote-config@0.3.14":
+  version "0.3.14"
+  resolved "https://registry.yarnpkg.com/@firebase/remote-config/-/remote-config-0.3.14.tgz#44b2e6174b82b9729ab0893ab80eadcc7b3c830c"
+  integrity sha512-wEOz3Tasxhr5lCGioe0WNZwDOoQhNZK2qGAm5+AlHAPaAhWIWvqUTkKsk3nFRztyRZzj3r9k5Gc2OSpEcQKP1A==
   dependencies:
-    "@firebase/component" "0.5.13"
-    "@firebase/installations" "0.5.8"
-    "@firebase/logger" "0.3.2"
-    "@firebase/util" "1.5.2"
+    "@firebase/component" "0.5.20"
+    "@firebase/installations" "0.5.15"
+    "@firebase/logger" "0.3.3"
+    "@firebase/util" "1.7.2"
     tslib "^2.1.0"
 
-"@firebase/storage-compat@0.1.13":
-  version "0.1.13"
-  resolved "https://registry.yarnpkg.com/@firebase/storage-compat/-/storage-compat-0.1.13.tgz#e7a985ee01336df40682add37a2d0055e83c9a3a"
-  integrity sha512-MdubKh+xe3Xpi34WaXBKtim8H2aauO5sqqmATTc2WgSmSAqTmNSjQfNqIdf139Mp9ZCnpZAxiwiwzQtfckLYWg==
+"@firebase/storage-compat@0.1.20":
+  version "0.1.20"
+  resolved "https://registry.yarnpkg.com/@firebase/storage-compat/-/storage-compat-0.1.20.tgz#ec24fd62332d39460db6e7d62770de57e72fe690"
+  integrity sha512-8vruwltKdvEPhYbPXA/otb5fAD7MGsBHpCzktJWvF7eIALa4sUlYt+jJxG5Nwk2FoT1NrwLQ7TtI7zvm6/NinA==
   dependencies:
-    "@firebase/component" "0.5.13"
-    "@firebase/storage" "0.9.5"
+    "@firebase/component" "0.5.20"
+    "@firebase/storage" "0.9.12"
     "@firebase/storage-types" "0.6.0"
-    "@firebase/util" "1.5.2"
+    "@firebase/util" "1.7.2"
     tslib "^2.1.0"
 
 "@firebase/storage-types@0.6.0":
@@ -1745,27 +1755,27 @@
   resolved "https://registry.yarnpkg.com/@firebase/storage-types/-/storage-types-0.6.0.tgz#0b1af64a2965af46fca138e5b70700e9b7e6312a"
   integrity sha512-1LpWhcCb1ftpkP/akhzjzeFxgVefs6eMD2QeKiJJUGH1qOiows2w5o0sKCUSQrvrRQS1lz3SFGvNR1Ck/gqxeA==
 
-"@firebase/storage@0.9.5":
-  version "0.9.5"
-  resolved "https://registry.yarnpkg.com/@firebase/storage/-/storage-0.9.5.tgz#f74c905c7fbc40c1fef02c9191d2bffcf2898b4e"
-  integrity sha512-+nCDNIT2pNovlHnLOQPofn8jdOyJ4akUWPGn4ydAoFrfVt1/lINx5Qe+jS3/tKLROfYabqBYxfFUjHQKZBYwvg==
+"@firebase/storage@0.9.12":
+  version "0.9.12"
+  resolved "https://registry.yarnpkg.com/@firebase/storage/-/storage-0.9.12.tgz#5631893a1ae9f7b0426948ab9910cd58782f9183"
+  integrity sha512-XIAmje0ufvRrxrUU/9tvGCuUIy7WSJf3XM8Y8OV9EW2Dg1w4f8IpraLiUdlirdtFM0UAnO2kDQHoiVQYhRrADQ==
   dependencies:
-    "@firebase/component" "0.5.13"
-    "@firebase/util" "1.5.2"
+    "@firebase/component" "0.5.20"
+    "@firebase/util" "1.7.2"
     node-fetch "2.6.7"
     tslib "^2.1.0"
 
-"@firebase/util@1.5.2":
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/@firebase/util/-/util-1.5.2.tgz#bdd2bc11c956a8a6a0fa25fbd752a13e033558bc"
-  integrity sha512-YvBH2UxFcdWG2HdFnhxZptPl2eVFlpOyTH66iDo13JPEYraWzWToZ5AMTtkyRHVmu7sssUpQlU9igy1KET7TOw==
+"@firebase/util@1.7.2":
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/@firebase/util/-/util-1.7.2.tgz#dbdb259f141b5025a7faaaa38e2ea5df0be36ff5"
+  integrity sha512-P3aTihYEMoz2QQlcn0T7av7HLEK9gsTc1ZiN9VA8wnUtEJscUNemCmTmP3RRysqEb3Z+tVVoycztY8f6R36rRw==
   dependencies:
     tslib "^2.1.0"
 
-"@firebase/webchannel-wrapper@0.6.1":
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.6.1.tgz#0c74724ba6e9ea6ad25a391eab60a79eaba4c556"
-  integrity sha512-9FqhNjKQWpQ3fGnSOCovHOm+yhhiorKEqYLAfd525jWavunDJcx8rOW6i6ozAh+FbwcYMkL7b+3j4UR/30MpoQ==
+"@firebase/webchannel-wrapper@0.8.0":
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.8.0.tgz#88dfc717fb950276fd0fdee879fad2c041e33475"
+  integrity sha512-Q8erQds5LuAUgNuFOt/tu/abffYUHYxN+Ogp2V5EOssfFG7Ja4ce324Sqyq41u/vB5CSr+tfYS3JzTDrDxCvdw==
 
 "@grpc/grpc-js@^1.3.2":
   version "1.3.6"
@@ -1774,16 +1784,16 @@
   dependencies:
     "@types/node" ">=12.12.47"
 
-"@grpc/proto-loader@^0.6.0":
-  version "0.6.4"
-  resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.6.4.tgz#5438c0d771e92274e77e631babdc14456441cbdc"
-  integrity sha512-7xvDvW/vJEcmLUltCUGOgWRPM8Oofv0eCFSVMuKqaqWJaXSzmB+m9hiyqe34QofAl4WAzIKUZZlinIF9FOHyTQ==
+"@grpc/proto-loader@^0.6.13":
+  version "0.6.13"
+  resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.6.13.tgz#008f989b72a40c60c96cd4088522f09b05ac66bc"
+  integrity sha512-FjxPYDRTn6Ec3V0arm1FtSpmP6V50wuph2yILpyvTKzjc76oDdoihXqM1DzOW5ubvCC8GivfCnNtfaRE8myJ7g==
   dependencies:
     "@types/long" "^4.0.1"
     lodash.camelcase "^4.3.0"
     long "^4.0.0"
-    protobufjs "^6.10.0"
-    yargs "^16.1.1"
+    protobufjs "^6.11.3"
+    yargs "^16.2.0"
 
 "@hookform/resolvers@^2.6.0":
   version "2.8.8"
@@ -4628,11 +4638,6 @@ core-js-pure@^3.20.2, core-js-pure@^3.8.1:
   resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.21.1.tgz#8c4d1e78839f5f46208de7230cebfb72bc3bdb51"
   integrity sha512-12VZfFIu+wyVbBebyHmRTuEE/tZrB4tJToWcwAMcsp3h4+sHR+fMJWbKpYiCRWlhFBq+KNyO8rIV9rTkeVmznQ==
 
-core-js@3.6.5:
-  version "3.6.5"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a"
-  integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==
-
 core-js@^3.19.2:
   version "3.21.1"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.21.1.tgz#f2e0ddc1fc43da6f904706e8e955bc19d06a0d94"
@@ -6028,37 +6033,37 @@ find-up@^5.0.0:
     locate-path "^6.0.0"
     path-exists "^4.0.0"
 
-firebase@^9.6.11:
-  version "9.6.11"
-  resolved "https://registry.yarnpkg.com/firebase/-/firebase-9.6.11.tgz#ec198b3bd646d0028b5d6240261cd89b200a590d"
-  integrity sha512-Zdmag/wGNkA4IAek+2yQoWrF2vyqIowu+2eOcSaE6jE2hDZYA3nHNutsQ+jquSxE3SeJk3Dh1OEsffqgunBy/w==
+firebase@^9.12.1:
+  version "9.12.1"
+  resolved "https://registry.yarnpkg.com/firebase/-/firebase-9.12.1.tgz#f2ef2560a3a122bcf82dee09d5ae3a3805bb890a"
+  integrity sha512-sBp4rvkCC7TUnGeneRNs6GVcajO+iSXmYjxqXN4FsrBzldJ5/AOnDXf4bi9OUZtQSl+EHDgUWShBieht15ijgQ==
   dependencies:
-    "@firebase/analytics" "0.7.8"
-    "@firebase/analytics-compat" "0.1.9"
-    "@firebase/app" "0.7.21"
-    "@firebase/app-check" "0.5.6"
-    "@firebase/app-check-compat" "0.2.6"
-    "@firebase/app-compat" "0.1.22"
-    "@firebase/app-types" "0.7.0"
-    "@firebase/auth" "0.19.12"
-    "@firebase/auth-compat" "0.2.12"
-    "@firebase/database" "0.12.8"
-    "@firebase/database-compat" "0.1.8"
-    "@firebase/firestore" "3.4.8"
-    "@firebase/firestore-compat" "0.1.17"
-    "@firebase/functions" "0.7.11"
-    "@firebase/functions-compat" "0.1.12"
-    "@firebase/installations" "0.5.8"
-    "@firebase/messaging" "0.9.12"
-    "@firebase/messaging-compat" "0.1.12"
-    "@firebase/performance" "0.5.8"
-    "@firebase/performance-compat" "0.1.8"
-    "@firebase/polyfill" "0.3.36"
-    "@firebase/remote-config" "0.3.7"
-    "@firebase/remote-config-compat" "0.1.8"
-    "@firebase/storage" "0.9.5"
-    "@firebase/storage-compat" "0.1.13"
-    "@firebase/util" "1.5.2"
+    "@firebase/analytics" "0.8.3"
+    "@firebase/analytics-compat" "0.1.16"
+    "@firebase/app" "0.8.2"
+    "@firebase/app-check" "0.5.15"
+    "@firebase/app-check-compat" "0.2.15"
+    "@firebase/app-compat" "0.1.37"
+    "@firebase/app-types" "0.8.0"
+    "@firebase/auth" "0.20.10"
+    "@firebase/auth-compat" "0.2.23"
+    "@firebase/database" "0.13.9"
+    "@firebase/database-compat" "0.2.9"
+    "@firebase/firestore" "3.7.1"
+    "@firebase/firestore-compat" "0.2.1"
+    "@firebase/functions" "0.8.7"
+    "@firebase/functions-compat" "0.2.7"
+    "@firebase/installations" "0.5.15"
+    "@firebase/installations-compat" "0.1.15"
+    "@firebase/messaging" "0.9.19"
+    "@firebase/messaging-compat" "0.1.19"
+    "@firebase/performance" "0.5.15"
+    "@firebase/performance-compat" "0.1.15"
+    "@firebase/remote-config" "0.3.14"
+    "@firebase/remote-config-compat" "0.1.15"
+    "@firebase/storage" "0.9.12"
+    "@firebase/storage-compat" "0.1.20"
+    "@firebase/util" "1.7.2"
 
 firebaseui@^6.0.1:
   version "6.0.1"
@@ -6709,6 +6714,11 @@ icss-utils@^5.0.0, icss-utils@^5.1.0:
   resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
   integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==
 
+idb@7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/idb/-/idb-7.0.1.tgz#d2875b3a2f205d854ee307f6d196f246fea590a7"
+  integrity sha512-UUxlE7vGWK5RfB/fDwEGgRf84DY/ieqNha6msMV99UsEMQhJ1RwbCd8AYBj3QMgnE3VZnfQvm4oKVCJTYlqIgg==
+
 idb@^6.1.4:
   version "6.1.5"
   resolved "https://registry.yarnpkg.com/idb/-/idb-6.1.5.tgz#dbc53e7adf1ac7c59f9b2bf56e00b4ea4fce8c7b"
@@ -9736,11 +9746,6 @@ process-nextick-args@~2.0.0:
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
   integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 
-promise-polyfill@8.1.3:
-  version "8.1.3"
-  resolved "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-8.1.3.tgz#8c99b3cf53f3a91c68226ffde7bde81d7f904116"
-  integrity sha512-MG5r82wBzh7pSKDRa9y+vllNHz3e3d4CNj1PQE4BQYxLme0gKYYBm9YENq+UkEikyZ0XbiGWxYlVw3Rl9O/U8g==
-
 promise@^7.1.1:
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
@@ -9782,7 +9787,7 @@ property-information@^6.0.0:
   resolved "https://registry.yarnpkg.com/property-information/-/property-information-6.1.1.tgz#5ca85510a3019726cb9afed4197b7b8ac5926a22"
   integrity sha512-hrzC564QIl0r0vy4l6MvRLhafmUowhO/O3KgVSoXIbbA2Sz4j8HGpJc6T2cubRVwMwpdiG/vKGfhT4IixmKN9w==
 
-protobufjs@^6.10.0:
+protobufjs@^6.11.3:
   version "6.11.3"
   resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.3.tgz#637a527205a35caa4f3e2a9a4a13ddffe0e7af74"
   integrity sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg==
@@ -10811,13 +10816,12 @@ select-hose@^2.0.0:
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
   integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
 
-selenium-webdriver@4.0.0-rc-1, selenium-webdriver@^4.0.0-beta.2:
-  version "4.0.0-rc-1"
-  resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-4.0.0-rc-1.tgz#b1e7e5821298c8a071e988518dd6b759f0c41281"
-  integrity sha512-bcrwFPRax8fifRP60p7xkWDGSJJoMkPAzufMlk5K2NyLPht/YZzR2WcIk1+3gR8VOCLlst1P2PI+MXACaFzpIw==
+selenium-webdriver@4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-4.1.2.tgz#d463b4335632d2ea41a9e988e435a55dc41f5314"
+  integrity sha512-e4Ap8vQvhipgBB8Ry9zBiKGkU6kHKyNnWiavGGLKkrdW81Zv7NVMtFOL/j3yX0G8QScM7XIXijKssNd4EUxSOw==
   dependencies:
     jszip "^3.6.0"
-    rimraf "^3.0.2"
     tmp "^0.2.1"
     ws ">=7.4.6"
 
@@ -12344,11 +12348,6 @@ whatwg-encoding@^1.0.5:
   dependencies:
     iconv-lite "0.4.24"
 
-whatwg-fetch@2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"
-  integrity sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==
-
 whatwg-fetch@>=0.10.0, whatwg-fetch@^3.6.2:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz#dced24f37f2624ed0281725d51d0e2e3fe677f8c"
@@ -12667,7 +12666,7 @@ yargs-parser@^20.2.2, yargs-parser@^20.x:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
-yargs@^16.1.1, yargs@^16.2.0:
+yargs@^16.2.0:
   version "16.2.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
   integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==

From 6f8dd8cdc576ea5f2e05f51098e46d54abcaa568 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Thu, 17 Nov 2022 15:50:26 +1100
Subject: [PATCH 276/309] fix cells not re-rendering when there's a new value
 from db

---
 src/components/Table/CellValidation.tsx | 29 ++++++++++++-----------
 src/components/Table/withTableCell.tsx  | 31 +++++++++++++++----------
 2 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/src/components/Table/CellValidation.tsx b/src/components/Table/CellValidation.tsx
index 6e566487..c7589786 100644
--- a/src/components/Table/CellValidation.tsx
+++ b/src/components/Table/CellValidation.tsx
@@ -18,6 +18,7 @@ import {
   contextMenuTargetAtom,
 } from "@src/atoms/tableScope";
 import type { TableRow } from "@src/types/table";
+import type { ITableCellProps } from "./withTableCell";
 
 const Dot = styled("div")(({ theme }) => ({
   position: "absolute",
@@ -96,6 +97,20 @@ export const CellValidation = memo(function MemoizedCellValidation({
     );
   }
 
+  const tableCellComponentProps: ITableCellProps = {
+    ...cell.getContext(),
+    value,
+    focusInsideCell: isSelectedCell && focusInsideCell,
+    setFocusInsideCell: (focusInside: boolean) =>
+      setSelectedCell({
+        path: row.original._rowy_ref.path,
+        columnKey: cell.column.id,
+        focusInside,
+      }),
+    disabled: !canEditCells || cell.column.columnDef.meta?.editable === false,
+    rowHeight,
+  };
+
   return (
     <StyledCell
       key={cell.id}
@@ -157,19 +172,7 @@ export const CellValidation = memo(function MemoizedCellValidation({
     >
       {renderedValidationTooltip}
       <ErrorBoundary fallbackRender={InlineErrorFallback}>
-        {flexRender(cell.column.columnDef.cell, {
-          ...cell.getContext(),
-          focusInsideCell: isSelectedCell && focusInsideCell,
-          setFocusInsideCell: (focusInside: boolean) =>
-            setSelectedCell({
-              path: row.original._rowy_ref.path,
-              columnKey: cell.column.id,
-              focusInside,
-            }),
-          disabled:
-            !canEditCells || cell.column.columnDef.meta?.editable === false,
-          rowHeight,
-        })}
+        {flexRender(cell.column.columnDef.cell, tableCellComponentProps)}
       </ErrorBoundary>
     </StyledCell>
   );
diff --git a/src/components/Table/withTableCell.tsx b/src/components/Table/withTableCell.tsx
index d91eda98..c281423d 100644
--- a/src/components/Table/withTableCell.tsx
+++ b/src/components/Table/withTableCell.tsx
@@ -8,7 +8,7 @@ import {
 } from "react";
 import useStateRef from "react-usestateref";
 import { useSetAtom } from "jotai";
-import { get, isEqual } from "lodash-es";
+import { isEqual } from "lodash-es";
 import type { CellContext } from "@tanstack/react-table";
 
 import { Popover, PopoverProps } from "@mui/material";
@@ -32,7 +32,9 @@ export interface ICellOptions {
   popoverProps?: Partial<PopoverProps>;
 }
 
-export interface ITableCellProps extends CellContext<TableRow, any> {
+export interface ITableCellProps<TValue = any>
+  extends CellContext<TableRow, TValue> {
+  value: TValue;
   focusInsideCell: boolean;
   setFocusInsideCell: (focusInside: boolean) => void;
   disabled: boolean;
@@ -61,15 +63,12 @@ export default function withTableCell(
     function TableCell({
       row,
       column,
-      getValue,
+      value,
       focusInsideCell,
       setFocusInsideCell,
       disabled,
       rowHeight,
     }: ITableCellProps) {
-      // Get the latest value on every re-render of this component
-      const value = getValue();
-
       // Render inline editor cell after timeout on mount
       // to improve scroll performance
       const [inlineEditorReady, setInlineEditorReady] = useState(false);
@@ -203,10 +202,7 @@ export default function withTableCell(
       return null;
     },
     (prev, next) => {
-      const valueEqual = isEqual(
-        get(prev.row.original, prev.column.columnDef.meta!.fieldName),
-        get(next.row.original, next.column.columnDef.meta!.fieldName)
-      );
+      const valueEqual = isEqual(prev.value, next.value);
       const columnEqual = isEqual(
         prev.column.columnDef.meta,
         next.column.columnDef.meta
@@ -234,12 +230,23 @@ interface IEditorCellManagerProps extends IDisplayCellProps {
 function EditorCellManager({
   EditorCellComponent,
   saveOnUnmount,
+  value,
   ...props
 }: IEditorCellManagerProps) {
-  const [localValue, setLocalValue, localValueRef] = useStateRef(props.value);
-  const [, setIsDirty, isDirtyRef] = useStateRef(false);
+  // Store local value so we don’t immediately write to db when the user
+  // types in a textbox, for example
+  const [localValue, setLocalValue, localValueRef] = useStateRef(value);
+  // Mark if the user has interacted with this cell and hasn’t saved yet
+  const [isDirty, setIsDirty, isDirtyRef] = useStateRef(false);
   const updateField = useSetAtom(updateFieldAtom, tableScope);
 
+  // When this cell’s data has updated, update the local value if
+  // it’s not dirty and the value is different
+  useEffect(() => {
+    if (!isDirty && !isEqual(value, localValueRef.current))
+      setLocalValue(value);
+  }, [isDirty, localValueRef, setLocalValue, value]);
+
   // This is where we update the documents
   const handleSubmit = () => {
     if (props.disabled || !isDirtyRef.current) return;

From 7c6c035fb048f87f3a43eb627d9ad81b40ac37c4 Mon Sep 17 00:00:00 2001
From: Bobby Wang <bofei@mail.com>
Date: Thu, 17 Nov 2022 12:57:28 +0800
Subject: [PATCH 277/309] fix diff editor dark theme ui (#955)

---
 src/components/CodeEditor/DiffEditor.tsx | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/components/CodeEditor/DiffEditor.tsx b/src/components/CodeEditor/DiffEditor.tsx
index 64a9a55f..08569167 100644
--- a/src/components/CodeEditor/DiffEditor.tsx
+++ b/src/components/CodeEditor/DiffEditor.tsx
@@ -15,6 +15,8 @@ import useMonacoCustomizations, {
 } from "./useMonacoCustomizations";
 import FullScreenButton from "@src/components/FullScreenButton";
 import { spreadSx } from "@src/utils/ui";
+import githubLightTheme from "@src/components/CodeEditor/github-light-default.json";
+import githubDarkTheme from "@src/components/CodeEditor/github-dark-default.json";
 
 export interface IDiffEditorProps
   extends Partial<DiffEditorProps>,
@@ -73,7 +75,12 @@ export default function DiffEditor({
           loading={<CircularProgressOptical size={20} sx={{ m: 2 }} />}
           className="editor"
           {...props}
+          beforeMount={(monaco) => {
+            monaco.editor.defineTheme("github-light", githubLightTheme as any);
+            monaco.editor.defineTheme("github-dark", githubDarkTheme as any);
+          }}
           onMount={handleEditorMount}
+          theme={`github-${theme.palette.mode}`}
           options={
             {
               readOnly: disabled,

From 6f0873ff7de12f663986b937c551fe073725084a Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Thu, 17 Nov 2022 18:17:43 +1100
Subject: [PATCH 278/309] improve Table code organization & fix memo issues

---
 src/components/ColumnMenu/ColumnMenu.tsx      |   2 +-
 .../{ => Breadcrumbs}/BreadcrumbsSubTable.tsx |   0
 .../BreadcrumbsTableRoot.tsx                  |   2 +-
 .../Table/ColumnHeader/ColumnHeader.tsx       | 294 +++++++++++-------
 .../ColumnHeader/ColumnHeaderDragHandle.tsx   |  58 ++++
 .../ColumnHeaderResizer.tsx}                  |  12 +-
 .../Table/ColumnHeader/ColumnHeaderSort.tsx   |  16 +-
 .../Table/FinalColumn/FinalColumn.tsx         |   4 +-
 src/components/Table/{ => Mock}/Cell.tsx      |   0
 src/components/Table/{ => Mock}/Column.tsx    |   1 -
 src/components/Table/Table.tsx                |   2 +
 src/components/Table/TableBody.tsx            |  18 +-
 .../Table/{ => TableCell}/ChipList.tsx        |   0
 .../{ => TableCell}/EditorCellTextField.tsx   |   0
 .../TableCell.tsx}                            |  33 +-
 src/components/Table/TableCell/index.ts       |   2 +
 .../withRenderTableCell.tsx}                  |   6 +-
 src/components/Table/TableHeader.tsx          | 118 +------
 src/components/Table/TableSkeleton.tsx        |   2 +-
 .../ImportAirtableWizard/Step1Columns.tsx     |   4 +-
 .../ImportAirtableWizard/Step2NewColumns.tsx  |   4 +-
 .../ImportAirtableWizard/Step3Preview.tsx     |   4 +-
 .../ImportCsvWizard/Step1Columns.tsx          |   4 +-
 .../ImportCsvWizard/Step2NewColumns.tsx       |   4 +-
 .../ImportCsvWizard/Step3Preview.tsx          |   4 +-
 .../ImportExistingWizard/Step1Columns.tsx     |   2 +-
 .../ImportExistingWizard/Step2Rename.tsx      |   4 +-
 .../ImportExistingWizard/Step3Types.tsx       |   4 +-
 .../ImportExistingWizard/Step4Preview.tsx     |   4 +-
 src/components/fields/Action/index.tsx        |   4 +-
 src/components/fields/Checkbox/index.tsx      |   4 +-
 src/components/fields/Code/index.tsx          |   4 +-
 src/components/fields/Color/index.tsx         |   4 +-
 .../fields/ConnectService/DisplayCell.tsx     |   2 +-
 .../fields/ConnectService/index.tsx           |   4 +-
 .../fields/ConnectTable/DisplayCell.tsx       |   2 +-
 src/components/fields/ConnectTable/index.tsx  |   4 +-
 .../fields/Connector/DisplayCell.tsx          |   2 +-
 src/components/fields/Connector/index.tsx     |   4 +-
 src/components/fields/CreatedAt/index.tsx     |   4 +-
 src/components/fields/CreatedBy/index.tsx     |   4 +-
 src/components/fields/Date/index.tsx          |   4 +-
 src/components/fields/DateTime/index.tsx      |   4 +-
 src/components/fields/Derivative/index.tsx    |   4 +-
 src/components/fields/Duration/index.tsx      |   4 +-
 src/components/fields/Email/EditorCell.tsx    |   2 +-
 src/components/fields/Email/index.tsx         |   4 +-
 src/components/fields/File/DisplayCell.tsx    |   2 +-
 src/components/fields/File/EditorCell.tsx     |   2 +-
 src/components/fields/File/index.tsx          |   4 +-
 src/components/fields/GeoPoint/index.tsx      |   4 +-
 src/components/fields/Id/index.tsx            |   4 +-
 src/components/fields/Image/index.tsx         |   4 +-
 src/components/fields/Json/index.tsx          |   4 +-
 src/components/fields/LongText/EditorCell.tsx |   2 +-
 src/components/fields/LongText/index.tsx      |   4 +-
 src/components/fields/Markdown/index.tsx      |   4 +-
 .../fields/MultiSelect/DisplayCell.tsx        |   2 +-
 src/components/fields/MultiSelect/index.tsx   |   4 +-
 src/components/fields/Number/EditorCell.tsx   |   2 +-
 src/components/fields/Number/index.tsx        |   4 +-
 .../fields/Percentage/EditorCell.tsx          |   2 +-
 src/components/fields/Percentage/index.tsx    |   4 +-
 src/components/fields/Phone/EditorCell.tsx    |   2 +-
 src/components/fields/Phone/index.tsx         |   4 +-
 src/components/fields/Rating/index.tsx        |   4 +-
 .../fields/Reference/EditorCell.tsx           |   2 +-
 src/components/fields/Reference/index.tsx     |   4 +-
 src/components/fields/RichText/index.tsx      |   4 +-
 .../fields/ShortText/EditorCell.tsx           |   2 +-
 src/components/fields/ShortText/index.tsx     |   4 +-
 src/components/fields/SingleSelect/index.tsx  |   4 +-
 src/components/fields/Slider/index.tsx        |   4 +-
 src/components/fields/Status/index.tsx        |   4 +-
 src/components/fields/SubTable/index.tsx      |   4 +-
 src/components/fields/UpdatedAt/index.tsx     |   4 +-
 src/components/fields/UpdatedBy/index.tsx     |   4 +-
 src/components/fields/Url/EditorCell.tsx      |   2 +-
 src/components/fields/Url/index.tsx           |   4 +-
 src/components/fields/User/index.tsx          |   4 +-
 src/components/fields/types.ts                |   4 +-
 src/constants/routes.tsx                      |   2 +-
 src/pages/Table/ProvidedSubTablePage.tsx      |   2 +-
 83 files changed, 420 insertions(+), 372 deletions(-)
 rename src/components/Table/{ => Breadcrumbs}/BreadcrumbsSubTable.tsx (100%)
 rename src/components/Table/{ => Breadcrumbs}/BreadcrumbsTableRoot.tsx (97%)
 create mode 100644 src/components/Table/ColumnHeader/ColumnHeaderDragHandle.tsx
 rename src/components/Table/{Styled/StyledResizer.tsx => ColumnHeader/ColumnHeaderResizer.tsx} (79%)
 rename src/components/Table/{ => Mock}/Cell.tsx (100%)
 rename src/components/Table/{ => Mock}/Column.tsx (99%)
 rename src/components/Table/{ => TableCell}/ChipList.tsx (100%)
 rename src/components/Table/{ => TableCell}/EditorCellTextField.tsx (100%)
 rename src/components/Table/{CellValidation.tsx => TableCell/TableCell.tsx} (87%)
 create mode 100644 src/components/Table/TableCell/index.ts
 rename src/components/Table/{withTableCell.tsx => TableCell/withRenderTableCell.tsx} (98%)

diff --git a/src/components/ColumnMenu/ColumnMenu.tsx b/src/components/ColumnMenu/ColumnMenu.tsx
index 54f6e0c3..72b1b765 100644
--- a/src/components/ColumnMenu/ColumnMenu.tsx
+++ b/src/components/ColumnMenu/ColumnMenu.tsx
@@ -29,7 +29,7 @@ import SettingsIcon from "@mui/icons-material/SettingsOutlined";
 import EvalIcon from "@mui/icons-material/PlayCircleOutline";
 
 import MenuContents, { IMenuContentsProps } from "./MenuContents";
-import ColumnHeader from "@src/components/Table/Column";
+import ColumnHeader from "@src/components/Table/Mock/Column";
 
 import {
   projectScope,
diff --git a/src/components/Table/BreadcrumbsSubTable.tsx b/src/components/Table/Breadcrumbs/BreadcrumbsSubTable.tsx
similarity index 100%
rename from src/components/Table/BreadcrumbsSubTable.tsx
rename to src/components/Table/Breadcrumbs/BreadcrumbsSubTable.tsx
diff --git a/src/components/Table/BreadcrumbsTableRoot.tsx b/src/components/Table/Breadcrumbs/BreadcrumbsTableRoot.tsx
similarity index 97%
rename from src/components/Table/BreadcrumbsTableRoot.tsx
rename to src/components/Table/Breadcrumbs/BreadcrumbsTableRoot.tsx
index dd15526d..676408e3 100644
--- a/src/components/Table/BreadcrumbsTableRoot.tsx
+++ b/src/components/Table/Breadcrumbs/BreadcrumbsTableRoot.tsx
@@ -1,5 +1,5 @@
 import { useAtom } from "jotai";
-import { useLocation, useParams, Link as RouterLink } from "react-router-dom";
+import { useParams, Link as RouterLink } from "react-router-dom";
 import { find, camelCase, uniq } from "lodash-es";
 
 import {
diff --git a/src/components/Table/ColumnHeader/ColumnHeader.tsx b/src/components/Table/ColumnHeader/ColumnHeader.tsx
index 345e856b..84239a40 100644
--- a/src/components/Table/ColumnHeader/ColumnHeader.tsx
+++ b/src/components/Table/ColumnHeader/ColumnHeader.tsx
@@ -1,5 +1,10 @@
-import { forwardRef, useRef } from "react";
+import { memo, useRef } from "react";
 import { useAtom, useSetAtom } from "jotai";
+import type { Header } from "@tanstack/react-table";
+import type {
+  DraggableProvided,
+  DraggableStateSnapshot,
+} from "react-beautiful-dnd";
 
 import {
   styled,
@@ -7,8 +12,8 @@ import {
   TooltipProps,
   tooltipClasses,
   Fade,
-  Grid,
-  GridProps,
+  Stack,
+  StackProps,
   IconButton,
   Typography,
 } from "@mui/material";
@@ -16,21 +21,58 @@ import DropdownIcon from "@mui/icons-material/MoreHoriz";
 import LockIcon from "@mui/icons-material/LockOutlined";
 
 import ColumnHeaderSort, { SORT_STATES } from "./ColumnHeaderSort";
+import ColumnHeaderDragHandle from "./ColumnHeaderDragHandle";
+import ColumnHeaderResizer from "./ColumnHeaderResizer";
 
 import { projectScope, altPressAtom } from "@src/atoms/projectScope";
 import {
   tableScope,
+  selectedCellAtom,
   columnMenuAtom,
   tableSortsAtom,
 } from "@src/atoms/tableScope";
 import { getFieldProp } from "@src/components/fields";
-import { COLUMN_HEADER_HEIGHT } from "@src/components/Table/Column";
-import { ColumnConfig } from "@src/types/table";
 import { FieldType } from "@src/constants/fields";
-import { spreadSx } from "@src/utils/ui";
+import { COLUMN_HEADER_HEIGHT } from "@src/components/Table/Mock/Column";
+import type { ColumnConfig } from "@src/types/table";
+import type { TableRow } from "@src/types/table";
 
 export { COLUMN_HEADER_HEIGHT };
 
+const StyledColumnHeader = styled(Stack)(({ theme }) => ({
+  position: "relative",
+  height: "100%",
+  border: `1px solid ${theme.palette.divider}`,
+  "& + &": { borderLeftStyle: "none" },
+
+  flexDirection: "row",
+  alignItems: "center",
+  padding: theme.spacing(0, 0.5, 0, 1),
+  "& svg, & button": { display: "block", zIndex: 1 },
+
+  backgroundColor: theme.palette.background.default,
+  color: theme.palette.text.secondary,
+  transition: theme.transitions.create("color", {
+    duration: theme.transitions.duration.short,
+  }),
+  "&:hover": { color: theme.palette.text.primary },
+
+  "& .MuiIconButton-root": {
+    color: theme.palette.text.disabled,
+    transition: theme.transitions.create(
+      ["background-color", "opacity", "color"],
+      { duration: theme.transitions.duration.short }
+    ),
+  },
+  [`&:hover .MuiIconButton-root,
+    &:focus .MuiIconButton-root,
+    &:focus-within .MuiIconButton-root,
+    .MuiIconButton-root:focus`]: {
+    color: theme.palette.text.primary,
+    opacity: 1,
+  },
+}));
+
 const LightTooltip = styled(({ className, ...props }: TooltipProps) => (
   <Tooltip {...props} classes={{ popper: className }} />
 ))(({ theme }) => ({
@@ -44,18 +86,34 @@ const LightTooltip = styled(({ className, ...props }: TooltipProps) => (
   },
 }));
 
-export interface IColumnHeaderProps extends Partial<GridProps> {
+export interface IColumnHeaderProps
+  extends Partial<Omit<StackProps, "style" | "sx">> {
+  header: Header<TableRow, any>;
   column: ColumnConfig;
+
+  provided: DraggableProvided;
+  snapshot: DraggableStateSnapshot;
+
   width: number;
+  isSelectedCell: boolean;
   focusInsideCell: boolean;
-  children: React.ReactNode;
+  canEditColumns: boolean;
+  isLastFrozen: boolean;
 }
 
-export const ColumnHeader = forwardRef(function ColumnHeader(
-  { column, width, focusInsideCell, children, ...props }: IColumnHeaderProps,
-  ref: React.Ref<HTMLDivElement>
-) {
+export const ColumnHeader = memo(function ColumnHeader({
+  header,
+  column,
+  provided,
+  snapshot,
+  width,
+  isSelectedCell,
+  focusInsideCell,
+  canEditColumns,
+  isLastFrozen,
+}: IColumnHeaderProps) {
   const openColumnMenu = useSetAtom(columnMenuAtom, tableScope);
+  const setSelectedCell = useSetAtom(selectedCellAtom, tableScope);
   const [altPress] = useAtom(altPressAtom, projectScope);
   const [tableSorts] = useAtom(tableSortsAtom, tableScope);
 
@@ -74,11 +132,19 @@ export const ColumnHeader = forwardRef(function ColumnHeader(
       : tableSorts[0]?.direction || "none";
 
   return (
-    <Grid
+    <StyledColumnHeader
       role="columnheader"
       id={`column-header-${column.key}`}
-      ref={ref}
-      {...props}
+      ref={provided.innerRef}
+      {...provided.draggableProps}
+      data-row-id={"_rowy_header"}
+      data-col-id={header.id}
+      data-frozen={header.column.getIsPinned() || undefined}
+      data-frozen-last={isLastFrozen || undefined}
+      tabIndex={isSelectedCell ? 0 : -1}
+      aria-colindex={header.index + 1}
+      aria-readonly={!canEditColumns}
+      aria-selected={isSelectedCell}
       aria-sort={
         currentSort === "none"
           ? "none"
@@ -86,34 +152,40 @@ export const ColumnHeader = forwardRef(function ColumnHeader(
           ? "ascending"
           : "descending"
       }
-      container
-      alignItems="center"
-      wrap="nowrap"
+      style={{
+        left: header.column.getIsPinned()
+          ? header.column.getStart()
+          : undefined,
+        zIndex: header.column.getIsPinned() ? 11 : 10,
+        ...provided.draggableProps.style,
+        width,
+        borderLeftStyle: snapshot.isDragging ? "solid" : undefined,
+      }}
       onContextMenu={handleOpenMenu}
-      sx={[
-        {
-          height: "100%",
-          "& svg, & button": { display: "block", zIndex: 1 },
-          border: (theme) => `1px solid ${theme.palette.divider}`,
-
-          backgroundColor: "background.default",
-          color: "text.secondary",
-          transition: (theme) =>
-            theme.transitions.create("color", {
-              duration: theme.transitions.duration.short,
-            }),
-          "&:hover": { color: "text.primary" },
-
-          position: "relative",
-
-          py: 0,
-          pr: 0.5,
-          pl: 1,
-          width: "100%",
-        },
-        ...spreadSx(props.sx),
-      ]}
+      onClick={(e) => {
+        setSelectedCell({
+          path: "_rowy_header",
+          columnKey: header.id,
+          focusInside: false,
+        });
+        (e.target as HTMLDivElement).focus();
+      }}
+      onDoubleClick={(e) => {
+        setSelectedCell({
+          path: "_rowy_header",
+          columnKey: header.id,
+          focusInside: true,
+        });
+        (e.target as HTMLDivElement).focus();
+      }}
     >
+      {provided.dragHandleProps && (
+        <ColumnHeaderDragHandle
+          dragHandleProps={provided.dragHandleProps}
+          tabIndex={focusInsideCell ? 0 : -1}
+        />
+      )}
+
       {width > 140 && (
         <Tooltip
           title={
@@ -127,8 +199,7 @@ export const ColumnHeader = forwardRef(function ColumnHeader(
           placement="bottom-start"
           arrow
         >
-          <Grid
-            item
+          <div
             onClick={() => {
               navigator.clipboard.writeText(column.key);
             }}
@@ -139,96 +210,87 @@ export const ColumnHeader = forwardRef(function ColumnHeader(
             ) : (
               getFieldProp("icon", (column as any).type)
             )}
-          </Grid>
+          </div>
         </Tooltip>
       )}
 
-      <Grid
-        item
-        xs
-        sx={{ flexShrink: 1, overflow: "hidden", my: 0, ml: 0.5, mr: -30 / 8 }}
-      >
-        <LightTooltip
-          title={
-            <Typography
-              sx={{
-                typography: "caption",
-                fontWeight: "fontWeightMedium",
-                lineHeight: `${COLUMN_HEADER_HEIGHT - 2 - 4}px`,
-                textOverflow: "clip",
-              }}
-              color="inherit"
-            >
-              {column.name as string}
-            </Typography>
-          }
-          enterDelay={1000}
-          placement="bottom-start"
-          disableInteractive
-          TransitionComponent={Fade}
-          sx={{ "& .MuiTooltip-tooltip": { marginTop: "-28px !important" } }}
-        >
+      <LightTooltip
+        title={
           <Typography
-            noWrap
             sx={{
               typography: "caption",
               fontWeight: "fontWeightMedium",
+              lineHeight: `${COLUMN_HEADER_HEIGHT - 2 - 4}px`,
               textOverflow: "clip",
-              position: "relative",
-              zIndex: 1,
             }}
-            component="div"
             color="inherit"
           >
-            {altPress ? (
-              <>
-                {column.index} <code>{column.fieldName}</code>
-              </>
-            ) : (
-              column.name
-            )}
+            {column.name as string}
           </Typography>
-        </LightTooltip>
-      </Grid>
+        }
+        enterDelay={1000}
+        placement="bottom-start"
+        disableInteractive
+        TransitionComponent={Fade}
+        sx={{ "& .MuiTooltip-tooltip": { marginTop: "-28px !important" } }}
+      >
+        <Typography
+          noWrap
+          sx={{
+            typography: "caption",
+            fontWeight: "fontWeightMedium",
+            textOverflow: "clip",
+            position: "relative",
+            zIndex: 1,
+
+            flexGrow: 1,
+            flexShrink: 1,
+            overflow: "hidden",
+            my: 0,
+            ml: 0.5,
+            mr: -30 / 8,
+          }}
+          component="div"
+          color="inherit"
+        >
+          {altPress ? (
+            <>
+              {column.index} <code>{column.fieldName}</code>
+            </>
+          ) : (
+            column.name
+          )}
+        </Typography>
+      </LightTooltip>
 
       {column.type !== FieldType.id && (
-        <Grid item>
-          <ColumnHeaderSort
-            sortKey={sortKey}
-            currentSort={currentSort}
-            tabIndex={focusInsideCell ? 0 : -1}
-          />
-        </Grid>
+        <ColumnHeaderSort
+          sortKey={sortKey}
+          currentSort={currentSort}
+          tabIndex={focusInsideCell ? 0 : -1}
+        />
       )}
 
-      <Grid item>
-        <Tooltip title="Column settings">
-          <IconButton
-            size="small"
-            aria-label={`Column settings for ${column.name as string}`}
-            tabIndex={focusInsideCell ? 0 : -1}
-            id={`column-settings-${column.key}`}
-            color="inherit"
-            onClick={handleOpenMenu}
-            ref={buttonRef}
-            sx={{
-              transition: (theme) =>
-                theme.transitions.create("color", {
-                  duration: theme.transitions.duration.short,
-                }),
+      <Tooltip title="Column settings">
+        <IconButton
+          size="small"
+          tabIndex={focusInsideCell ? 0 : -1}
+          id={`column-settings-${column.key}`}
+          onClick={handleOpenMenu}
+          ref={buttonRef}
+        >
+          <DropdownIcon />
+        </IconButton>
+      </Tooltip>
 
-              color: "text.disabled",
-              "[role='columnheader']:hover &, [role='columnheader']:focus &, [role='columnheader']:focus-within &, &:focus":
-                { color: "text.primary" },
-            }}
-          >
-            <DropdownIcon />
-          </IconButton>
-        </Tooltip>
-      </Grid>
-
-      {children}
-    </Grid>
+      {header.column.getCanResize() && (
+        <ColumnHeaderResizer
+          isResizing={header.column.getIsResizing()}
+          onMouseDown={header.getResizeHandler()}
+          onTouchStart={header.getResizeHandler()}
+        />
+      )}
+    </StyledColumnHeader>
   );
 });
 
diff --git a/src/components/Table/ColumnHeader/ColumnHeaderDragHandle.tsx b/src/components/Table/ColumnHeader/ColumnHeaderDragHandle.tsx
new file mode 100644
index 00000000..a7ae1da9
--- /dev/null
+++ b/src/components/Table/ColumnHeader/ColumnHeaderDragHandle.tsx
@@ -0,0 +1,58 @@
+import type { DraggableProvidedDragHandleProps } from "react-beautiful-dnd";
+import { DragVertical } from "@src/assets/icons";
+
+export interface IColumnHeaderDragHandleProps {
+  dragHandleProps: DraggableProvidedDragHandleProps;
+  tabIndex: number;
+}
+
+export default function ColumnHeaderDragHandle({
+  dragHandleProps,
+  tabIndex,
+}: IColumnHeaderDragHandleProps) {
+  return (
+    <div
+      {...dragHandleProps}
+      tabIndex={tabIndex}
+      aria-describedby={
+        tabIndex > -1 ? dragHandleProps["aria-describedby"] : undefined
+      }
+      style={{
+        position: "absolute",
+        inset: 0,
+        zIndex: 0,
+        display: "flex",
+        alignItems: "center",
+        outline: "none",
+      }}
+      className="column-drag-handle"
+    >
+      <DragVertical
+        sx={{
+          opacity: 0,
+          borderRadius: 2,
+          transition: (theme) => theme.transitions.create(["opacity"]),
+          "[role='columnheader']:hover &, [role='columnheader']:focus-within &":
+            {
+              opacity: 0.5,
+            },
+          ".column-drag-handle:hover &": {
+            opacity: 1,
+          },
+          ".column-drag-handle:active &": {
+            opacity: 1,
+            color: "primary.main",
+          },
+          ".column-drag-handle:focus &": {
+            opacity: 1,
+            color: "primary.main",
+            outline: "2px solid",
+            outlineColor: "primary.main",
+          },
+        }}
+        style={{ width: 8 }}
+        preserveAspectRatio="xMidYMid slice"
+      />
+    </div>
+  );
+}
diff --git a/src/components/Table/Styled/StyledResizer.tsx b/src/components/Table/ColumnHeader/ColumnHeaderResizer.tsx
similarity index 79%
rename from src/components/Table/Styled/StyledResizer.tsx
rename to src/components/Table/ColumnHeader/ColumnHeaderResizer.tsx
index 7f23f1da..88b65232 100644
--- a/src/components/Table/Styled/StyledResizer.tsx
+++ b/src/components/Table/ColumnHeader/ColumnHeaderResizer.tsx
@@ -1,13 +1,13 @@
 import { styled } from "@mui/material";
 
-export interface IStyledResizerProps {
+export interface IColumnHeaderResizerProps {
   isResizing: boolean;
 }
 
-export const StyledResizer = styled("div", {
-  name: "StyledResizer",
+export const ColumnHeaderResizer = styled("div", {
+  name: "ColumnHeaderResizer",
   shouldForwardProp: (prop) => prop !== "isResizing",
-})<IStyledResizerProps>(({ theme, isResizing }) => ({
+})<IColumnHeaderResizerProps>(({ theme, isResizing }) => ({
   position: "absolute",
   zIndex: 5,
   right: 0,
@@ -51,6 +51,6 @@ export const StyledResizer = styled("div", {
     transform: isResizing ? "scaleY(1.5) !important" : undefined,
   },
 }));
-StyledResizer.displayName = "StyledResizer";
+ColumnHeaderResizer.displayName = "ColumnHeaderResizer";
 
-export default StyledResizer;
+export default ColumnHeaderResizer;
diff --git a/src/components/Table/ColumnHeader/ColumnHeaderSort.tsx b/src/components/Table/ColumnHeader/ColumnHeaderSort.tsx
index c8c4878f..0a5bc049 100644
--- a/src/components/Table/ColumnHeader/ColumnHeaderSort.tsx
+++ b/src/components/Table/ColumnHeader/ColumnHeaderSort.tsx
@@ -1,3 +1,4 @@
+import { memo } from "react";
 import { useSetAtom } from "jotai";
 import { colord } from "colord";
 
@@ -17,7 +18,7 @@ export interface IColumnHeaderSortProps {
   tabIndex?: number;
 }
 
-export default function ColumnHeaderSort({
+export const ColumnHeaderSort = memo(function ColumnHeaderSort({
   sortKey,
   currentSort,
   tabIndex,
@@ -34,7 +35,7 @@ export default function ColumnHeaderSort({
 
   return (
     <Tooltip
-      title={nextSort === "none" ? "Unsort" : `Sort by ${nextSort}ending`}
+      title={nextSort === "none" ? "Remove sort" : `Sort by ${nextSort}ending`}
     >
       <IconButton
         disableFocusRipple={true}
@@ -68,13 +69,6 @@ export default function ColumnHeaderSort({
 
           position: "relative",
           opacity: currentSort !== "none" ? 1 : 0,
-          "[role='columnheader']:hover &, [role='columnheader']:focus &, [role='columnheader']:focus-within &, &:focus":
-            { opacity: 1 },
-
-          transition: (theme) =>
-            theme.transitions.create(["background-color", "opacity"], {
-              duration: theme.transitions.duration.short,
-            }),
 
           "& .arrow": {
             transition: (theme) =>
@@ -108,4 +102,6 @@ export default function ColumnHeaderSort({
       </IconButton>
     </Tooltip>
   );
-}
+});
+
+export default ColumnHeaderSort;
diff --git a/src/components/Table/FinalColumn/FinalColumn.tsx b/src/components/Table/FinalColumn/FinalColumn.tsx
index 6f058eda..28b584e6 100644
--- a/src/components/Table/FinalColumn/FinalColumn.tsx
+++ b/src/components/Table/FinalColumn/FinalColumn.tsx
@@ -1,6 +1,6 @@
 import { memo } from "react";
 import { useAtom, useSetAtom } from "jotai";
-import type { ITableCellProps } from "@src/components/Table/withTableCell";
+import type { IRenderedTableCellProps } from "@src/components/Table/TableCell/withRenderTableCell";
 
 import { Stack, Tooltip, IconButton, alpha } from "@mui/material";
 import { CopyCells as CopyCellsIcon } from "@src/assets/icons";
@@ -25,7 +25,7 @@ import {
 export const FinalColumn = memo(function FinalColumn({
   row,
   focusInsideCell,
-}: ITableCellProps) {
+}: IRenderedTableCellProps) {
   const [userRoles] = useAtom(userRolesAtom, projectScope);
   const [addRowIdType] = useAtom(tableAddRowIdTypeAtom, projectScope);
   const confirm = useSetAtom(confirmDialogAtom, projectScope);
diff --git a/src/components/Table/Cell.tsx b/src/components/Table/Mock/Cell.tsx
similarity index 100%
rename from src/components/Table/Cell.tsx
rename to src/components/Table/Mock/Cell.tsx
diff --git a/src/components/Table/Column.tsx b/src/components/Table/Mock/Column.tsx
similarity index 99%
rename from src/components/Table/Column.tsx
rename to src/components/Table/Mock/Column.tsx
index bc841fc0..fc831d1d 100644
--- a/src/components/Table/Column.tsx
+++ b/src/components/Table/Mock/Column.tsx
@@ -105,7 +105,6 @@ export const Column = forwardRef(function Column(
 
             ml: 0.5,
           }}
-          aria-hidden
         >
           {label}
         </Typography>
diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index 886fdcff..fe1447c4 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -221,6 +221,7 @@ export default function Table({
             canAddColumns={canAddColumns}
             canEditColumns={canEditColumns}
             lastFrozen={lastFrozen}
+            columnSizing={columnSizing}
           />
         </div>
 
@@ -233,6 +234,7 @@ export default function Table({
             rows={rows}
             canEditCells={canEditCells}
             lastFrozen={lastFrozen}
+            columnSizing={columnSizing}
           />
         )}
       </StyledTable>
diff --git a/src/components/Table/TableBody.tsx b/src/components/Table/TableBody.tsx
index ae119011..674d8d96 100644
--- a/src/components/Table/TableBody.tsx
+++ b/src/components/Table/TableBody.tsx
@@ -1,9 +1,10 @@
+import { memo } from "react";
 import { useAtom } from "jotai";
-import type { Column, Row } from "@tanstack/react-table";
+import type { Column, Row, ColumnSizingState } from "@tanstack/react-table";
 
 import StyledRow from "./Styled/StyledRow";
 import OutOfOrderIndicator from "./OutOfOrderIndicator";
-import CellValidation from "./CellValidation";
+import CellValidation from "./TableCell";
 import { RowsSkeleton } from "./TableSkeleton";
 
 import {
@@ -29,9 +30,12 @@ export interface ITableBodyProps {
 
   canEditCells: boolean;
   lastFrozen?: string;
+
+  /** Re-render when local column sizing changes */
+  columnSizing: ColumnSizingState;
 }
 
-export default function TableBody({
+export const TableBody = memo(function TableBody({
   containerRef,
   leafColumns,
   rows,
@@ -105,9 +109,11 @@ export default function TableBody({
                       : undefined
                   }
                   isSelectedCell={isSelectedCell}
+                  focusInsideCell={isSelectedCell && selectedCell?.focusInside}
                   isReadOnlyCell={isReadOnlyCell}
                   canEditCells={canEditCells}
-                  lastFrozen={lastFrozen}
+                  isLastFrozen={lastFrozen === cell.column.id}
+                  width={cell.column.getSize()}
                   rowHeight={tableSchema.rowHeight || DEFAULT_ROW_HEIGHT}
                 />
               );
@@ -127,4 +133,6 @@ export default function TableBody({
       )}
     </div>
   );
-}
+});
+
+export default TableBody;
diff --git a/src/components/Table/ChipList.tsx b/src/components/Table/TableCell/ChipList.tsx
similarity index 100%
rename from src/components/Table/ChipList.tsx
rename to src/components/Table/TableCell/ChipList.tsx
diff --git a/src/components/Table/EditorCellTextField.tsx b/src/components/Table/TableCell/EditorCellTextField.tsx
similarity index 100%
rename from src/components/Table/EditorCellTextField.tsx
rename to src/components/Table/TableCell/EditorCellTextField.tsx
diff --git a/src/components/Table/CellValidation.tsx b/src/components/Table/TableCell/TableCell.tsx
similarity index 87%
rename from src/components/Table/CellValidation.tsx
rename to src/components/Table/TableCell/TableCell.tsx
index c7589786..48fb7b93 100644
--- a/src/components/Table/CellValidation.tsx
+++ b/src/components/Table/TableCell/TableCell.tsx
@@ -1,5 +1,5 @@
 import { memo } from "react";
-import { useAtom, useSetAtom } from "jotai";
+import { useSetAtom } from "jotai";
 import { ErrorBoundary } from "react-error-boundary";
 import { flexRender } from "@tanstack/react-table";
 import type { Row, Cell } from "@tanstack/react-table";
@@ -8,7 +8,7 @@ import { styled } from "@mui/material/styles";
 import ErrorIcon from "@mui/icons-material/ErrorOutline";
 import WarningIcon from "@mui/icons-material/WarningAmber";
 
-import StyledCell from "./Styled/StyledCell";
+import StyledCell from "@src/components/Table/Styled/StyledCell";
 import { InlineErrorFallback } from "@src/components/ErrorFallback";
 import RichTooltip from "@src/components/RichTooltip";
 
@@ -18,7 +18,7 @@ import {
   contextMenuTargetAtom,
 } from "@src/atoms/tableScope";
 import type { TableRow } from "@src/types/table";
-import type { ITableCellProps } from "./withTableCell";
+import type { IRenderedTableCellProps } from "./withRenderTableCell";
 
 const Dot = styled("div")(({ theme }) => ({
   position: "absolute",
@@ -39,31 +39,34 @@ const Dot = styled("div")(({ theme }) => ({
   },
 }));
 
-export interface ICellValidationProps {
+export interface ITableCellProps {
   row: Row<TableRow>;
   cell: Cell<TableRow, any>;
   index: number;
   isSelectedCell: boolean;
+  focusInsideCell: boolean;
   isReadOnlyCell: boolean;
   canEditCells: boolean;
   rowHeight: number;
-  lastFrozen?: string;
+  isLastFrozen: boolean;
+  width: number;
   left?: number;
 }
 
-export const CellValidation = memo(function MemoizedCellValidation({
+export const TableCell = memo(function TableCell({
   row,
   cell,
   index,
   isSelectedCell,
+  focusInsideCell,
   isReadOnlyCell,
   canEditCells,
   rowHeight,
-  lastFrozen,
+  isLastFrozen,
+  width,
   left,
-}: ICellValidationProps) {
-  const [selectedCell, setSelectedCell] = useAtom(selectedCellAtom, tableScope);
-  const focusInsideCell = selectedCell?.focusInside ?? false;
+}: ITableCellProps) {
+  const setSelectedCell = useSetAtom(selectedCellAtom, tableScope);
   const setContextMenuTarget = useSetAtom(contextMenuTargetAtom, tableScope);
 
   const value = cell.getValue();
@@ -97,10 +100,10 @@ export const CellValidation = memo(function MemoizedCellValidation({
     );
   }
 
-  const tableCellComponentProps: ITableCellProps = {
+  const tableCellComponentProps: IRenderedTableCellProps = {
     ...cell.getContext(),
     value,
-    focusInsideCell: isSelectedCell && focusInsideCell,
+    focusInsideCell,
     setFocusInsideCell: (focusInside: boolean) =>
       setSelectedCell({
         path: row.original._rowy_ref.path,
@@ -117,7 +120,7 @@ export const CellValidation = memo(function MemoizedCellValidation({
       data-row-id={row.id}
       data-col-id={cell.column.id}
       data-frozen={cell.column.getIsPinned() || undefined}
-      data-frozen-last={lastFrozen === cell.column.id || undefined}
+      data-frozen-last={isLastFrozen || undefined}
       role="gridcell"
       tabIndex={isSelectedCell && !focusInsideCell ? 0 : -1}
       aria-colindex={index + 1}
@@ -133,7 +136,7 @@ export const CellValidation = memo(function MemoizedCellValidation({
       }
       aria-invalid={isInvalid || isMissing}
       style={{
-        width: cell.column.getSize(),
+        width,
         height: rowHeight,
         left,
         backgroundColor:
@@ -178,4 +181,4 @@ export const CellValidation = memo(function MemoizedCellValidation({
   );
 });
 
-export default CellValidation;
+export default TableCell;
diff --git a/src/components/Table/TableCell/index.ts b/src/components/Table/TableCell/index.ts
new file mode 100644
index 00000000..f876b4de
--- /dev/null
+++ b/src/components/Table/TableCell/index.ts
@@ -0,0 +1,2 @@
+export { default } from "./TableCell";
+export * from "./TableCell";
diff --git a/src/components/Table/withTableCell.tsx b/src/components/Table/TableCell/withRenderTableCell.tsx
similarity index 98%
rename from src/components/Table/withTableCell.tsx
rename to src/components/Table/TableCell/withRenderTableCell.tsx
index c281423d..3a4d2d5f 100644
--- a/src/components/Table/withTableCell.tsx
+++ b/src/components/Table/TableCell/withRenderTableCell.tsx
@@ -32,7 +32,7 @@ export interface ICellOptions {
   popoverProps?: Partial<PopoverProps>;
 }
 
-export interface ITableCellProps<TValue = any>
+export interface IRenderedTableCellProps<TValue = any>
   extends CellContext<TableRow, TValue> {
   value: TValue;
   focusInsideCell: boolean;
@@ -60,7 +60,7 @@ export default function withTableCell(
   options: ICellOptions = {}
 ) {
   return memo(
-    function TableCell({
+    function RenderedTableCell({
       row,
       column,
       value,
@@ -68,7 +68,7 @@ export default function withTableCell(
       setFocusInsideCell,
       disabled,
       rowHeight,
-    }: ITableCellProps) {
+    }: IRenderedTableCellProps) {
       // Render inline editor cell after timeout on mount
       // to improve scroll performance
       const [inlineEditorReady, setInlineEditorReady] = useState(false);
diff --git a/src/components/Table/TableHeader.tsx b/src/components/Table/TableHeader.tsx
index b90bf178..ac93d566 100644
--- a/src/components/Table/TableHeader.tsx
+++ b/src/components/Table/TableHeader.tsx
@@ -2,14 +2,12 @@ import { memo } from "react";
 import { useAtom } from "jotai";
 import { DragDropContext, Droppable, Draggable } from "react-beautiful-dnd";
 import type { DropResult } from "react-beautiful-dnd";
-import type { HeaderGroup } from "@tanstack/react-table";
+import type { ColumnSizingState, HeaderGroup } from "@tanstack/react-table";
 import type { TableRow } from "@src/types/table";
 
 import StyledRow from "./Styled/StyledRow";
 import ColumnHeader from "./ColumnHeader";
-import StyledResizer from "./Styled/StyledResizer";
 import FinalColumnHeader from "./FinalColumn/FinalColumnHeader";
-import { DragVertical } from "@src/assets/icons";
 
 import { tableScope, selectedCellAtom } from "@src/atoms/tableScope";
 import { DEFAULT_ROW_HEIGHT } from "@src/components/Table";
@@ -20,6 +18,9 @@ export interface ITableHeaderProps {
   canAddColumns: boolean;
   canEditColumns: boolean;
   lastFrozen?: string;
+
+  /** Re-render when local column sizing changes */
+  columnSizing: ColumnSizingState;
 }
 
 export const TableHeader = memo(function TableHeader({
@@ -29,8 +30,8 @@ export const TableHeader = memo(function TableHeader({
   canEditColumns,
   lastFrozen,
 }: ITableHeaderProps) {
-  const [selectedCell, setSelectedCell] = useAtom(selectedCellAtom, tableScope);
-  const focusInsideCell = selectedCell?.focusInside ?? false;
+  const [selectedCell] = useAtom(selectedCellAtom, tableScope);
+  const focusInside = selectedCell?.focusInside ?? false;
 
   return (
     <DragDropContext onDragEnd={handleDropColumn}>
@@ -58,7 +59,7 @@ export const TableHeader = memo(function TableHeader({
                       data-row-id={"_rowy_header"}
                       data-col-id={header.id}
                       tabIndex={isSelectedCell ? 0 : -1}
-                      focusInsideCell={isSelectedCell && focusInsideCell}
+                      focusInsideCell={isSelectedCell && focusInside}
                       aria-colindex={header.index + 1}
                       aria-readonly={!canEditColumns}
                       aria-selected={isSelectedCell}
@@ -78,105 +79,16 @@ export const TableHeader = memo(function TableHeader({
                   >
                     {(provided, snapshot) => (
                       <ColumnHeader
-                        key={header.id}
-                        data-row-id={"_rowy_header"}
-                        data-col-id={header.id}
-                        data-frozen={header.column.getIsPinned() || undefined}
-                        data-frozen-last={lastFrozen === header.id || undefined}
-                        ref={provided.innerRef}
-                        {...provided.draggableProps}
-                        tabIndex={isSelectedCell ? 0 : -1}
-                        aria-colindex={header.index + 1}
-                        aria-readonly={!canEditColumns}
-                        aria-selected={isSelectedCell}
+                        header={header}
                         column={header.column.columnDef.meta!}
-                        style={{
-                          width: header.getSize(),
-                          left: header.column.getIsPinned()
-                            ? header.column.getStart()
-                            : undefined,
-                          ...provided.draggableProps.style,
-                          zIndex: header.column.getIsPinned() ? 11 : 10,
-                        }}
+                        provided={provided}
+                        snapshot={snapshot}
                         width={header.getSize()}
-                        sx={
-                          snapshot.isDragging
-                            ? undefined
-                            : { "& + &": { borderLeft: "none" } }
-                        }
-                        onClick={(e) => {
-                          setSelectedCell({
-                            path: "_rowy_header",
-                            columnKey: header.id,
-                            focusInside: false,
-                          });
-                          (e.target as HTMLDivElement).focus();
-                        }}
-                        onDoubleClick={(e) => {
-                          setSelectedCell({
-                            path: "_rowy_header",
-                            columnKey: header.id,
-                            focusInside: true,
-                          });
-                          (e.target as HTMLDivElement).focus();
-                        }}
-                        focusInsideCell={isSelectedCell && focusInsideCell}
-                      >
-                        <div
-                          {...provided.dragHandleProps}
-                          tabIndex={isSelectedCell && focusInsideCell ? 0 : -1}
-                          aria-describedby={
-                            isSelectedCell && focusInsideCell
-                              ? provided.dragHandleProps?.["aria-describedby"]
-                              : undefined
-                          }
-                          style={{
-                            position: "absolute",
-                            inset: 0,
-                            zIndex: 0,
-                            display: "flex",
-                            alignItems: "center",
-                            outline: "none",
-                          }}
-                          className="column-drag-handle"
-                        >
-                          <DragVertical
-                            sx={{
-                              opacity: 0,
-                              borderRadius: 2,
-                              transition: (theme) =>
-                                theme.transitions.create(["opacity"]),
-                              "[role='columnheader']:hover &, [role='columnheader']:focus-within &":
-                                {
-                                  opacity: 0.5,
-                                },
-                              ".column-drag-handle:hover &": {
-                                opacity: 1,
-                              },
-                              ".column-drag-handle:active &": {
-                                opacity: 1,
-                                color: "primary.main",
-                              },
-                              ".column-drag-handle:focus &": {
-                                opacity: 1,
-                                color: "primary.main",
-                                outline: "2px solid",
-                                outlineColor: "primary.main",
-                              },
-                            }}
-                            style={{ width: 8 }}
-                            preserveAspectRatio="xMidYMid slice"
-                          />
-                        </div>
-
-                        {header.column.getCanResize() && (
-                          <StyledResizer
-                            isResizing={header.column.getIsResizing()}
-                            onMouseDown={header.getResizeHandler()}
-                            onTouchStart={header.getResizeHandler()}
-                          />
-                        )}
-                      </ColumnHeader>
+                        isSelectedCell={isSelectedCell}
+                        focusInsideCell={isSelectedCell && focusInside}
+                        canEditColumns={canEditColumns}
+                        isLastFrozen={lastFrozen === header.id}
+                      />
                     )}
                   </Draggable>
                 );
diff --git a/src/components/Table/TableSkeleton.tsx b/src/components/Table/TableSkeleton.tsx
index 065770fc..6bfaa051 100644
--- a/src/components/Table/TableSkeleton.tsx
+++ b/src/components/Table/TableSkeleton.tsx
@@ -4,7 +4,7 @@ import { colord } from "colord";
 
 import { Fade, Stack, Skeleton, Button } from "@mui/material";
 import { AddColumn as AddColumnIcon } from "@src/assets/icons";
-import Column from "./Column";
+import Column from "./Mock/Column";
 
 import { projectScope, userSettingsAtom } from "@src/atoms/projectScope";
 import {
diff --git a/src/components/TableModals/ImportAirtableWizard/Step1Columns.tsx b/src/components/TableModals/ImportAirtableWizard/Step1Columns.tsx
index ea86e2c4..06235545 100644
--- a/src/components/TableModals/ImportAirtableWizard/Step1Columns.tsx
+++ b/src/components/TableModals/ImportAirtableWizard/Step1Columns.tsx
@@ -22,7 +22,9 @@ import { TableColumn as TableColumnIcon } from "@src/assets/icons";
 import { IStepProps } from ".";
 import { AirtableConfig } from "@src/components/TableModals/ImportAirtableWizard";
 import FadeList from "@src/components/TableModals/ScrollableList";
-import Column, { COLUMN_HEADER_HEIGHT } from "@src/components/Table/Column";
+import Column, {
+  COLUMN_HEADER_HEIGHT,
+} from "@src/components/Table/Mock/Column";
 import ColumnSelect from "@src/components/Table/ColumnSelect";
 
 import {
diff --git a/src/components/TableModals/ImportAirtableWizard/Step2NewColumns.tsx b/src/components/TableModals/ImportAirtableWizard/Step2NewColumns.tsx
index e3b81ece..105d6f58 100644
--- a/src/components/TableModals/ImportAirtableWizard/Step2NewColumns.tsx
+++ b/src/components/TableModals/ImportAirtableWizard/Step2NewColumns.tsx
@@ -6,8 +6,8 @@ import ChevronRightIcon from "@mui/icons-material/ChevronRight";
 
 import { IStepProps } from ".";
 import ScrollableList from "@src/components/TableModals/ScrollableList";
-import Column from "@src/components/Table/Column";
-import Cell from "@src/components/Table/Cell";
+import Column from "@src/components/Table/Mock/Column";
+import Cell from "@src/components/Table/Mock/Cell";
 import FieldsDropdown from "@src/components/ColumnModals/FieldsDropdown";
 import { FieldType } from "@src/constants/fields";
 import { SELECTABLE_TYPES } from "@src/components/TableModals/ImportExistingWizard/utils";
diff --git a/src/components/TableModals/ImportAirtableWizard/Step3Preview.tsx b/src/components/TableModals/ImportAirtableWizard/Step3Preview.tsx
index ae5c0ee8..fa9f4d4a 100644
--- a/src/components/TableModals/ImportAirtableWizard/Step3Preview.tsx
+++ b/src/components/TableModals/ImportAirtableWizard/Step3Preview.tsx
@@ -2,8 +2,8 @@ import { useAtom } from "jotai";
 import { find } from "lodash-es";
 
 import { styled, Grid } from "@mui/material";
-import Column from "@src/components/Table/Column";
-import Cell from "@src/components/Table/Cell";
+import Column from "@src/components/Table/Mock/Column";
+import Cell from "@src/components/Table/Mock/Cell";
 
 import { IStepProps } from ".";
 import { tableScope, tableSchemaAtom } from "@src/atoms/tableScope";
diff --git a/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx b/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx
index 3189cf3e..684584ec 100644
--- a/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx
+++ b/src/components/TableModals/ImportCsvWizard/Step1Columns.tsx
@@ -26,7 +26,9 @@ import { TableColumn as TableColumnIcon } from "@src/assets/icons";
 import { IStepProps } from ".";
 import { CsvConfig } from "@src/components/TableModals/ImportCsvWizard";
 import FadeList from "@src/components/TableModals/ScrollableList";
-import Column, { COLUMN_HEADER_HEIGHT } from "@src/components/Table/Column";
+import Column, {
+  COLUMN_HEADER_HEIGHT,
+} from "@src/components/Table/Mock/Column";
 import ColumnSelect from "@src/components/Table/ColumnSelect";
 
 import {
diff --git a/src/components/TableModals/ImportCsvWizard/Step2NewColumns.tsx b/src/components/TableModals/ImportCsvWizard/Step2NewColumns.tsx
index b47f6afe..6bd3a264 100644
--- a/src/components/TableModals/ImportCsvWizard/Step2NewColumns.tsx
+++ b/src/components/TableModals/ImportCsvWizard/Step2NewColumns.tsx
@@ -7,8 +7,8 @@ import ChevronRightIcon from "@mui/icons-material/ChevronRight";
 
 import { IStepProps } from ".";
 import ScrollableList from "@src/components/TableModals/ScrollableList";
-import Column from "@src/components/Table/Column";
-import Cell from "@src/components/Table/Cell";
+import Column from "@src/components/Table/Mock/Column";
+import Cell from "@src/components/Table/Mock/Cell";
 import FieldsDropdown from "@src/components/ColumnModals/FieldsDropdown";
 
 import { FieldType } from "@src/constants/fields";
diff --git a/src/components/TableModals/ImportCsvWizard/Step3Preview.tsx b/src/components/TableModals/ImportCsvWizard/Step3Preview.tsx
index 8c1addb3..c17608fc 100644
--- a/src/components/TableModals/ImportCsvWizard/Step3Preview.tsx
+++ b/src/components/TableModals/ImportCsvWizard/Step3Preview.tsx
@@ -3,8 +3,8 @@ import { find } from "lodash-es";
 import { parseJSON } from "date-fns";
 
 import { styled, Grid } from "@mui/material";
-import Column from "@src/components/Table/Column";
-import Cell from "@src/components/Table/Cell";
+import Column from "@src/components/Table/Mock/Column";
+import Cell from "@src/components/Table/Mock/Cell";
 
 import { IStepProps } from ".";
 import { tableScope, tableSchemaAtom } from "@src/atoms/tableScope";
diff --git a/src/components/TableModals/ImportExistingWizard/Step1Columns.tsx b/src/components/TableModals/ImportExistingWizard/Step1Columns.tsx
index 97563c10..29d5903f 100644
--- a/src/components/TableModals/ImportExistingWizard/Step1Columns.tsx
+++ b/src/components/TableModals/ImportExistingWizard/Step1Columns.tsx
@@ -20,7 +20,7 @@ import DragHandleIcon from "@mui/icons-material/DragHandle";
 import { AddColumn as AddColumnIcon } from "@src/assets/icons";
 
 import ScrollableList from "@src/components/TableModals/ScrollableList";
-import Column from "@src/components/Table/Column";
+import Column from "@src/components/Table/Mock/Column";
 import EmptyState from "@src/components/EmptyState";
 
 import { tableScope, tableRowsAtom } from "@src/atoms/tableScope";
diff --git a/src/components/TableModals/ImportExistingWizard/Step2Rename.tsx b/src/components/TableModals/ImportExistingWizard/Step2Rename.tsx
index 0b13ed11..d4bf3faf 100644
--- a/src/components/TableModals/ImportExistingWizard/Step2Rename.tsx
+++ b/src/components/TableModals/ImportExistingWizard/Step2Rename.tsx
@@ -14,7 +14,9 @@ import DoneIcon from "@mui/icons-material/Done";
 
 import { IStepProps } from ".";
 import ScrollableList from "@src/components/TableModals/ScrollableList";
-import Column, { COLUMN_HEADER_HEIGHT } from "@src/components/Table/Column";
+import Column, {
+  COLUMN_HEADER_HEIGHT,
+} from "@src/components/Table/Mock/Column";
 
 export default function Step2Rename({
   config,
diff --git a/src/components/TableModals/ImportExistingWizard/Step3Types.tsx b/src/components/TableModals/ImportExistingWizard/Step3Types.tsx
index 2cebf092..f4c9be37 100644
--- a/src/components/TableModals/ImportExistingWizard/Step3Types.tsx
+++ b/src/components/TableModals/ImportExistingWizard/Step3Types.tsx
@@ -6,8 +6,8 @@ import ChevronRightIcon from "@mui/icons-material/ChevronRight";
 
 import { IStepProps } from ".";
 import ScrollableList from "@src/components/TableModals/ScrollableList";
-import Column from "@src/components/Table/Column";
-import Cell from "@src/components/Table/Cell";
+import Column from "@src/components/Table/Mock/Column";
+import Cell from "@src/components/Table/Mock/Cell";
 import FieldsDropdown from "@src/components/ColumnModals/FieldsDropdown";
 
 import { tableScope, tableRowsAtom } from "@src/atoms/tableScope";
diff --git a/src/components/TableModals/ImportExistingWizard/Step4Preview.tsx b/src/components/TableModals/ImportExistingWizard/Step4Preview.tsx
index 3852f8a5..8fb9be9e 100644
--- a/src/components/TableModals/ImportExistingWizard/Step4Preview.tsx
+++ b/src/components/TableModals/ImportExistingWizard/Step4Preview.tsx
@@ -2,8 +2,8 @@ import { useAtom } from "jotai";
 import { IStepProps } from ".";
 
 import { styled, Grid } from "@mui/material";
-import Column from "@src/components/Table/Column";
-import Cell from "@src/components/Table/Cell";
+import Column from "@src/components/Table/Mock/Column";
+import Cell from "@src/components/Table/Mock/Cell";
 
 import { tableScope, tableRowsAtom } from "@src/atoms/tableScope";
 
diff --git a/src/components/fields/Action/index.tsx b/src/components/fields/Action/index.tsx
index 0677e7e4..e2e8c1bd 100644
--- a/src/components/fields/Action/index.tsx
+++ b/src/components/fields/Action/index.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withTableCell from "@src/components/Table/withTableCell";
+import withRenderTableCell from "@src/components/Table/TableCell/withRenderTableCell";
 
 import ActionIcon from "@mui/icons-material/TouchAppOutlined";
 import DisplayCell from "./DisplayCell";
@@ -24,7 +24,7 @@ export const config: IFieldConfig = {
   icon: <ActionIcon />,
   description:
     "Button with pre-defined action script or triggers a Cloud Function. Optionally supports Undo and Redo.",
-  TableCell: withTableCell(DisplayCell, EditorCell, "inline", {
+  TableCell: withRenderTableCell(DisplayCell, EditorCell, "inline", {
     disablePadding: true,
   }),
   SideDrawerField,
diff --git a/src/components/fields/Checkbox/index.tsx b/src/components/fields/Checkbox/index.tsx
index 291d074c..24039351 100644
--- a/src/components/fields/Checkbox/index.tsx
+++ b/src/components/fields/Checkbox/index.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withTableCell from "@src/components/Table/withTableCell";
+import withRenderTableCell from "@src/components/Table/TableCell/withRenderTableCell";
 
 import CheckboxIcon from "@mui/icons-material/ToggleOnOutlined";
 import DisplayCell from "./DisplayCell";
@@ -24,7 +24,7 @@ export const config: IFieldConfig = {
   initializable: true,
   icon: <CheckboxIcon />,
   description: "True/false value. Default: false.",
-  TableCell: withTableCell(DisplayCell, EditorCell, "inline", {
+  TableCell: withRenderTableCell(DisplayCell, EditorCell, "inline", {
     usesRowData: true,
   }),
   csvImportParser: (value: string) => {
diff --git a/src/components/fields/Code/index.tsx b/src/components/fields/Code/index.tsx
index 72738586..d3ca01ec 100644
--- a/src/components/fields/Code/index.tsx
+++ b/src/components/fields/Code/index.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withTableCell from "@src/components/Table/withTableCell";
+import withRenderTableCell from "@src/components/Table/TableCell/withRenderTableCell";
 
 import CodeIcon from "@mui/icons-material/Code";
 import DisplayCell from "./DisplayCell";
@@ -23,7 +23,7 @@ export const config: IFieldConfig = {
   initializable: true,
   icon: <CodeIcon />,
   description: "Raw code edited with the Monaco Editor.",
-  TableCell: withTableCell(DisplayCell, SideDrawerField, "popover", {
+  TableCell: withRenderTableCell(DisplayCell, SideDrawerField, "popover", {
     popoverProps: {
       anchorOrigin: { vertical: "top", horizontal: "center" },
       PaperProps: { sx: { borderRadius: 1 } },
diff --git a/src/components/fields/Color/index.tsx b/src/components/fields/Color/index.tsx
index 140593a3..ad626bd5 100644
--- a/src/components/fields/Color/index.tsx
+++ b/src/components/fields/Color/index.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withTableCell from "@src/components/Table/withTableCell";
+import withRenderTableCell from "@src/components/Table/TableCell/withRenderTableCell";
 import { toColor } from "react-color-palette";
 
 import ColorIcon from "@mui/icons-material/Colorize";
@@ -25,7 +25,7 @@ export const config: IFieldConfig = {
   icon: <ColorIcon />,
   description:
     "Color stored as Hex, RGB, and HSV. Edited with a visual picker.",
-  TableCell: withTableCell(DisplayCell, EditorCell, "popover", {
+  TableCell: withRenderTableCell(DisplayCell, EditorCell, "popover", {
     disablePadding: true,
   }),
   SideDrawerField,
diff --git a/src/components/fields/ConnectService/DisplayCell.tsx b/src/components/fields/ConnectService/DisplayCell.tsx
index 2dd91bd8..9e8177bf 100644
--- a/src/components/fields/ConnectService/DisplayCell.tsx
+++ b/src/components/fields/ConnectService/DisplayCell.tsx
@@ -3,7 +3,7 @@ import { IDisplayCellProps } from "@src/components/fields/types";
 import { ButtonBase, Grid, Chip } from "@mui/material";
 import { ChevronDown } from "@src/assets/icons";
 
-import ChipList from "@src/components/Table/ChipList";
+import ChipList from "@src/components/Table/TableCell/ChipList";
 import { get } from "lodash-es";
 
 export default function ConnectService({
diff --git a/src/components/fields/ConnectService/index.tsx b/src/components/fields/ConnectService/index.tsx
index 2495b867..f58219ca 100644
--- a/src/components/fields/ConnectService/index.tsx
+++ b/src/components/fields/ConnectService/index.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withTableCell from "@src/components/Table/withTableCell";
+import withRenderTableCell from "@src/components/Table/TableCell/withRenderTableCell";
 
 import ConnectServiceIcon from "@mui/icons-material/Http";
 import DisplayCell from "./DisplayCell";
@@ -28,7 +28,7 @@ export const config: IFieldConfig = {
   icon: <ConnectServiceIcon />,
   description:
     "Connects to an external web service to fetch a list of results.",
-  TableCell: withTableCell(DisplayCell, EditorCell, "popover", {
+  TableCell: withRenderTableCell(DisplayCell, EditorCell, "popover", {
     disablePadding: true,
     transparentPopover: true,
   }),
diff --git a/src/components/fields/ConnectTable/DisplayCell.tsx b/src/components/fields/ConnectTable/DisplayCell.tsx
index 90ca35af..de750aa8 100644
--- a/src/components/fields/ConnectTable/DisplayCell.tsx
+++ b/src/components/fields/ConnectTable/DisplayCell.tsx
@@ -3,7 +3,7 @@ import { IDisplayCellProps } from "@src/components/fields/types";
 import { ButtonBase, Grid, Chip } from "@mui/material";
 import { ChevronDown } from "@src/assets/icons";
 
-import ChipList from "@src/components/Table/ChipList";
+import ChipList from "@src/components/Table/TableCell/ChipList";
 
 export default function ConnectTable({
   value,
diff --git a/src/components/fields/ConnectTable/index.tsx b/src/components/fields/ConnectTable/index.tsx
index e5cd002b..f4a0ca38 100644
--- a/src/components/fields/ConnectTable/index.tsx
+++ b/src/components/fields/ConnectTable/index.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withTableCell from "@src/components/Table/withTableCell";
+import withRenderTableCell from "@src/components/Table/TableCell/withRenderTableCell";
 
 import { ConnectTable as ConnectTableIcon } from "@src/assets/icons";
 import DisplayCell from "./DisplayCell";
@@ -28,7 +28,7 @@ export const config: IFieldConfig = {
   icon: <ConnectTableIcon />,
   description:
     "Connects to an existing table to fetch a snapshot of values from a row. Requires Rowy Run and Algolia setup.",
-  TableCell: withTableCell(DisplayCell, EditorCell, "popover", {
+  TableCell: withRenderTableCell(DisplayCell, EditorCell, "popover", {
     disablePadding: true,
     transparentPopover: true,
   }),
diff --git a/src/components/fields/Connector/DisplayCell.tsx b/src/components/fields/Connector/DisplayCell.tsx
index 6576204a..e31e3d18 100644
--- a/src/components/fields/Connector/DisplayCell.tsx
+++ b/src/components/fields/Connector/DisplayCell.tsx
@@ -3,7 +3,7 @@ import { IDisplayCellProps } from "@src/components/fields/types";
 import { ButtonBase, Grid, Chip } from "@mui/material";
 import { ChevronDown } from "@src/assets/icons";
 
-import ChipList from "@src/components/Table/ChipList";
+import ChipList from "@src/components/Table/TableCell/ChipList";
 import { get } from "lodash-es";
 import { getLabel } from "./utils";
 
diff --git a/src/components/fields/Connector/index.tsx b/src/components/fields/Connector/index.tsx
index 7946e82b..a0e239d1 100644
--- a/src/components/fields/Connector/index.tsx
+++ b/src/components/fields/Connector/index.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withTableCell from "@src/components/Table/withTableCell";
+import withRenderTableCell from "@src/components/Table/TableCell/withRenderTableCell";
 
 import ConnectorIcon from "@mui/icons-material/Cable";
 import DisplayCell from "./DisplayCell";
@@ -29,7 +29,7 @@ export const config: IFieldConfig = {
   icon: <ConnectorIcon />,
   description:
     "Connects to any table or API to fetch a list of results based on a text query or row data.",
-  TableCell: withTableCell(DisplayCell, EditorCell, "popover", {
+  TableCell: withRenderTableCell(DisplayCell, EditorCell, "popover", {
     disablePadding: true,
   }),
   SideDrawerField,
diff --git a/src/components/fields/CreatedAt/index.tsx b/src/components/fields/CreatedAt/index.tsx
index 151466fe..cffa0ea8 100644
--- a/src/components/fields/CreatedAt/index.tsx
+++ b/src/components/fields/CreatedAt/index.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withTableCell from "@src/components/Table/withTableCell";
+import withRenderTableCell from "@src/components/Table/TableCell/withRenderTableCell";
 
 import { CreatedAt as CreatedAtIcon } from "@src/assets/icons";
 import DisplayCell from "./DisplayCell";
@@ -24,7 +24,7 @@ export const config: IFieldConfig = {
   initialValue: null,
   icon: <CreatedAtIcon />,
   description: "Displays the timestamp of when the row was created. Read-only.",
-  TableCell: withTableCell(DisplayCell, null),
+  TableCell: withRenderTableCell(DisplayCell, null),
   SideDrawerField,
   settings: Settings,
 };
diff --git a/src/components/fields/CreatedBy/index.tsx b/src/components/fields/CreatedBy/index.tsx
index 8bb0329c..98fe8cb6 100644
--- a/src/components/fields/CreatedBy/index.tsx
+++ b/src/components/fields/CreatedBy/index.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withTableCell from "@src/components/Table/withTableCell";
+import withRenderTableCell from "@src/components/Table/TableCell/withRenderTableCell";
 
 import { CreatedBy as CreatedByIcon } from "@src/assets/icons";
 import DisplayCell from "./DisplayCell";
@@ -25,7 +25,7 @@ export const config: IFieldConfig = {
   icon: <CreatedByIcon />,
   description:
     "Displays the user that created the row and timestamp. Read-only.",
-  TableCell: withTableCell(DisplayCell, null),
+  TableCell: withRenderTableCell(DisplayCell, null),
   SideDrawerField,
   settings: Settings,
 };
diff --git a/src/components/fields/Date/index.tsx b/src/components/fields/Date/index.tsx
index 1ff9b01a..7078e1f1 100644
--- a/src/components/fields/Date/index.tsx
+++ b/src/components/fields/Date/index.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withTableCell from "@src/components/Table/withTableCell";
+import withRenderTableCell from "@src/components/Table/TableCell/withRenderTableCell";
 import { parse, format } from "date-fns";
 import { DATE_FORMAT } from "@src/constants/dates";
 
@@ -28,7 +28,7 @@ export const config: IFieldConfig = {
   initializable: true,
   icon: <DateIcon />,
   description: `Formatted date. Format is configurable, default: ${DATE_FORMAT}. Edited with a visual picker.`,
-  TableCell: withTableCell(DisplayCell, EditorCell, "focus", {
+  TableCell: withRenderTableCell(DisplayCell, EditorCell, "focus", {
     disablePadding: true,
   }),
   SideDrawerField,
diff --git a/src/components/fields/DateTime/index.tsx b/src/components/fields/DateTime/index.tsx
index cc247b97..d414fb6e 100644
--- a/src/components/fields/DateTime/index.tsx
+++ b/src/components/fields/DateTime/index.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withTableCell from "@src/components/Table/withTableCell";
+import withRenderTableCell from "@src/components/Table/TableCell/withRenderTableCell";
 import { parseJSON, format } from "date-fns";
 import { DATE_TIME_FORMAT } from "@src/constants/dates";
 
@@ -36,7 +36,7 @@ export const config: IFieldConfig = {
   initializable: true,
   icon: <DateTimeIcon />,
   description: `Formatted date & time. Format is configurable, default: ${DATE_TIME_FORMAT}. Edited with a visual picker.`,
-  TableCell: withTableCell(DisplayCell, EditorCell, "focus", {
+  TableCell: withRenderTableCell(DisplayCell, EditorCell, "focus", {
     disablePadding: true,
   }),
   SideDrawerField,
diff --git a/src/components/fields/Derivative/index.tsx b/src/components/fields/Derivative/index.tsx
index f37897ed..d046b4d3 100644
--- a/src/components/fields/Derivative/index.tsx
+++ b/src/components/fields/Derivative/index.tsx
@@ -1,5 +1,5 @@
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withTableCell from "@src/components/Table/withTableCell";
+import withRenderTableCell from "@src/components/Table/TableCell/withRenderTableCell";
 
 import { Derivative as DerivativeIcon } from "@src/assets/icons";
 import Settings, { settingsValidator } from "./Settings";
@@ -15,7 +15,7 @@ export const config: IFieldConfig = {
   icon: <DerivativeIcon />,
   description:
     "Value derived from the rest of the row’s values. Displayed using any other field type. Requires Rowy Run set up.",
-  TableCell: withTableCell(() => null, null),
+  TableCell: withRenderTableCell(() => null, null),
   SideDrawerField: () => null as any,
   contextMenuActions: ContextMenuActions,
   settings: Settings,
diff --git a/src/components/fields/Duration/index.tsx b/src/components/fields/Duration/index.tsx
index 56f05132..225906ba 100644
--- a/src/components/fields/Duration/index.tsx
+++ b/src/components/fields/Duration/index.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withTableCell from "@src/components/Table/withTableCell";
+import withRenderTableCell from "@src/components/Table/TableCell/withRenderTableCell";
 
 import DurationIcon from "@mui/icons-material/TimerOutlined";
 import DisplayCell from "./DisplayCell";
@@ -20,7 +20,7 @@ export const config: IFieldConfig = {
   initialValue: {},
   icon: <DurationIcon />,
   description: "Duration calculated from two timestamps.",
-  TableCell: withTableCell(DisplayCell, SideDrawerField, "popover", {
+  TableCell: withRenderTableCell(DisplayCell, SideDrawerField, "popover", {
     popoverProps: { PaperProps: { sx: { p: 1 } } },
   }),
   SideDrawerField,
diff --git a/src/components/fields/Email/EditorCell.tsx b/src/components/fields/Email/EditorCell.tsx
index c14a114a..bdc0d823 100644
--- a/src/components/fields/Email/EditorCell.tsx
+++ b/src/components/fields/Email/EditorCell.tsx
@@ -1,5 +1,5 @@
 import type { IEditorCellProps } from "@src/components/fields/types";
-import EditorCellTextField from "@src/components/Table/EditorCellTextField";
+import EditorCellTextField from "@src/components/Table/TableCell/EditorCellTextField";
 
 export default function Email(props: IEditorCellProps<string>) {
   return <EditorCellTextField {...props} InputProps={{ type: "email" }} />;
diff --git a/src/components/fields/Email/index.tsx b/src/components/fields/Email/index.tsx
index 1450f513..3ea395d8 100644
--- a/src/components/fields/Email/index.tsx
+++ b/src/components/fields/Email/index.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withTableCell from "@src/components/Table/withTableCell";
+import withRenderTableCell from "@src/components/Table/TableCell/withRenderTableCell";
 
 import EmailIcon from "@mui/icons-material/MailOutlined";
 import DisplayCell from "@src/components/fields/ShortText/DisplayCell";
@@ -23,7 +23,7 @@ export const config: IFieldConfig = {
   icon: <EmailIcon />,
   description: "Email address. Not validated.",
   contextMenuActions: BasicContextMenuActions,
-  TableCell: withTableCell(DisplayCell, EditorCell),
+  TableCell: withRenderTableCell(DisplayCell, EditorCell),
   SideDrawerField,
   filter: {
     operators: filterOperators,
diff --git a/src/components/fields/File/DisplayCell.tsx b/src/components/fields/File/DisplayCell.tsx
index 2183f902..36d82d64 100644
--- a/src/components/fields/File/DisplayCell.tsx
+++ b/src/components/fields/File/DisplayCell.tsx
@@ -1,7 +1,7 @@
 import { IDisplayCellProps } from "@src/components/fields/types";
 
 import { Grid, Chip } from "@mui/material";
-import ChipList from "@src/components/Table/ChipList";
+import ChipList from "@src/components/Table/TableCell/ChipList";
 
 import { FileIcon } from ".";
 import { FileValue } from "@src/types/table";
diff --git a/src/components/fields/File/EditorCell.tsx b/src/components/fields/File/EditorCell.tsx
index ed5ba74b..c738f9d4 100644
--- a/src/components/fields/File/EditorCell.tsx
+++ b/src/components/fields/File/EditorCell.tsx
@@ -8,7 +8,7 @@ import { format } from "date-fns";
 
 import { alpha, Stack, Grid, Tooltip, Chip, IconButton } from "@mui/material";
 import { Upload as UploadIcon } from "@src/assets/icons";
-import ChipList from "@src/components/Table/ChipList";
+import ChipList from "@src/components/Table/TableCell/ChipList";
 import CircularProgressOptical from "@src/components/CircularProgressOptical";
 
 import { projectScope, confirmDialogAtom } from "@src/atoms/projectScope";
diff --git a/src/components/fields/File/index.tsx b/src/components/fields/File/index.tsx
index 2f883954..33ab5021 100644
--- a/src/components/fields/File/index.tsx
+++ b/src/components/fields/File/index.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withTableCell from "@src/components/Table/withTableCell";
+import withRenderTableCell from "@src/components/Table/TableCell/withRenderTableCell";
 
 import FileIcon from "@mui/icons-material/AttachFile";
 import DisplayCell from "./DisplayCell";
@@ -22,7 +22,7 @@ export const config: IFieldConfig = {
   initialValue: [],
   icon: <FileIcon />,
   description: "File uploaded to Firebase Storage. Supports any file type.",
-  TableCell: withTableCell(DisplayCell, EditorCell, "inline", {
+  TableCell: withRenderTableCell(DisplayCell, EditorCell, "inline", {
     disablePadding: true,
   }),
   SideDrawerField,
diff --git a/src/components/fields/GeoPoint/index.tsx b/src/components/fields/GeoPoint/index.tsx
index 481198f6..17dc20fb 100644
--- a/src/components/fields/GeoPoint/index.tsx
+++ b/src/components/fields/GeoPoint/index.tsx
@@ -1,7 +1,7 @@
 import { lazy } from "react";
 import { GeoPoint } from "firebase/firestore";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withTableCell from "@src/components/Table/withTableCell";
+import withRenderTableCell from "@src/components/Table/TableCell/withRenderTableCell";
 
 import GeoPointIcon from "@mui/icons-material/PinDropOutlined";
 import DisplayCell from "./DisplayCell";
@@ -21,7 +21,7 @@ export const config: IFieldConfig = {
   initialValue: {},
   icon: <GeoPointIcon />,
   description: "Geo point is represented as latitude/longitude pair.",
-  TableCell: withTableCell(DisplayCell, SideDrawerField, "popover", {
+  TableCell: withRenderTableCell(DisplayCell, SideDrawerField, "popover", {
     popoverProps: { PaperProps: { sx: { p: 1, pt: 0 } } },
   }),
   SideDrawerField,
diff --git a/src/components/fields/Id/index.tsx b/src/components/fields/Id/index.tsx
index 0b2a5b85..0215e7fe 100644
--- a/src/components/fields/Id/index.tsx
+++ b/src/components/fields/Id/index.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withTableCell from "@src/components/Table/withTableCell";
+import withRenderTableCell from "@src/components/Table/TableCell/withRenderTableCell";
 
 import DisplayCell from "./DisplayCell";
 import { Id as IdIcon } from "@src/assets/icons";
@@ -17,7 +17,7 @@ export const config: IFieldConfig = {
   initialValue: "",
   icon: <IdIcon />,
   description: "Displays the row’s ID. Read-only. Cannot be sorted.",
-  TableCell: withTableCell(DisplayCell, null),
+  TableCell: withRenderTableCell(DisplayCell, null),
   SideDrawerField,
 };
 export default config;
diff --git a/src/components/fields/Image/index.tsx b/src/components/fields/Image/index.tsx
index 1dbcde26..71d5a32d 100644
--- a/src/components/fields/Image/index.tsx
+++ b/src/components/fields/Image/index.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withTableCell from "@src/components/Table/withTableCell";
+import withRenderTableCell from "@src/components/Table/TableCell/withRenderTableCell";
 
 import { Image as ImageIcon } from "@src/assets/icons";
 import DisplayCell from "./DisplayCell";
@@ -23,7 +23,7 @@ export const config: IFieldConfig = {
   icon: <ImageIcon />,
   description:
     "Image file uploaded to Firebase Storage. Supports JPEG, PNG, SVG, GIF, WebP, AVIF, JPEG XL.",
-  TableCell: withTableCell(DisplayCell, EditorCell, "inline", {
+  TableCell: withRenderTableCell(DisplayCell, EditorCell, "inline", {
     disablePadding: true,
   }),
   SideDrawerField,
diff --git a/src/components/fields/Json/index.tsx b/src/components/fields/Json/index.tsx
index a847f009..6804b7c6 100644
--- a/src/components/fields/Json/index.tsx
+++ b/src/components/fields/Json/index.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withTableCell from "@src/components/Table/withTableCell";
+import withRenderTableCell from "@src/components/Table/TableCell/withRenderTableCell";
 
 import { Json as JsonIcon } from "@src/assets/icons";
 import DisplayCell from "./DisplayCell";
@@ -24,7 +24,7 @@ export const config: IFieldConfig = {
   initializable: true,
   icon: <JsonIcon />,
   description: "Object edited with a visual JSON editor.",
-  TableCell: withTableCell(DisplayCell, SideDrawerField, "popover", {
+  TableCell: withRenderTableCell(DisplayCell, SideDrawerField, "popover", {
     popoverProps: { PaperProps: { sx: { p: 1 } } },
   }),
   csvImportParser: (value) => {
diff --git a/src/components/fields/LongText/EditorCell.tsx b/src/components/fields/LongText/EditorCell.tsx
index ba2824bd..581ce96a 100644
--- a/src/components/fields/LongText/EditorCell.tsx
+++ b/src/components/fields/LongText/EditorCell.tsx
@@ -1,5 +1,5 @@
 import type { IEditorCellProps } from "@src/components/fields/types";
-import EditorCellTextField from "@src/components/Table/EditorCellTextField";
+import EditorCellTextField from "@src/components/Table/TableCell/EditorCellTextField";
 
 export default function LongText(props: IEditorCellProps<string>) {
   return <EditorCellTextField {...props} InputProps={{ multiline: true }} />;
diff --git a/src/components/fields/LongText/index.tsx b/src/components/fields/LongText/index.tsx
index 00c79f31..6b926126 100644
--- a/src/components/fields/LongText/index.tsx
+++ b/src/components/fields/LongText/index.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withTableCell from "@src/components/Table/withTableCell";
+import withRenderTableCell from "@src/components/Table/TableCell/withRenderTableCell";
 
 import LongTextIcon from "@mui/icons-material/Notes";
 import DisplayCell from "./DisplayCell";
@@ -29,7 +29,7 @@ export const config: IFieldConfig = {
   icon: <LongTextIcon />,
   description: "Text displayed on multiple lines.",
   contextMenuActions: BasicContextMenuActions,
-  TableCell: withTableCell(DisplayCell, EditorCell),
+  TableCell: withRenderTableCell(DisplayCell, EditorCell),
   SideDrawerField,
   settings: Settings,
   filter: {
diff --git a/src/components/fields/Markdown/index.tsx b/src/components/fields/Markdown/index.tsx
index 23776019..26de107b 100644
--- a/src/components/fields/Markdown/index.tsx
+++ b/src/components/fields/Markdown/index.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withTableCell from "@src/components/Table/withTableCell";
+import withRenderTableCell from "@src/components/Table/TableCell/withRenderTableCell";
 
 import { Markdown as MarkdownIcon } from "@src/assets/icons";
 import DisplayCell from "./DisplayCell";
@@ -21,7 +21,7 @@ export const config: IFieldConfig = {
   initializable: true,
   icon: <MarkdownIcon />,
   description: "Markdown editor with preview",
-  TableCell: withTableCell(DisplayCell, SideDrawerField, "popover"),
+  TableCell: withRenderTableCell(DisplayCell, SideDrawerField, "popover"),
   SideDrawerField,
 };
 export default config;
diff --git a/src/components/fields/MultiSelect/DisplayCell.tsx b/src/components/fields/MultiSelect/DisplayCell.tsx
index 7554330a..fe7d6b87 100644
--- a/src/components/fields/MultiSelect/DisplayCell.tsx
+++ b/src/components/fields/MultiSelect/DisplayCell.tsx
@@ -5,7 +5,7 @@ import WarningIcon from "@mui/icons-material/WarningAmber";
 import { ChevronDown } from "@src/assets/icons";
 
 import { sanitiseValue } from "./utils";
-import ChipList from "@src/components/Table/ChipList";
+import ChipList from "@src/components/Table/TableCell/ChipList";
 import FormattedChip from "@src/components/FormattedChip";
 
 export default function MultiSelect({
diff --git a/src/components/fields/MultiSelect/index.tsx b/src/components/fields/MultiSelect/index.tsx
index f6400d1b..19a5cecd 100644
--- a/src/components/fields/MultiSelect/index.tsx
+++ b/src/components/fields/MultiSelect/index.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withTableCell from "@src/components/Table/withTableCell";
+import withRenderTableCell from "@src/components/Table/TableCell/withRenderTableCell";
 
 import { MultiSelect as MultiSelectIcon } from "@src/assets/icons";
 import DisplayCell from "./DisplayCell";
@@ -32,7 +32,7 @@ export const config: IFieldConfig = {
   icon: <MultiSelectIcon />,
   description:
     "Multiple values from predefined options. Options are searchable and users can optionally input custom values.",
-  TableCell: withTableCell(DisplayCell, EditorCell, "popover", {
+  TableCell: withRenderTableCell(DisplayCell, EditorCell, "popover", {
     disablePadding: true,
     transparentPopover: false,
   }),
diff --git a/src/components/fields/Number/EditorCell.tsx b/src/components/fields/Number/EditorCell.tsx
index 5ae634a2..e3594eac 100644
--- a/src/components/fields/Number/EditorCell.tsx
+++ b/src/components/fields/Number/EditorCell.tsx
@@ -1,5 +1,5 @@
 import type { IEditorCellProps } from "@src/components/fields/types";
-import EditorCellTextField from "@src/components/Table/EditorCellTextField";
+import EditorCellTextField from "@src/components/Table/TableCell/EditorCellTextField";
 
 export default function Number_(props: IEditorCellProps<number>) {
   return (
diff --git a/src/components/fields/Number/index.tsx b/src/components/fields/Number/index.tsx
index 0a25fca8..2f04cadd 100644
--- a/src/components/fields/Number/index.tsx
+++ b/src/components/fields/Number/index.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withTableCell from "@src/components/Table/withTableCell";
+import withRenderTableCell from "@src/components/Table/TableCell/withRenderTableCell";
 
 import { Number as NumberIcon } from "@src/assets/icons";
 import DisplayCell from "./DisplayCell";
@@ -22,7 +22,7 @@ export const config: IFieldConfig = {
   icon: <NumberIcon />,
   description: "Numeric value.",
   contextMenuActions: BasicContextMenuActions,
-  TableCell: withTableCell(DisplayCell, EditorCell),
+  TableCell: withRenderTableCell(DisplayCell, EditorCell),
   SideDrawerField,
   filter: {
     operators: filterOperators,
diff --git a/src/components/fields/Percentage/EditorCell.tsx b/src/components/fields/Percentage/EditorCell.tsx
index 16dd9a88..1e3a7e96 100644
--- a/src/components/fields/Percentage/EditorCell.tsx
+++ b/src/components/fields/Percentage/EditorCell.tsx
@@ -1,5 +1,5 @@
 import type { IEditorCellProps } from "@src/components/fields/types";
-import EditorCellTextField from "@src/components/Table/EditorCellTextField";
+import EditorCellTextField from "@src/components/Table/TableCell/EditorCellTextField";
 
 export default function Percentage(props: IEditorCellProps<number>) {
   return (
diff --git a/src/components/fields/Percentage/index.tsx b/src/components/fields/Percentage/index.tsx
index 86ff6fe6..b571b50f 100644
--- a/src/components/fields/Percentage/index.tsx
+++ b/src/components/fields/Percentage/index.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withTableCell from "@src/components/Table/withTableCell";
+import withRenderTableCell from "@src/components/Table/TableCell/withRenderTableCell";
 
 import { Percentage as PercentageIcon } from "@src/assets/icons";
 import DisplayCell from "./DisplayCell";
@@ -30,7 +30,7 @@ export const config: IFieldConfig = {
   requireConfiguration: true,
   description: "Percentage stored as a number between 0 and 1.",
   contextMenuActions: BasicContextMenuActions,
-  TableCell: withTableCell(DisplayCell, EditorCell),
+  TableCell: withRenderTableCell(DisplayCell, EditorCell),
   SideDrawerField,
   settings: Settings,
   filter: {
diff --git a/src/components/fields/Phone/EditorCell.tsx b/src/components/fields/Phone/EditorCell.tsx
index 825fd00f..4db1bf0c 100644
--- a/src/components/fields/Phone/EditorCell.tsx
+++ b/src/components/fields/Phone/EditorCell.tsx
@@ -1,5 +1,5 @@
 import type { IEditorCellProps } from "@src/components/fields/types";
-import EditorCellTextField from "@src/components/Table/EditorCellTextField";
+import EditorCellTextField from "@src/components/Table/TableCell/EditorCellTextField";
 
 export default function Phone(props: IEditorCellProps<string>) {
   return <EditorCellTextField {...props} InputProps={{ type: "tel" }} />;
diff --git a/src/components/fields/Phone/index.tsx b/src/components/fields/Phone/index.tsx
index ec8792a6..0d72c31a 100644
--- a/src/components/fields/Phone/index.tsx
+++ b/src/components/fields/Phone/index.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withTableCell from "@src/components/Table/withTableCell";
+import withRenderTableCell from "@src/components/Table/TableCell/withRenderTableCell";
 
 import PhoneIcon from "@mui/icons-material/PhoneOutlined";
 import DisplayCell from "@src/components/fields/ShortText/DisplayCell";
@@ -23,7 +23,7 @@ export const config: IFieldConfig = {
   icon: <PhoneIcon />,
   description: "Phone number stored as text. Not validated.",
   contextMenuActions: BasicContextMenuActions,
-  TableCell: withTableCell(DisplayCell, EditorCell),
+  TableCell: withRenderTableCell(DisplayCell, EditorCell),
   SideDrawerField,
   filter: {
     operators: filterOperators,
diff --git a/src/components/fields/Rating/index.tsx b/src/components/fields/Rating/index.tsx
index eac10ed3..3712ffe7 100644
--- a/src/components/fields/Rating/index.tsx
+++ b/src/components/fields/Rating/index.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withTableCell from "@src/components/Table/withTableCell";
+import withRenderTableCell from "@src/components/Table/TableCell/withRenderTableCell";
 
 import RatingIcon from "@mui/icons-material/StarBorder";
 import DisplayCell from "./DisplayCell";
@@ -26,7 +26,7 @@ export const config: IFieldConfig = {
   requireConfiguration: true,
   description:
     "Rating displayed as stars. Max stars is configurable, default: 5 stars.",
-  TableCell: withTableCell(DisplayCell, EditorCell, "inline"),
+  TableCell: withRenderTableCell(DisplayCell, EditorCell, "inline"),
   settings: Settings,
   SideDrawerField,
   filter: {
diff --git a/src/components/fields/Reference/EditorCell.tsx b/src/components/fields/Reference/EditorCell.tsx
index 27232cff..07115fb8 100644
--- a/src/components/fields/Reference/EditorCell.tsx
+++ b/src/components/fields/Reference/EditorCell.tsx
@@ -3,7 +3,7 @@ import { useAtom } from "jotai";
 import { doc, deleteField } from "firebase/firestore";
 
 import type { IEditorCellProps } from "@src/components/fields/types";
-import EditorCellTextField from "@src/components/Table/EditorCellTextField";
+import EditorCellTextField from "@src/components/Table/TableCell/EditorCellTextField";
 
 import { InputAdornment, Tooltip } from "@mui/material";
 import ErrorIcon from "@mui/icons-material/ErrorOutline";
diff --git a/src/components/fields/Reference/index.tsx b/src/components/fields/Reference/index.tsx
index fcf0345d..c4fdce52 100644
--- a/src/components/fields/Reference/index.tsx
+++ b/src/components/fields/Reference/index.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withTableCell from "@src/components/Table/withTableCell";
+import withRenderTableCell from "@src/components/Table/TableCell/withRenderTableCell";
 
 import { Reference } from "@src/assets/icons";
 import DisplayCell from "./DisplayCell";
@@ -23,7 +23,7 @@ export const config: IFieldConfig = {
   initializable: true,
   icon: <Reference />,
   description: "Firestore document reference",
-  TableCell: withTableCell(DisplayCell, EditorCell, "focus", {
+  TableCell: withRenderTableCell(DisplayCell, EditorCell, "focus", {
     disablePadding: true,
   }),
   SideDrawerField,
diff --git a/src/components/fields/RichText/index.tsx b/src/components/fields/RichText/index.tsx
index bd53d610..c9c1ddbe 100644
--- a/src/components/fields/RichText/index.tsx
+++ b/src/components/fields/RichText/index.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withTableCell from "@src/components/Table/withTableCell";
+import withRenderTableCell from "@src/components/Table/TableCell/withRenderTableCell";
 
 import RichTextIcon from "@mui/icons-material/TextFormat";
 import DisplayCell from "./DisplayCell";
@@ -23,7 +23,7 @@ export const config: IFieldConfig = {
   icon: <RichTextIcon />,
   description: "HTML edited with a rich text editor.",
   contextMenuActions: BasicContextMenuActions,
-  TableCell: withTableCell(DisplayCell, SideDrawerField, "popover"),
+  TableCell: withRenderTableCell(DisplayCell, SideDrawerField, "popover"),
   SideDrawerField,
 };
 export default config;
diff --git a/src/components/fields/ShortText/EditorCell.tsx b/src/components/fields/ShortText/EditorCell.tsx
index 0e34e5a8..123d7892 100644
--- a/src/components/fields/ShortText/EditorCell.tsx
+++ b/src/components/fields/ShortText/EditorCell.tsx
@@ -1,5 +1,5 @@
 import type { IEditorCellProps } from "@src/components/fields/types";
-import EditorCellTextField from "@src/components/Table/EditorCellTextField";
+import EditorCellTextField from "@src/components/Table/TableCell/EditorCellTextField";
 
 export default function ShortText(props: IEditorCellProps<string>) {
   return <EditorCellTextField {...props} />;
diff --git a/src/components/fields/ShortText/index.tsx b/src/components/fields/ShortText/index.tsx
index 0160a64a..1288f9bb 100644
--- a/src/components/fields/ShortText/index.tsx
+++ b/src/components/fields/ShortText/index.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withTableCell from "@src/components/Table/withTableCell";
+import withRenderTableCell from "@src/components/Table/TableCell/withRenderTableCell";
 
 import ShortTextIcon from "@mui/icons-material/ShortText";
 import DisplayCell from "@src/components/fields/ShortText/DisplayCell";
@@ -30,7 +30,7 @@ export const config: IFieldConfig = {
   icon: <ShortTextIcon />,
   description: "Text displayed on a single line.",
   contextMenuActions: BasicContextMenuActions,
-  TableCell: withTableCell(DisplayCell, EditorCell),
+  TableCell: withRenderTableCell(DisplayCell, EditorCell),
   SideDrawerField,
   settings: Settings,
   filter: {
diff --git a/src/components/fields/SingleSelect/index.tsx b/src/components/fields/SingleSelect/index.tsx
index 187be997..83a23e3e 100644
--- a/src/components/fields/SingleSelect/index.tsx
+++ b/src/components/fields/SingleSelect/index.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withTableCell from "@src/components/Table/withTableCell";
+import withRenderTableCell from "@src/components/Table/TableCell/withRenderTableCell";
 
 import { SingleSelect as SingleSelectIcon } from "@src/assets/icons";
 import DisplayCell from "./DisplayCell";
@@ -27,7 +27,7 @@ export const config: IFieldConfig = {
   icon: <SingleSelectIcon />,
   description:
     "Single value from predefined options. Options are searchable and users can optionally input custom values.",
-  TableCell: withTableCell(DisplayCell, EditorCell, "popover", {
+  TableCell: withRenderTableCell(DisplayCell, EditorCell, "popover", {
     disablePadding: true,
     transparentPopover: true,
   }),
diff --git a/src/components/fields/Slider/index.tsx b/src/components/fields/Slider/index.tsx
index 6d21dc9d..06f7bce0 100644
--- a/src/components/fields/Slider/index.tsx
+++ b/src/components/fields/Slider/index.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withTableCell from "@src/components/Table/withTableCell";
+import withRenderTableCell from "@src/components/Table/TableCell/withRenderTableCell";
 
 import { Slider as SliderIcon } from "@src/assets/icons";
 import DisplayCell from "./DisplayCell";
@@ -24,7 +24,7 @@ export const config: IFieldConfig = {
   icon: <SliderIcon />,
   requireConfiguration: true,
   description: "Numeric value edited with a Slider. Range is configurable.",
-  TableCell: withTableCell(DisplayCell, SideDrawerField, "popover", {
+  TableCell: withRenderTableCell(DisplayCell, SideDrawerField, "popover", {
     popoverProps: { PaperProps: { sx: { p: 1, pt: 5 } } },
   }),
   settings: Settings,
diff --git a/src/components/fields/Status/index.tsx b/src/components/fields/Status/index.tsx
index d4d0e978..420a5e11 100644
--- a/src/components/fields/Status/index.tsx
+++ b/src/components/fields/Status/index.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withTableCell from "@src/components/Table/withTableCell";
+import withRenderTableCell from "@src/components/Table/TableCell/withRenderTableCell";
 
 import { Status as StatusIcon } from "@src/assets/icons";
 import DisplayCell from "./DisplayCell";
@@ -24,7 +24,7 @@ export const config: IFieldConfig = {
   initializable: true,
   icon: <StatusIcon />,
   description: "Displays field value as custom status text.",
-  TableCell: withTableCell(DisplayCell, EditorCell, "popover", {
+  TableCell: withRenderTableCell(DisplayCell, EditorCell, "popover", {
     disablePadding: true,
     transparentPopover: true,
   }),
diff --git a/src/components/fields/SubTable/index.tsx b/src/components/fields/SubTable/index.tsx
index 84df815d..7e153771 100644
--- a/src/components/fields/SubTable/index.tsx
+++ b/src/components/fields/SubTable/index.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withTableCell from "@src/components/Table/withTableCell";
+import withRenderTableCell from "@src/components/Table/TableCell/withRenderTableCell";
 
 import { SubTable as SubTableIcon } from "@src/assets/icons";
 import DisplayCell from "./DisplayCell";
@@ -24,7 +24,7 @@ export const config: IFieldConfig = {
   settings: Settings,
   description:
     "Connects to a sub-table in the current row. Also displays number of rows inside the sub-table. Max sub-table depth: 100.",
-  TableCell: withTableCell(DisplayCell, null, "focus", {
+  TableCell: withRenderTableCell(DisplayCell, null, "focus", {
     usesRowData: true,
     disablePadding: true,
   }),
diff --git a/src/components/fields/UpdatedAt/index.tsx b/src/components/fields/UpdatedAt/index.tsx
index 9b7476eb..d6e5eb92 100644
--- a/src/components/fields/UpdatedAt/index.tsx
+++ b/src/components/fields/UpdatedAt/index.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withTableCell from "@src/components/Table/withTableCell";
+import withRenderTableCell from "@src/components/Table/TableCell/withRenderTableCell";
 
 import { UpdatedAt as UpdatedAtIcon } from "@src/assets/icons";
 import DisplayCell from "./DisplayCell";
@@ -25,7 +25,7 @@ export const config: IFieldConfig = {
   icon: <UpdatedAtIcon />,
   description:
     "Displays the timestamp of the last update to the row. Read-only.",
-  TableCell: withTableCell(DisplayCell, null),
+  TableCell: withRenderTableCell(DisplayCell, null),
   SideDrawerField,
   settings: Settings,
 };
diff --git a/src/components/fields/UpdatedBy/index.tsx b/src/components/fields/UpdatedBy/index.tsx
index 5ddfb877..4b1c3a42 100644
--- a/src/components/fields/UpdatedBy/index.tsx
+++ b/src/components/fields/UpdatedBy/index.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withTableCell from "@src/components/Table/withTableCell";
+import withRenderTableCell from "@src/components/Table/TableCell/withRenderTableCell";
 
 import { UpdatedBy as UpdatedByIcon } from "@src/assets/icons";
 import DisplayCell from "./DisplayCell";
@@ -26,7 +26,7 @@ export const config: IFieldConfig = {
   icon: <UpdatedByIcon />,
   description:
     "Displays the user that last updated the row, timestamp, and updated field key. Read-only.",
-  TableCell: withTableCell(DisplayCell, null),
+  TableCell: withRenderTableCell(DisplayCell, null),
   SideDrawerField,
   settings: Settings,
 };
diff --git a/src/components/fields/Url/EditorCell.tsx b/src/components/fields/Url/EditorCell.tsx
index 6f39d2d9..d22c4880 100644
--- a/src/components/fields/Url/EditorCell.tsx
+++ b/src/components/fields/Url/EditorCell.tsx
@@ -1,5 +1,5 @@
 import type { IEditorCellProps } from "@src/components/fields/types";
-import EditorCellTextField from "@src/components/Table/EditorCellTextField";
+import EditorCellTextField from "@src/components/Table/TableCell/EditorCellTextField";
 
 export default function Url(props: IEditorCellProps<string>) {
   return <EditorCellTextField {...props} InputProps={{ type: "url" }} />;
diff --git a/src/components/fields/Url/index.tsx b/src/components/fields/Url/index.tsx
index 612423d0..be276388 100644
--- a/src/components/fields/Url/index.tsx
+++ b/src/components/fields/Url/index.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withTableCell from "@src/components/Table/withTableCell";
+import withRenderTableCell from "@src/components/Table/TableCell/withRenderTableCell";
 
 import UrlIcon from "@mui/icons-material/Link";
 import DisplayCell from "./DisplayCell";
@@ -23,7 +23,7 @@ export const config: IFieldConfig = {
   icon: <UrlIcon />,
   description: "Web address. Not validated.",
   contextMenuActions: BasicContextMenuActions,
-  TableCell: withTableCell(DisplayCell, EditorCell, "focus", {
+  TableCell: withRenderTableCell(DisplayCell, EditorCell, "focus", {
     disablePadding: true,
   }),
   SideDrawerField,
diff --git a/src/components/fields/User/index.tsx b/src/components/fields/User/index.tsx
index 29f996d8..b06680df 100644
--- a/src/components/fields/User/index.tsx
+++ b/src/components/fields/User/index.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { IFieldConfig, FieldType } from "@src/components/fields/types";
-import withTableCell from "@src/components/Table/withTableCell";
+import withRenderTableCell from "@src/components/Table/TableCell/withRenderTableCell";
 
 import UserIcon from "@mui/icons-material/PersonOutlined";
 import DisplayCell from "./DisplayCell";
@@ -23,7 +23,7 @@ export const config: IFieldConfig = {
   initialValue: null,
   icon: <UserIcon />,
   description: "User information and optionally, timestamp. Read-only.",
-  TableCell: withTableCell(DisplayCell, null),
+  TableCell: withRenderTableCell(DisplayCell, null),
   SideDrawerField,
   settings: Settings,
 };
diff --git a/src/components/fields/types.ts b/src/components/fields/types.ts
index e4084365..b43b6d82 100644
--- a/src/components/fields/types.ts
+++ b/src/components/fields/types.ts
@@ -1,5 +1,5 @@
 import { FieldType } from "@src/constants/fields";
-import type { ITableCellProps } from "@src/components/Table/withTableCell";
+import type { IRenderedTableCellProps } from "@src/components/Table/TableCell/withRenderTableCell";
 import type { PopoverProps } from "@mui/material";
 import type {
   ColumnConfig,
@@ -27,7 +27,7 @@ export interface IFieldConfig {
     selectedCell: SelectedCell,
     reset: () => void
   ) => IContextMenuItem[];
-  TableCell: React.ComponentType<ITableCellProps>;
+  TableCell: React.ComponentType<IRenderedTableCellProps>;
   SideDrawerField: React.ComponentType<ISideDrawerFieldProps>;
   settings?: React.ComponentType<ISettingsProps>;
   settingsValidator?: (config: Record<string, any>) => Record<string, string>;
diff --git a/src/constants/routes.tsx b/src/constants/routes.tsx
index 4b59b687..af23e2cd 100644
--- a/src/constants/routes.tsx
+++ b/src/constants/routes.tsx
@@ -1,5 +1,5 @@
 import Logo from "@src/assets/Logo";
-import BreadcrumbsTableRoot from "@src/components/Table/BreadcrumbsTableRoot";
+import BreadcrumbsTableRoot from "@src/components/Table/Breadcrumbs/BreadcrumbsTableRoot";
 import { FadeProps, Typography } from "@mui/material";
 
 export enum ROUTES {
diff --git a/src/pages/Table/ProvidedSubTablePage.tsx b/src/pages/Table/ProvidedSubTablePage.tsx
index 58380d27..0769d445 100644
--- a/src/pages/Table/ProvidedSubTablePage.tsx
+++ b/src/pages/Table/ProvidedSubTablePage.tsx
@@ -7,7 +7,7 @@ import { useLocation, useNavigate, useParams } from "react-router-dom";
 import { find, isEqual } from "lodash-es";
 
 import Modal from "@src/components/Modal";
-import BreadcrumbsSubTable from "@src/components/Table/BreadcrumbsSubTable";
+import BreadcrumbsSubTable from "@src/components/Table/Breadcrumbs/BreadcrumbsSubTable";
 import ErrorFallback from "@src/components/ErrorFallback";
 import TableSourceFirestore from "@src/sources/TableSourceFirestore";
 import TableToolbarSkeleton from "@src/components/TableToolbar/TableToolbarSkeleton";

From 86b2004215043652f2e8918996a01583f11b554e Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Fri, 18 Nov 2022 14:27:08 +1100
Subject: [PATCH 279/309] fix disabled cell styles

---
 .../Table/TableCell/EditorCellTextField.tsx     |  3 ++-
 .../Table/TableCell/withRenderTableCell.tsx     |  2 +-
 src/components/fields/Action/DisplayCell.tsx    | 17 ++++++++++++++++-
 src/components/fields/Checkbox/DisplayCell.tsx  | 13 ++++++++++++-
 src/components/fields/Code/DisplayCell.tsx      |  2 +-
 src/components/fields/File/DisplayCell.tsx      | 12 +++++++-----
 src/components/fields/File/EditorCell.tsx       | 12 +++++++-----
 src/components/fields/Json/DisplayCell.tsx      |  2 +-
 src/components/fields/LongText/DisplayCell.tsx  |  2 +-
 src/components/fields/Status/DisplayCell.tsx    |  1 +
 10 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/src/components/Table/TableCell/EditorCellTextField.tsx b/src/components/Table/TableCell/EditorCellTextField.tsx
index 3d89d8be..1f3cb155 100644
--- a/src/components/Table/TableCell/EditorCellTextField.tsx
+++ b/src/components/Table/TableCell/EditorCellTextField.tsx
@@ -55,6 +55,7 @@ export default function EditorCellTextField({
           width: "100%",
           height: "calc(100% - 1px)",
           marginTop: "1px",
+          padding: 0,
           paddingBottom: "1px",
 
           backgroundColor: "var(--cell-background-color)",
@@ -70,7 +71,7 @@ export default function EditorCellTextField({
             lineHeight: (theme) => theme.typography.body2.lineHeight,
             maxHeight: "100%",
             boxSizing: "border-box",
-            py: 3 / 8,
+            py: 2 / 8,
           },
         },
         ...spreadSx(InputProps.sx),
diff --git a/src/components/Table/TableCell/withRenderTableCell.tsx b/src/components/Table/TableCell/withRenderTableCell.tsx
index 3a4d2d5f..a8f10f83 100644
--- a/src/components/Table/TableCell/withRenderTableCell.tsx
+++ b/src/components/Table/TableCell/withRenderTableCell.tsx
@@ -111,7 +111,7 @@ export default function withTableCell(
         row: row.original,
         column: column.columnDef.meta!,
         _rowy_ref: row.original._rowy_ref,
-        disabled: column.columnDef.meta!.editable === false,
+        disabled,
         tabIndex: focusInsideCell ? 0 : -1,
         showPopoverCell,
         setFocusInsideCell,
diff --git a/src/components/fields/Action/DisplayCell.tsx b/src/components/fields/Action/DisplayCell.tsx
index 78871401..264f55be 100644
--- a/src/components/fields/Action/DisplayCell.tsx
+++ b/src/components/fields/Action/DisplayCell.tsx
@@ -1,5 +1,6 @@
 import { IDisplayCellProps } from "@src/components/fields/types";
 import { get } from "lodash-es";
+import { sanitiseCallableName, isUrl } from "./utils";
 
 export const getActionName = (column: IDisplayCellProps["column"]) => {
   const config = get(column, "config");
@@ -10,5 +11,19 @@ export const getActionName = (column: IDisplayCellProps["column"]) => {
 };
 
 export default function Action({ value, column }: IDisplayCellProps) {
-  return <>{value ? value.status : getActionName(column)}</>;
+  const hasRan = value && ![null, undefined].includes(value.status);
+
+  return (
+    <div style={{ padding: "0 var(--cell-padding)" }}>
+      {hasRan && isUrl(value.status) ? (
+        <a href={value.status} target="_blank" rel="noopener noreferrer">
+          {value.status}
+        </a>
+      ) : hasRan ? (
+        value.status
+      ) : (
+        sanitiseCallableName(getActionName(column))
+      )}
+    </div>
+  );
 }
diff --git a/src/components/fields/Checkbox/DisplayCell.tsx b/src/components/fields/Checkbox/DisplayCell.tsx
index 67943586..65af2709 100644
--- a/src/components/fields/Checkbox/DisplayCell.tsx
+++ b/src/components/fields/Checkbox/DisplayCell.tsx
@@ -6,7 +6,16 @@ export default function Checkbox({ column, value }: IDisplayCellProps) {
   return (
     <FormControlLabel
       control={
-        <Switch checked={!!value} disabled color="success" tabIndex={-1} />
+        <Switch
+          checked={!!value}
+          color="success"
+          tabIndex={-1}
+          readOnly
+          sx={{
+            pointerEvents: "none",
+            "& .MuiSwitch-thumb:active": { transform: "none" },
+          }}
+        />
       }
       label={column.name as string}
       labelPlacement="start"
@@ -15,6 +24,8 @@ export default function Checkbox({ column, value }: IDisplayCellProps) {
         width: "100%",
         alignItems: "center",
 
+        cursor: "default",
+
         "& .MuiFormControlLabel-label": {
           font: "inherit",
           letterSpacing: "inherit",
diff --git a/src/components/fields/Code/DisplayCell.tsx b/src/components/fields/Code/DisplayCell.tsx
index 215266f2..dc9b5bd1 100644
--- a/src/components/fields/Code/DisplayCell.tsx
+++ b/src/components/fields/Code/DisplayCell.tsx
@@ -12,7 +12,7 @@ export default function Code({ value }: IDisplayCellProps) {
       style={{
         width: "100%",
         maxHeight: "100%",
-        padding: theme.spacing(1, 0),
+        padding: "3px 0",
 
         whiteSpace: "pre-wrap",
         lineHeight: theme.typography.body2.lineHeight,
diff --git a/src/components/fields/File/DisplayCell.tsx b/src/components/fields/File/DisplayCell.tsx
index 36d82d64..f92d21e6 100644
--- a/src/components/fields/File/DisplayCell.tsx
+++ b/src/components/fields/File/DisplayCell.tsx
@@ -26,11 +26,13 @@ export default function File_({
             <Chip
               icon={<FileIcon />}
               label={file.name}
-              onClick={(e) => {
-                window.open(file.downloadURL);
-                e.stopPropagation();
-              }}
-              style={{ width: "100%" }}
+              onClick={(e: any) => e.stopPropagation()}
+              component="a"
+              href={file.downloadURL}
+              target="_blank"
+              rel="noopener noreferrer"
+              clickable
+              style={{ width: "100%", cursor: "pointer" }}
               tabIndex={tabIndex}
             />
           </Grid>
diff --git a/src/components/fields/File/EditorCell.tsx b/src/components/fields/File/EditorCell.tsx
index c738f9d4..adcea801 100644
--- a/src/components/fields/File/EditorCell.tsx
+++ b/src/components/fields/File/EditorCell.tsx
@@ -117,10 +117,12 @@ export default function File_({
                 <Chip
                   icon={<FileIcon />}
                   label={file.name}
-                  onClick={(e) => {
-                    window.open(file.downloadURL);
-                    e.stopPropagation();
-                  }}
+                  onClick={(e: any) => e.stopPropagation()}
+                  component="a"
+                  href={file.downloadURL}
+                  target="_blank"
+                  rel="noopener noreferrer"
+                  clickable
                   onDelete={
                     disabled
                       ? undefined
@@ -134,7 +136,7 @@ export default function File_({
                           })
                   }
                   tabIndex={tabIndex}
-                  style={{ width: "100%" }}
+                  style={{ width: "100%", cursor: "pointer" }}
                 />
               </Tooltip>
             </Grid>
diff --git a/src/components/fields/Json/DisplayCell.tsx b/src/components/fields/Json/DisplayCell.tsx
index 82a1eea1..bc97afa0 100644
--- a/src/components/fields/Json/DisplayCell.tsx
+++ b/src/components/fields/Json/DisplayCell.tsx
@@ -15,7 +15,7 @@ export default function Json({ value }: IDisplayCellProps) {
       style={{
         width: "100%",
         maxHeight: "100%",
-        padding: theme.spacing(1, 0),
+        padding: "3px 0",
 
         whiteSpace: "pre-wrap",
         lineHeight: theme.typography.body2.lineHeight,
diff --git a/src/components/fields/LongText/DisplayCell.tsx b/src/components/fields/LongText/DisplayCell.tsx
index 1e8e0fc2..cc285625 100644
--- a/src/components/fields/LongText/DisplayCell.tsx
+++ b/src/components/fields/LongText/DisplayCell.tsx
@@ -9,7 +9,7 @@ export default function LongText({ value }: IDisplayCellProps) {
     <div
       style={{
         maxHeight: "100%",
-        padding: theme.spacing(1, 0),
+        padding: "3px 0",
 
         whiteSpace: "pre-line",
         lineHeight: theme.typography.body2.lineHeight,
diff --git a/src/components/fields/Status/DisplayCell.tsx b/src/components/fields/Status/DisplayCell.tsx
index 9717a19c..34e8dc7b 100644
--- a/src/components/fields/Status/DisplayCell.tsx
+++ b/src/components/fields/Status/DisplayCell.tsx
@@ -41,6 +41,7 @@ export const StatusSingleSelect = forwardRef(function StatusSingleSelect({
           paddingLeft: "var(--cell-padding)",
         }}
       >
+        {value}
         {getLabel(value, sortedConditions)}
       </div>
     );

From c6b10d337897c7c7b89797d8dbf52ddab8e02803 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Fri, 18 Nov 2022 14:27:23 +1100
Subject: [PATCH 280/309] fix sub-table opening appearing to crash the page

---
 src/App.tsx                              | 17 ++++++++++++++++-
 src/pages/Table/ProvidedSubTablePage.tsx |  1 +
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/App.tsx b/src/App.tsx
index 79162f2d..ea283a01 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -2,6 +2,7 @@ import { lazy, Suspense } from "react";
 import { Routes, Route, Navigate } from "react-router-dom";
 import { useAtom } from "jotai";
 
+import { Backdrop } from "@mui/material";
 import Loading from "@src/components/Loading";
 import ProjectSourceFirebase from "@src/sources/ProjectSourceFirebase";
 import MembersSourceFirebase from "@src/sources/MembersSourceFirebase";
@@ -116,7 +117,21 @@ export default function App() {
                   <Route index element={<NotFound />} />
                   <Route
                     path=":docPath/:subTableKey"
-                    element={<ProvidedSubTablePage />}
+                    element={
+                      <Suspense
+                        fallback={
+                          <Backdrop
+                            key="sub-table-modal-backdrop"
+                            open
+                            sx={{ zIndex: "modal" }}
+                          >
+                            <Loading />
+                          </Backdrop>
+                        }
+                      >
+                        <ProvidedSubTablePage />
+                      </Suspense>
+                    }
                   />
                 </Route>
               </Route>
diff --git a/src/pages/Table/ProvidedSubTablePage.tsx b/src/pages/Table/ProvidedSubTablePage.tsx
index 0769d445..860748c2 100644
--- a/src/pages/Table/ProvidedSubTablePage.tsx
+++ b/src/pages/Table/ProvidedSubTablePage.tsx
@@ -110,6 +110,7 @@ export default function ProvidedSubTablePage() {
         disableBottomDivider: true,
         style: { "--dialog-spacing": 0, "--dialog-contents-spacing": 0 } as any,
       }}
+      BackdropProps={{ key: "sub-table-modal-backdrop" }}
     >
       <ErrorBoundary FallbackComponent={ErrorFallback}>
         <Suspense

From be953da123cfd7edf0a3fe026a77919d351ec2f7 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Fri, 18 Nov 2022 16:53:45 +1100
Subject: [PATCH 281/309] ColumnMenu: get user permissions as props instead of
 checking userRolesAtom

---
 src/components/ColumnMenu/ColumnMenu.tsx | 21 +++++++++++++++++----
 src/pages/Table/TablePage.tsx            | 16 +++++++++++-----
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/components/ColumnMenu/ColumnMenu.tsx b/src/components/ColumnMenu/ColumnMenu.tsx
index 72b1b765..cf025217 100644
--- a/src/components/ColumnMenu/ColumnMenu.tsx
+++ b/src/components/ColumnMenu/ColumnMenu.tsx
@@ -33,7 +33,6 @@ import ColumnHeader from "@src/components/Table/Mock/Column";
 
 import {
   projectScope,
-  userRolesAtom,
   userSettingsAtom,
   updateUserSettingsAtom,
   confirmDialogAtom,
@@ -80,8 +79,17 @@ export interface IMenuModalProps {
   ) => void;
 }
 
-export default function ColumnMenu() {
-  const [userRoles] = useAtom(userRolesAtom, projectScope);
+export interface IColumnMenuProps {
+  canAddColumns: boolean;
+  canEditColumns: boolean;
+  canDeleteColumns: boolean;
+}
+
+export default function ColumnMenu({
+  canAddColumns,
+  canEditColumns,
+  canDeleteColumns,
+}: IColumnMenuProps) {
   const [userSettings] = useAtom(userSettingsAtom, projectScope);
   const [updateUserSettings] = useAtom(updateUserSettingsAtom, projectScope);
   const confirm = useSetAtom(confirmDialogAtom, projectScope);
@@ -387,6 +395,7 @@ export default function ColumnMenu() {
         openColumnModal({ type: "new", index: column.index - 1 });
         handleClose();
       },
+      disabled: !canAddColumns,
     },
     {
       label: "Insert to the right…",
@@ -396,6 +405,7 @@ export default function ColumnMenu() {
         openColumnModal({ type: "new", index: column.index + 1 });
         handleClose();
       },
+      disabled: !canAddColumns,
     },
     {
       label: `Delete column${altPress ? "" : "…"}`,
@@ -450,16 +460,19 @@ export default function ColumnMenu() {
             });
           },
       color: "error" as "error",
+      disabled: !canDeleteColumns,
     },
   ];
 
   let menuItems = [...localViewActions];
 
-  if (userRoles.includes("ADMIN") || userRoles.includes("OPS")) {
+  if (canEditColumns) {
     menuItems.push.apply(menuItems, configActions);
     if (column.type === FieldType.derivative) {
       menuItems.push.apply(menuItems, derivativeActions);
     }
+  }
+  if (canAddColumns || canDeleteColumns) {
     menuItems.push.apply(menuItems, columnActions);
   }
 
diff --git a/src/pages/Table/TablePage.tsx b/src/pages/Table/TablePage.tsx
index 5959376e..3dce7445 100644
--- a/src/pages/Table/TablePage.tsx
+++ b/src/pages/Table/TablePage.tsx
@@ -67,10 +67,12 @@ export default function TablePage({
   const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
   const snackLogContext = useSnackLogContext();
 
-  // Set permissions here so we can pass them to the Table component, which
-  // shouldn’t access projectScope at all, to separate concerns.
-  const canAddColumns = userRoles.includes("ADMIN");
-  const canEditColumns = userRoles.includes("ADMIN");
+  // Set permissions here so we can pass them to the `Table` component, which
+  // shouldn’t access `projectScope` at all, to separate concerns.
+  const canAddColumns =
+    userRoles.includes("ADMIN") || userRoles.includes("OPS");
+  const canEditColumns = canAddColumns;
+  const canDeleteColumns = canAddColumns;
   const canEditCells =
     userRoles.includes("ADMIN") ||
     (!tableSettings.readOnly &&
@@ -170,7 +172,11 @@ export default function TablePage({
       {!disableModals && (
         <ErrorBoundary FallbackComponent={InlineErrorFallback}>
           <Suspense fallback={null}>
-            <ColumnMenu />
+            <ColumnMenu
+              canAddColumns={canAddColumns}
+              canEditColumns={canEditColumns}
+              canDeleteColumns={canDeleteColumns}
+            />
             <ColumnModals />
           </Suspense>
         </ErrorBoundary>

From edb70164cf6b1639f9db96da9c029cd0cb853c7f Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Fri, 18 Nov 2022 17:31:03 +1100
Subject: [PATCH 282/309] add code comments & explanations

---
 .../Table/ColumnHeader/ColumnHeader.tsx       |  71 +++------
 .../Table/ColumnHeader/ColumnHeaderSort.tsx   |   4 +
 .../Table/Styled/StyledColumnHeader.tsx       |  58 +++++++
 src/components/Table/Styled/StyledDot.tsx     |  22 +++
 src/components/Table/Table.tsx                |  33 +++-
 src/components/Table/TableBody.tsx            |  21 ++-
 .../Table/TableCell/EditorCellController.tsx  |  90 +++++++++++
 src/components/Table/TableCell/TableCell.tsx  |  58 ++++---
 .../Table/TableCell/withRenderTableCell.tsx   | 145 ++++++++----------
 src/components/Table/TableHeader.tsx          |  16 +-
 src/components/Table/useSaveColumnSizing.tsx  |   3 +-
 src/components/fields/types.ts                |   6 +
 src/pages/Table/ProvidedSubTablePage.tsx      |   7 +-
 src/pages/Table/ProvidedTablePage.tsx         |   7 +
 src/pages/Table/TablePage.tsx                 |  14 +-
 15 files changed, 380 insertions(+), 175 deletions(-)
 create mode 100644 src/components/Table/Styled/StyledColumnHeader.tsx
 create mode 100644 src/components/Table/Styled/StyledDot.tsx
 create mode 100644 src/components/Table/TableCell/EditorCellController.tsx

diff --git a/src/components/Table/ColumnHeader/ColumnHeader.tsx b/src/components/Table/ColumnHeader/ColumnHeader.tsx
index 84239a40..40e5c5a1 100644
--- a/src/components/Table/ColumnHeader/ColumnHeader.tsx
+++ b/src/components/Table/ColumnHeader/ColumnHeader.tsx
@@ -7,12 +7,8 @@ import type {
 } from "react-beautiful-dnd";
 
 import {
-  styled,
   Tooltip,
-  TooltipProps,
-  tooltipClasses,
   Fade,
-  Stack,
   StackProps,
   IconButton,
   Typography,
@@ -20,6 +16,10 @@ import {
 import DropdownIcon from "@mui/icons-material/MoreHoriz";
 import LockIcon from "@mui/icons-material/LockOutlined";
 
+import {
+  StyledColumnHeader,
+  StyledColumnHeaderNameTooltip,
+} from "@src/components/Table/Styled/StyledColumnHeader";
 import ColumnHeaderSort, { SORT_STATES } from "./ColumnHeaderSort";
 import ColumnHeaderDragHandle from "./ColumnHeaderDragHandle";
 import ColumnHeaderResizer from "./ColumnHeaderResizer";
@@ -39,53 +39,6 @@ import type { TableRow } from "@src/types/table";
 
 export { COLUMN_HEADER_HEIGHT };
 
-const StyledColumnHeader = styled(Stack)(({ theme }) => ({
-  position: "relative",
-  height: "100%",
-  border: `1px solid ${theme.palette.divider}`,
-  "& + &": { borderLeftStyle: "none" },
-
-  flexDirection: "row",
-  alignItems: "center",
-  padding: theme.spacing(0, 0.5, 0, 1),
-  "& svg, & button": { display: "block", zIndex: 1 },
-
-  backgroundColor: theme.palette.background.default,
-  color: theme.palette.text.secondary,
-  transition: theme.transitions.create("color", {
-    duration: theme.transitions.duration.short,
-  }),
-  "&:hover": { color: theme.palette.text.primary },
-
-  "& .MuiIconButton-root": {
-    color: theme.palette.text.disabled,
-    transition: theme.transitions.create(
-      ["background-color", "opacity", "color"],
-      { duration: theme.transitions.duration.short }
-    ),
-  },
-  [`&:hover .MuiIconButton-root,
-    &:focus .MuiIconButton-root,
-    &:focus-within .MuiIconButton-root,
-    .MuiIconButton-root:focus`]: {
-    color: theme.palette.text.primary,
-    opacity: 1,
-  },
-}));
-
-const LightTooltip = styled(({ className, ...props }: TooltipProps) => (
-  <Tooltip {...props} classes={{ popper: className }} />
-))(({ theme }) => ({
-  [`& .${tooltipClasses.tooltip}`]: {
-    backgroundColor: theme.palette.background.default,
-    color: theme.palette.text.primary,
-
-    margin: `-${COLUMN_HEADER_HEIGHT - 1 - 2}px 0 0 !important`,
-    padding: 0,
-    paddingRight: theme.spacing(1.5),
-  },
-}));
-
 export interface IColumnHeaderProps
   extends Partial<Omit<StackProps, "style" | "sx">> {
   header: Header<TableRow, any>;
@@ -101,6 +54,18 @@ export interface IColumnHeaderProps
   isLastFrozen: boolean;
 }
 
+/**
+ * Renders UI components for each column header, including accessibility
+ * attributes. Memoized to prevent re-render when resizing or reordering other
+ * columns.
+ *
+ * Renders:
+ * - Drag handle (accessible)
+ * - Field type icon + click to copy field key
+ * - Field name + hover to view full name if cut off
+ * - Sort button
+ * - Resize handle (not accessible)
+ */
 export const ColumnHeader = memo(function ColumnHeader({
   header,
   column,
@@ -214,7 +179,7 @@ export const ColumnHeader = memo(function ColumnHeader({
         </Tooltip>
       )}
 
-      <LightTooltip
+      <StyledColumnHeaderNameTooltip
         title={
           <Typography
             sx={{
@@ -261,7 +226,7 @@ export const ColumnHeader = memo(function ColumnHeader({
             column.name
           )}
         </Typography>
-      </LightTooltip>
+      </StyledColumnHeaderNameTooltip>
 
       {column.type !== FieldType.id && (
         <ColumnHeaderSort
diff --git a/src/components/Table/ColumnHeader/ColumnHeaderSort.tsx b/src/components/Table/ColumnHeader/ColumnHeaderSort.tsx
index 0a5bc049..b9d1f6ac 100644
--- a/src/components/Table/ColumnHeader/ColumnHeaderSort.tsx
+++ b/src/components/Table/ColumnHeader/ColumnHeaderSort.tsx
@@ -18,6 +18,10 @@ export interface IColumnHeaderSortProps {
   tabIndex?: number;
 }
 
+/**
+ * Renders button with current sort state.
+ * On click, updates `tableSortsAtom` in `tableScope`.
+ */
 export const ColumnHeaderSort = memo(function ColumnHeaderSort({
   sortKey,
   currentSort,
diff --git a/src/components/Table/Styled/StyledColumnHeader.tsx b/src/components/Table/Styled/StyledColumnHeader.tsx
new file mode 100644
index 00000000..36791504
--- /dev/null
+++ b/src/components/Table/Styled/StyledColumnHeader.tsx
@@ -0,0 +1,58 @@
+import {
+  styled,
+  Tooltip,
+  TooltipProps,
+  tooltipClasses,
+  Stack,
+} from "@mui/material";
+import { COLUMN_HEADER_HEIGHT } from "@src/components/Table/Mock/Column";
+
+export const StyledColumnHeader = styled(Stack)(({ theme }) => ({
+  position: "relative",
+  height: "100%",
+  border: `1px solid ${theme.palette.divider}`,
+  "& + &": { borderLeftStyle: "none" },
+
+  flexDirection: "row",
+  alignItems: "center",
+  padding: theme.spacing(0, 0.5, 0, 1),
+  "& svg, & button": { display: "block", zIndex: 1 },
+
+  backgroundColor: theme.palette.background.default,
+  color: theme.palette.text.secondary,
+  transition: theme.transitions.create("color", {
+    duration: theme.transitions.duration.short,
+  }),
+  "&:hover": { color: theme.palette.text.primary },
+
+  "& .MuiIconButton-root": {
+    color: theme.palette.text.disabled,
+    transition: theme.transitions.create(
+      ["background-color", "opacity", "color"],
+      { duration: theme.transitions.duration.short }
+    ),
+  },
+  [`&:hover .MuiIconButton-root,
+    &:focus .MuiIconButton-root,
+    &:focus-within .MuiIconButton-root,
+    .MuiIconButton-root:focus`]: {
+    color: theme.palette.text.primary,
+    opacity: 1,
+  },
+}));
+export default StyledColumnHeader;
+
+export const StyledColumnHeaderNameTooltip = styled(
+  ({ className, ...props }: TooltipProps) => (
+    <Tooltip {...props} classes={{ popper: className }} />
+  )
+)(({ theme }) => ({
+  [`& .${tooltipClasses.tooltip}`]: {
+    backgroundColor: theme.palette.background.default,
+    color: theme.palette.text.primary,
+
+    margin: `-${COLUMN_HEADER_HEIGHT - 1 - 2}px 0 0 !important`,
+    padding: 0,
+    paddingRight: theme.spacing(1.5),
+  },
+}));
diff --git a/src/components/Table/Styled/StyledDot.tsx b/src/components/Table/Styled/StyledDot.tsx
new file mode 100644
index 00000000..bd942a8f
--- /dev/null
+++ b/src/components/Table/Styled/StyledDot.tsx
@@ -0,0 +1,22 @@
+import { styled } from "@mui/material";
+
+export const StyledDot = styled("div")(({ theme }) => ({
+  position: "absolute",
+  right: -5,
+  top: "50%",
+  transform: "translateY(-50%)",
+  zIndex: 1,
+
+  width: 12,
+  height: 12,
+
+  borderRadius: "50%",
+  backgroundColor: theme.palette.error.main,
+
+  boxShadow: `0 0 0 4px var(--cell-background-color)`,
+  "[role='row']:hover &": {
+    boxShadow: `0 0 0 4px var(--row-hover-background-color)`,
+  },
+}));
+
+export default StyledDot;
diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index fe1447c4..2d412787 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -49,13 +49,34 @@ const columnHelper = createColumnHelper<TableRow>();
 const getRowId = (row: TableRow) => row._rowy_ref.path || row._rowy_ref.id;
 
 export interface ITableProps {
+  /** Determines if “Add column” button is displayed */
   canAddColumns: boolean;
+  /** Determines if columns can be rearranged */
   canEditColumns: boolean;
+  /**
+   * Determines if any cell can be edited.
+   * If false, `Table` only ever renders `EditorCell`.
+   */
   canEditCells: boolean;
+  /** The hidden columns saved to user settings */
   hiddenColumns?: string[];
+  /**
+   * Displayed when `tableRows` is empty.
+   * Loading state handled by Suspense in parent component.
+   */
   emptyState?: React.ReactNode;
 }
 
+/**
+ * Takes table schema and row data from `tableScope` and makes it compatible
+ * with TanStack Table. Renders table children and cell context menu.
+ *
+ * - Calls `useKeyboardNavigation` hook
+ * - Handles rearranging columns
+ * - Handles infinite scrolling
+ * - Stores local state for resizing columns, and asks admins if they want to
+ *   save to table schema for all users
+ */
 export default function Table({
   canAddColumns,
   canEditColumns,
@@ -75,7 +96,7 @@ export default function Table({
   const gridRef = useRef<HTMLDivElement>(null);
 
   // Get column defs from table schema
-  // Also add end column for admins
+  // Also add end column for admins (canAddColumns || canEditCells)
   const columns = useMemo(() => {
     const _columns = tableColumnsOrdered
       // Hide column for all users using table schema
@@ -103,13 +124,13 @@ export default function Table({
     return _columns;
   }, [tableColumnsOrdered, canAddColumns, canEditCells]);
 
-  // Get user’s hidden columns from props and memoize into a VisibilityState
+  // Get user’s hidden columns from props and memoize into a `VisibilityState`
   const columnVisibility = useMemo(() => {
     if (!Array.isArray(hiddenColumns)) return {};
     return hiddenColumns.reduce((a, c) => ({ ...a, [c]: false }), {});
   }, [hiddenColumns]);
 
-  // Get frozen columns
+  // Get frozen columns and memoize into a `ColumnPinningState`
   const columnPinning = useMemo(
     () => ({
       left: columns.filter((c) => c.meta?.fixed && c.id).map((c) => c.id!),
@@ -128,7 +149,7 @@ export default function Table({
     columnResizeMode: "onChange",
   });
 
-  // Store local columnSizing state so we can save it to table schema
+  // Store local `columnSizing` state so we can save it to table schema
   // in `useSaveColumnSizing`. This could be generalized by storing the
   // entire table state.
   const [columnSizing, setColumnSizing] = useState(
@@ -139,16 +160,18 @@ export default function Table({
     state: { ...prev.state, columnVisibility, columnPinning, columnSizing },
     onColumnSizingChange: setColumnSizing,
   }));
-
+  // Get rows and columns for virtualization
   const { rows } = table.getRowModel();
   const leafColumns = table.getVisibleLeafColumns();
 
+  // Handle keyboard navigation
   const { handleKeyDown } = useKeyboardNavigation({
     gridRef,
     tableRows,
     leafColumns,
   });
 
+  // Handle prompt to save local column sizes if user `canEditColumns`
   useSaveColumnSizing(columnSizing, canEditColumns);
 
   const handleDropColumn = useCallback(
diff --git a/src/components/Table/TableBody.tsx b/src/components/Table/TableBody.tsx
index 674d8d96..45eef9a3 100644
--- a/src/components/Table/TableBody.tsx
+++ b/src/components/Table/TableBody.tsx
@@ -4,7 +4,7 @@ import type { Column, Row, ColumnSizingState } from "@tanstack/react-table";
 
 import StyledRow from "./Styled/StyledRow";
 import OutOfOrderIndicator from "./OutOfOrderIndicator";
-import CellValidation from "./TableCell";
+import TableCell from "./TableCell";
 import { RowsSkeleton } from "./TableSkeleton";
 
 import {
@@ -24,17 +24,28 @@ import {
 } from "./Table";
 
 export interface ITableBodyProps {
+  /** Used in `useVirtualization` */
   containerRef: React.RefObject<HTMLDivElement>;
+  /** Used in `useVirtualization` */
   leafColumns: Column<TableRow, unknown>[];
+  /** Current table rows with context from TanStack Table state */
   rows: Row<TableRow>[];
-
+  /** Determines if EditorCell can be displayed */
   canEditCells: boolean;
+  /** If specified, renders a shadow in the last frozen column */
   lastFrozen?: string;
-
-  /** Re-render when local column sizing changes */
+  /**
+   * Must pass this prop so that it re-renders when local column sizing changes */
   columnSizing: ColumnSizingState;
 }
 
+/**
+ * Renders table body & data rows.
+ * Handles virtualization of rows & columns via `useVirtualization`.
+ *
+ * - Renders row out of order indicator
+ * - Renders next page loading UI (`RowsSkeleton`)
+ */
 export const TableBody = memo(function TableBody({
   containerRef,
   leafColumns,
@@ -98,7 +109,7 @@ export const TableBody = memo(function TableBody({
                 fieldTypeGroup === "Auditing" || fieldTypeGroup === "Metadata";
 
               return (
-                <CellValidation
+                <TableCell
                   key={cell.id}
                   row={row}
                   cell={cell}
diff --git a/src/components/Table/TableCell/EditorCellController.tsx b/src/components/Table/TableCell/EditorCellController.tsx
new file mode 100644
index 00000000..a8978c8d
--- /dev/null
+++ b/src/components/Table/TableCell/EditorCellController.tsx
@@ -0,0 +1,90 @@
+import { useEffect, useLayoutEffect } from "react";
+import useStateRef from "react-usestateref";
+import { useSetAtom } from "jotai";
+import { isEqual } from "lodash-es";
+
+import { tableScope, updateFieldAtom } from "@src/atoms/tableScope";
+import type {
+  IDisplayCellProps,
+  IEditorCellProps,
+} from "@src/components/fields/types";
+
+interface IEditorCellControllerProps extends IDisplayCellProps {
+  EditorCellComponent: React.ComponentType<IEditorCellProps>;
+  parentRef: IEditorCellProps["parentRef"];
+  saveOnUnmount: boolean;
+}
+
+/**
+ * Stores a local state for the cell’s value, so that `EditorCell` doesn’t
+ * immediately update the database when the user quickly makes changes to the
+ * cell’s value (e.g. text input).
+ *
+ * Extracted from `withRenderTableCell()` so when the `DisplayCell` is
+ * rendered, an unnecessary extra state is not created.
+ *
+ * - Defines function to update the field in db
+ * - Tracks when the user has made the input “dirty”
+ * - By default, saves to db when the component is unmounted and the input
+ *   is dirty
+ * - Has an effect to change the local value state when it receives an update
+ *   from db and the field is not dirty. This is required to make inline
+ *   `EditorCell` work when they haven’t been interacted with, but prevent the
+ *   value changing while someone is editing a field, like Long Text.
+ */
+export default function EditorCellController({
+  EditorCellComponent,
+  saveOnUnmount,
+  value,
+  ...props
+}: IEditorCellControllerProps) {
+  // Store local value so we don’t immediately write to db when the user
+  // types in a textbox, for example
+  const [localValue, setLocalValue, localValueRef] = useStateRef(value);
+  // Mark if the user has interacted with this cell and hasn’t saved yet
+  const [isDirty, setIsDirty, isDirtyRef] = useStateRef(false);
+  const updateField = useSetAtom(updateFieldAtom, tableScope);
+
+  // When this cell’s data has updated, update the local value if
+  // it’s not dirty and the value is different
+  useEffect(() => {
+    if (!isDirty && !isEqual(value, localValueRef.current))
+      setLocalValue(value);
+  }, [isDirty, localValueRef, setLocalValue, value]);
+
+  // This is where we update the documents
+  const handleSubmit = () => {
+    // props.disabled should always be false as withRenderTableCell would
+    // render DisplayCell instead of EditorCell
+    if (props.disabled || !isDirtyRef.current) return;
+
+    updateField({
+      path: props._rowy_ref.path,
+      fieldName: props.column.fieldName,
+      value: localValueRef.current,
+      deleteField: localValueRef.current === undefined,
+    });
+  };
+
+  useLayoutEffect(() => {
+    return () => {
+      if (saveOnUnmount) handleSubmit();
+    };
+    // Warns that `saveOnUnmount` and `handleSubmit` should be included, but
+    // those don’t change across re-renders. We only want to run this on unmount
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  return (
+    <EditorCellComponent
+      {...props}
+      value={localValue}
+      onDirty={(dirty?: boolean) => setIsDirty(dirty ?? true)}
+      onChange={(v) => {
+        setIsDirty(true);
+        setLocalValue(v);
+      }}
+      onSubmit={handleSubmit}
+    />
+  );
+}
diff --git a/src/components/Table/TableCell/TableCell.tsx b/src/components/Table/TableCell/TableCell.tsx
index 48fb7b93..1842602b 100644
--- a/src/components/Table/TableCell/TableCell.tsx
+++ b/src/components/Table/TableCell/TableCell.tsx
@@ -4,13 +4,13 @@ import { ErrorBoundary } from "react-error-boundary";
 import { flexRender } from "@tanstack/react-table";
 import type { Row, Cell } from "@tanstack/react-table";
 
-import { styled } from "@mui/material/styles";
 import ErrorIcon from "@mui/icons-material/ErrorOutline";
 import WarningIcon from "@mui/icons-material/WarningAmber";
 
 import StyledCell from "@src/components/Table/Styled/StyledCell";
 import { InlineErrorFallback } from "@src/components/ErrorFallback";
 import RichTooltip from "@src/components/RichTooltip";
+import StyledDot from "@src/components/Table/Styled/StyledDot";
 
 import {
   tableScope,
@@ -20,39 +20,53 @@ import {
 import type { TableRow } from "@src/types/table";
 import type { IRenderedTableCellProps } from "./withRenderTableCell";
 
-const Dot = styled("div")(({ theme }) => ({
-  position: "absolute",
-  right: -5,
-  top: "50%",
-  transform: "translateY(-50%)",
-  zIndex: 1,
-
-  width: 12,
-  height: 12,
-
-  borderRadius: "50%",
-  backgroundColor: theme.palette.error.main,
-
-  boxShadow: `0 0 0 4px var(--cell-background-color)`,
-  "[role='row']:hover &": {
-    boxShadow: `0 0 0 4px var(--row-hover-background-color)`,
-  },
-}));
-
 export interface ITableCellProps {
+  /** Current row with context from TanStack Table state */
   row: Row<TableRow>;
+  /** Current cell with context from TanStack Table state */
   cell: Cell<TableRow, any>;
+  /** Virtual cell index (column index) */
   index: number;
+  /** User has clicked or navigated to this cell */
   isSelectedCell: boolean;
+  /** User has double-clicked or pressed Enter and this cell is selected */
   focusInsideCell: boolean;
+  /**
+   * Used to disable `aria-description` that says “Press Enter to edit”
+   * for Auditing and Metadata cells. Need to find another way to do this.
+   */
   isReadOnlyCell: boolean;
+  /** Determines if EditorCell can be displayed */
   canEditCells: boolean;
+  /**
+   * Pass current row height as a prop so we don’t access `tableSchema` here.
+   * If that atom is listened to here, all table cells will re-render whenever
+   * `tableSchema` changes, which is unnecessary.
+   */
   rowHeight: number;
+  /** If true, renders a shadow */
   isLastFrozen: boolean;
+  /** Pass width as a prop to get local column sizing state */
   width: number;
+  /**
+   * If provided, cell is pinned/frozen, and this value is used for
+   * `position: sticky`.
+   */
   left?: number;
 }
 
+/**
+ * Renders the container div for each cell with accessibility attributes for
+ * keyboard navigation.
+ *
+ * - Performs regex & missing value check and renders associated UI
+ * - Provides children with value from `cell.getValue()` so they can work with
+ *   memoization
+ * - Provides helpers as props to aid with memoization, so children components
+ *   don’t have to read atoms, which may cause unnecessary re-renders of many
+ *   cell components
+ * - Renders `ErrorBoundary`
+ */
 export const TableCell = memo(function TableCell({
   row,
   cell,
@@ -85,7 +99,7 @@ export const TableCell = memo(function TableCell({
         title="Invalid data"
         message="This row will not be saved until all the required fields contain valid data"
         placement="right"
-        render={({ openTooltip }) => <Dot onClick={openTooltip} />}
+        render={({ openTooltip }) => <StyledDot onClick={openTooltip} />}
       />
     );
   } else if (isMissing) {
@@ -95,7 +109,7 @@ export const TableCell = memo(function TableCell({
         title="Required field"
         message="This row will not be saved until all the required fields contain valid data"
         placement="right"
-        render={({ openTooltip }) => <Dot onClick={openTooltip} />}
+        render={({ openTooltip }) => <StyledDot onClick={openTooltip} />}
       />
     );
   }
diff --git a/src/components/Table/TableCell/withRenderTableCell.tsx b/src/components/Table/TableCell/withRenderTableCell.tsx
index a8f10f83..0d215b19 100644
--- a/src/components/Table/TableCell/withRenderTableCell.tsx
+++ b/src/components/Table/TableCell/withRenderTableCell.tsx
@@ -1,19 +1,11 @@
-import {
-  memo,
-  Suspense,
-  useState,
-  useEffect,
-  useRef,
-  useLayoutEffect,
-} from "react";
-import useStateRef from "react-usestateref";
-import { useSetAtom } from "jotai";
+import { memo, Suspense, useState, useEffect, useRef } from "react";
 import { isEqual } from "lodash-es";
 import type { CellContext } from "@tanstack/react-table";
 
 import { Popover, PopoverProps } from "@mui/material";
 
-import { tableScope, updateFieldAtom } from "@src/atoms/tableScope";
+import EditorCellController from "./EditorCellController";
+
 import { spreadSx } from "@src/utils/ui";
 import type { TableRow } from "@src/types/table";
 import type {
@@ -32,6 +24,7 @@ export interface ICellOptions {
   popoverProps?: Partial<PopoverProps>;
 }
 
+/** Received from `TableCell` */
 export interface IRenderedTableCellProps<TValue = any>
   extends CellContext<TableRow, TValue> {
   value: TValue;
@@ -42,18 +35,61 @@ export interface IRenderedTableCellProps<TValue = any>
 }
 
 /**
- * HOC to render table cells.
- * Renders read-only DisplayCell while scrolling for scroll performance.
- * Defers render for inline EditorCell.
- * @param DisplayCellComponent - The lighter cell component to display values
- * @param EditorCellComponent - The heavier cell component to edit inline
- * @param editorMode - When to display the EditorCell
- *   - "focus" (default) - when the cell is focused (Enter or double-click)
- *   - "inline" - inline with deferred render
- *   - "popover" - as a popover
- * @param options - {@link ICellOptions}
+ * Higher-order component to render each field type’s cell components.
+ * Handles when to render read-only `DisplayCell` and `EditorCell`.
+ *
+ * Memoized to re-render when value, column, focus, or disabled states change.
+ * Optionally re-renders when entire row updates.
+ *
+ * - Renders inline `EditorCell` after a timeout to improve scroll performance
+ * - Handles popovers
+ * - Renders Suspense for lazy-loaded `EditorCell`
+ * - Provides a `tabIndex` prop, so that interactive cell children (like
+ *   buttons) cannot be interacted with unless the user has focused in the
+ *   cell. Required for accessibility.
+ *
+ * @param DisplayCellComponent
+ * - The lighter cell component to display values. Also displayed when the
+ *   column is disabled/read-only.
+ *
+ *   - Keep these components lightweight, i.e. use base HTML or simple MUI
+ *     components. Avoid `Tooltip`, which is heavy.
+ *   - Avoid displaying disabled states (e.g. do not reduce opacity/grey out
+ *     toggles). This improves the experience of read-only tables for non-admins
+ *   - ⚠️ Make sure the disabled state does not render the buttons to open a
+ *       popover `EditorCell` (like Single/Multi Select).
+ *   - ⚠️ Make sure to use the `tabIndex` prop for buttons and other interactive
+ *       elements.
+ *   - {@link IDisplayCellProps}
+ *
+ * @param EditorCellComponent
+ * - The heavier cell component to edit values
+ *
+ *   - `EditorCell` should use the `value` and `onChange` props for the
+ *     rendered inputs. Avoid creating another local state here.
+ *   - `onSubmit` is available if `saveOnUnmount` does not work or if you want
+ *     to submit to the db before unmount.
+ *   - ✨ You can reuse your `SideDrawerField` as they take the same props. It
+ *       should probably be displayed in a popover.
+ *   - You can pass `null` to `withRenderTableCell()` to always display the
+ *     `DisplayCell`.
+ *   - ⚠️ Make sure to use the `tabIndex` prop for buttons, text fields, and
+ *       other interactive elements.
+ *   - {@link IEditorCellProps}
+ *
+ * @param editorMode
+ * - When to display the `EditorCell`
+ * 1. **focus** (default): the user has focused on the cell by pressing Enter or
+ *    double-clicking,
+ * 2. **inline**: always displayed if the cell is editable, or
+ * 3. **popover**: inside a popover when a user has focused on the cell
+ *    (as above) or clicked a button rendered by `DisplayCell`
+ *
+ * @param options
+ * - Note this is OK to pass as an object since it’s not defined in runtime
+ * - {@link ICellOptions}
  */
-export default function withTableCell(
+export default function withRenderTableCell(
   DisplayCellComponent: React.ComponentType<IDisplayCellProps>,
   EditorCellComponent: React.ComponentType<IEditorCellProps> | null,
   editorMode: "focus" | "inline" | "popover" = "focus",
@@ -137,7 +173,7 @@ export default function withTableCell(
       // Show displayCell as a fallback if intentionally null
       const editorCell = EditorCellComponent ? (
         <Suspense fallback={null}>
-          <EditorCellManager
+          <EditorCellController
             {...basicCellProps}
             EditorCellComponent={EditorCellComponent}
             parentRef={parentRef}
@@ -201,6 +237,7 @@ export default function withTableCell(
       // Should not reach this line
       return null;
     },
+    // Memo function
     (prev, next) => {
       const valueEqual = isEqual(prev.value, next.value);
       const columnEqual = isEqual(
@@ -220,65 +257,3 @@ export default function withTableCell(
     }
   );
 }
-
-interface IEditorCellManagerProps extends IDisplayCellProps {
-  EditorCellComponent: React.ComponentType<IEditorCellProps>;
-  parentRef: IEditorCellProps["parentRef"];
-  saveOnUnmount: boolean;
-}
-
-function EditorCellManager({
-  EditorCellComponent,
-  saveOnUnmount,
-  value,
-  ...props
-}: IEditorCellManagerProps) {
-  // Store local value so we don’t immediately write to db when the user
-  // types in a textbox, for example
-  const [localValue, setLocalValue, localValueRef] = useStateRef(value);
-  // Mark if the user has interacted with this cell and hasn’t saved yet
-  const [isDirty, setIsDirty, isDirtyRef] = useStateRef(false);
-  const updateField = useSetAtom(updateFieldAtom, tableScope);
-
-  // When this cell’s data has updated, update the local value if
-  // it’s not dirty and the value is different
-  useEffect(() => {
-    if (!isDirty && !isEqual(value, localValueRef.current))
-      setLocalValue(value);
-  }, [isDirty, localValueRef, setLocalValue, value]);
-
-  // This is where we update the documents
-  const handleSubmit = () => {
-    if (props.disabled || !isDirtyRef.current) return;
-
-    updateField({
-      path: props._rowy_ref.path,
-      fieldName: props.column.fieldName,
-      value: localValueRef.current,
-      deleteField: localValueRef.current === undefined,
-    });
-  };
-
-  useLayoutEffect(() => {
-    return () => {
-      if (saveOnUnmount) {
-        console.log("unmount", props._rowy_ref.path, props.column.fieldName);
-        handleSubmit();
-      }
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
-  return (
-    <EditorCellComponent
-      {...props}
-      value={localValue}
-      onDirty={(dirty?: boolean) => setIsDirty(dirty ?? true)}
-      onChange={(v) => {
-        setIsDirty(true);
-        setLocalValue(v);
-      }}
-      onSubmit={handleSubmit}
-    />
-  );
-}
diff --git a/src/components/Table/TableHeader.tsx b/src/components/Table/TableHeader.tsx
index ac93d566..43eb8833 100644
--- a/src/components/Table/TableHeader.tsx
+++ b/src/components/Table/TableHeader.tsx
@@ -13,16 +13,27 @@ import { tableScope, selectedCellAtom } from "@src/atoms/tableScope";
 import { DEFAULT_ROW_HEIGHT } from "@src/components/Table";
 
 export interface ITableHeaderProps {
+  /** Headers with context from TanStack Table state */
   headerGroups: HeaderGroup<TableRow>[];
+  /** Called when a header is dropped in a new position */
   handleDropColumn: (result: DropResult) => void;
+  /** Passed to `FinalColumnHeader` */
   canAddColumns: boolean;
+  /** Determines if columns can be re-ordered */
   canEditColumns: boolean;
+  /** If specified, renders a shadow in the last frozen column */
   lastFrozen?: string;
-
-  /** Re-render when local column sizing changes */
+  /**
+   * Must pass this prop so that it re-renders when local column sizing changes */
   columnSizing: ColumnSizingState;
 }
 
+/**
+ * Renders table header row. Memoized to only re-render when column definitions
+ * and sizes change.
+ *
+ * - Renders drag & drop components
+ */
 export const TableHeader = memo(function TableHeader({
   headerGroups,
   handleDropColumn,
@@ -93,6 +104,7 @@ export const TableHeader = memo(function TableHeader({
                   </Draggable>
                 );
               })}
+              {/* Required by react-beautiful-dnd */}
               {provided.placeholder}
             </StyledRow>
           )}
diff --git a/src/components/Table/useSaveColumnSizing.tsx b/src/components/Table/useSaveColumnSizing.tsx
index 2bcf9c59..af1a6e37 100644
--- a/src/components/Table/useSaveColumnSizing.tsx
+++ b/src/components/Table/useSaveColumnSizing.tsx
@@ -17,7 +17,8 @@ import { DEBOUNCE_DELAY } from "./Table";
 import { ColumnSizingState } from "@tanstack/react-table";
 
 /**
- * Debounces columnSizing and asks admins if they want to save for all users
+ * Debounces `columnSizing` and asks user if they want to save for all users,
+ * if they have the `canEditColumns` permission
  */
 export function useSaveColumnSizing(
   columnSizing: ColumnSizingState,
diff --git a/src/components/fields/types.ts b/src/components/fields/types.ts
index b43b6d82..50a05f8a 100644
--- a/src/components/fields/types.ts
+++ b/src/components/fields/types.ts
@@ -42,6 +42,7 @@ export interface IFieldConfig {
   csvImportParser?: (value: string, config?: any) => any;
 }
 
+/** See {@link IRenderedTableCellProps | `withRenderTableCell` } for guidance */
 export interface IDisplayCellProps<T = any> {
   value: T;
   type: FieldType;
@@ -51,11 +52,16 @@ export interface IDisplayCellProps<T = any> {
   /** The row’s _rowy_ref object */
   _rowy_ref: TableRowRef;
   disabled: boolean;
+  /**
+   * ⚠️ Make sure to use the `tabIndex` prop for buttons and other interactive
+   *   elements.
+   */
   tabIndex: number;
   showPopoverCell: (value: boolean) => void;
   setFocusInsideCell: (focusInside: boolean) => void;
   rowHeight: number;
 }
+/** See {@link IRenderedTableCellProps | `withRenderTableCell` } for guidance */
 export interface IEditorCellProps<T = any> extends IDisplayCellProps<T> {
   /** Call when the user has input but changes have not been saved */
   onDirty: (dirty?: boolean) => void;
diff --git a/src/pages/Table/ProvidedSubTablePage.tsx b/src/pages/Table/ProvidedSubTablePage.tsx
index 860748c2..e4659d33 100644
--- a/src/pages/Table/ProvidedSubTablePage.tsx
+++ b/src/pages/Table/ProvidedSubTablePage.tsx
@@ -28,7 +28,12 @@ import { TABLE_TOOLBAR_HEIGHT } from "@src/components/TableToolbar";
 const TablePage = lazy(() => import("./TablePage" /* webpackChunkName: "TablePage" */));
 
 /**
- * Wraps `TablePage` with the data for a top-level table.
+ * Wraps `TablePage` with the data for a sub-table.
+ *
+ * Differences to `ProvidedTablePage`:
+ * - Renders a `Modal`
+ * - When this is a child of `ProvidedTablePage`, the `TablePage` rendered for
+ *   the root table has its modals disabled
  */
 export default function ProvidedSubTablePage() {
   const location = useLocation();
diff --git a/src/pages/Table/ProvidedTablePage.tsx b/src/pages/Table/ProvidedTablePage.tsx
index 8f86be90..cdb7d19c 100644
--- a/src/pages/Table/ProvidedTablePage.tsx
+++ b/src/pages/Table/ProvidedTablePage.tsx
@@ -38,6 +38,13 @@ const TablePage = lazy(() => import("./TablePage" /* webpackChunkName: "TablePag
 /**
  * Wraps `TablePage` with the data for a top-level table.
  * `SubTablePage` is inserted in the outlet, alongside `TablePage`.
+ *
+ * Interfaces with `projectScope` atoms to find the correct table (or sub-table)
+ * settings and schema.
+ *
+ * - Renders the Jotai `Provider` with `tableScope`
+ * - Renders `TableSourceFirestore`, which queries Firestore and stores data in
+ *   atoms in `tableScope`
  */
 export default function ProvidedTablePage() {
   const { id } = useParams();
diff --git a/src/pages/Table/TablePage.tsx b/src/pages/Table/TablePage.tsx
index 3dce7445..6008c835 100644
--- a/src/pages/Table/TablePage.tsx
+++ b/src/pages/Table/TablePage.tsx
@@ -46,7 +46,10 @@ import { formatSubTableName } from "@src/utils/table";
 const BuildLogsSnack = lazy(() => import("@src/components/TableModals/CloudLogsModal/BuildLogs/BuildLogsSnack" /* webpackChunkName: "TableModals-BuildLogsSnack" */));
 
 export interface ITablePageProps {
-  /** Disable modals on this table when a sub-table is open and it’s listening to URL state */
+  /**
+   * Disable modals on this table when a sub-table is open and it’s listening
+   * to URL state
+   */
   disableModals?: boolean;
   /** Disable side drawer */
   disableSideDrawer?: boolean;
@@ -55,6 +58,15 @@ export interface ITablePageProps {
 /**
  * TablePage renders all the UI for the table.
  * Must be wrapped by either `ProvidedTablePage` or `ProvidedSubTablePage`.
+ *
+ * Renders `Table`, `TableToolbar`, `SideDrawer`, `TableModals`, `ColumnMenu`,
+ * Suspense fallback UI. These components are all independent of each other.
+ *
+ * - Renders empty state if no columns
+ * - Defines empty state if no rows
+ * - Defines permissions `canAddColumns`, `canEditColumns`, `canEditCells`
+ *   for `Table` using `userRolesAtom` in `projectScope`
+ * - Provides `Table` with hidden columns array from user settings
  */
 export default function TablePage({
   disableModals,

From dd3f5553ab2ab9c6ea5b39937aa2f882089ee710 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Fri, 18 Nov 2022 18:36:41 +1100
Subject: [PATCH 283/309] fix Rating cells not saving to db & add warning in
 comments

---
 src/components/Table/TableCell/withRenderTableCell.tsx | 8 ++++----
 src/components/fields/Rating/EditorCell.tsx            | 6 +++++-
 src/components/fields/types.ts                         | 2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/components/Table/TableCell/withRenderTableCell.tsx b/src/components/Table/TableCell/withRenderTableCell.tsx
index 0d215b19..60935e07 100644
--- a/src/components/Table/TableCell/withRenderTableCell.tsx
+++ b/src/components/Table/TableCell/withRenderTableCell.tsx
@@ -67,12 +67,12 @@ export interface IRenderedTableCellProps<TValue = any>
  *
  *   - `EditorCell` should use the `value` and `onChange` props for the
  *     rendered inputs. Avoid creating another local state here.
- *   - `onSubmit` is available if `saveOnUnmount` does not work or if you want
- *     to submit to the db before unmount.
- *   - ✨ You can reuse your `SideDrawerField` as they take the same props. It
- *       should probably be displayed in a popover.
  *   - You can pass `null` to `withRenderTableCell()` to always display the
  *     `DisplayCell`.
+ *   - ⚠️ If it’s displayed inline, you must call `onSubmit` to save the value
+ *       to the database, because it never unmounts.
+ *   - ✨ You can reuse your `SideDrawerField` as they take the same props. It
+ *       should probably be displayed in a popover.
  *   - ⚠️ Make sure to use the `tabIndex` prop for buttons, text fields, and
  *       other interactive elements.
  *   - {@link IEditorCellProps}
diff --git a/src/components/fields/Rating/EditorCell.tsx b/src/components/fields/Rating/EditorCell.tsx
index 4d3c0c23..89a48f2d 100644
--- a/src/components/fields/Rating/EditorCell.tsx
+++ b/src/components/fields/Rating/EditorCell.tsx
@@ -4,6 +4,7 @@ import DisplayCell from "./DisplayCell";
 
 export default function Rating({
   onChange,
+  onSubmit,
   tabIndex,
   ...props
 }: IEditorCellProps) {
@@ -20,7 +21,10 @@ export default function Rating({
     <DisplayCell
       {...props}
       tabIndex={tabIndex}
-      onChange={(_, newValue) => onChange(newValue)}
+      onChange={(_, newValue) => {
+        onChange(newValue);
+        onSubmit();
+      }}
       ref={ref}
     />
   );
diff --git a/src/components/fields/types.ts b/src/components/fields/types.ts
index 50a05f8a..63374d81 100644
--- a/src/components/fields/types.ts
+++ b/src/components/fields/types.ts
@@ -1,5 +1,5 @@
 import { FieldType } from "@src/constants/fields";
-import type { IRenderedTableCellProps } from "@src/components/Table/TableCell/withRenderTableCell";
+import { IRenderedTableCellProps } from "@src/components/Table/TableCell/withRenderTableCell";
 import type { PopoverProps } from "@mui/material";
 import type {
   ColumnConfig,

From 763c0a20d0a2b191411ae2d5c0263dd2e7cd8d02 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 21 Nov 2022 14:17:42 +1100
Subject: [PATCH 284/309] Rating Icon: remove console.log

---
 src/components/fields/Rating/Icon.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/fields/Rating/Icon.tsx b/src/components/fields/Rating/Icon.tsx
index e65b8f3d..a34bdc24 100644
--- a/src/components/fields/Rating/Icon.tsx
+++ b/src/components/fields/Rating/Icon.tsx
@@ -20,7 +20,6 @@ const getStateIcon = (config: any) => {
   if (!get(config, "customIcons.enabled")) {
     return <RatingIcon />;
   }
-  console.log(get(config, "customIcons.rating"));
   return get(config, "customIcons.rating") || <RatingIcon />;
 };
 const getStateOutline = (config: any) => {

From 9829fdebc1938a65dabfe0a92b85ace7f2c85939 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 21 Nov 2022 17:16:32 +1100
Subject: [PATCH 285/309] fix virtualization occasionally not detecting scroll

---
 src/components/Table/Table.tsx     | 17 ++++++++++++++---
 src/components/Table/TableBody.tsx |  6 ++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index 2d412787..412e0535 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -1,4 +1,5 @@
 import { useMemo, useRef, useState, useEffect, useCallback } from "react";
+import useStateRef from "react-usestateref";
 import { useAtom, useSetAtom } from "jotai";
 import { useThrottledCallback } from "use-debounce";
 import {
@@ -92,7 +93,11 @@ export default function Table({
 
   const updateColumn = useSetAtom(updateColumnAtom, tableScope);
 
-  const containerRef = useRef<HTMLDivElement>(null);
+  // Store a **state** and reference to the container element
+  // so the state can re-render `TableBody`, preventing virtualization
+  // not detecting scroll if the container element was initially `null`
+  const [containerEl, setContainerEl, containerRef] =
+    useStateRef<HTMLDivElement | null>(null);
   const gridRef = useRef<HTMLDivElement>(null);
 
   // Get column defs from table schema
@@ -205,11 +210,16 @@ export default function Table({
   // for large screen heights
   useEffect(() => {
     fetchMoreOnBottomReached(containerRef.current);
-  }, [fetchMoreOnBottomReached, tablePage, tableNextPage.loading]);
+  }, [
+    fetchMoreOnBottomReached,
+    tablePage,
+    tableNextPage.loading,
+    containerRef,
+  ]);
 
   return (
     <div
-      ref={containerRef}
+      ref={(el) => setContainerEl(el)}
       onScroll={(e) => fetchMoreOnBottomReached(e.target as HTMLDivElement)}
       style={{ overflow: "auto", width: "100%", height: "100%" }}
     >
@@ -252,6 +262,7 @@ export default function Table({
           emptyState ?? <EmptyState sx={{ py: 8 }} />
         ) : (
           <TableBody
+            containerEl={containerEl}
             containerRef={containerRef}
             leafColumns={leafColumns}
             rows={rows}
diff --git a/src/components/Table/TableBody.tsx b/src/components/Table/TableBody.tsx
index 45eef9a3..118dbece 100644
--- a/src/components/Table/TableBody.tsx
+++ b/src/components/Table/TableBody.tsx
@@ -24,6 +24,12 @@ import {
 } from "./Table";
 
 export interface ITableBodyProps {
+  /**
+   * Re-render this component when the container element changes, to fix a bug
+   * where virtualization doesn’t detect scrolls if `containerRef.current` was
+   * initially null
+   */
+  containerEl: HTMLDivElement | null;
   /** Used in `useVirtualization` */
   containerRef: React.RefObject<HTMLDivElement>;
   /** Used in `useVirtualization` */

From 74cdae7195649509902602f00a61dfa4a1c87a54 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 21 Nov 2022 18:13:33 +1100
Subject: [PATCH 286/309] fix frozen columns disappearing when scrolled right

---
 src/components/Table/TableBody.tsx           | 29 ++++++--------------
 src/components/Table/TableCell/TableCell.tsx |  8 ++++--
 src/components/Table/useVirtualization.tsx   | 18 +++++++++++-
 3 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/src/components/Table/TableBody.tsx b/src/components/Table/TableBody.tsx
index 118dbece..74efe194 100644
--- a/src/components/Table/TableBody.tsx
+++ b/src/components/Table/TableBody.tsx
@@ -17,11 +17,7 @@ import {
 import { getFieldProp } from "@src/components/fields";
 import type { TableRow } from "@src/types/table";
 import useVirtualization from "./useVirtualization";
-import {
-  TABLE_PADDING,
-  DEFAULT_ROW_HEIGHT,
-  OUT_OF_ORDER_MARGIN,
-} from "./Table";
+import { DEFAULT_ROW_HEIGHT, OUT_OF_ORDER_MARGIN } from "./Table";
 
 export interface ITableBodyProps {
   /**
@@ -72,6 +68,8 @@ export const TableBody = memo(function TableBody({
     paddingRight,
   } = useVirtualization(containerRef, leafColumns);
 
+  const rowHeight = tableSchema.rowHeight || DEFAULT_ROW_HEIGHT;
+
   return (
     <div className="tbody" role="rowgroup">
       {paddingTop > 0 && (
@@ -88,15 +86,13 @@ export const TableBody = memo(function TableBody({
             role="row"
             aria-rowindex={row.index + 2}
             style={{
-              height: "auto",
+              height: rowHeight,
               marginBottom: outOfOrder ? OUT_OF_ORDER_MARGIN : 0,
+              paddingLeft,
+              paddingRight,
             }}
             data-out-of-order={outOfOrder || undefined}
           >
-            {paddingLeft > 0 && (
-              <div role="presentation" style={{ width: `${paddingLeft}px` }} />
-            )}
-
             {outOfOrder && <OutOfOrderIndicator />}
 
             {virtualCols.map((virtualCell) => {
@@ -120,25 +116,18 @@ export const TableBody = memo(function TableBody({
                   row={row}
                   cell={cell}
                   index={cellIndex}
-                  left={
-                    cell.column.getIsPinned()
-                      ? virtualCell.start - TABLE_PADDING
-                      : undefined
-                  }
                   isSelectedCell={isSelectedCell}
                   focusInsideCell={isSelectedCell && selectedCell?.focusInside}
                   isReadOnlyCell={isReadOnlyCell}
                   canEditCells={canEditCells}
                   isLastFrozen={lastFrozen === cell.column.id}
                   width={cell.column.getSize()}
-                  rowHeight={tableSchema.rowHeight || DEFAULT_ROW_HEIGHT}
+                  rowHeight={rowHeight}
+                  left={virtualCell.start}
+                  isPinned={cell.column.getIsPinned() === "left"}
                 />
               );
             })}
-
-            {paddingRight > 0 && (
-              <div role="presentation" style={{ width: `${paddingRight}px` }} />
-            )}
           </StyledRow>
         );
       })}
diff --git a/src/components/Table/TableCell/TableCell.tsx b/src/components/Table/TableCell/TableCell.tsx
index 1842602b..4ea51433 100644
--- a/src/components/Table/TableCell/TableCell.tsx
+++ b/src/components/Table/TableCell/TableCell.tsx
@@ -17,6 +17,7 @@ import {
   selectedCellAtom,
   contextMenuTargetAtom,
 } from "@src/atoms/tableScope";
+import { TABLE_PADDING } from "@src/components/Table";
 import type { TableRow } from "@src/types/table";
 import type { IRenderedTableCellProps } from "./withRenderTableCell";
 
@@ -52,7 +53,8 @@ export interface ITableCellProps {
    * If provided, cell is pinned/frozen, and this value is used for
    * `position: sticky`.
    */
-  left?: number;
+  left: number;
+  isPinned: boolean;
 }
 
 /**
@@ -79,6 +81,7 @@ export const TableCell = memo(function TableCell({
   isLastFrozen,
   width,
   left,
+  isPinned,
 }: ITableCellProps) {
   const setSelectedCell = useSetAtom(selectedCellAtom, tableScope);
   const setContextMenuTarget = useSetAtom(contextMenuTargetAtom, tableScope);
@@ -152,7 +155,8 @@ export const TableCell = memo(function TableCell({
       style={{
         width,
         height: rowHeight,
-        left,
+        position: isPinned ? "sticky" : "absolute",
+        left: left - (isPinned ? TABLE_PADDING : 0),
         backgroundColor:
           cell.column.id === "_rowy_column_actions" ? "transparent" : undefined,
         borderBottomWidth:
diff --git a/src/components/Table/useVirtualization.tsx b/src/components/Table/useVirtualization.tsx
index b9b3ca55..90df0329 100644
--- a/src/components/Table/useVirtualization.tsx
+++ b/src/components/Table/useVirtualization.tsx
@@ -1,6 +1,7 @@
 import { useEffect, useCallback } from "react";
 import { useAtom } from "jotai";
-import { useVirtual } from "react-virtual";
+import { useVirtual, defaultRangeExtractor } from "react-virtual";
+import type { Range } from "react-virtual";
 
 import {
   tableScope,
@@ -69,6 +70,21 @@ export function useVirtualization(
         ),
       [leafColumns]
     ),
+    rangeExtractor: useCallback(
+      (range: Range) => {
+        const defaultRange = defaultRangeExtractor(range);
+        const frozenColumns = leafColumns
+          .filter((c) => c.getIsPinned())
+          .map((c) => c.getPinnedIndex());
+
+        const combinedRange = Array.from(
+          new Set([...defaultRange, ...frozenColumns])
+        ).sort((a, b) => a - b);
+
+        return combinedRange;
+      },
+      [leafColumns]
+    ),
   });
 
   // Scroll to selected cell

From e2bed9e4b0f1c8581edcd8c9867bb7f39a5efb89 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 22 Nov 2022 14:59:02 +1100
Subject: [PATCH 287/309] temp fix vercel builds breaking on node 18

```
The prop value with an expression type of JSXFragment could not be resolved. Please file an issue ( https://github.com/jsx-eslint/jsx-ast-utils/issues/new ) to get this fixed immediately.

Error: error:0308010C:digital envelope routines::unsupported
    at String.replace (<anonymous>)
```
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0ea80114..4b331667 100644
--- a/package.json
+++ b/package.json
@@ -92,7 +92,7 @@
     "typedoc": "typedoc src/atoms/tableScope/index.ts src/atoms/globalScope/index.ts --out typedoc"
   },
   "engines": {
-    "node": ">=16"
+    "node": "^16"
   },
   "eslintConfig": {
     "plugins": [

From 9a7b225afae509a281f957e15a42c4aa75bd63c2 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 22 Nov 2022 16:20:10 +1100
Subject: [PATCH 288/309] fix final column header appearing to be draggable

---
 src/components/Table/TableHeader.tsx | 45 ++++++++++++++++++----------
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --git a/src/components/Table/TableHeader.tsx b/src/components/Table/TableHeader.tsx
index 43eb8833..ab813275 100644
--- a/src/components/Table/TableHeader.tsx
+++ b/src/components/Table/TableHeader.tsx
@@ -1,4 +1,4 @@
-import { memo } from "react";
+import { memo, Fragment } from "react";
 import { useAtom } from "jotai";
 import { DragDropContext, Droppable, Draggable } from "react-beautiful-dnd";
 import type { DropResult } from "react-beautiful-dnd";
@@ -57,30 +57,36 @@ export const TableHeader = memo(function TableHeader({
               {...provided.droppableProps}
               ref={provided.innerRef}
             >
-              {headerGroup.headers.map((header) => {
+              {headerGroup.headers.map((header, i) => {
                 const isSelectedCell =
                   (!selectedCell && header.index === 0) ||
                   (selectedCell?.path === "_rowy_header" &&
                     selectedCell?.columnKey === header.id);
 
+                const isLastHeader = i === headerGroup.headers.length - 1;
+
+                // Render later, after the drag & drop placeholder
                 if (header.id === "_rowy_column_actions")
                   return (
-                    <FinalColumnHeader
-                      key={header.id}
-                      data-row-id={"_rowy_header"}
-                      data-col-id={header.id}
-                      tabIndex={isSelectedCell ? 0 : -1}
-                      focusInsideCell={isSelectedCell && focusInside}
-                      aria-colindex={header.index + 1}
-                      aria-readonly={!canEditColumns}
-                      aria-selected={isSelectedCell}
-                      canAddColumns={canAddColumns}
-                    />
+                    <Fragment key={header.id}>
+                      {provided.placeholder}
+                      <FinalColumnHeader
+                        key={header.id}
+                        data-row-id={"_rowy_header"}
+                        data-col-id={header.id}
+                        tabIndex={isSelectedCell ? 0 : -1}
+                        focusInsideCell={isSelectedCell && focusInside}
+                        aria-colindex={header.index + 1}
+                        aria-readonly={!canEditColumns}
+                        aria-selected={isSelectedCell}
+                        canAddColumns={canAddColumns}
+                      />
+                    </Fragment>
                   );
 
                 if (!header.column.columnDef.meta) return null;
 
-                return (
+                const draggableHeader = (
                   <Draggable
                     key={header.id}
                     draggableId={header.id}
@@ -103,9 +109,16 @@ export const TableHeader = memo(function TableHeader({
                     )}
                   </Draggable>
                 );
+
+                if (isLastHeader)
+                  return (
+                    <Fragment key={header.id}>
+                      {draggableHeader}
+                      {provided.placeholder}
+                    </Fragment>
+                  );
+                else return draggableHeader;
               })}
-              {/* Required by react-beautiful-dnd */}
-              {provided.placeholder}
             </StyledRow>
           )}
         </Droppable>

From 3115a9c917344dbf22e36522600e65ba890292fc Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 22 Nov 2022 16:24:46 +1100
Subject: [PATCH 289/309] fix table spacing when side drawer is opened

---
 src/pages/Table/TablePage.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/pages/Table/TablePage.tsx b/src/pages/Table/TablePage.tsx
index 6008c835..75f1fc28 100644
--- a/src/pages/Table/TablePage.tsx
+++ b/src/pages/Table/TablePage.tsx
@@ -13,7 +13,7 @@ import TableSkeleton from "@src/components/Table/TableSkeleton";
 import EmptyTable from "@src/components/Table/EmptyTable";
 import TableToolbar from "@src/components/TableToolbar";
 import Table from "@src/components/Table";
-import SideDrawer from "@src/components/SideDrawer";
+import SideDrawer, { DRAWER_WIDTH } from "@src/components/SideDrawer";
 import ColumnMenu from "@src/components/ColumnMenu";
 import ColumnModals from "@src/components/ColumnModals";
 import TableModals from "@src/components/TableModals";
@@ -140,7 +140,9 @@ export default function TablePage({
               '& [role="grid"]': {
                 marginBottom: `env(safe-area-inset-bottom)`,
                 marginLeft: `env(safe-area-inset-left)`,
-                marginRight: `env(safe-area-inset-right)`,
+                // Ensure there’s enough space so that all columns are
+                // still visible when the side drawer is open
+                marginRight: `max(env(safe-area-inset-right), ${DRAWER_WIDTH}px)`,
               },
             }}
           >

From 6a30220b94f0e74af225a75d59761583460be691 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 22 Nov 2022 17:07:36 +1100
Subject: [PATCH 290/309] fix out of order & missing field rows being added
 twice to tableRowsLocalAtom

---
 src/atoms/tableScope/rowActions.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/atoms/tableScope/rowActions.ts b/src/atoms/tableScope/rowActions.ts
index 37d1f9de..fd90fe3d 100644
--- a/src/atoms/tableScope/rowActions.ts
+++ b/src/atoms/tableScope/rowActions.ts
@@ -129,9 +129,9 @@ export const addRowAtom = atom(
         });
       }
 
-      // Also add to rowsLocal if  any required fields are missing
+      // Also add to rowsLocal if any required fields are missing
       // (not out of order since those cases are handled above)
-      if (missingRequiredFields.length > 0) {
+      else if (missingRequiredFields.length > 0) {
         set(tableRowsLocalAtom, {
           type: "add",
           row: { ...rowValues, _rowy_outOfOrder: false },

From e3831d716abf5cbbc7a21627fa143c7651554211 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 22 Nov 2022 17:36:17 +1100
Subject: [PATCH 291/309] =?UTF-8?q?fix=20serverDocCountAtom=20loading=20st?=
 =?UTF-8?q?ate=20displaying=20=E2=80=9Cof=200=20rows=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/atoms/tableScope/table.ts                 |  7 ++--
 .../TableToolbar/LoadedRowsStatus.tsx         | 12 +++----
 src/hooks/useFirestoreCollectionWithAtom.ts   | 32 ++++++++++++-------
 3 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/src/atoms/tableScope/table.ts b/src/atoms/tableScope/table.ts
index 6681af87..fdf8820c 100644
--- a/src/atoms/tableScope/table.ts
+++ b/src/atoms/tableScope/table.ts
@@ -239,5 +239,8 @@ export type AuditChangeFunction = (
  */
 export const auditChangeAtom = atom<AuditChangeFunction | undefined>(undefined);
 
-/** Store total  number of rows in firestore collection */
-export const serverDocCountAtom = atom(0)
\ No newline at end of file
+/**
+ * Store total number of rows in the table, respecting current filters.
+ * If `undefined`, the query hasn’t loaded yet.
+ */
+export const serverDocCountAtom = atom<number | undefined>(undefined);
diff --git a/src/components/TableToolbar/LoadedRowsStatus.tsx b/src/components/TableToolbar/LoadedRowsStatus.tsx
index c57ab80d..6a1465fa 100644
--- a/src/components/TableToolbar/LoadedRowsStatus.tsx
+++ b/src/components/TableToolbar/LoadedRowsStatus.tsx
@@ -10,7 +10,7 @@ import {
   tableScope,
   tableRowsAtom,
   tableNextPageAtom,
-  serverDocCountAtom
+  serverDocCountAtom,
 } from "@src/atoms/tableScope";
 import { spreadSx } from "@src/utils/ui";
 
@@ -58,20 +58,20 @@ const loadingIcon = (
 
 function LoadedRowsStatus() {
   const [tableNextPage] = useAtom(tableNextPageAtom, tableScope);
-  const [serverDocCount] = useAtom(serverDocCountAtom, tableScope)
-  const [tableRows] = useAtom(tableRowsAtom, tableScope)
-
+  const [serverDocCount] = useAtom(serverDocCountAtom, tableScope);
+  const [tableRows] = useAtom(tableRowsAtom, tableScope);
 
   if (tableNextPage.loading)
     return <StatusText>{loadingIcon}Loading more…</StatusText>;
 
-
   return (
     <Tooltip title="Syncing with database in realtime" describeChild>
       <StatusText>
         <SyncIcon style={{ transform: "rotate(45deg)" }} />
         Loaded {!tableNextPage.available && "all "}
-        {tableRows.length} {tableNextPage.available && `of ${serverDocCount}`} row{serverDocCount !== 1 && "s"}
+        {tableRows.length}
+        {serverDocCount !== undefined && ` of ${serverDocCount}`} row
+        {(serverDocCount ?? tableRows.length) !== 1 && "s"}
       </StatusText>
     </Tooltip>
   );
diff --git a/src/hooks/useFirestoreCollectionWithAtom.ts b/src/hooks/useFirestoreCollectionWithAtom.ts
index 4896a609..fb4ec621 100644
--- a/src/hooks/useFirestoreCollectionWithAtom.ts
+++ b/src/hooks/useFirestoreCollectionWithAtom.ts
@@ -22,7 +22,7 @@ import {
   QueryConstraint,
   WhereFilterOp,
   documentId,
-  getCountFromServer
+  getCountFromServer,
 } from "firebase/firestore";
 import { useErrorHandler } from "react-error-boundary";
 
@@ -64,7 +64,7 @@ interface IUseFirestoreCollectionWithAtomOptions<T> {
   /** Update this atom when we’re loading the next page, and if there is a next page available. Uses same scope as `dataScope`. */
   nextPageAtom?: PrimitiveAtom<NextPageState>;
   /** Set this atom's value to the number of docs in the collection on each new snapshot */
-  serverDocCountAtom?: PrimitiveAtom<number> | undefined;
+  serverDocCountAtom?: PrimitiveAtom<number | undefined>;
 }
 
 /**
@@ -96,7 +96,7 @@ export function useFirestoreCollectionWithAtom<T = TableRow>(
     updateDocAtom,
     deleteDocAtom,
     nextPageAtom,
-    serverDocCountAtom
+    serverDocCountAtom,
   } = options || {};
 
   const [firebaseDb] = useAtom(firebaseDbAtom, projectScope);
@@ -120,7 +120,10 @@ export function useFirestoreCollectionWithAtom<T = TableRow>(
     void
   >(nextPageAtom || (dataAtom as any), dataScope);
 
-  const setServerDocCountAtom = useSetAtom(serverDocCountAtom || (dataAtom as any), dataScope)
+  const setServerDocCountAtom = useSetAtom(
+    serverDocCountAtom || (dataAtom as any),
+    dataScope
+  );
 
   // Store if we’re at the last page to prevent a new query from being created
   const [isLastPage, setIsLastPage] = useState(false);
@@ -198,8 +201,8 @@ export function useFirestoreCollectionWithAtom<T = TableRow>(
           // on each new snapshot, use the query to get and set the document count from the server
           if (serverDocCountAtom) {
             getCountFromServer(memoizedQuery.unlimitedQuery).then((value) => {
-              setServerDocCountAtom(value.data().count)
-            })
+              setServerDocCountAtom(value.data().count);
+            });
           }
         } catch (error) {
           if (onError) onError(error as FirestoreError);
@@ -232,7 +235,8 @@ export function useFirestoreCollectionWithAtom<T = TableRow>(
     handleError,
     nextPageAtom,
     setNextPageAtom,
-    setServerDocCountAtom
+    serverDocCountAtom,
+    setServerDocCountAtom,
   ]);
 
   // Create variable for validity of query to pass to useEffect dependencies
@@ -339,7 +343,7 @@ const getQuery = <T>(
       limit,
       firestoreFilters,
       sorts,
-      unlimitedQuery: query<T>(collectionRef, ...firestoreFilters)
+      unlimitedQuery: query<T>(collectionRef, ...firestoreFilters),
     };
   } catch (e) {
     if (onError) onError(e as FirestoreError);
@@ -389,11 +393,15 @@ export const tableFiltersToFirestoreFilters = (filters: TableFilter[]) => {
       firestoreFilters.push(where(documentId(), "==", filter.value));
       continue;
     } else if (filter.operator === "color-equal") {
-      firestoreFilters.push(where(filter.key.concat(".hex"), "==", filter.value.hex.toString()))
-      continue
+      firestoreFilters.push(
+        where(filter.key.concat(".hex"), "==", filter.value.hex.toString())
+      );
+      continue;
     } else if (filter.operator === "color-not-equal") {
-      firestoreFilters.push(where(filter.key.concat(".hex"), "!=", filter.value.hex.toString()))
-      continue
+      firestoreFilters.push(
+        where(filter.key.concat(".hex"), "!=", filter.value.hex.toString())
+      );
+      continue;
     }
     firestoreFilters.push(
       where(filter.key, filter.operator as WhereFilterOp, filter.value)

From c1d1f44a3270afbde5495cc74c9dad0a60806148 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 22 Nov 2022 17:38:52 +1100
Subject: [PATCH 292/309] fix typedoc paths

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4783c433..a3bceebf 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "env": "node createDotEnv",
     "target": "firebase target:apply hosting rowy",
     "deploy": "firebase deploy --only hosting",
-    "typedoc": "typedoc src/atoms/tableScope/index.ts src/atoms/globalScope/index.ts --out typedoc"
+    "typedoc": "typedoc src/atoms/projectScope/index.ts src/atoms/tableScope/index.ts --out typedoc"
   },
   "engines": {
     "node": ">=16"

From ad7c5fd99202cb94f87dc25b5beafed2dfe1043b Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Thu, 24 Nov 2022 17:11:14 +1100
Subject: [PATCH 293/309] update typedoc config

---
 package.json |  4 ++--
 typedoc.json | 14 ++++++++++++++
 yarn.lock    | 50 +++++++++++++++++++-------------------------------
 3 files changed, 35 insertions(+), 33 deletions(-)
 create mode 100644 typedoc.json

diff --git a/package.json b/package.json
index a3bceebf..eebc09e1 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "env": "node createDotEnv",
     "target": "firebase target:apply hosting rowy",
     "deploy": "firebase deploy --only hosting",
-    "typedoc": "typedoc src/atoms/projectScope/index.ts src/atoms/tableScope/index.ts --out typedoc"
+    "typedoc": "typedoc --options typedoc.json"
   },
   "engines": {
     "node": ">=16"
@@ -180,7 +180,7 @@
     "raw-loader": "^4.0.2",
     "source-map-explorer": "^2.5.2",
     "ts-jest": "^28.0.2",
-    "typedoc": "^0.22.17"
+    "typedoc": "^0.23.21"
   },
   "resolutions": {
     "@types/react": "^18"
diff --git a/typedoc.json b/typedoc.json
new file mode 100644
index 00000000..c050816f
--- /dev/null
+++ b/typedoc.json
@@ -0,0 +1,14 @@
+{
+  "plugin": "",
+  "entryPoints": ["src/atoms/projectScope/*.ts", "src/atoms/tableScope/*.ts"],
+  "includes": "src/types",
+  "exclude": ["**/*.test"],
+  "readme": "none",
+  "githubPages": false,
+  "hideInPageTOC": true,
+  "entryDocument": "index.md",
+  "name": "Rowy",
+  "includeVersion": true,
+  "publicPath": "",
+  "out": "typedoc"
+}
diff --git a/yarn.lock b/yarn.lock
index 91bc54a8..12293512 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6269,17 +6269,6 @@ glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^8.0.3:
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e"
-  integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^5.0.1"
-    once "^1.3.0"
-
 global-modules@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
@@ -8039,10 +8028,10 @@ markdown-table@^3.0.0:
   resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-3.0.2.tgz#9b59eb2c1b22fe71954a65ff512887065a7bb57c"
   integrity sha512-y8j3a5/DkJCmS5x4dMCQL+OR0+2EAq3DOtio1COSHsmW2BGXnNCK3v12hJt1LrUz5iZH5g0LmuYOjDdI+czghA==
 
-marked@^4.0.16:
-  version "4.0.16"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-4.0.16.tgz#9ec18fc1a723032eb28666100344d9428cf7a264"
-  integrity sha512-wahonIQ5Jnyatt2fn8KqF/nIqZM8mh3oRu2+l5EANGMhu6RFjiSG52QNE2eWzFMI94HqYSgN184NurgNG6CztA==
+marked@^4.0.19:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-4.2.3.tgz#bd76a5eb510ff1d8421bc6c3b2f0b93488c15bea"
+  integrity sha512-slWRdJkbTZ+PjkyJnE30Uid64eHwbwa1Q25INCAYfZlK4o6ylagBy/Le9eWntqJFoFT93ikUKMv47GZ4gTwHkw==
 
 match-sorter@^6.3.1:
   version "6.3.1"
@@ -10947,14 +10936,14 @@ shell-quote@^1.7.3:
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123"
   integrity sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==
 
-shiki@^0.10.1:
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/shiki/-/shiki-0.10.1.tgz#6f9a16205a823b56c072d0f1a0bcd0f2646bef14"
-  integrity sha512-VsY7QJVzU51j5o1+DguUd+6vmCmZ5v/6gYu4vyYAhzjuNQU6P/vmSy4uQaOhvje031qQMiW0d2BwgMH52vqMng==
+shiki@^0.11.1:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/shiki/-/shiki-0.11.1.tgz#df0f719e7ab592c484d8b73ec10e215a503ab8cc"
+  integrity sha512-EugY9VASFuDqOexOgXR18ZV+TbFrQHeCpEYaXamO+SZlsnT/2LxuLBX25GGtIrwaEVFXUAbUQ601SWE2rMwWHA==
   dependencies:
     jsonc-parser "^3.0.0"
     vscode-oniguruma "^1.6.1"
-    vscode-textmate "5.2.0"
+    vscode-textmate "^6.0.0"
 
 side-channel@^1.0.4:
   version "1.0.4"
@@ -11807,16 +11796,15 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typedoc@^0.22.17:
-  version "0.22.17"
-  resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.22.17.tgz#bc51cc95f569040112504300831cdac4f8089b7b"
-  integrity sha512-h6+uXHVVCPDaANzjwzdsj9aePBjZiBTpiMpBBeyh1zcN2odVsDCNajz8zyKnixF93HJeGpl34j/70yoEE5BfNg==
+typedoc@^0.23.21:
+  version "0.23.21"
+  resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.23.21.tgz#2a6b0e155f91ffa9689086706ad7e3e4bc11d241"
+  integrity sha512-VNE9Jv7BgclvyH9moi2mluneSviD43dCE9pY8RWkO88/DrEgJZk9KpUk7WO468c9WWs/+aG6dOnoH7ccjnErhg==
   dependencies:
-    glob "^8.0.3"
     lunr "^2.3.9"
-    marked "^4.0.16"
+    marked "^4.0.19"
     minimatch "^5.1.0"
-    shiki "^0.10.1"
+    shiki "^0.11.1"
 
 typescript@^4.6.3:
   version "4.6.3"
@@ -12144,10 +12132,10 @@ vscode-oniguruma@^1.6.1:
   resolved "https://registry.yarnpkg.com/vscode-oniguruma/-/vscode-oniguruma-1.6.2.tgz#aeb9771a2f1dbfc9083c8a7fdd9cccaa3f386607"
   integrity sha512-KH8+KKov5eS/9WhofZR8M8dMHWN2gTxjMsG4jd04YhpbPR91fUj7rYQ2/XjeHCJWbg7X++ApRIU9NUwM2vTvLA==
 
-vscode-textmate@5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-5.2.0.tgz#01f01760a391e8222fe4f33fbccbd1ad71aed74e"
-  integrity sha512-Uw5ooOQxRASHgu6C7GVvUxisKXfSgW4oFlO+aa+PAkgmH89O3CXxEEzNRNtHSqtXFTl0nAC1uYj0GMSH27uwtQ==
+vscode-textmate@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-6.0.0.tgz#a3777197235036814ac9a92451492f2748589210"
+  integrity sha512-gu73tuZfJgu+mvCSy4UZwd2JXykjK9zAZsfmDeut5dx/1a7FeTk0XwJsSuqQn+cuMCGVbIBfl+s53X4T19DnzQ==
 
 w3c-hr-time@^1.0.2:
   version "1.0.2"

From 511eed5ab74d050f532c5c6284d390c61605e8d9 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Thu, 24 Nov 2022 17:27:15 +1100
Subject: [PATCH 294/309] fix column widths not updating in virtualized cells

---
 src/components/Table/TableBody.tsx         |  3 ++-
 src/components/Table/useVirtualization.tsx | 22 ++++++++++++++--------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/components/Table/TableBody.tsx b/src/components/Table/TableBody.tsx
index 74efe194..8dd53d73 100644
--- a/src/components/Table/TableBody.tsx
+++ b/src/components/Table/TableBody.tsx
@@ -54,6 +54,7 @@ export const TableBody = memo(function TableBody({
   rows,
   canEditCells,
   lastFrozen,
+  columnSizing,
 }: ITableBodyProps) {
   const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
   const [selectedCell] = useAtom(selectedCellAtom, tableScope);
@@ -66,7 +67,7 @@ export const TableBody = memo(function TableBody({
     paddingBottom,
     paddingLeft,
     paddingRight,
-  } = useVirtualization(containerRef, leafColumns);
+  } = useVirtualization(containerRef, leafColumns, columnSizing);
 
   const rowHeight = tableSchema.rowHeight || DEFAULT_ROW_HEIGHT;
 
diff --git a/src/components/Table/useVirtualization.tsx b/src/components/Table/useVirtualization.tsx
index 90df0329..090c3b83 100644
--- a/src/components/Table/useVirtualization.tsx
+++ b/src/components/Table/useVirtualization.tsx
@@ -15,8 +15,8 @@ import {
   OUT_OF_ORDER_MARGIN,
   DEFAULT_COL_WIDTH,
 } from "./Table";
-import { TableRow } from "@src/types/table";
-import { Column } from "@tanstack/react-table";
+import type { TableRow } from "@src/types/table";
+import type { Column, ColumnSizingState } from "@tanstack/react-table";
 
 import { MIN_COL_WIDTH } from "./Table";
 
@@ -26,7 +26,8 @@ import { MIN_COL_WIDTH } from "./Table";
  */
 export function useVirtualization(
   containerRef: React.RefObject<HTMLDivElement>,
-  leafColumns: Column<TableRow, unknown>[]
+  leafColumns: Column<TableRow, unknown>[],
+  columnSizing: ColumnSizingState
 ) {
   const [tableSchema] = useAtom(tableSchemaAtom, tableScope);
   const [tableRows] = useAtom(tableRowsAtom, tableScope);
@@ -63,12 +64,17 @@ export function useVirtualization(
     paddingStart: TABLE_PADDING,
     paddingEnd: TABLE_PADDING,
     estimateSize: useCallback(
-      (index: number) =>
-        Math.max(
+      (index: number) => {
+        const columnDef = leafColumns[index].columnDef;
+        const schemaWidth = columnDef.size;
+        const localWidth = columnSizing[columnDef.id || ""];
+
+        return Math.max(
           MIN_COL_WIDTH,
-          leafColumns[index].columnDef.size || DEFAULT_COL_WIDTH
-        ),
-      [leafColumns]
+          localWidth || schemaWidth || DEFAULT_COL_WIDTH
+        );
+      },
+      [leafColumns, columnSizing]
     ),
     rangeExtractor: useCallback(
       (range: Range) => {

From 7942b58e64107d89bfb21441ff3a42a41d4bf3e6 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Thu, 24 Nov 2022 19:13:28 +1100
Subject: [PATCH 295/309] update contributing guide with links to new technical
 docs

---
 CONTRIBUTING.md | 61 +++++++++++++++++++++++++++++++++++++------------
 1 file changed, 46 insertions(+), 15 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b78c5926..69b69a45 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,42 +1,73 @@
 # Contributing
 
-We welcome any feedback and contributions from the community. Please read the following guidelines to contribute to Rowy.
+We welcome any feedback and contributions from the community. Please read the
+following guidelines to contribute to Rowy.
 
 ## Code of conduct
 
-We want to have a welcoming and inclusive environment, towards this please read and follow our [our code of conduct](https://github.com/rowyio/rowy/blob/main/CODE_OF_CONDUCT.md).
+We want to have a welcoming and inclusive environment, towards this please read
+and follow our
+[our code of conduct](https://github.com/rowyio/rowy/blob/main/CODE_OF_CONDUCT.md).
 
 ## Getting started
 
-Read the documentation on getting started [here](http://docs.rowy.io/). To get familiar with the project, [good first issues](https://github.com/rowyio/rowy/projects/3) is a good place to start. 
+Read the documentation on setting up your local development environment
+[here](https://docs.rowy.io/setup/install#option-2-manual-install).
+
+Read how to submit a pull request [here](https://docs.rowy.io/contributing).
+
+To get familiar with the project,
+[good first issues](https://github.com/rowyio/rowy/projects/3) is a good place
+to start.
 
 ## Working on existing issues
 
-If you are working on an  [issue](https://github.com/rowyio/rowy/issues), share that you are working on it by commenting on the issue and posting a message on #contributions channel in Rowy's [Discord](https://discord.com/invite/fjBugmvzZP). 
-This allows others in the community and the maintainers a chance to provide feedback and guidance before you spend time working on it.
+If you are working on an [issue](https://github.com/rowyio/rowy/issues), share
+that you are working on it by commenting on the issue and posting a message on
+#contributions channel in Rowy's
+[Discord](https://discord.com/invite/fjBugmvzZP). This allows others in the
+community and the maintainers a chance to provide feedback and guidance before
+you spend time working on it.
 
 ## File a feature request
 
-If you have some interesting idea that will be a good addition to Rowy, then create a new issue using [Feature Request Template](https://github.com/rowyio/rowy/issues/new?assignees=&labels=&template=feature_request.md) 
-to share your idea. If you are working on this to contribute to the project, then let others in the community and project maintainers know by posting on #contributions channel in Rowy's [Discord](https://discord.com/invite/fjBugmvzZP). 
-This allows others in the community and the maintainers a chance to provide feedback and guidance before you spend time working on it.
+If you have some interesting idea that will be a good addition to Rowy, then
+create a new issue using
+[Feature Request Template](https://github.com/rowyio/rowy/issues/new?assignees=&labels=&template=feature_request.md)
+to share your idea. If you are working on this to contribute to the project,
+then let others in the community and project maintainers know by posting on
+#contributions channel in Rowy's
+[Discord](https://discord.com/invite/fjBugmvzZP). This allows others in the
+community and the maintainers a chance to provide feedback and guidance before
+you spend time working on it.
 
 ## Report an issue
 
-You can report all issues through using [Report A Bug](https://github.com/rowyio/rowy/issues/new?assignees=&labels=&template=bug_report.md) template. Please provide as much information as possible so that it can be resolved.
+You can report all issues through using
+[Report A Bug](https://github.com/rowyio/rowy/issues/new?assignees=&labels=&template=bug_report.md)
+template. Please provide as much information as possible so that it can be
+resolved.
 
 ## Review
 
-All submissions, including code and copy changes, will require review by project maintainers.
+All submissions, including code and copy changes, will require review by project
+maintainers.
 
 ## Create a pull request
 
-When making any pull requests to the repository, please follow these instructions:
+When making any pull requests to the repository, please follow these
+instructions:
 
-- Submit your PR to the develop branch
-- Add as much information as possible in your PR's description including link to any related issues.
-- Ensure all your commits have clear commit message along with comments in the code as required
+Make sure you’ve read our technical documentation
+[here](https://docs.rowy.io/contributing).
+
+- Submit your PR to the `develop` branch
+- Add as much information as possible in your PR's description including link to
+  any related issues.
+- Ensure all your commits have clear commit message along with comments in the
+  code as required
 
 ## License
 
-By contributing to Rowy, you agree that your contributions will be licensed with the same license that is specified in the repository you are contributing to.
+By contributing to Rowy, you agree that your contributions will be licensed with
+the same license that is specified in the repository you are contributing to.

From 15e1254625909b738516a4bbd0ffc2ec9c2404f6 Mon Sep 17 00:00:00 2001
From: saravanan-inc <59250081+saravanan-inc@users.noreply.github.com>
Date: Mon, 28 Nov 2022 09:49:50 +0530
Subject: [PATCH 296/309] Feat: Richtext field full screen mode, similar to
 markdown fieldtype (#972)

* Feat: Richtext field full screen mode, similar to markdown fieldtype

* Update src/components/RichTextEditor.tsx

Co-authored-by: Sidney Alcantara <sidney@sidney.me>
---
 CONTRIBUTING.md                   | 11 +++++------
 src/components/RichTextEditor.tsx | 18 ++++++++++++++++--
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 69b69a45..691abaaa 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -22,12 +22,11 @@ to start.
 
 ## Working on existing issues
 
-If you are working on an [issue](https://github.com/rowyio/rowy/issues), share
-that you are working on it by commenting on the issue and posting a message on
-#contributions channel in Rowy's
-[Discord](https://discord.com/invite/fjBugmvzZP). This allows others in the
-community and the maintainers a chance to provide feedback and guidance before
-you spend time working on it.
+If you are working on an  [issue](https://github.com/rowyio/rowy/issues), share that you are working on it by commenting on the issue and posting a message on #contributions channel in Rowy's [Discord](https://discord.com/invite/fjBugmvzZP). 
+This allows others in the community and the maintainers a chance to provide feedback and guidance before you spend time working on it.
+Before you get started working on an [issue](https://github.com/rowyio/rowy/issues), please make sure to share that you are working on it by commenting on the issue and posting a message on #contributions channel in Rowy's [Discord](https://discord.com/invite/fjBugmvzZP). The maintainers will then assign the issue to you after making sure any relevant information or context in addition is provided before you can start on the task.
+
+Once you are assigned a task, please provide periodic updates or share any questions or roadblocks on either discord or the Github issue, so that the commmunity or the project maintainers can provide you any feedback or guidance as needed. If you are inactive for more than 1-2 week on a issue that was assigned to you, then we will assume you have stopped working on it and we will unassign it from you - so that we can give a chance to others in the community to work on it.
 
 ## File a feature request
 
diff --git a/src/components/RichTextEditor.tsx b/src/components/RichTextEditor.tsx
index a8e9179a..93c8c4d4 100644
--- a/src/components/RichTextEditor.tsx
+++ b/src/components/RichTextEditor.tsx
@@ -28,6 +28,7 @@ import "tinymce/plugins/image";
 import "tinymce/plugins/paste";
 import "tinymce/plugins/help";
 import "tinymce/plugins/code";
+import "tinymce/plugins/fullscreen";
 
 const Styles = styled("div", {
   shouldForwardProp: (prop) => prop !== "focus",
@@ -120,6 +121,10 @@ const Styles = styled("div", {
                   0 0 0 1px ${theme.palette.action.inputOutline} inset`,
         }
       : {},
+    "& .tox-tinymce.tox-fullscreen": {
+      zIndex: theme.zIndex.modal,
+      backgroundColor: theme.palette.background.paper,
+    },
   },
 }));
 
@@ -149,6 +154,9 @@ export default function RichTextEditor({
       <GlobalStyles
         styles={{
           ".tox": {
+            // "& .tox-editor-container": {
+            //   backgroundColor: theme.palette.background.paper,
+            // },
             "& .tox-menu.tox-menu, &.tox-tinymce-aux .tox-toolbar__overflow.tox-toolbar__overflow":
               {
                 backgroundColor: theme.palette.background.paper,
@@ -242,10 +250,16 @@ export default function RichTextEditor({
           ].join("\n"),
           minHeight: 300,
           menubar: false,
-          plugins: ["autoresize", "lists link image", "paste help", "code"],
+          plugins: [
+            "fullscreen",
+            "autoresize",
+            "lists link image",
+            "paste help",
+            "code",
+          ],
           statusbar: false,
           toolbar:
-            "formatselect | bold italic forecolor | link | bullist numlist outdent indent | removeformat code | help",
+            "formatselect | bold italic forecolor | link | fullscreen | bullist numlist outdent indent | removeformat code | help",
           body_id: id,
         }}
         value={value}

From 1ac3afdac148605d23c0027526ea441eca336d15 Mon Sep 17 00:00:00 2001
From: Anish Roy <62830866+iamanishroy@users.noreply.github.com>
Date: Mon, 28 Nov 2022 11:00:10 +0530
Subject: [PATCH 297/309] #562: Add accessible reorder option in column menu
 [new] (#984)

* added reordering feature to the hidden fields menu

* added comment

* HiddenFields2 to HiddenFields

* Update src/components/TableToolbar/HiddenFields.tsx

Co-authored-by: Sidney Alcantara <sidney@sidney.me>
---
 src/components/TableToolbar/HiddenFields.tsx | 186 ++++++++++++++-----
 1 file changed, 143 insertions(+), 43 deletions(-)

diff --git a/src/components/TableToolbar/HiddenFields.tsx b/src/components/TableToolbar/HiddenFields.tsx
index 8015f6f5..0a537713 100644
--- a/src/components/TableToolbar/HiddenFields.tsx
+++ b/src/components/TableToolbar/HiddenFields.tsx
@@ -1,12 +1,26 @@
-import { useEffect, useRef, useMemo, useState } from "react";
-import { useAtom } from "jotai";
+import {
+  useEffect,
+  useRef,
+  useMemo,
+  useState,
+  forwardRef,
+  ChangeEvent,
+} from "react";
+import { useAtom, useSetAtom } from "jotai";
 import { isEqual } from "lodash-es";
 import { colord } from "colord";
+import {
+  DragDropContext,
+  Droppable,
+  Draggable,
+  DropResult,
+} from "react-beautiful-dnd";
 
 import { Box, AutocompleteProps, Theme } from "@mui/material";
 import VisibilityIcon from "@mui/icons-material/VisibilityOutlined";
 import VisibilityOffIcon from "@mui/icons-material/VisibilityOffOutlined";
 import IconSlash from "@src/components/IconSlash";
+import DragIndicatorOutlinedIcon from "@mui/icons-material/DragIndicatorOutlined";
 
 import ColumnSelect, { ColumnItem } from "@src/components/Table/ColumnSelect";
 import ButtonWithStatus from "@src/components/ButtonWithStatus";
@@ -16,7 +30,11 @@ import {
   userSettingsAtom,
   updateUserSettingsAtom,
 } from "@src/atoms/projectScope";
-import { tableScope, tableIdAtom } from "@src/atoms/tableScope";
+import {
+  tableScope,
+  tableIdAtom,
+  updateColumnAtom,
+} from "@src/atoms/tableScope";
 import { formatSubTableName } from "@src/utils/table";
 
 export default function HiddenFields() {
@@ -57,6 +75,9 @@ export default function HiddenFields() {
     }
     setOpen(false);
   };
+
+  // disable drag if search box is not empty
+  const [disableDrag, setDisableDrag] = useState<boolean>(false);
   const renderOption: AutocompleteProps<
     any,
     true,
@@ -67,49 +88,119 @@ export default function HiddenFields() {
       colord(theme.palette.background.paper)
         .mix("#fff", theme.palette.mode === "dark" ? 0.16 : 0)
         .alpha(1);
-
     return (
-      <li {...props}>
-        <ColumnItem option={option}>
-          <Box
-            sx={[
-              { position: "relative", height: "1.5rem" },
-              selected
-                ? { color: "primary.main" }
-                : {
-                    opacity: 0,
-                    ".MuiAutocomplete-option.Mui-focused &": { opacity: 0.5 },
+      <Draggable
+        draggableId={option.value}
+        index={option.index}
+        isDragDisabled={disableDrag}
+      >
+        {(provided) => (
+          <li {...props} ref={provided.innerRef} {...provided.draggableProps}>
+            <Box
+              sx={[{ position: "relative", height: "1.5rem" }]}
+              {...provided.dragHandleProps}
+            >
+              <DragIndicatorOutlinedIcon
+                color="disabled"
+                sx={[
+                  {
+                    marginRight: "6px",
+                    opacity: (theme) =>
+                      disableDrag ? theme.palette.action.disabledOpacity : 1,
                   },
-            ]}
-          >
-            <VisibilityIcon />
-            <IconSlash
-              sx={[
-                {
-                  "& .icon-slash-mask": {
-                    stroke: (theme) => slashColor(theme).toHslString(),
-                  },
-                  ".Mui-focused & .icon-slash-mask": {
-                    stroke: (theme) =>
-                      slashColor(theme)
-                        .mix(
-                          theme.palette.primary.main,
-                          theme.palette.action.selectedOpacity +
-                            theme.palette.action.hoverOpacity
-                        )
-                        .alpha(1)
-                        .toHslString(),
-                  },
-                },
-                selected ? { strokeDashoffset: 0 } : {},
-              ]}
-            />
-          </Box>
-        </ColumnItem>
-      </li>
+                ]}
+              />
+            </Box>
+            <ColumnItem option={option}>
+              <Box
+                sx={[
+                  { position: "relative", height: "1.5rem" },
+                  selected
+                    ? { color: "primary.main" }
+                    : {
+                        opacity: 0,
+                        ".MuiAutocomplete-option.Mui-focused &": {
+                          opacity: 0.5,
+                        },
+                      },
+                ]}
+              >
+                <VisibilityIcon />
+                <IconSlash
+                  sx={[
+                    {
+                      "& .icon-slash-mask": {
+                        stroke: (theme) => slashColor(theme).toHslString(),
+                      },
+                      ".Mui-focused & .icon-slash-mask": {
+                        stroke: (theme) =>
+                          slashColor(theme)
+                            .mix(
+                              theme.palette.primary.main,
+                              theme.palette.action.selectedOpacity +
+                                theme.palette.action.hoverOpacity
+                            )
+                            .alpha(1)
+                            .toHslString(),
+                      },
+                    },
+                    selected ? { strokeDashoffset: 0 } : {},
+                  ]}
+                />
+              </Box>
+            </ColumnItem>
+          </li>
+        )}
+      </Draggable>
     );
   };
 
+  const updateColumn = useSetAtom(updateColumnAtom, tableScope);
+
+  // updates column on drag end
+  function handleOnDragEnd(result: DropResult) {
+    if (!result.destination) return;
+    updateColumn({
+      key: result.draggableId,
+      config: {},
+      index: result.destination.index,
+    });
+  }
+
+  // checks whether to disable reordering when search filter is applied
+  function checkToDisableDrag(e: ChangeEvent<HTMLInputElement>) {
+    setDisableDrag(e.target.value !== "");
+  }
+
+  const ListboxComponent = forwardRef(function ListboxComponent(
+    props: React.HTMLAttributes<HTMLElement>,
+    ulRef: any /*React.ForwardedRef<HTMLUListElement>*/
+  ) {
+    const { children, ...other } = props;
+
+    return (
+      <DragDropContext onDragEnd={handleOnDragEnd}>
+        <Droppable droppableId="columns_manager" direction="vertical">
+          {(provided) => (
+            <ul
+              {...other}
+              {...provided.droppableProps}
+              ref={(ref) => {
+                provided.innerRef(ref);
+                if (ulRef !== null) {
+                  ulRef(ref);
+                }
+              }}
+            >
+              {props.children}
+              {provided.placeholder}
+            </ul>
+          )}
+        </Droppable>
+      </DragDropContext>
+    );
+  });
+
   return (
     <>
       <ButtonWithStatus
@@ -123,6 +214,7 @@ export default function HiddenFields() {
       <ColumnSelect
         TextFieldProps={{
           style: { display: "none" },
+          onInput: checkToDisableDrag,
           SelectProps: {
             open,
             MenuProps: {
@@ -138,11 +230,19 @@ export default function HiddenFields() {
             },
           },
         }}
-        {...{ AutocompleteProps: { renderOption } }}
+        {...{
+          AutocompleteProps: {
+            renderOption,
+            ListboxComponent,
+          },
+        }}
         label="Hidden fields"
         labelPlural="fields"
         value={hiddenFields ?? []}
-        onChange={setHiddenFields}
+        onChange={(updates: string[]) => {
+          setHiddenFields(updates);
+          setDisableDrag(false);
+        }}
         onClose={handleSave}
         clearText="Show all"
         selectAllText="Hide all"

From 1f28a8cb5bc0444e020982d35baa31e166f0124e Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 28 Nov 2022 18:18:26 +1100
Subject: [PATCH 298/309] fix table infinite loop if user doesn't have read
 permissions

---
 src/hooks/useFirestoreCollectionWithAtom.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hooks/useFirestoreCollectionWithAtom.ts b/src/hooks/useFirestoreCollectionWithAtom.ts
index fb4ec621..a49ec98a 100644
--- a/src/hooks/useFirestoreCollectionWithAtom.ts
+++ b/src/hooks/useFirestoreCollectionWithAtom.ts
@@ -215,7 +215,7 @@ export function useFirestoreCollectionWithAtom<T = TableRow>(
           setDataAtom([]);
           suspended = false;
         }
-        if (nextPageAtom) setNextPageAtom({ loading: false, available: true });
+        if (nextPageAtom) setNextPageAtom({ loading: false, available: false });
         if (onError) onError(error);
         else handleError(error);
       }

From ca72c656d60fea61aa9e4bdf19088cba48e9de03 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 28 Nov 2022 18:31:14 +1100
Subject: [PATCH 299/309] ROWY-791 fix virtualization not handling minimum
 width correctly

---
 src/components/Table/useVirtualization.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/Table/useVirtualization.tsx b/src/components/Table/useVirtualization.tsx
index 090c3b83..cd50acc6 100644
--- a/src/components/Table/useVirtualization.tsx
+++ b/src/components/Table/useVirtualization.tsx
@@ -68,11 +68,11 @@ export function useVirtualization(
         const columnDef = leafColumns[index].columnDef;
         const schemaWidth = columnDef.size;
         const localWidth = columnSizing[columnDef.id || ""];
+        const definedWidth = localWidth || schemaWidth;
 
-        return Math.max(
-          MIN_COL_WIDTH,
-          localWidth || schemaWidth || DEFAULT_COL_WIDTH
-        );
+        if (definedWidth === undefined) return DEFAULT_COL_WIDTH;
+        if (definedWidth < MIN_COL_WIDTH) return MIN_COL_WIDTH;
+        return definedWidth;
       },
       [leafColumns, columnSizing]
     ),

From 3fb60102ef243f4a2f5a5c6967771142b6a1e1a3 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 28 Nov 2022 18:33:58 +1100
Subject: [PATCH 300/309] ROWY-706 fix build logs snackbar appearing under
 frozen columns

---
 .../TableModals/CloudLogsModal/BuildLogs/BuildLogsSnack.tsx     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/TableModals/CloudLogsModal/BuildLogs/BuildLogsSnack.tsx b/src/components/TableModals/CloudLogsModal/BuildLogs/BuildLogsSnack.tsx
index 563eb599..ffc2f2e8 100644
--- a/src/components/TableModals/CloudLogsModal/BuildLogs/BuildLogsSnack.tsx
+++ b/src/components/TableModals/CloudLogsModal/BuildLogs/BuildLogsSnack.tsx
@@ -105,7 +105,7 @@ export default function BuildLogsSnack({
         p: 2,
         pt: 1,
         borderRadius: 1,
-        zIndex: 1,
+        zIndex: (theme) => theme.zIndex.snackbar,
         transition: (theme) => theme.transitions.create("height"),
         height: expanded ? "calc(100% - 300px)" : 50,
       }}

From 672f0b4d964cd068d2cdd941198bcc1804c13bd1 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 28 Nov 2022 18:42:44 +1100
Subject: [PATCH 301/309] fix lastFrozen column being incorrect if it's hidden

---
 src/components/Table/Table.tsx | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index 412e0535..092ff0ab 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -7,6 +7,10 @@ import {
   getCoreRowModel,
   useReactTable,
 } from "@tanstack/react-table";
+import type {
+  ColumnPinningState,
+  VisibilityState,
+} from "@tanstack/react-table";
 import { DropResult } from "react-beautiful-dnd";
 import { get } from "lodash-es";
 
@@ -15,7 +19,6 @@ import TableHeader from "./TableHeader";
 import TableBody from "./TableBody";
 import FinalColumn from "./FinalColumn/FinalColumn";
 import ContextMenu from "./ContextMenu";
-
 import EmptyState from "@src/components/EmptyState";
 // import BulkActions from "./BulkActions";
 
@@ -28,11 +31,10 @@ import {
   tablePageAtom,
   updateColumnAtom,
 } from "@src/atoms/tableScope";
-
 import { getFieldType, getFieldProp } from "@src/components/fields";
-import { TableRow, ColumnConfig } from "@src/types/table";
 import { useKeyboardNavigation } from "./useKeyboardNavigation";
 import { useSaveColumnSizing } from "./useSaveColumnSizing";
+import type { TableRow, ColumnConfig } from "@src/types/table";
 
 export const DEFAULT_ROW_HEIGHT = 41;
 export const DEFAULT_COL_WIDTH = 150;
@@ -130,20 +132,24 @@ export default function Table({
   }, [tableColumnsOrdered, canAddColumns, canEditCells]);
 
   // Get user’s hidden columns from props and memoize into a `VisibilityState`
-  const columnVisibility = useMemo(() => {
+  const columnVisibility: VisibilityState = useMemo(() => {
     if (!Array.isArray(hiddenColumns)) return {};
     return hiddenColumns.reduce((a, c) => ({ ...a, [c]: false }), {});
   }, [hiddenColumns]);
 
   // Get frozen columns and memoize into a `ColumnPinningState`
-  const columnPinning = useMemo(
+  const columnPinning: ColumnPinningState = useMemo(
     () => ({
-      left: columns.filter((c) => c.meta?.fixed && c.id).map((c) => c.id!),
+      left: columns
+        .filter(
+          (c) => c.meta?.fixed && c.id && columnVisibility[c.id] !== false
+        )
+        .map((c) => c.id!),
     }),
-    [columns]
+    [columns, columnVisibility]
   );
   const lastFrozen: string | undefined =
-    columnPinning.left[columnPinning.left.length - 1];
+    columnPinning.left![columnPinning.left!.length - 1];
 
   // Call TanStack Table
   const table = useReactTable({

From 093463793d949b78eb1f40ef4e293fdc83ec9a27 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Mon, 28 Nov 2022 19:09:44 +1100
Subject: [PATCH 302/309] fix typedoc config - remove markdown plugin

---
 typedoc.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/typedoc.json b/typedoc.json
index c050816f..169e59de 100644
--- a/typedoc.json
+++ b/typedoc.json
@@ -1,14 +1,10 @@
 {
-  "plugin": "",
   "entryPoints": ["src/atoms/projectScope/*.ts", "src/atoms/tableScope/*.ts"],
   "includes": "src/types",
   "exclude": ["**/*.test"],
   "readme": "none",
   "githubPages": false,
-  "hideInPageTOC": true,
-  "entryDocument": "index.md",
   "name": "Rowy",
   "includeVersion": true,
-  "publicPath": "",
   "out": "typedoc"
 }

From a474e42d50a404b8669ffb49a0540a0e505497e5 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 29 Nov 2022 11:01:34 +1100
Subject: [PATCH 303/309] fix RichTextEditor full screen styles (#972)

---
 src/components/RichTextEditor.tsx | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/components/RichTextEditor.tsx b/src/components/RichTextEditor.tsx
index 93c8c4d4..039347da 100644
--- a/src/components/RichTextEditor.tsx
+++ b/src/components/RichTextEditor.tsx
@@ -49,6 +49,11 @@ const Styles = styled("div", {
         boxShadow: `0 -1px 0 0 ${theme.palette.text.primary} inset,
                     0 0 0 1px ${theme.palette.action.inputOutline} inset`,
       },
+
+      "&.tox-fullscreen": {
+        zIndex: theme.zIndex.modal,
+        backgroundColor: theme.palette.background.paper,
+      },
     },
 
     "& .tox-toolbar-overlord, & .tox-edit-area__iframe, & .tox-toolbar__primary":
@@ -121,10 +126,6 @@ const Styles = styled("div", {
                   0 0 0 1px ${theme.palette.action.inputOutline} inset`,
         }
       : {},
-    "& .tox-tinymce.tox-fullscreen": {
-      zIndex: theme.zIndex.modal,
-      backgroundColor: theme.palette.background.paper,
-    },
   },
 }));
 
@@ -154,9 +155,6 @@ export default function RichTextEditor({
       <GlobalStyles
         styles={{
           ".tox": {
-            // "& .tox-editor-container": {
-            //   backgroundColor: theme.palette.background.paper,
-            // },
             "& .tox-menu.tox-menu, &.tox-tinymce-aux .tox-toolbar__overflow.tox-toolbar__overflow":
               {
                 backgroundColor: theme.palette.background.paper,

From 86f9905600c97de0c465bc8c71338950e6eaf09e Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 29 Nov 2022 11:32:00 +1100
Subject: [PATCH 304/309] ROWY-796 fix action fields showing value and label

---
 src/components/fields/Status/DisplayCell.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/fields/Status/DisplayCell.tsx b/src/components/fields/Status/DisplayCell.tsx
index 34e8dc7b..9717a19c 100644
--- a/src/components/fields/Status/DisplayCell.tsx
+++ b/src/components/fields/Status/DisplayCell.tsx
@@ -41,7 +41,6 @@ export const StatusSingleSelect = forwardRef(function StatusSingleSelect({
           paddingLeft: "var(--cell-padding)",
         }}
       >
-        {value}
         {getLabel(value, sortedConditions)}
       </div>
     );

From 402334ee208c661bf04ad3cf48aa92afd44a1ab8 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 29 Nov 2022 16:47:53 +1100
Subject: [PATCH 305/309] upgrade dependencies, fix node 18 build, migrate date
 pickers from mui/lab to mui/x

---
 .../{yarn-1.22.5.cjs => yarn-1.22.19.cjs}     | 15599 ++++++++--------
 .yarnrc.yml                                   |     1 +
 package.json                                  |    39 +-
 src/Providers.tsx                             |     4 +-
 .../TableSettingsDialog.tsx                   |    16 +-
 src/components/fields/Date/EditorCell.tsx     |     5 +-
 .../fields/Date/SideDrawerField.tsx           |     3 +-
 src/components/fields/DateTime/EditorCell.tsx |     5 +-
 .../fields/DateTime/SideDrawerField.tsx       |     6 +-
 .../fields/Duration/SideDrawerField.tsx       |    30 +-
 src/hooks/useFirestoreCollectionWithAtom.ts   |     5 +-
 src/theme/components.tsx                      |    34 +-
 yarn.lock                                     |  7343 ++++----
 13 files changed, 11841 insertions(+), 11249 deletions(-)
 rename .yarn/releases/{yarn-1.22.5.cjs => yarn-1.22.19.cjs} (99%)
 create mode 100644 .yarnrc.yml

diff --git a/.yarn/releases/yarn-1.22.5.cjs b/.yarn/releases/yarn-1.22.19.cjs
similarity index 99%
rename from .yarn/releases/yarn-1.22.5.cjs
rename to .yarn/releases/yarn-1.22.19.cjs
index 7e3b13da..0fefc258 100755
--- a/.yarn/releases/yarn-1.22.5.cjs
+++ b/.yarn/releases/yarn-1.22.19.cjs
@@ -65,7 +65,7 @@ module.exports =
 /******/ 	__webpack_require__.p = "";
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 549);
+/******/ 	return __webpack_require__(__webpack_require__.s = 517);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -98,192 +98,192 @@ module.exports = require("path");
 /* unused harmony export __makeTemplateObject */
 /* unused harmony export __importStar */
 /* unused harmony export __importDefault */
-/*! *****************************************************************************
-Copyright (c) Microsoft Corporation. All rights reserved.
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License. You may obtain a copy of the
-License at http://www.apache.org/licenses/LICENSE-2.0
-
-THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
-WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-MERCHANTABLITY OR NON-INFRINGEMENT.
-
-See the Apache Version 2.0 License for specific language governing permissions
-and limitations under the License.
-***************************************************************************** */
-/* global Reflect, Promise */
-
-var extendStatics = function(d, b) {
-    extendStatics = Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-    return extendStatics(d, b);
-};
-
-function __extends(d, b) {
-    extendStatics(d, b);
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-}
-
-var __assign = function() {
-    __assign = Object.assign || function __assign(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-        }
-        return t;
-    }
-    return __assign.apply(this, arguments);
-}
-
-function __rest(s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
-            t[p[i]] = s[p[i]];
-    return t;
-}
-
-function __decorate(decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-}
-
-function __param(paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-}
-
-function __metadata(metadataKey, metadataValue) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
-}
-
-function __awaiter(thisArg, _arguments, P, generator) {
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-}
-
-function __generator(thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-}
-
-function __exportStar(m, exports) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}
-
-function __values(o) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
-    if (m) return m.call(o);
-    return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-}
-
-function __read(o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-}
-
-function __spread() {
-    for (var ar = [], i = 0; i < arguments.length; i++)
-        ar = ar.concat(__read(arguments[i]));
-    return ar;
-}
-
-function __await(v) {
-    return this instanceof __await ? (this.v = v, this) : new __await(v);
-}
-
-function __asyncGenerator(thisArg, _arguments, generator) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var g = generator.apply(thisArg, _arguments || []), i, q = [];
-    return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
-    function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
-    function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
-    function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
-    function fulfill(value) { resume("next", value); }
-    function reject(value) { resume("throw", value); }
-    function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
-}
-
-function __asyncDelegator(o) {
-    var i, p;
-    return i = {}, verb("next"), verb("throw", function (e) { throw e; }), verb("return"), i[Symbol.iterator] = function () { return this; }, i;
-    function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: n === "return" } : f ? f(v) : v; } : f; }
-}
-
-function __asyncValues(o) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var m = o[Symbol.asyncIterator], i;
-    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
-    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
-    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
-}
-
-function __makeTemplateObject(cooked, raw) {
-    if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
-    return cooked;
-};
-
-function __importStar(mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result.default = mod;
-    return result;
-}
-
-function __importDefault(mod) {
-    return (mod && mod.__esModule) ? mod : { default: mod };
-}
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0
+
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+MERCHANTABLITY OR NON-INFRINGEMENT.
+
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+/* global Reflect, Promise */
+
+var extendStatics = function(d, b) {
+    extendStatics = Object.setPrototypeOf ||
+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    return extendStatics(d, b);
+};
+
+function __extends(d, b) {
+    extendStatics(d, b);
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+}
+
+var __assign = function() {
+    __assign = Object.assign || function __assign(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+        }
+        return t;
+    }
+    return __assign.apply(this, arguments);
+}
+
+function __rest(s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
+            t[p[i]] = s[p[i]];
+    return t;
+}
+
+function __decorate(decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+
+function __param(paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+}
+
+function __metadata(metadataKey, metadataValue) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
+}
+
+function __awaiter(thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+}
+
+function __generator(thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+}
+
+function __exportStar(m, exports) {
+    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+}
+
+function __values(o) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
+    if (m) return m.call(o);
+    return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+}
+
+function __read(o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+}
+
+function __spread() {
+    for (var ar = [], i = 0; i < arguments.length; i++)
+        ar = ar.concat(__read(arguments[i]));
+    return ar;
+}
+
+function __await(v) {
+    return this instanceof __await ? (this.v = v, this) : new __await(v);
+}
+
+function __asyncGenerator(thisArg, _arguments, generator) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var g = generator.apply(thisArg, _arguments || []), i, q = [];
+    return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
+    function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
+    function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
+    function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
+    function fulfill(value) { resume("next", value); }
+    function reject(value) { resume("throw", value); }
+    function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
+}
+
+function __asyncDelegator(o) {
+    var i, p;
+    return i = {}, verb("next"), verb("throw", function (e) { throw e; }), verb("return"), i[Symbol.iterator] = function () { return this; }, i;
+    function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: n === "return" } : f ? f(v) : v; } : f; }
+}
+
+function __asyncValues(o) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var m = o[Symbol.asyncIterator], i;
+    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+}
+
+function __makeTemplateObject(cooked, raw) {
+    if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
+    return cooked;
+};
+
+function __importStar(mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
+    result.default = mod;
+    return result;
+}
+
+function __importDefault(mod) {
+    return (mod && mod.__esModule) ? mod : { default: mod };
+}
 
 
 /***/ }),
@@ -295,7 +295,7 @@ function __importDefault(mod) {
 
 exports.__esModule = true;
 
-var _promise = __webpack_require__(227);
+var _promise = __webpack_require__(224);
 
 var _promise2 = _interopRequireDefault(_promise);
 
@@ -338,6 +338,12 @@ module.exports = require("util");
 
 /***/ }),
 /* 4 */
+/***/ (function(module, exports) {
+
+module.exports = require("fs");
+
+/***/ }),
+/* 5 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -1393,7 +1399,7 @@ exports.normalizeOS = normalizeOS;
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireDefault(__webpack_require__(5));
+  return _fs = _interopRequireDefault(__webpack_require__(4));
 }
 
 var _glob;
@@ -1423,13 +1429,13 @@ function _load_blockingQueue() {
 var _promise;
 
 function _load_promise() {
-  return _promise = _interopRequireWildcard(__webpack_require__(50));
+  return _promise = _interopRequireWildcard(__webpack_require__(51));
 }
 
 var _promise2;
 
 function _load_promise2() {
-  return _promise2 = __webpack_require__(50);
+  return _promise2 = __webpack_require__(51);
 }
 
 var _map;
@@ -1441,7 +1447,7 @@ function _load_map() {
 var _fsNormalized;
 
 function _load_fsNormalized() {
-  return _fsNormalized = __webpack_require__(218);
+  return _fsNormalized = __webpack_require__(216);
 }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
@@ -1516,12 +1522,6 @@ function normalizeOS(body) {
 const cr = '\r'.charCodeAt(0);
 const lf = '\n'.charCodeAt(0);
 
-/***/ }),
-/* 5 */
-/***/ (function(module, exports) {
-
-module.exports = require("fs");
-
 /***/ }),
 /* 6 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -1565,7 +1565,13 @@ class ResponseError extends Error {
 }
 
 exports.ResponseError = ResponseError;
-class OneTimePasswordError extends Error {}
+class OneTimePasswordError extends Error {
+  constructor(notice) {
+    super();
+    this.notice = notice;
+  }
+
+}
 exports.OneTimePasswordError = OneTimePasswordError;
 
 /***/ }),
@@ -1580,7 +1586,7 @@ exports.OneTimePasswordError = OneTimePasswordError;
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Observer__ = __webpack_require__(420);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__Subscription__ = __webpack_require__(25);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__internal_symbol_rxSubscriber__ = __webpack_require__(321);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__config__ = __webpack_require__(185);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__config__ = __webpack_require__(186);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__util_hostReportError__ = __webpack_require__(323);
 /** PURE_IMPORTS_START tslib,_util_isFunction,_Observer,_Subscription,_internal_symbol_rxSubscriber,_config,_util_hostReportError PURE_IMPORTS_END */
 
@@ -1836,7 +1842,7 @@ const os = __webpack_require__(46);
 const path = __webpack_require__(0);
 const userHome = __webpack_require__(67).default;
 
-var _require = __webpack_require__(225);
+var _require = __webpack_require__(222);
 
 const getCacheDir = _require.getCacheDir,
       getConfigDir = _require.getConfigDir,
@@ -2027,7 +2033,7 @@ module.exports = invariant;
 "use strict";
 
 
-var YAMLException = __webpack_require__(54);
+var YAMLException = __webpack_require__(55);
 
 var TYPE_CONSTRUCTOR_OPTIONS = [
   'kind',
@@ -2102,9 +2108,9 @@ module.exports = require("crypto");
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Observable; });
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_canReportError__ = __webpack_require__(322);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_toSubscriber__ = __webpack_require__(932);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__internal_symbol_observable__ = __webpack_require__(117);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__internal_symbol_observable__ = __webpack_require__(118);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_pipe__ = __webpack_require__(324);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__config__ = __webpack_require__(185);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__config__ = __webpack_require__(186);
 /** PURE_IMPORTS_START _util_canReportError,_util_toSubscriber,_internal_symbol_observable,_util_pipe,_config PURE_IMPORTS_END */
 
 
@@ -2610,7 +2616,7 @@ exports.hyphenate = hyphenate;
 exports.camelCase = camelCase;
 exports.compareSortedArrays = compareSortedArrays;
 exports.sleep = sleep;
-const _camelCase = __webpack_require__(230);
+const _camelCase = __webpack_require__(227);
 
 function sortAlpha(a, b) {
   // sort alphabetically in a deterministic way
@@ -2718,7 +2724,7 @@ function _load_asyncToGenerator() {
 var _parse;
 
 function _load_parse() {
-  return _parse = __webpack_require__(105);
+  return _parse = __webpack_require__(106);
 }
 
 Object.defineProperty(exports, 'parse', {
@@ -2731,7 +2737,7 @@ Object.defineProperty(exports, 'parse', {
 var _stringify;
 
 function _load_stringify() {
-  return _stringify = __webpack_require__(199);
+  return _stringify = __webpack_require__(200);
 }
 
 Object.defineProperty(exports, 'stringify', {
@@ -2758,7 +2764,7 @@ function _load_normalizePattern() {
 var _parse2;
 
 function _load_parse2() {
-  return _parse2 = _interopRequireDefault(__webpack_require__(105));
+  return _parse2 = _interopRequireDefault(__webpack_require__(106));
 }
 
 var _constants;
@@ -2770,7 +2776,7 @@ function _load_constants() {
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
@@ -2994,29 +3000,12 @@ exports.default = Lockfile;
 /* 20 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var store = __webpack_require__(133)('wks');
-var uid = __webpack_require__(137);
-var Symbol = __webpack_require__(17).Symbol;
-var USE_SYMBOL = typeof Symbol == 'function';
-
-var $exports = module.exports = function (name) {
-  return store[name] || (store[name] =
-    USE_SYMBOL && Symbol[name] || (USE_SYMBOL ? Symbol : uid)('Symbol.' + name));
-};
-
-$exports.store = store;
-
-
-/***/ }),
-/* 21 */
-/***/ (function(module, exports, __webpack_require__) {
-
 "use strict";
 
 
 exports.__esModule = true;
 
-var _assign = __webpack_require__(591);
+var _assign = __webpack_require__(559);
 
 var _assign2 = _interopRequireDefault(_assign);
 
@@ -3036,6 +3025,23 @@ exports.default = _assign2.default || function (target) {
   return target;
 };
 
+/***/ }),
+/* 21 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var store = __webpack_require__(133)('wks');
+var uid = __webpack_require__(137);
+var Symbol = __webpack_require__(17).Symbol;
+var USE_SYMBOL = typeof Symbol == 'function';
+
+var $exports = module.exports = function (name) {
+  return store[name] || (store[name] =
+    USE_SYMBOL && Symbol[name] || (USE_SYMBOL ? Symbol : uid)('Symbol.' + name));
+};
+
+$exports.store = store;
+
+
 /***/ }),
 /* 22 */
 /***/ (function(module, exports) {
@@ -4387,7 +4393,7 @@ module.exports = require("url");
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_isArray__ = __webpack_require__(41);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isObject__ = __webpack_require__(444);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isFunction__ = __webpack_require__(154);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_tryCatch__ = __webpack_require__(56);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_tryCatch__ = __webpack_require__(57);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_errorObject__ = __webpack_require__(48);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_UnsubscriptionError__ = __webpack_require__(441);
 /** PURE_IMPORTS_START _util_isArray,_util_isObject,_util_isFunction,_util_tryCatch,_util_errorObject,_util_UnsubscriptionError PURE_IMPORTS_END */
@@ -4954,7 +4960,7 @@ formats['pkcs1'] = __webpack_require__(327);
 formats['pkcs8'] = __webpack_require__(157);
 formats['rfc4253'] = __webpack_require__(103);
 formats['ssh'] = __webpack_require__(456);
-formats['ssh-private'] = __webpack_require__(192);
+formats['ssh-private'] = __webpack_require__(193);
 formats['openssh'] = formats['ssh-private'];
 formats['dnssec'] = __webpack_require__(326);
 
@@ -5255,11 +5261,11 @@ function nullify(obj = {}) {
 
 "use strict";
 
-const escapeStringRegexp = __webpack_require__(388);
-const ansiStyles = __webpack_require__(506);
-const stdoutColor = __webpack_require__(598).stdout;
+const escapeStringRegexp = __webpack_require__(382);
+const ansiStyles = __webpack_require__(474);
+const stdoutColor = __webpack_require__(566).stdout;
 
-const template = __webpack_require__(599);
+const template = __webpack_require__(567);
 
 const isSimpleWindowsTerm = process.platform === 'win32' && !(process.env.TERM || '').toLowerCase().startsWith('xterm');
 
@@ -5707,7 +5713,7 @@ formats['pem'] = __webpack_require__(86);
 formats['pkcs1'] = __webpack_require__(327);
 formats['pkcs8'] = __webpack_require__(157);
 formats['rfc4253'] = __webpack_require__(103);
-formats['ssh-private'] = __webpack_require__(192);
+formats['ssh-private'] = __webpack_require__(193);
 formats['openssh'] = formats['ssh-private'];
 formats['ssh'] = formats['ssh-private'];
 formats['dnssec'] = __webpack_require__(326);
@@ -5940,7 +5946,7 @@ exports.wrapLifecycle = exports.run = exports.install = exports.Install = undefi
 var _extends2;
 
 function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+  return _extends2 = _interopRequireDefault(__webpack_require__(20));
 }
 
 var _asyncToGenerator2;
@@ -6041,13 +6047,13 @@ function _load_objectPath() {
 var _hooks;
 
 function _load_hooks() {
-  return _hooks = __webpack_require__(374);
+  return _hooks = __webpack_require__(368);
 }
 
 var _index;
 
 function _load_index() {
-  return _index = _interopRequireDefault(__webpack_require__(220));
+  return _index = _interopRequireDefault(__webpack_require__(218));
 }
 
 var _errors;
@@ -6059,7 +6065,7 @@ function _load_errors() {
 var _integrityChecker;
 
 function _load_integrityChecker() {
-  return _integrityChecker = _interopRequireDefault(__webpack_require__(208));
+  return _integrityChecker = _interopRequireDefault(__webpack_require__(206));
 }
 
 var _lockfile;
@@ -6077,37 +6083,37 @@ function _load_lockfile2() {
 var _packageFetcher;
 
 function _load_packageFetcher() {
-  return _packageFetcher = _interopRequireWildcard(__webpack_require__(210));
+  return _packageFetcher = _interopRequireWildcard(__webpack_require__(208));
 }
 
 var _packageInstallScripts;
 
 function _load_packageInstallScripts() {
-  return _packageInstallScripts = _interopRequireDefault(__webpack_require__(557));
+  return _packageInstallScripts = _interopRequireDefault(__webpack_require__(525));
 }
 
 var _packageCompatibility;
 
 function _load_packageCompatibility() {
-  return _packageCompatibility = _interopRequireWildcard(__webpack_require__(209));
+  return _packageCompatibility = _interopRequireWildcard(__webpack_require__(207));
 }
 
 var _packageResolver;
 
 function _load_packageResolver() {
-  return _packageResolver = _interopRequireDefault(__webpack_require__(366));
+  return _packageResolver = _interopRequireDefault(__webpack_require__(360));
 }
 
 var _packageLinker;
 
 function _load_packageLinker() {
-  return _packageLinker = _interopRequireDefault(__webpack_require__(211));
+  return _packageLinker = _interopRequireDefault(__webpack_require__(209));
 }
 
 var _index2;
 
 function _load_index2() {
-  return _index2 = __webpack_require__(57);
+  return _index2 = __webpack_require__(58);
 }
 
 var _index3;
@@ -6119,7 +6125,7 @@ function _load_index3() {
 var _autoclean;
 
 function _load_autoclean() {
-  return _autoclean = __webpack_require__(354);
+  return _autoclean = __webpack_require__(348);
 }
 
 var _constants;
@@ -6137,7 +6143,7 @@ function _load_normalizePattern() {
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 var _map;
@@ -6149,13 +6155,13 @@ function _load_map() {
 var _yarnVersion;
 
 function _load_yarnVersion() {
-  return _yarnVersion = __webpack_require__(120);
+  return _yarnVersion = __webpack_require__(105);
 }
 
 var _generatePnpMap;
 
 function _load_generatePnpMap() {
-  return _generatePnpMap = __webpack_require__(579);
+  return _generatePnpMap = __webpack_require__(547);
 }
 
 var _workspaceLayout;
@@ -6167,7 +6173,7 @@ function _load_workspaceLayout() {
 var _resolutionMap;
 
 function _load_resolutionMap() {
-  return _resolutionMap = _interopRequireDefault(__webpack_require__(214));
+  return _resolutionMap = _interopRequireDefault(__webpack_require__(212));
 }
 
 var _guessName;
@@ -6179,20 +6185,20 @@ function _load_guessName() {
 var _audit;
 
 function _load_audit() {
-  return _audit = _interopRequireDefault(__webpack_require__(353));
+  return _audit = _interopRequireDefault(__webpack_require__(347));
 }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const deepEqual = __webpack_require__(631);
+const deepEqual = __webpack_require__(599);
 
 const emoji = __webpack_require__(302);
 const invariant = __webpack_require__(9);
 const path = __webpack_require__(0);
 const semver = __webpack_require__(22);
-const uuid = __webpack_require__(119);
+const uuid = __webpack_require__(120);
 const ssri = __webpack_require__(65);
 
 const ONE_DAY = 1000 * 60 * 60 * 24;
@@ -7485,7 +7491,7 @@ function setFlags(commander) {
 /* 35 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var isObject = __webpack_require__(52);
+var isObject = __webpack_require__(53);
 module.exports = function (it) {
   if (!isObject(it)) throw TypeError(it + ' is not an object!');
   return it;
@@ -7504,7 +7510,7 @@ module.exports = function (it) {
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Observable__ = __webpack_require__(12);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Subscriber__ = __webpack_require__(7);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__Subscription__ = __webpack_require__(25);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_ObjectUnsubscribedError__ = __webpack_require__(189);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_ObjectUnsubscribedError__ = __webpack_require__(190);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__SubjectSubscription__ = __webpack_require__(422);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__internal_symbol_rxSubscriber__ = __webpack_require__(321);
 /** PURE_IMPORTS_START tslib,_Observable,_Subscriber,_Subscription,_util_ObjectUnsubscribedError,_SubjectSubscription,_internal_symbol_rxSubscriber PURE_IMPORTS_END */
@@ -24882,7 +24888,7 @@ var isArray = Array.isArray || (function (x) { return x && typeof x.length === '
 
 var dP = __webpack_require__(72);
 var createDesc = __webpack_require__(132);
-module.exports = __webpack_require__(51) ? function (object, key, value) {
+module.exports = __webpack_require__(52) ? function (object, key, value) {
   return dP.f(object, key, createDesc(1, value));
 } : function (object, key, value) {
   object[key] = value;
@@ -24966,7 +24972,7 @@ module.exports.extend         = extend;
 /*eslint-disable max-len*/
 
 var common        = __webpack_require__(43);
-var YAMLException = __webpack_require__(54);
+var YAMLException = __webpack_require__(55);
 var Type          = __webpack_require__(10);
 
 
@@ -25232,6 +25238,223 @@ function isScheduler(value) {
 "use strict";
 
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.exec = exports.queue = undefined;
+exports.forkp = forkp;
+exports.spawnp = spawnp;
+exports.forwardSignalToSpawnedProcesses = forwardSignalToSpawnedProcesses;
+exports.spawn = spawn;
+
+var _constants;
+
+function _load_constants() {
+  return _constants = _interopRequireWildcard(__webpack_require__(8));
+}
+
+var _blockingQueue;
+
+function _load_blockingQueue() {
+  return _blockingQueue = _interopRequireDefault(__webpack_require__(110));
+}
+
+var _errors;
+
+function _load_errors() {
+  return _errors = __webpack_require__(6);
+}
+
+var _promise;
+
+function _load_promise() {
+  return _promise = __webpack_require__(51);
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+/* global child_process$spawnOpts */
+
+const child = __webpack_require__(331);
+const fs = __webpack_require__(4);
+const path = __webpack_require__(0);
+
+const queue = exports.queue = new (_blockingQueue || _load_blockingQueue()).default('child', (_constants || _load_constants()).CHILD_CONCURRENCY);
+
+// TODO: this uid check is kinda whack
+let uid = 0;
+
+const exec = exports.exec = (0, (_promise || _load_promise()).promisify)(child.exec);
+
+function validate(program, opts = {}) {
+  if (program.match(/[\\\/]/)) {
+    return;
+  }
+
+  if (process.platform === 'win32' && process.env.PATHEXT) {
+    const cwd = opts.cwd || process.cwd();
+    const pathext = process.env.PATHEXT;
+
+    for (var _iterator = pathext.split(';'), _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref;
+
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref = _i.value;
+      }
+
+      const ext = _ref;
+
+      const candidate = path.join(cwd, `${program}${ext}`);
+      if (fs.existsSync(candidate)) {
+        throw new Error(`Potentially dangerous call to "${program}" in ${cwd}`);
+      }
+    }
+  }
+}
+
+function forkp(program, args, opts) {
+  validate(program, opts);
+  const key = String(++uid);
+  return new Promise((resolve, reject) => {
+    const proc = child.fork(program, args, opts);
+    spawnedProcesses[key] = proc;
+
+    proc.on('error', error => {
+      reject(error);
+    });
+
+    proc.on('close', exitCode => {
+      resolve(exitCode);
+    });
+  });
+}
+
+function spawnp(program, args, opts) {
+  validate(program, opts);
+  const key = String(++uid);
+  return new Promise((resolve, reject) => {
+    const proc = child.spawn(program, args, opts);
+    spawnedProcesses[key] = proc;
+
+    proc.on('error', error => {
+      reject(error);
+    });
+
+    proc.on('close', exitCode => {
+      resolve(exitCode);
+    });
+  });
+}
+
+const spawnedProcesses = {};
+
+function forwardSignalToSpawnedProcesses(signal) {
+  for (var _iterator2 = Object.keys(spawnedProcesses), _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+    var _ref2;
+
+    if (_isArray2) {
+      if (_i2 >= _iterator2.length) break;
+      _ref2 = _iterator2[_i2++];
+    } else {
+      _i2 = _iterator2.next();
+      if (_i2.done) break;
+      _ref2 = _i2.value;
+    }
+
+    const key = _ref2;
+
+    spawnedProcesses[key].kill(signal);
+  }
+}
+
+function spawn(program, args, opts = {}, onData) {
+  const key = opts.cwd || String(++uid);
+  return queue.push(key, () => new Promise((resolve, reject) => {
+    validate(program, opts);
+
+    const proc = child.spawn(program, args, opts);
+    spawnedProcesses[key] = proc;
+
+    let processingDone = false;
+    let processClosed = false;
+    let err = null;
+
+    let stdout = '';
+
+    proc.on('error', err => {
+      if (err.code === 'ENOENT') {
+        reject(new (_errors || _load_errors()).ProcessSpawnError(`Couldn't find the binary ${program}`, err.code, program));
+      } else {
+        reject(err);
+      }
+    });
+
+    function updateStdout(chunk) {
+      stdout += chunk;
+      if (onData) {
+        onData(chunk);
+      }
+    }
+
+    function finish() {
+      delete spawnedProcesses[key];
+      if (err) {
+        reject(err);
+      } else {
+        resolve(stdout.trim());
+      }
+    }
+
+    if (typeof opts.process === 'function') {
+      opts.process(proc, updateStdout, reject, function () {
+        if (processClosed) {
+          finish();
+        } else {
+          processingDone = true;
+        }
+      });
+    } else {
+      if (proc.stderr) {
+        proc.stderr.on('data', updateStdout);
+      }
+
+      if (proc.stdout) {
+        proc.stdout.on('data', updateStdout);
+      }
+
+      processingDone = true;
+    }
+
+    proc.on('close', (code, signal) => {
+      if (signal || code >= 1) {
+        err = new (_errors || _load_errors()).ProcessTermError(['Command failed.', signal ? `Exit signal: ${signal}` : `Exit code: ${code}`, `Command: ${program}`, `Arguments: ${args.join(' ')}`, `Directory: ${opts.cwd || process.cwd()}`, `Output:\n${stdout.trim()}`].join('\n'));
+        err.EXIT_SIGNAL = signal;
+        err.EXIT_CODE = code;
+      }
+
+      if (processingDone || err) {
+        finish();
+      } else {
+        processClosed = true;
+      }
+    });
+  }));
+}
+
+/***/ }),
+/* 51 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -25309,7 +25532,7 @@ function queue(arr, promiseProducer, concurrency = Infinity) {
 }
 
 /***/ }),
-/* 51 */
+/* 52 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // Thank's IE8 for his funny defineProperty
@@ -25319,7 +25542,7 @@ module.exports = !__webpack_require__(112)(function () {
 
 
 /***/ }),
-/* 52 */
+/* 53 */
 /***/ (function(module, exports) {
 
 module.exports = function (it) {
@@ -25328,14 +25551,14 @@ module.exports = function (it) {
 
 
 /***/ }),
-/* 53 */
+/* 54 */
 /***/ (function(module, exports) {
 
 module.exports = {};
 
 
 /***/ }),
-/* 54 */
+/* 55 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -25385,7 +25608,7 @@ module.exports = YAMLException;
 
 
 /***/ }),
-/* 55 */
+/* 56 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -25420,7 +25643,7 @@ module.exports = new Schema({
 
 
 /***/ }),
-/* 56 */
+/* 57 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -25446,7 +25669,7 @@ function tryCatch(fn) {
 
 
 /***/ }),
-/* 57 */
+/* 58 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -25460,7 +25683,7 @@ exports.registryNames = exports.registries = undefined;
 var _yarnRegistry;
 
 function _load_yarnRegistry() {
-  return _yarnRegistry = _interopRequireDefault(__webpack_require__(559));
+  return _yarnRegistry = _interopRequireDefault(__webpack_require__(527));
 }
 
 var _npmRegistry;
@@ -25478,182 +25701,6 @@ const registries = exports.registries = {
 
 const registryNames = exports.registryNames = Object.keys(registries);
 
-/***/ }),
-/* 58 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.exec = exports.queue = undefined;
-exports.forkp = forkp;
-exports.spawnp = spawnp;
-exports.forwardSignalToSpawnedProcesses = forwardSignalToSpawnedProcesses;
-exports.spawn = spawn;
-
-var _constants;
-
-function _load_constants() {
-  return _constants = _interopRequireWildcard(__webpack_require__(8));
-}
-
-var _blockingQueue;
-
-function _load_blockingQueue() {
-  return _blockingQueue = _interopRequireDefault(__webpack_require__(110));
-}
-
-var _errors;
-
-function _load_errors() {
-  return _errors = __webpack_require__(6);
-}
-
-var _promise;
-
-function _load_promise() {
-  return _promise = __webpack_require__(50);
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-/* global child_process$spawnOpts */
-
-const child = __webpack_require__(331);
-
-const queue = exports.queue = new (_blockingQueue || _load_blockingQueue()).default('child', (_constants || _load_constants()).CHILD_CONCURRENCY);
-
-// TODO: this uid check is kinda whack
-let uid = 0;
-
-const exec = exports.exec = (0, (_promise || _load_promise()).promisify)(child.exec);
-
-function forkp(program, args, opts) {
-  return new Promise((resolve, reject) => {
-    const proc = child.fork(program, args, opts);
-
-    proc.on('error', error => {
-      reject(error);
-    });
-
-    proc.on('close', exitCode => {
-      resolve(exitCode);
-    });
-  });
-}
-
-function spawnp(program, args, opts) {
-  return new Promise((resolve, reject) => {
-    const proc = child.spawn(program, args, opts);
-
-    proc.on('error', error => {
-      reject(error);
-    });
-
-    proc.on('close', exitCode => {
-      resolve(exitCode);
-    });
-  });
-}
-
-const spawnedProcesses = {};
-
-function forwardSignalToSpawnedProcesses(signal) {
-  for (var _iterator = Object.keys(spawnedProcesses), _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
-    var _ref;
-
-    if (_isArray) {
-      if (_i >= _iterator.length) break;
-      _ref = _iterator[_i++];
-    } else {
-      _i = _iterator.next();
-      if (_i.done) break;
-      _ref = _i.value;
-    }
-
-    const key = _ref;
-
-    spawnedProcesses[key].kill(signal);
-  }
-}
-
-function spawn(program, args, opts = {}, onData) {
-  const key = opts.cwd || String(++uid);
-  return queue.push(key, () => new Promise((resolve, reject) => {
-    const proc = child.spawn(program, args, opts);
-    spawnedProcesses[key] = proc;
-
-    let processingDone = false;
-    let processClosed = false;
-    let err = null;
-
-    let stdout = '';
-
-    proc.on('error', err => {
-      if (err.code === 'ENOENT') {
-        reject(new (_errors || _load_errors()).ProcessSpawnError(`Couldn't find the binary ${program}`, err.code, program));
-      } else {
-        reject(err);
-      }
-    });
-
-    function updateStdout(chunk) {
-      stdout += chunk;
-      if (onData) {
-        onData(chunk);
-      }
-    }
-
-    function finish() {
-      delete spawnedProcesses[key];
-      if (err) {
-        reject(err);
-      } else {
-        resolve(stdout.trim());
-      }
-    }
-
-    if (typeof opts.process === 'function') {
-      opts.process(proc, updateStdout, reject, function () {
-        if (processClosed) {
-          finish();
-        } else {
-          processingDone = true;
-        }
-      });
-    } else {
-      if (proc.stderr) {
-        proc.stderr.on('data', updateStdout);
-      }
-
-      if (proc.stdout) {
-        proc.stdout.on('data', updateStdout);
-      }
-
-      processingDone = true;
-    }
-
-    proc.on('close', (code, signal) => {
-      if (signal || code >= 1) {
-        err = new (_errors || _load_errors()).ProcessTermError(['Command failed.', signal ? `Exit signal: ${signal}` : `Exit code: ${code}`, `Command: ${program}`, `Arguments: ${args.join(' ')}`, `Directory: ${opts.cwd || process.cwd()}`, `Output:\n${stdout.trim()}`].join('\n'));
-        err.EXIT_SIGNAL = signal;
-        err.EXIT_CODE = code;
-      }
-
-      if (processingDone || err) {
-        finish();
-      } else {
-        processClosed = true;
-      }
-    });
-  }));
-}
-
 /***/ }),
 /* 59 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -25980,7 +26027,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
 /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "mergeScan", function() { return __WEBPACK_IMPORTED_MODULE_47__internal_operators_mergeScan__["a"]; });
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_48__internal_operators_min__ = __webpack_require__(875);
 /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "min", function() { return __WEBPACK_IMPORTED_MODULE_48__internal_operators_min__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_49__internal_operators_multicast__ = __webpack_require__(116);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_49__internal_operators_multicast__ = __webpack_require__(117);
 /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "multicast", function() { return __WEBPACK_IMPORTED_MODULE_49__internal_operators_multicast__["a"]; });
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_50__internal_operators_observeOn__ = __webpack_require__(434);
 /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "observeOn", function() { return __WEBPACK_IMPORTED_MODULE_50__internal_operators_observeOn__["b"]; });
@@ -26002,7 +26049,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
 /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "publishReplay", function() { return __WEBPACK_IMPORTED_MODULE_58__internal_operators_publishReplay__["a"]; });
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_59__internal_operators_race__ = __webpack_require__(884);
 /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "race", function() { return __WEBPACK_IMPORTED_MODULE_59__internal_operators_race__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_60__internal_operators_reduce__ = __webpack_require__(187);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_60__internal_operators_reduce__ = __webpack_require__(188);
 /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "reduce", function() { return __WEBPACK_IMPORTED_MODULE_60__internal_operators_reduce__["a"]; });
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_61__internal_operators_repeat__ = __webpack_require__(885);
 /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "repeat", function() { return __WEBPACK_IMPORTED_MODULE_61__internal_operators_repeat__["a"]; });
@@ -26060,7 +26107,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
 /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "throttle", function() { return __WEBPACK_IMPORTED_MODULE_87__internal_operators_throttle__["a"]; });
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_88__internal_operators_throttleTime__ = __webpack_require__(905);
 /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "throttleTime", function() { return __WEBPACK_IMPORTED_MODULE_88__internal_operators_throttleTime__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_89__internal_operators_throwIfEmpty__ = __webpack_require__(188);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_89__internal_operators_throwIfEmpty__ = __webpack_require__(189);
 /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "throwIfEmpty", function() { return __WEBPACK_IMPORTED_MODULE_89__internal_operators_throwIfEmpty__["a"]; });
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_90__internal_operators_timeInterval__ = __webpack_require__(906);
 /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "timeInterval", function() { return __WEBPACK_IMPORTED_MODULE_90__internal_operators_timeInterval__["a"]; });
@@ -26597,7 +26644,7 @@ function getPrioritizedHash (algo1, algo2) {
 // If you have no idea what ASN.1 or BER is, see this:
 // ftp://ftp.rsa.com/pub/pkcs/ascii/layman.asc
 
-var Ber = __webpack_require__(514);
+var Ber = __webpack_require__(482);
 
 
 
@@ -26629,7 +26676,7 @@ exports.home = undefined;
 var _rootUser;
 
 function _load_rootUser() {
-  return _rootUser = _interopRequireDefault(__webpack_require__(223));
+  return _rootUser = _interopRequireDefault(__webpack_require__(221));
 }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -26704,11 +26751,11 @@ module.exports = function (it, key) {
 /***/ (function(module, exports, __webpack_require__) {
 
 var anObject = __webpack_require__(35);
-var IE8_DOM_DEFINE = __webpack_require__(238);
-var toPrimitive = __webpack_require__(255);
+var IE8_DOM_DEFINE = __webpack_require__(235);
+var toPrimitive = __webpack_require__(252);
 var dP = Object.defineProperty;
 
-exports.f = __webpack_require__(51) ? Object.defineProperty : function defineProperty(O, P, Attributes) {
+exports.f = __webpack_require__(52) ? Object.defineProperty : function defineProperty(O, P, Attributes) {
   anObject(O);
   P = toPrimitive(P, true);
   anObject(Attributes);
@@ -26743,7 +26790,7 @@ var Schema = __webpack_require__(44);
 
 module.exports = Schema.DEFAULT = new Schema({
   include: [
-    __webpack_require__(55)
+    __webpack_require__(56)
   ],
   explicit: [
     __webpack_require__(290),
@@ -29586,13 +29633,13 @@ function _load_baseResolver() {
 var _npmResolver;
 
 function _load_npmResolver() {
-  return _npmResolver = _interopRequireDefault(__webpack_require__(217));
+  return _npmResolver = _interopRequireDefault(__webpack_require__(215));
 }
 
 var _yarnResolver;
 
 function _load_yarnResolver() {
-  return _yarnResolver = _interopRequireDefault(__webpack_require__(576));
+  return _yarnResolver = _interopRequireDefault(__webpack_require__(544));
 }
 
 var _gitResolver;
@@ -29604,43 +29651,43 @@ function _load_gitResolver() {
 var _tarballResolver;
 
 function _load_tarballResolver() {
-  return _tarballResolver = _interopRequireDefault(__webpack_require__(574));
+  return _tarballResolver = _interopRequireDefault(__webpack_require__(542));
 }
 
 var _githubResolver;
 
 function _load_githubResolver() {
-  return _githubResolver = _interopRequireDefault(__webpack_require__(367));
+  return _githubResolver = _interopRequireDefault(__webpack_require__(361));
 }
 
 var _fileResolver;
 
 function _load_fileResolver() {
-  return _fileResolver = _interopRequireDefault(__webpack_require__(215));
+  return _fileResolver = _interopRequireDefault(__webpack_require__(213));
 }
 
 var _linkResolver;
 
 function _load_linkResolver() {
-  return _linkResolver = _interopRequireDefault(__webpack_require__(368));
+  return _linkResolver = _interopRequireDefault(__webpack_require__(362));
 }
 
 var _gitlabResolver;
 
 function _load_gitlabResolver() {
-  return _gitlabResolver = _interopRequireDefault(__webpack_require__(572));
+  return _gitlabResolver = _interopRequireDefault(__webpack_require__(540));
 }
 
 var _gistResolver;
 
 function _load_gistResolver() {
-  return _gistResolver = _interopRequireDefault(__webpack_require__(216));
+  return _gistResolver = _interopRequireDefault(__webpack_require__(214));
 }
 
 var _bitbucketResolver;
 
 function _load_bitbucketResolver() {
-  return _bitbucketResolver = _interopRequireDefault(__webpack_require__(571));
+  return _bitbucketResolver = _interopRequireDefault(__webpack_require__(539));
 }
 
 var _hostedGitResolver;
@@ -29652,7 +29699,7 @@ function _load_hostedGitResolver() {
 var _registryResolver;
 
 function _load_registryResolver() {
-  return _registryResolver = _interopRequireDefault(__webpack_require__(573));
+  return _registryResolver = _interopRequireDefault(__webpack_require__(541));
 }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -29730,7 +29777,7 @@ for (const key in registries) {
 
 var _ = __webpack_require__(38);
 var chalk = __webpack_require__(30);
-var runAsync = __webpack_require__(181);
+var runAsync = __webpack_require__(182);
 var { filter, flatMap, share, take, takeUntil } = __webpack_require__(63);
 var Choices = __webpack_require__(686);
 var ScreenManager = __webpack_require__(697);
@@ -29878,7 +29925,7 @@ module.exports = Prompt;
 
 "use strict";
 
-var { fromEvent } = __webpack_require__(182);
+var { fromEvent } = __webpack_require__(183);
 var { filter, map, share } = __webpack_require__(63);
 
 function normalizeKeypressEvents(value, key) {
@@ -31308,7 +31355,7 @@ try {
 } catch (er) {}
 
 var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {}
-var expand = __webpack_require__(229)
+var expand = __webpack_require__(226)
 
 var plTypes = {
   '!': { open: '(?:(?!(?:', close: '))[^/]*?)'},
@@ -32370,7 +32417,7 @@ var PrivateKey = __webpack_require__(33);
 
 var pkcs1 = __webpack_require__(327);
 var pkcs8 = __webpack_require__(157);
-var sshpriv = __webpack_require__(192);
+var sshpriv = __webpack_require__(193);
 var rfc4253 = __webpack_require__(103);
 
 var errors = __webpack_require__(74);
@@ -32567,7 +32614,7 @@ exports.SCOPE_SEPARATOR = undefined;
 var _extends2;
 
 function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+  return _extends2 = _interopRequireDefault(__webpack_require__(20));
 }
 
 var _asyncToGenerator2;
@@ -32585,25 +32632,25 @@ function _load_constants() {
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 var _npmResolver;
 
 function _load_npmResolver() {
-  return _npmResolver = _interopRequireDefault(__webpack_require__(217));
+  return _npmResolver = _interopRequireDefault(__webpack_require__(215));
 }
 
 var _envReplace;
 
 function _load_envReplace() {
-  return _envReplace = _interopRequireDefault(__webpack_require__(577));
+  return _envReplace = _interopRequireDefault(__webpack_require__(545));
 }
 
 var _baseRegistry;
 
 function _load_baseRegistry() {
-  return _baseRegistry = _interopRequireDefault(__webpack_require__(558));
+  return _baseRegistry = _interopRequireDefault(__webpack_require__(526));
 }
 
 var _misc;
@@ -32615,7 +32662,7 @@ function _load_misc() {
 var _path;
 
 function _load_path() {
-  return _path = __webpack_require__(377);
+  return _path = __webpack_require__(371);
 }
 
 var _normalizeUrl;
@@ -32751,7 +32798,7 @@ class NpmRegistry extends (_baseRegistry || _load_baseRegistry()).default {
     let resolved = pathname;
 
     if (!REGEX_REGISTRY_PREFIX.test(pathname)) {
-      resolved = (_url || _load_url()).default.resolve((0, (_misc || _load_misc()).addSuffix)(registry, '/'), pathname);
+      resolved = (_url || _load_url()).default.resolve((0, (_misc || _load_misc()).addSuffix)(registry, '/'), `./${pathname}`);
     }
 
     if (REGEX_REGISTRY_ENFORCED_HTTPS.test(resolved)) {
@@ -32826,6 +32873,10 @@ class NpmRegistry extends (_baseRegistry || _load_baseRegistry()).default {
           }
 
           _this.reporter.info(_this.reporter.lang('twoFactorAuthenticationEnabled'));
+          if (error.notice) {
+            _this.reporter.info(error.notice);
+          }
+
           _this.otp = yield (0, (_login || _load_login()).getOneTimePassword)(_this.reporter);
 
           _this.requestManager.clearCache();
@@ -33225,7 +33276,7 @@ module.exports = function (it) {
 /* 92 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var isObject = __webpack_require__(52);
+var isObject = __webpack_require__(53);
 var document = __webpack_require__(17).document;
 // typeof document.createElement is 'object' in old IE
 var is = isObject(document) && isObject(document.createElement);
@@ -33272,7 +33323,7 @@ module.exports.f = function (C) {
 
 var def = __webpack_require__(72).f;
 var has = __webpack_require__(71);
-var TAG = __webpack_require__(20)('toStringTag');
+var TAG = __webpack_require__(21)('toStringTag');
 
 module.exports = function (it, tag, stat) {
   if (it && !has(it = stat ? it : it.prototype, TAG)) def(it, TAG, { configurable: true, value: tag });
@@ -33307,7 +33358,7 @@ module.exports = function (it) {
 /***/ (function(module, exports, __webpack_require__) {
 
 // to indexed object, toObject with fallback for non-array-like ES3 strings
-var IObject = __webpack_require__(170);
+var IObject = __webpack_require__(171);
 var defined = __webpack_require__(91);
 module.exports = function (it) {
   return IObject(defined(it));
@@ -33360,7 +33411,7 @@ module.exports = function (it) {
 
 module.exports = glob
 
-var fs = __webpack_require__(5)
+var fs = __webpack_require__(4)
 var rp = __webpack_require__(140)
 var minimatch = __webpack_require__(82)
 var Minimatch = minimatch.Minimatch
@@ -33369,7 +33420,7 @@ var EE = __webpack_require__(77).EventEmitter
 var path = __webpack_require__(0)
 var assert = __webpack_require__(28)
 var isAbsolute = __webpack_require__(101)
-var globSync = __webpack_require__(272)
+var globSync = __webpack_require__(269)
 var common = __webpack_require__(141)
 var alphasort = common.alphasort
 var alphasorti = common.alphasorti
@@ -34180,7 +34231,7 @@ if (process.env.READABLE_STREAM === 'disable' && Stream) {
   exports.Stream = Stream || exports;
   exports.Readable = exports;
   exports.Writable = __webpack_require__(408);
-  exports.Duplex = __webpack_require__(115);
+  exports.Duplex = __webpack_require__(116);
   exports.Transform = __webpack_require__(407);
   exports.PassThrough = __webpack_require__(792);
 }
@@ -34371,6 +34422,85 @@ module.exports = require("tty");
 "use strict";
 
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getInstallationMethod = exports.version = undefined;
+
+var _asyncToGenerator2;
+
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
+}
+
+let getInstallationMethod = exports.getInstallationMethod = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+    let installationMethod = originalInstallationMethod;
+
+    // If there's a package.json in the parent directory, it could have an
+    // override for the installation method, so we should prefer that over
+    // whatever was originally in Yarn's package.json. This is the case with
+    // systems such as Homebrew, which take the tarball and modify the
+    // installation method so we're aware of the fact that Yarn was installed via
+    // Homebrew (so things like update notifications can point out the correct
+    // command to upgrade).
+    try {
+      const manifestPath = (_path || _load_path()).default.join(__dirname, '..', 'package.json');
+      if ((_fs2 || _load_fs2()).default.existsSync(manifestPath)) {
+        // non-async version is deprecated
+        const manifest = yield (0, (_fs || _load_fs()).readJson)(manifestPath);
+        if (manifest.installationMethod) {
+          installationMethod = manifest.installationMethod;
+        }
+      }
+    } catch (e) {
+      // Ignore any errors; this is not critical functionality.
+    }
+    return installationMethod;
+  });
+
+  return function getInstallationMethod() {
+    return _ref.apply(this, arguments);
+  };
+})();
+
+var _fs;
+
+function _load_fs() {
+  return _fs = __webpack_require__(5);
+}
+
+var _fs2;
+
+function _load_fs2() {
+  return _fs2 = _interopRequireDefault(__webpack_require__(4));
+}
+
+var _path;
+
+function _load_path() {
+  return _path = _interopRequireDefault(__webpack_require__(0));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+// This will be bundled directly in the .js file for production builds
+var _require = __webpack_require__(195); /**
+                                               * Determines the current version of Yarn itself.
+                                               * 
+                                               */
+
+const version = _require.version,
+      originalInstallationMethod = _require.installationMethod;
+exports.version = version;
+
+/***/ }),
+/* 106 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -34846,280 +34976,6 @@ function parseWithConflict(str, fileLoc) {
   }
 }
 
-/***/ }),
-/* 106 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-
-module.exports = {
-  copy: copy,
-  checkDataType: checkDataType,
-  checkDataTypes: checkDataTypes,
-  coerceToTypes: coerceToTypes,
-  toHash: toHash,
-  getProperty: getProperty,
-  escapeQuotes: escapeQuotes,
-  equal: __webpack_require__(204),
-  ucs2length: __webpack_require__(480),
-  varOccurences: varOccurences,
-  varReplace: varReplace,
-  cleanUpCode: cleanUpCode,
-  finalCleanUpCode: finalCleanUpCode,
-  schemaHasRules: schemaHasRules,
-  schemaHasRulesExcept: schemaHasRulesExcept,
-  toQuotedString: toQuotedString,
-  getPathExpr: getPathExpr,
-  getPath: getPath,
-  getData: getData,
-  unescapeFragment: unescapeFragment,
-  unescapeJsonPointer: unescapeJsonPointer,
-  escapeFragment: escapeFragment,
-  escapeJsonPointer: escapeJsonPointer
-};
-
-
-function copy(o, to) {
-  to = to || {};
-  for (var key in o) to[key] = o[key];
-  return to;
-}
-
-
-function checkDataType(dataType, data, negate) {
-  var EQUAL = negate ? ' !== ' : ' === '
-    , AND = negate ? ' || ' : ' && '
-    , OK = negate ? '!' : ''
-    , NOT = negate ? '' : '!';
-  switch (dataType) {
-    case 'null': return data + EQUAL + 'null';
-    case 'array': return OK + 'Array.isArray(' + data + ')';
-    case 'object': return '(' + OK + data + AND +
-                          'typeof ' + data + EQUAL + '"object"' + AND +
-                          NOT + 'Array.isArray(' + data + '))';
-    case 'integer': return '(typeof ' + data + EQUAL + '"number"' + AND +
-                           NOT + '(' + data + ' % 1)' +
-                           AND + data + EQUAL + data + ')';
-    default: return 'typeof ' + data + EQUAL + '"' + dataType + '"';
-  }
-}
-
-
-function checkDataTypes(dataTypes, data) {
-  switch (dataTypes.length) {
-    case 1: return checkDataType(dataTypes[0], data, true);
-    default:
-      var code = '';
-      var types = toHash(dataTypes);
-      if (types.array && types.object) {
-        code = types.null ? '(': '(!' + data + ' || ';
-        code += 'typeof ' + data + ' !== "object")';
-        delete types.null;
-        delete types.array;
-        delete types.object;
-      }
-      if (types.number) delete types.integer;
-      for (var t in types)
-        code += (code ? ' && ' : '' ) + checkDataType(t, data, true);
-
-      return code;
-  }
-}
-
-
-var COERCE_TO_TYPES = toHash([ 'string', 'number', 'integer', 'boolean', 'null' ]);
-function coerceToTypes(optionCoerceTypes, dataTypes) {
-  if (Array.isArray(dataTypes)) {
-    var types = [];
-    for (var i=0; i<dataTypes.length; i++) {
-      var t = dataTypes[i];
-      if (COERCE_TO_TYPES[t]) types[types.length] = t;
-      else if (optionCoerceTypes === 'array' && t === 'array') types[types.length] = t;
-    }
-    if (types.length) return types;
-  } else if (COERCE_TO_TYPES[dataTypes]) {
-    return [dataTypes];
-  } else if (optionCoerceTypes === 'array' && dataTypes === 'array') {
-    return ['array'];
-  }
-}
-
-
-function toHash(arr) {
-  var hash = {};
-  for (var i=0; i<arr.length; i++) hash[arr[i]] = true;
-  return hash;
-}
-
-
-var IDENTIFIER = /^[a-z$_][a-z$_0-9]*$/i;
-var SINGLE_QUOTE = /'|\\/g;
-function getProperty(key) {
-  return typeof key == 'number'
-          ? '[' + key + ']'
-          : IDENTIFIER.test(key)
-            ? '.' + key
-            : "['" + escapeQuotes(key) + "']";
-}
-
-
-function escapeQuotes(str) {
-  return str.replace(SINGLE_QUOTE, '\\$&')
-            .replace(/\n/g, '\\n')
-            .replace(/\r/g, '\\r')
-            .replace(/\f/g, '\\f')
-            .replace(/\t/g, '\\t');
-}
-
-
-function varOccurences(str, dataVar) {
-  dataVar += '[^0-9]';
-  var matches = str.match(new RegExp(dataVar, 'g'));
-  return matches ? matches.length : 0;
-}
-
-
-function varReplace(str, dataVar, expr) {
-  dataVar += '([^0-9])';
-  expr = expr.replace(/\$/g, '$$$$');
-  return str.replace(new RegExp(dataVar, 'g'), expr + '$1');
-}
-
-
-var EMPTY_ELSE = /else\s*{\s*}/g
-  , EMPTY_IF_NO_ELSE = /if\s*\([^)]+\)\s*\{\s*\}(?!\s*else)/g
-  , EMPTY_IF_WITH_ELSE = /if\s*\(([^)]+)\)\s*\{\s*\}\s*else(?!\s*if)/g;
-function cleanUpCode(out) {
-  return out.replace(EMPTY_ELSE, '')
-            .replace(EMPTY_IF_NO_ELSE, '')
-            .replace(EMPTY_IF_WITH_ELSE, 'if (!($1))');
-}
-
-
-var ERRORS_REGEXP = /[^v.]errors/g
-  , REMOVE_ERRORS = /var errors = 0;|var vErrors = null;|validate.errors = vErrors;/g
-  , REMOVE_ERRORS_ASYNC = /var errors = 0;|var vErrors = null;/g
-  , RETURN_VALID = 'return errors === 0;'
-  , RETURN_TRUE = 'validate.errors = null; return true;'
-  , RETURN_ASYNC = /if \(errors === 0\) return data;\s*else throw new ValidationError\(vErrors\);/
-  , RETURN_DATA_ASYNC = 'return data;'
-  , ROOTDATA_REGEXP = /[^A-Za-z_$]rootData[^A-Za-z0-9_$]/g
-  , REMOVE_ROOTDATA = /if \(rootData === undefined\) rootData = data;/;
-
-function finalCleanUpCode(out, async) {
-  var matches = out.match(ERRORS_REGEXP);
-  if (matches && matches.length == 2) {
-    out = async
-          ? out.replace(REMOVE_ERRORS_ASYNC, '')
-               .replace(RETURN_ASYNC, RETURN_DATA_ASYNC)
-          : out.replace(REMOVE_ERRORS, '')
-               .replace(RETURN_VALID, RETURN_TRUE);
-  }
-
-  matches = out.match(ROOTDATA_REGEXP);
-  if (!matches || matches.length !== 3) return out;
-  return out.replace(REMOVE_ROOTDATA, '');
-}
-
-
-function schemaHasRules(schema, rules) {
-  if (typeof schema == 'boolean') return !schema;
-  for (var key in schema) if (rules[key]) return true;
-}
-
-
-function schemaHasRulesExcept(schema, rules, exceptKeyword) {
-  if (typeof schema == 'boolean') return !schema && exceptKeyword != 'not';
-  for (var key in schema) if (key != exceptKeyword && rules[key]) return true;
-}
-
-
-function toQuotedString(str) {
-  return '\'' + escapeQuotes(str) + '\'';
-}
-
-
-function getPathExpr(currentPath, expr, jsonPointers, isNumber) {
-  var path = jsonPointers // false by default
-              ? '\'/\' + ' + expr + (isNumber ? '' : '.replace(/~/g, \'~0\').replace(/\\//g, \'~1\')')
-              : (isNumber ? '\'[\' + ' + expr + ' + \']\'' : '\'[\\\'\' + ' + expr + ' + \'\\\']\'');
-  return joinPaths(currentPath, path);
-}
-
-
-function getPath(currentPath, prop, jsonPointers) {
-  var path = jsonPointers // false by default
-              ? toQuotedString('/' + escapeJsonPointer(prop))
-              : toQuotedString(getProperty(prop));
-  return joinPaths(currentPath, path);
-}
-
-
-var JSON_POINTER = /^\/(?:[^~]|~0|~1)*$/;
-var RELATIVE_JSON_POINTER = /^([0-9]+)(#|\/(?:[^~]|~0|~1)*)?$/;
-function getData($data, lvl, paths) {
-  var up, jsonPointer, data, matches;
-  if ($data === '') return 'rootData';
-  if ($data[0] == '/') {
-    if (!JSON_POINTER.test($data)) throw new Error('Invalid JSON-pointer: ' + $data);
-    jsonPointer = $data;
-    data = 'rootData';
-  } else {
-    matches = $data.match(RELATIVE_JSON_POINTER);
-    if (!matches) throw new Error('Invalid JSON-pointer: ' + $data);
-    up = +matches[1];
-    jsonPointer = matches[2];
-    if (jsonPointer == '#') {
-      if (up >= lvl) throw new Error('Cannot access property/index ' + up + ' levels up, current level is ' + lvl);
-      return paths[lvl - up];
-    }
-
-    if (up > lvl) throw new Error('Cannot access data ' + up + ' levels up, current level is ' + lvl);
-    data = 'data' + ((lvl - up) || '');
-    if (!jsonPointer) return data;
-  }
-
-  var expr = data;
-  var segments = jsonPointer.split('/');
-  for (var i=0; i<segments.length; i++) {
-    var segment = segments[i];
-    if (segment) {
-      data += getProperty(unescapeJsonPointer(segment));
-      expr += ' && ' + data;
-    }
-  }
-  return expr;
-}
-
-
-function joinPaths (a, b) {
-  if (a == '""') return b;
-  return (a + ' + ' + b).replace(/' \+ '/g, '');
-}
-
-
-function unescapeFragment(str) {
-  return unescapeJsonPointer(decodeURIComponent(str));
-}
-
-
-function escapeFragment(str) {
-  return encodeURIComponent(escapeJsonPointer(str));
-}
-
-
-function escapeJsonPointer(str) {
-  return str.replace(/~/g, '~0').replace(/\//g, '~1');
-}
-
-
-function unescapeJsonPointer(str) {
-  return str.replace(/~1/g, '/').replace(/~0/g, '~');
-}
-
-
 /***/ }),
 /* 107 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -35327,13 +35183,13 @@ exports.stringifyLangArgs = stringifyLangArgs;
 var _format;
 
 function _load_format() {
-  return _format = __webpack_require__(566);
+  return _format = __webpack_require__(534);
 }
 
 var _index;
 
 function _load_index() {
-  return _index = _interopRequireWildcard(__webpack_require__(568));
+  return _index = _interopRequireWildcard(__webpack_require__(536));
 }
 
 var _isCi;
@@ -35647,7 +35503,7 @@ function _load_errors() {
 var _index;
 
 function _load_index() {
-  return _index = __webpack_require__(57);
+  return _index = __webpack_require__(58);
 }
 
 var _gitResolver;
@@ -35665,7 +35521,7 @@ function _load_exoticResolver() {
 var _git;
 
 function _load_git() {
-  return _git = _interopRequireDefault(__webpack_require__(219));
+  return _git = _interopRequireDefault(__webpack_require__(217));
 }
 
 var _guessName;
@@ -35931,7 +35787,7 @@ function _load_map() {
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const debug = __webpack_require__(266)('yarn');
+const debug = __webpack_require__(263)('yarn');
 
 class BlockingQueue {
   constructor(alias, maxConcurrency = Infinity) {
@@ -36072,7 +35928,7 @@ exports.execCommand = exports.execFromManifest = exports.executeLifecycleScript
 var _extends2;
 
 function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+  return _extends2 = _interopRequireDefault(__webpack_require__(20));
 }
 
 var _asyncToGenerator2;
@@ -36478,31 +36334,31 @@ function _load_constants() {
 var _child;
 
 function _load_child() {
-  return _child = _interopRequireWildcard(__webpack_require__(58));
+  return _child = _interopRequireWildcard(__webpack_require__(50));
 }
 
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 var _dynamicRequire;
 
 function _load_dynamicRequire() {
-  return _dynamicRequire = __webpack_require__(371);
+  return _dynamicRequire = __webpack_require__(365);
 }
 
 var _portableScript;
 
 function _load_portableScript() {
-  return _portableScript = __webpack_require__(589);
+  return _portableScript = __webpack_require__(557);
 }
 
 var _fixCmdWinSlashes;
 
 function _load_fixCmdWinSlashes() {
-  return _fixCmdWinSlashes = __webpack_require__(578);
+  return _fixCmdWinSlashes = __webpack_require__(546);
 }
 
 var _global;
@@ -36680,6 +36536,280 @@ function objectToString(o) {
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
+
+
+
+module.exports = {
+  copy: copy,
+  checkDataType: checkDataType,
+  checkDataTypes: checkDataTypes,
+  coerceToTypes: coerceToTypes,
+  toHash: toHash,
+  getProperty: getProperty,
+  escapeQuotes: escapeQuotes,
+  equal: __webpack_require__(272),
+  ucs2length: __webpack_require__(654),
+  varOccurences: varOccurences,
+  varReplace: varReplace,
+  cleanUpCode: cleanUpCode,
+  finalCleanUpCode: finalCleanUpCode,
+  schemaHasRules: schemaHasRules,
+  schemaHasRulesExcept: schemaHasRulesExcept,
+  toQuotedString: toQuotedString,
+  getPathExpr: getPathExpr,
+  getPath: getPath,
+  getData: getData,
+  unescapeFragment: unescapeFragment,
+  unescapeJsonPointer: unescapeJsonPointer,
+  escapeFragment: escapeFragment,
+  escapeJsonPointer: escapeJsonPointer
+};
+
+
+function copy(o, to) {
+  to = to || {};
+  for (var key in o) to[key] = o[key];
+  return to;
+}
+
+
+function checkDataType(dataType, data, negate) {
+  var EQUAL = negate ? ' !== ' : ' === '
+    , AND = negate ? ' || ' : ' && '
+    , OK = negate ? '!' : ''
+    , NOT = negate ? '' : '!';
+  switch (dataType) {
+    case 'null': return data + EQUAL + 'null';
+    case 'array': return OK + 'Array.isArray(' + data + ')';
+    case 'object': return '(' + OK + data + AND +
+                          'typeof ' + data + EQUAL + '"object"' + AND +
+                          NOT + 'Array.isArray(' + data + '))';
+    case 'integer': return '(typeof ' + data + EQUAL + '"number"' + AND +
+                           NOT + '(' + data + ' % 1)' +
+                           AND + data + EQUAL + data + ')';
+    default: return 'typeof ' + data + EQUAL + '"' + dataType + '"';
+  }
+}
+
+
+function checkDataTypes(dataTypes, data) {
+  switch (dataTypes.length) {
+    case 1: return checkDataType(dataTypes[0], data, true);
+    default:
+      var code = '';
+      var types = toHash(dataTypes);
+      if (types.array && types.object) {
+        code = types.null ? '(': '(!' + data + ' || ';
+        code += 'typeof ' + data + ' !== "object")';
+        delete types.null;
+        delete types.array;
+        delete types.object;
+      }
+      if (types.number) delete types.integer;
+      for (var t in types)
+        code += (code ? ' && ' : '' ) + checkDataType(t, data, true);
+
+      return code;
+  }
+}
+
+
+var COERCE_TO_TYPES = toHash([ 'string', 'number', 'integer', 'boolean', 'null' ]);
+function coerceToTypes(optionCoerceTypes, dataTypes) {
+  if (Array.isArray(dataTypes)) {
+    var types = [];
+    for (var i=0; i<dataTypes.length; i++) {
+      var t = dataTypes[i];
+      if (COERCE_TO_TYPES[t]) types[types.length] = t;
+      else if (optionCoerceTypes === 'array' && t === 'array') types[types.length] = t;
+    }
+    if (types.length) return types;
+  } else if (COERCE_TO_TYPES[dataTypes]) {
+    return [dataTypes];
+  } else if (optionCoerceTypes === 'array' && dataTypes === 'array') {
+    return ['array'];
+  }
+}
+
+
+function toHash(arr) {
+  var hash = {};
+  for (var i=0; i<arr.length; i++) hash[arr[i]] = true;
+  return hash;
+}
+
+
+var IDENTIFIER = /^[a-z$_][a-z$_0-9]*$/i;
+var SINGLE_QUOTE = /'|\\/g;
+function getProperty(key) {
+  return typeof key == 'number'
+          ? '[' + key + ']'
+          : IDENTIFIER.test(key)
+            ? '.' + key
+            : "['" + escapeQuotes(key) + "']";
+}
+
+
+function escapeQuotes(str) {
+  return str.replace(SINGLE_QUOTE, '\\$&')
+            .replace(/\n/g, '\\n')
+            .replace(/\r/g, '\\r')
+            .replace(/\f/g, '\\f')
+            .replace(/\t/g, '\\t');
+}
+
+
+function varOccurences(str, dataVar) {
+  dataVar += '[^0-9]';
+  var matches = str.match(new RegExp(dataVar, 'g'));
+  return matches ? matches.length : 0;
+}
+
+
+function varReplace(str, dataVar, expr) {
+  dataVar += '([^0-9])';
+  expr = expr.replace(/\$/g, '$$$$');
+  return str.replace(new RegExp(dataVar, 'g'), expr + '$1');
+}
+
+
+var EMPTY_ELSE = /else\s*{\s*}/g
+  , EMPTY_IF_NO_ELSE = /if\s*\([^)]+\)\s*\{\s*\}(?!\s*else)/g
+  , EMPTY_IF_WITH_ELSE = /if\s*\(([^)]+)\)\s*\{\s*\}\s*else(?!\s*if)/g;
+function cleanUpCode(out) {
+  return out.replace(EMPTY_ELSE, '')
+            .replace(EMPTY_IF_NO_ELSE, '')
+            .replace(EMPTY_IF_WITH_ELSE, 'if (!($1))');
+}
+
+
+var ERRORS_REGEXP = /[^v.]errors/g
+  , REMOVE_ERRORS = /var errors = 0;|var vErrors = null;|validate.errors = vErrors;/g
+  , REMOVE_ERRORS_ASYNC = /var errors = 0;|var vErrors = null;/g
+  , RETURN_VALID = 'return errors === 0;'
+  , RETURN_TRUE = 'validate.errors = null; return true;'
+  , RETURN_ASYNC = /if \(errors === 0\) return data;\s*else throw new ValidationError\(vErrors\);/
+  , RETURN_DATA_ASYNC = 'return data;'
+  , ROOTDATA_REGEXP = /[^A-Za-z_$]rootData[^A-Za-z0-9_$]/g
+  , REMOVE_ROOTDATA = /if \(rootData === undefined\) rootData = data;/;
+
+function finalCleanUpCode(out, async) {
+  var matches = out.match(ERRORS_REGEXP);
+  if (matches && matches.length == 2) {
+    out = async
+          ? out.replace(REMOVE_ERRORS_ASYNC, '')
+               .replace(RETURN_ASYNC, RETURN_DATA_ASYNC)
+          : out.replace(REMOVE_ERRORS, '')
+               .replace(RETURN_VALID, RETURN_TRUE);
+  }
+
+  matches = out.match(ROOTDATA_REGEXP);
+  if (!matches || matches.length !== 3) return out;
+  return out.replace(REMOVE_ROOTDATA, '');
+}
+
+
+function schemaHasRules(schema, rules) {
+  if (typeof schema == 'boolean') return !schema;
+  for (var key in schema) if (rules[key]) return true;
+}
+
+
+function schemaHasRulesExcept(schema, rules, exceptKeyword) {
+  if (typeof schema == 'boolean') return !schema && exceptKeyword != 'not';
+  for (var key in schema) if (key != exceptKeyword && rules[key]) return true;
+}
+
+
+function toQuotedString(str) {
+  return '\'' + escapeQuotes(str) + '\'';
+}
+
+
+function getPathExpr(currentPath, expr, jsonPointers, isNumber) {
+  var path = jsonPointers // false by default
+              ? '\'/\' + ' + expr + (isNumber ? '' : '.replace(/~/g, \'~0\').replace(/\\//g, \'~1\')')
+              : (isNumber ? '\'[\' + ' + expr + ' + \']\'' : '\'[\\\'\' + ' + expr + ' + \'\\\']\'');
+  return joinPaths(currentPath, path);
+}
+
+
+function getPath(currentPath, prop, jsonPointers) {
+  var path = jsonPointers // false by default
+              ? toQuotedString('/' + escapeJsonPointer(prop))
+              : toQuotedString(getProperty(prop));
+  return joinPaths(currentPath, path);
+}
+
+
+var JSON_POINTER = /^\/(?:[^~]|~0|~1)*$/;
+var RELATIVE_JSON_POINTER = /^([0-9]+)(#|\/(?:[^~]|~0|~1)*)?$/;
+function getData($data, lvl, paths) {
+  var up, jsonPointer, data, matches;
+  if ($data === '') return 'rootData';
+  if ($data[0] == '/') {
+    if (!JSON_POINTER.test($data)) throw new Error('Invalid JSON-pointer: ' + $data);
+    jsonPointer = $data;
+    data = 'rootData';
+  } else {
+    matches = $data.match(RELATIVE_JSON_POINTER);
+    if (!matches) throw new Error('Invalid JSON-pointer: ' + $data);
+    up = +matches[1];
+    jsonPointer = matches[2];
+    if (jsonPointer == '#') {
+      if (up >= lvl) throw new Error('Cannot access property/index ' + up + ' levels up, current level is ' + lvl);
+      return paths[lvl - up];
+    }
+
+    if (up > lvl) throw new Error('Cannot access data ' + up + ' levels up, current level is ' + lvl);
+    data = 'data' + ((lvl - up) || '');
+    if (!jsonPointer) return data;
+  }
+
+  var expr = data;
+  var segments = jsonPointer.split('/');
+  for (var i=0; i<segments.length; i++) {
+    var segment = segments[i];
+    if (segment) {
+      data += getProperty(unescapeJsonPointer(segment));
+      expr += ' && ' + data;
+    }
+  }
+  return expr;
+}
+
+
+function joinPaths (a, b) {
+  if (a == '""') return b;
+  return (a + ' + ' + b).replace(/' \+ '/g, '');
+}
+
+
+function unescapeFragment(str) {
+  return unescapeJsonPointer(decodeURIComponent(str));
+}
+
+
+function escapeFragment(str) {
+  return encodeURIComponent(escapeJsonPointer(str));
+}
+
+
+function escapeJsonPointer(str) {
+  return str.replace(/~/g, '~0').replace(/\//g, '~1');
+}
+
+
+function unescapeJsonPointer(str) {
+  return str.replace(/~1/g, '/').replace(/~0/g, '~');
+}
+
+
+/***/ }),
+/* 115 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
 /*!
  * micromatch <https://github.com/jonschlinkert/micromatch>
  *
@@ -37114,7 +37244,7 @@ module.exports = micromatch;
 
 
 /***/ }),
-/* 115 */
+/* 116 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -37148,7 +37278,7 @@ module.exports = micromatch;
 
 /*<replacement>*/
 
-var pna = __webpack_require__(180);
+var pna = __webpack_require__(181);
 /*</replacement>*/
 
 /*<replacement>*/
@@ -37251,7 +37381,7 @@ Duplex.prototype._destroy = function (err, cb) {
 };
 
 /***/ }),
-/* 116 */
+/* 117 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -37299,7 +37429,7 @@ var MulticastOperator = /*@__PURE__*/ (function () {
 
 
 /***/ }),
-/* 117 */
+/* 118 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -37310,7 +37440,7 @@ var observable = typeof Symbol === 'function' && Symbol.observable || '@@observa
 
 
 /***/ }),
-/* 118 */
+/* 119 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -37323,7 +37453,7 @@ function identity(x) {
 
 
 /***/ }),
-/* 119 */
+/* 120 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var v1 = __webpack_require__(957);
@@ -37336,85 +37466,6 @@ uuid.v4 = v4;
 module.exports = uuid;
 
 
-/***/ }),
-/* 120 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getInstallationMethod = exports.version = undefined;
-
-var _asyncToGenerator2;
-
-function _load_asyncToGenerator() {
-  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(2));
-}
-
-let getInstallationMethod = exports.getInstallationMethod = (() => {
-  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-    let installationMethod = originalInstallationMethod;
-
-    // If there's a package.json in the parent directory, it could have an
-    // override for the installation method, so we should prefer that over
-    // whatever was originally in Yarn's package.json. This is the case with
-    // systems such as Homebrew, which take the tarball and modify the
-    // installation method so we're aware of the fact that Yarn was installed via
-    // Homebrew (so things like update notifications can point out the correct
-    // command to upgrade).
-    try {
-      const manifestPath = (_path || _load_path()).default.join(__dirname, '..', 'package.json');
-      if ((_fs2 || _load_fs2()).default.existsSync(manifestPath)) {
-        // non-async version is deprecated
-        const manifest = yield (0, (_fs || _load_fs()).readJson)(manifestPath);
-        if (manifest.installationMethod) {
-          installationMethod = manifest.installationMethod;
-        }
-      }
-    } catch (e) {
-      // Ignore any errors; this is not critical functionality.
-    }
-    return installationMethod;
-  });
-
-  return function getInstallationMethod() {
-    return _ref.apply(this, arguments);
-  };
-})();
-
-var _fs;
-
-function _load_fs() {
-  return _fs = __webpack_require__(4);
-}
-
-var _fs2;
-
-function _load_fs2() {
-  return _fs2 = _interopRequireDefault(__webpack_require__(5));
-}
-
-var _path;
-
-function _load_path() {
-  return _path = _interopRequireDefault(__webpack_require__(0));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-// This will be bundled directly in the .js file for production builds
-var _require = __webpack_require__(194); /**
-                                               * Determines the current version of Yarn itself.
-                                               * 
-                                               */
-
-const version = _require.version,
-      originalInstallationMethod = _require.installationMethod;
-exports.version = version;
-
 /***/ }),
 /* 121 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -37707,7 +37758,7 @@ function _load_errors() {
 var _index;
 
 function _load_index() {
-  return _index = __webpack_require__(57);
+  return _index = __webpack_require__(58);
 }
 
 var _baseReporter;
@@ -37743,25 +37794,25 @@ function _load_add() {
 var _remove;
 
 function _load_remove() {
-  return _remove = __webpack_require__(359);
+  return _remove = __webpack_require__(353);
 }
 
 var _upgrade;
 
 function _load_upgrade() {
-  return _upgrade = __webpack_require__(207);
+  return _upgrade = __webpack_require__(205);
 }
 
 var _upgradeInteractive;
 
 function _load_upgradeInteractive() {
-  return _upgradeInteractive = __webpack_require__(362);
+  return _upgradeInteractive = __webpack_require__(356);
 }
 
 var _packageLinker;
 
 function _load_packageLinker() {
-  return _packageLinker = __webpack_require__(211);
+  return _packageLinker = __webpack_require__(209);
 }
 
 var _constants;
@@ -37773,7 +37824,7 @@ function _load_constants() {
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
@@ -37981,7 +38032,7 @@ function _load_lockfile() {
 var _packageReference;
 
 function _load_packageReference() {
-  return _packageReference = _interopRequireDefault(__webpack_require__(365));
+  return _packageReference = _interopRequireDefault(__webpack_require__(359));
 }
 
 var _index;
@@ -38005,19 +38056,19 @@ function _load_constants() {
 var _version;
 
 function _load_version() {
-  return _version = _interopRequireWildcard(__webpack_require__(226));
+  return _version = _interopRequireWildcard(__webpack_require__(223));
 }
 
 var _workspaceResolver;
 
 function _load_workspaceResolver() {
-  return _workspaceResolver = _interopRequireDefault(__webpack_require__(570));
+  return _workspaceResolver = _interopRequireDefault(__webpack_require__(538));
 }
 
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 var _normalizePattern4;
@@ -38030,7 +38081,7 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const micromatch = __webpack_require__(114);
+const micromatch = __webpack_require__(115);
 
 class PackageRequest {
   constructor(req, resolver) {
@@ -38577,7 +38628,7 @@ function _load_misc() {
 var _version;
 
 function _load_version() {
-  return _version = _interopRequireWildcard(__webpack_require__(226));
+  return _version = _interopRequireWildcard(__webpack_require__(223));
 }
 
 var _guessName;
@@ -38589,7 +38640,7 @@ function _load_guessName() {
 var _index2;
 
 function _load_index2() {
-  return _index2 = __webpack_require__(57);
+  return _index2 = __webpack_require__(58);
 }
 
 var _exoticResolver;
@@ -38601,7 +38652,7 @@ function _load_exoticResolver() {
 var _git;
 
 function _load_git() {
-  return _git = _interopRequireDefault(__webpack_require__(219));
+  return _git = _interopRequireDefault(__webpack_require__(217));
 }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
@@ -38858,13 +38909,13 @@ function _load_errors() {
 var _util;
 
 function _load_util() {
-  return _util = __webpack_require__(221);
+  return _util = __webpack_require__(219);
 }
 
 var _typos;
 
 function _load_typos() {
-  return _typos = _interopRequireDefault(__webpack_require__(587));
+  return _typos = _interopRequireDefault(__webpack_require__(555));
 }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -39022,7 +39073,7 @@ function cleanDependencies(info, isRoot, reporter, warn) {
 
 // getting tag from 19.1.3.6 Object.prototype.toString()
 var cof = __webpack_require__(69);
-var TAG = __webpack_require__(20)('toStringTag');
+var TAG = __webpack_require__(21)('toStringTag');
 // ES3 wrong here
 var ARG = cof(function () { return arguments; }()) == 'Arguments';
 
@@ -39071,13 +39122,13 @@ module.exports = document && document.documentElement;
 
 var LIBRARY = __webpack_require__(93);
 var $export = __webpack_require__(60);
-var redefine = __webpack_require__(251);
+var redefine = __webpack_require__(248);
 var hide = __webpack_require__(42);
-var Iterators = __webpack_require__(53);
-var $iterCreate = __webpack_require__(242);
+var Iterators = __webpack_require__(54);
+var $iterCreate = __webpack_require__(239);
 var setToStringTag = __webpack_require__(95);
-var getPrototypeOf = __webpack_require__(248);
-var ITERATOR = __webpack_require__(20)('iterator');
+var getPrototypeOf = __webpack_require__(245);
+var ITERATOR = __webpack_require__(21)('iterator');
 var BUGGY = !([].keys && 'next' in [].keys()); // Safari has buggy iterators w/o `next`
 var FF_ITERATOR = '@@iterator';
 var KEYS = 'keys';
@@ -39157,7 +39208,7 @@ module.exports = function (exec) {
 /***/ (function(module, exports, __webpack_require__) {
 
 var anObject = __webpack_require__(35);
-var isObject = __webpack_require__(52);
+var isObject = __webpack_require__(53);
 var newPromiseCapability = __webpack_require__(94);
 
 module.exports = function (C, x) {
@@ -39209,7 +39260,7 @@ var store = global[SHARED] || (global[SHARED] = {});
 // 7.3.20 SpeciesConstructor(O, defaultConstructor)
 var anObject = __webpack_require__(35);
 var aFunction = __webpack_require__(68);
-var SPECIES = __webpack_require__(20)('species');
+var SPECIES = __webpack_require__(21)('species');
 module.exports = function (O, D) {
   var C = anObject(O).constructor;
   var S;
@@ -39222,7 +39273,7 @@ module.exports = function (O, D) {
 /***/ (function(module, exports, __webpack_require__) {
 
 var ctx = __webpack_require__(70);
-var invoke = __webpack_require__(239);
+var invoke = __webpack_require__(236);
 var html = __webpack_require__(128);
 var cel = __webpack_require__(92);
 var global = __webpack_require__(17);
@@ -40139,13 +40190,13 @@ realpath.realpathSync = realpathSync
 realpath.monkeypatch = monkeypatch
 realpath.unmonkeypatch = unmonkeypatch
 
-var fs = __webpack_require__(5)
+var fs = __webpack_require__(4)
 var origRealpath = fs.realpath
 var origRealpathSync = fs.realpathSync
 
 var version = process.version
 var ok = /^v[0-5]\./.test(version)
-var old = __webpack_require__(271)
+var old = __webpack_require__(268)
 
 function newError (er) {
   return er && er.syscall === 'realpath' && (
@@ -40520,7 +40571,7 @@ module.exports = new Schema({
 /***/ (function(module, exports, __webpack_require__) {
 
 var path = __webpack_require__(0);
-var fs = __webpack_require__(5);
+var fs = __webpack_require__(4);
 var _0777 = parseInt('0777', 8);
 
 module.exports = mkdirP.mkdirp = mkdirP.mkdirP = mkdirP;
@@ -42772,7 +42823,7 @@ Object.defineProperty(exports, "__esModule", {
 var _extends2;
 
 function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+  return _extends2 = _interopRequireDefault(__webpack_require__(20));
 }
 
 var _asyncToGenerator2;
@@ -42792,7 +42843,7 @@ function _load_executeLifecycleScript() {
 var _path;
 
 function _load_path() {
-  return _path = __webpack_require__(377);
+  return _path = __webpack_require__(371);
 }
 
 var _conversion;
@@ -42804,7 +42855,7 @@ function _load_conversion() {
 var _index;
 
 function _load_index() {
-  return _index = _interopRequireDefault(__webpack_require__(220));
+  return _index = _interopRequireDefault(__webpack_require__(218));
 }
 
 var _errors;
@@ -42816,7 +42867,7 @@ function _load_errors() {
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 var _constants;
@@ -42828,25 +42879,25 @@ function _load_constants() {
 var _packageConstraintResolver;
 
 function _load_packageConstraintResolver() {
-  return _packageConstraintResolver = _interopRequireDefault(__webpack_require__(555));
+  return _packageConstraintResolver = _interopRequireDefault(__webpack_require__(523));
 }
 
 var _requestManager;
 
 function _load_requestManager() {
-  return _requestManager = _interopRequireDefault(__webpack_require__(378));
+  return _requestManager = _interopRequireDefault(__webpack_require__(372));
 }
 
 var _index2;
 
 function _load_index2() {
-  return _index2 = __webpack_require__(57);
+  return _index2 = __webpack_require__(58);
 }
 
 var _index3;
 
 function _load_index3() {
-  return _index3 = __webpack_require__(200);
+  return _index3 = __webpack_require__(201);
 }
 
 var _map;
@@ -42860,10 +42911,10 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const crypto = __webpack_require__(11);
-const detectIndent = __webpack_require__(635);
+const detectIndent = __webpack_require__(603);
 const invariant = __webpack_require__(9);
 const path = __webpack_require__(0);
-const micromatch = __webpack_require__(114);
+const micromatch = __webpack_require__(115);
 const isCi = __webpack_require__(397);
 
 function sortObject(object) {
@@ -43901,28 +43952,28 @@ function extractWorkspaces(manifest) {
 /* 163 */
 /***/ (function(module, exports) {
 
-module.exports = function(module) {
-	if(!module.webpackPolyfill) {
-		module.deprecate = function() {};
-		module.paths = [];
-		// module.parent = undefined by default
-		if(!module.children) module.children = [];
-		Object.defineProperty(module, "loaded", {
-			enumerable: true,
-			get: function() {
-				return module.l;
-			}
-		});
-		Object.defineProperty(module, "id", {
-			enumerable: true,
-			get: function() {
-				return module.i;
-			}
-		});
-		module.webpackPolyfill = 1;
-	}
-	return module;
-};
+module.exports = function(module) {
+	if(!module.webpackPolyfill) {
+		module.deprecate = function() {};
+		module.paths = [];
+		// module.parent = undefined by default
+		if(!module.children) module.children = [];
+		Object.defineProperty(module, "loaded", {
+			enumerable: true,
+			get: function() {
+				return module.l;
+			}
+		});
+		Object.defineProperty(module, "id", {
+			enumerable: true,
+			get: function() {
+				return module.i;
+			}
+		});
+		module.webpackPolyfill = 1;
+	}
+	return module;
+};
 
 
 /***/ }),
@@ -43952,7 +44003,7 @@ function _load_asyncToGenerator() {
 var _extends2;
 
 function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+  return _extends2 = _interopRequireDefault(__webpack_require__(20));
 }
 
 let run = exports.run = (() => {
@@ -44004,7 +44055,7 @@ function _load_index() {
 var _list;
 
 function _load_list() {
-  return _list = __webpack_require__(358);
+  return _list = __webpack_require__(352);
 }
 
 var _install;
@@ -44028,7 +44079,7 @@ function _load_constants() {
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 var _invariant;
@@ -44622,13 +44673,13 @@ exports.hasWrapper = hasWrapper;
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 var _filter;
 
 function _load_filter() {
-  return _filter = __webpack_require__(372);
+  return _filter = __webpack_require__(366);
 }
 
 var _errors;
@@ -44641,10 +44692,10 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const zlib = __webpack_require__(198);
+const zlib = __webpack_require__(199);
 const path = __webpack_require__(0);
-const tar = __webpack_require__(193);
-const fs2 = __webpack_require__(5);
+const tar = __webpack_require__(194);
+const fs2 = __webpack_require__(4);
 const depsFor = __webpack_require__(678);
 
 const FOLDERS_IGNORE = [
@@ -44703,7 +44754,7 @@ function _load_asyncToGenerator() {
 var _index;
 
 function _load_index() {
-  return _index = _interopRequireDefault(__webpack_require__(220));
+  return _index = _interopRequireDefault(__webpack_require__(218));
 }
 
 var _constants;
@@ -44715,13 +44766,13 @@ function _load_constants() {
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 var _mutex;
 
 function _load_mutex() {
-  return _mutex = _interopRequireDefault(__webpack_require__(375));
+  return _mutex = _interopRequireDefault(__webpack_require__(369));
 }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
@@ -44730,7 +44781,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 /* eslint no-unused-vars: 0 */
 
-const cmdShim = __webpack_require__(201);
+const cmdShim = __webpack_require__(202);
 const path = __webpack_require__(0);
 
 class BaseFetcher {
@@ -44967,6 +45018,139 @@ function guessName(source) {
 /* 170 */
 /***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.satisfiesWithPrereleases = satisfiesWithPrereleases;
+exports.diffWithUnstable = diffWithUnstable;
+
+var _semver;
+
+function _load_semver() {
+  return _semver = _interopRequireDefault(__webpack_require__(22));
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/**
+ * Returns whether the given semver version satisfies the given range. Notably this supports
+ * prerelease versions so that "2.0.0-rc.0" satisfies the range ">=1.0.0", for example.
+ */
+
+function satisfiesWithPrereleases(version, range, loose = false) {
+  let semverRange;
+  try {
+    // $FlowFixMe: Add a definition for the Range class
+    semverRange = new (_semver || _load_semver()).default.Range(range, loose);
+  } catch (err) {
+    return false;
+  }
+
+  if (!version) {
+    return false;
+  }
+  let semverVersion;
+  try {
+    semverVersion = new (_semver || _load_semver()).default.SemVer(version, semverRange.loose);
+  } catch (err) {
+    return false;
+  }
+
+  // A range has multiple sets of comparators. A version must satisfy all comparators in a set
+  // and at least one set to satisfy the range.
+  return semverRange.set.some(comparatorSet => {
+    // node-semver converts ~ and ^ ranges into pairs of >= and < ranges but the upper bounds don't
+    // properly exclude prerelease versions. For example, "^1.0.0" is converted to ">=1.0.0 <2.0.0",
+    // which includes "2.0.0-pre" since prerelease versions are lower than their non-prerelease
+    // counterparts. As a practical workaround we make upper-bound ranges exclude prereleases and
+    // convert "<2.0.0" to "<2.0.0-0", for example.
+    comparatorSet = comparatorSet.map(comparator => {
+      if (comparator.operator !== '<' || !comparator.value || comparator.semver.prerelease.length) {
+        return comparator;
+      }
+
+      // "0" is the lowest prerelease version
+      comparator.semver.inc('pre', 0);
+
+      const comparatorString = comparator.operator + comparator.semver.version;
+      // $FlowFixMe: Add a definition for the Comparator class
+      return new (_semver || _load_semver()).default.Comparator(comparatorString, comparator.loose);
+    });
+
+    return !comparatorSet.some(comparator => !comparator.test(semverVersion));
+  });
+}
+
+const PRE_RELEASES = {
+  major: 'premajor',
+  minor: 'preminor',
+  patch: 'prepatch'
+};
+
+/**
+ * Returns the difference between two versions as a semantic string representation.
+ * Similar to the `diff` method in node-semver, but it also accounts for unstable versions,
+ * like 0.x.x or 0.0.x.
+ */
+
+function diffWithUnstable(version1, version2) {
+  if ((_semver || _load_semver()).default.eq(version1, version2) === false) {
+    const v1 = (_semver || _load_semver()).default.parse(version1);
+    const v2 = (_semver || _load_semver()).default.parse(version2);
+
+    if (v1 != null && v2 != null) {
+      const isPreRelease = v1.prerelease.length > 0 || v2.prerelease.length > 0;
+      const preMajor = v1.major === 0 || v2.major === 0;
+      const preMinor = preMajor && (v1.minor === 0 || v2.minor === 0);
+
+      let diff = null;
+
+      if (v1.major !== v2.major) {
+        diff = 'major';
+      } else if (v1.minor !== v2.minor) {
+        if (preMajor) {
+          // If the major version number is zero (0.x.x), treat a change
+          // of the minor version number as a major change.
+          diff = 'major';
+        } else {
+          diff = 'minor';
+        }
+      } else if (v1.patch !== v2.patch) {
+        if (preMinor) {
+          // If the major & minor version numbers are zero (0.0.x), treat a change
+          // of the patch version number as a major change.
+          diff = 'major';
+        } else if (preMajor) {
+          // If the major version number is zero (0.x.x), treat a change
+          // of the patch version number as a minor change.
+          diff = 'minor';
+        } else {
+          diff = 'patch';
+        }
+      }
+
+      if (isPreRelease) {
+        if (diff != null) {
+          diff = PRE_RELEASES[diff];
+        } else {
+          diff = 'prerelease';
+        }
+      }
+
+      return diff;
+    }
+  }
+
+  return null;
+}
+
+/***/ }),
+/* 171 */
+/***/ (function(module, exports, __webpack_require__) {
+
 // fallback for non-array-like ES3 and non-enumerable old V8 strings
 var cof = __webpack_require__(69);
 // eslint-disable-next-line no-prototype-builtins
@@ -44976,11 +45160,11 @@ module.exports = Object('z').propertyIsEnumerable(0) ? Object : function (it) {
 
 
 /***/ }),
-/* 171 */
+/* 172 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // 19.1.2.14 / 15.2.3.14 Object.keys(O)
-var $keys = __webpack_require__(249);
+var $keys = __webpack_require__(246);
 var enumBugKeys = __webpack_require__(127);
 
 module.exports = Object.keys || function keys(O) {
@@ -44989,7 +45173,7 @@ module.exports = Object.keys || function keys(O) {
 
 
 /***/ }),
-/* 172 */
+/* 173 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // 7.1.13 ToObject(argument)
@@ -45000,7 +45184,7 @@ module.exports = function (it) {
 
 
 /***/ }),
-/* 173 */
+/* 174 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var once = __webpack_require__(83);
@@ -45093,7 +45277,7 @@ module.exports = eos;
 
 
 /***/ }),
-/* 174 */
+/* 175 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // Copyright 2012 Joyent, Inc.  All rights reserved.
@@ -45211,13 +45395,13 @@ module.exports = {
 
 
 /***/ }),
-/* 175 */
+/* 176 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 var chalk = __webpack_require__(30);
-var figures = __webpack_require__(270);
+var figures = __webpack_require__(267);
 
 /**
  * Separator object
@@ -45255,7 +45439,7 @@ module.exports = Separator;
 
 
 /***/ }),
-/* 176 */
+/* 177 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -45315,7 +45499,7 @@ module.exports = Paginator;
 
 
 /***/ }),
-/* 177 */
+/* 178 */
 /***/ (function(module, exports) {
 
 /*!
@@ -45332,7 +45516,7 @@ module.exports = function isExtglob(str) {
 
 
 /***/ }),
-/* 178 */
+/* 179 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /*!
@@ -45342,7 +45526,7 @@ module.exports = function isExtglob(str) {
  * Licensed under the MIT License.
  */
 
-var isExtglob = __webpack_require__(177);
+var isExtglob = __webpack_require__(178);
 
 module.exports = function isGlob(str) {
   return typeof str === 'string'
@@ -45351,7 +45535,7 @@ module.exports = function isGlob(str) {
 };
 
 /***/ }),
-/* 179 */
+/* 180 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var isBuffer = __webpack_require__(729);
@@ -45473,7 +45657,7 @@ module.exports = function kindOf(val) {
 
 
 /***/ }),
-/* 180 */
+/* 181 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -45524,7 +45708,7 @@ function nextTick(fn, arg1, arg2, arg3) {
 
 
 /***/ }),
-/* 181 */
+/* 182 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -45592,7 +45776,7 @@ runAsync.cb = function (func, cb) {
 
 
 /***/ }),
-/* 182 */
+/* 183 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -45603,7 +45787,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
 /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "ConnectableObservable", function() { return __WEBPACK_IMPORTED_MODULE_1__internal_observable_ConnectableObservable__["a"]; });
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__internal_operators_groupBy__ = __webpack_require__(433);
 /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "GroupedObservable", function() { return __WEBPACK_IMPORTED_MODULE_2__internal_operators_groupBy__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__internal_symbol_observable__ = __webpack_require__(117);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__internal_symbol_observable__ = __webpack_require__(118);
 /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "observable", function() { return __WEBPACK_IMPORTED_MODULE_3__internal_symbol_observable__["a"]; });
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__internal_Subject__ = __webpack_require__(36);
 /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "Subject", function() { return __WEBPACK_IMPORTED_MODULE_4__internal_Subject__["a"]; });
@@ -45611,7 +45795,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
 /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "BehaviorSubject", function() { return __WEBPACK_IMPORTED_MODULE_5__internal_BehaviorSubject__["a"]; });
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__internal_ReplaySubject__ = __webpack_require__(308);
 /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "ReplaySubject", function() { return __WEBPACK_IMPORTED_MODULE_6__internal_ReplaySubject__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__internal_AsyncSubject__ = __webpack_require__(183);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__internal_AsyncSubject__ = __webpack_require__(184);
 /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "AsyncSubject", function() { return __WEBPACK_IMPORTED_MODULE_7__internal_AsyncSubject__["a"]; });
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__internal_scheduler_asap__ = __webpack_require__(438);
 /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "asapScheduler", function() { return __WEBPACK_IMPORTED_MODULE_8__internal_scheduler_asap__["a"]; });
@@ -45630,13 +45814,13 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
 /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "Subscription", function() { return __WEBPACK_IMPORTED_MODULE_14__internal_Subscription__["a"]; });
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_15__internal_Subscriber__ = __webpack_require__(7);
 /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "Subscriber", function() { return __WEBPACK_IMPORTED_MODULE_15__internal_Subscriber__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_16__internal_Notification__ = __webpack_require__(184);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_16__internal_Notification__ = __webpack_require__(185);
 /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "Notification", function() { return __WEBPACK_IMPORTED_MODULE_16__internal_Notification__["a"]; });
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_17__internal_util_pipe__ = __webpack_require__(324);
 /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "pipe", function() { return __WEBPACK_IMPORTED_MODULE_17__internal_util_pipe__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_18__internal_util_noop__ = __webpack_require__(191);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_18__internal_util_noop__ = __webpack_require__(192);
 /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "noop", function() { return __WEBPACK_IMPORTED_MODULE_18__internal_util_noop__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_19__internal_util_identity__ = __webpack_require__(118);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_19__internal_util_identity__ = __webpack_require__(119);
 /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "identity", function() { return __WEBPACK_IMPORTED_MODULE_19__internal_util_identity__["a"]; });
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_20__internal_util_isObservable__ = __webpack_require__(930);
 /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "isObservable", function() { return __WEBPACK_IMPORTED_MODULE_20__internal_util_isObservable__["a"]; });
@@ -45644,7 +45828,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
 /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "ArgumentOutOfRangeError", function() { return __WEBPACK_IMPORTED_MODULE_21__internal_util_ArgumentOutOfRangeError__["a"]; });
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_22__internal_util_EmptyError__ = __webpack_require__(153);
 /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "EmptyError", function() { return __WEBPACK_IMPORTED_MODULE_22__internal_util_EmptyError__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_23__internal_util_ObjectUnsubscribedError__ = __webpack_require__(189);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_23__internal_util_ObjectUnsubscribedError__ = __webpack_require__(190);
 /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "ObjectUnsubscribedError", function() { return __WEBPACK_IMPORTED_MODULE_23__internal_util_ObjectUnsubscribedError__["a"]; });
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_24__internal_util_UnsubscriptionError__ = __webpack_require__(441);
 /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "UnsubscriptionError", function() { return __WEBPACK_IMPORTED_MODULE_24__internal_util_UnsubscriptionError__["a"]; });
@@ -45656,7 +45840,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
 /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "bindNodeCallback", function() { return __WEBPACK_IMPORTED_MODULE_27__internal_observable_bindNodeCallback__["a"]; });
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_28__internal_observable_combineLatest__ = __webpack_require__(309);
 /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "combineLatest", function() { return __WEBPACK_IMPORTED_MODULE_28__internal_observable_combineLatest__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_29__internal_observable_concat__ = __webpack_require__(186);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_29__internal_observable_concat__ = __webpack_require__(187);
 /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "concat", function() { return __WEBPACK_IMPORTED_MODULE_29__internal_observable_concat__["a"]; });
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_30__internal_observable_defer__ = __webpack_require__(310);
 /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "defer", function() { return __WEBPACK_IMPORTED_MODULE_30__internal_observable_defer__["a"]; });
@@ -45700,7 +45884,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
 /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "zip", function() { return __WEBPACK_IMPORTED_MODULE_49__internal_observable_zip__["a"]; });
 /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "EMPTY", function() { return __WEBPACK_IMPORTED_MODULE_31__internal_observable_empty__["b"]; });
 /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "NEVER", function() { return __WEBPACK_IMPORTED_MODULE_40__internal_observable_never__["b"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_50__internal_config__ = __webpack_require__(185);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_50__internal_config__ = __webpack_require__(186);
 /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "config", function() { return __WEBPACK_IMPORTED_MODULE_50__internal_config__["a"]; });
 /** PURE_IMPORTS_START  PURE_IMPORTS_END */
 
@@ -45760,7 +45944,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
 
 
 /***/ }),
-/* 183 */
+/* 184 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -45818,7 +46002,7 @@ var AsyncSubject = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 184 */
+/* 185 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -45899,7 +46083,7 @@ var Notification = /*@__PURE__*/ (function () {
 
 
 /***/ }),
-/* 185 */
+/* 186 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -45926,7 +46110,7 @@ var config = {
 
 
 /***/ }),
-/* 186 */
+/* 187 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -45954,7 +46138,7 @@ function concat() {
 
 
 /***/ }),
-/* 187 */
+/* 188 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -45982,7 +46166,7 @@ function reduce(accumulator, seed) {
 
 
 /***/ }),
-/* 188 */
+/* 189 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -46013,7 +46197,7 @@ function defaultErrorFactory() {
 
 
 /***/ }),
-/* 189 */
+/* 190 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -46031,7 +46215,7 @@ var ObjectUnsubscribedError = ObjectUnsubscribedErrorImpl;
 
 
 /***/ }),
-/* 190 */
+/* 191 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -46046,7 +46230,7 @@ function isNumeric(val) {
 
 
 /***/ }),
-/* 191 */
+/* 192 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -46057,7 +46241,7 @@ function noop() { }
 
 
 /***/ }),
-/* 192 */
+/* 193 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // Copyright 2015 Joyent, Inc.
@@ -46129,7 +46313,7 @@ function readSSHPrivate(type, buf, options) {
 		var rounds = kdfOptsBuf.readInt();
 		var cinf = utils.opensshCipherInfo(cipher);
 		if (bcrypt === undefined) {
-			bcrypt = __webpack_require__(379);
+			bcrypt = __webpack_require__(373);
 		}
 
 		if (typeof (options.passphrase) === 'string') {
@@ -46250,7 +46434,7 @@ function write(key, options) {
 		kdfopts = kdfssh.toBuffer();
 
 		if (bcrypt === undefined) {
-			bcrypt = __webpack_require__(379);
+			bcrypt = __webpack_require__(373);
 		}
 		var pass = new Uint8Array(passphrase);
 		var salti = new Uint8Array(salt);
@@ -46325,14 +46509,14 @@ function write(key, options) {
 
 
 /***/ }),
-/* 193 */
+/* 194 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var chownr = __webpack_require__(600)
+var chownr = __webpack_require__(568)
 var tar = __webpack_require__(460)
 var pump = __webpack_require__(781)
 var mkdirp = __webpack_require__(145)
-var fs = __webpack_require__(5)
+var fs = __webpack_require__(4)
 var path = __webpack_require__(0)
 var os = __webpack_require__(46)
 
@@ -46675,38 +46859,38 @@ function mkdirfix (name, opts, cb) {
 }
 
 
-/***/ }),
-/* 194 */
-/***/ (function(module, exports) {
-
-module.exports = {"name":"yarn","installationMethod":"unknown","version":"1.22.5","license":"BSD-2-Clause","preferGlobal":true,"description":"📦🐈 Fast, reliable, and secure dependency management.","dependencies":{"@zkochan/cmd-shim":"^3.1.0","babel-runtime":"^6.26.0","bytes":"^3.0.0","camelcase":"^4.0.0","chalk":"^2.1.0","cli-table3":"^0.4.0","commander":"^2.9.0","death":"^1.0.0","debug":"^3.0.0","deep-equal":"^1.0.1","detect-indent":"^5.0.0","dnscache":"^1.0.1","glob":"^7.1.1","gunzip-maybe":"^1.4.0","hash-for-dep":"^1.2.3","imports-loader":"^0.8.0","ini":"^1.3.4","inquirer":"^6.2.0","invariant":"^2.2.0","is-builtin-module":"^2.0.0","is-ci":"^1.0.10","is-webpack-bundle":"^1.0.0","js-yaml":"^3.13.1","leven":"^2.0.0","loud-rejection":"^1.2.0","micromatch":"^2.3.11","mkdirp":"^0.5.1","node-emoji":"^1.6.1","normalize-url":"^2.0.0","npm-logical-tree":"^1.2.1","object-path":"^0.11.2","proper-lockfile":"^2.0.0","puka":"^1.0.0","read":"^1.0.7","request":"^2.87.0","request-capture-har":"^1.2.2","rimraf":"^2.5.0","semver":"^5.1.0","ssri":"^5.3.0","strip-ansi":"^4.0.0","strip-bom":"^3.0.0","tar-fs":"^1.16.0","tar-stream":"^1.6.1","uuid":"^3.0.1","v8-compile-cache":"^2.0.0","validate-npm-package-license":"^3.0.4","yn":"^2.0.0"},"devDependencies":{"babel-core":"^6.26.0","babel-eslint":"^7.2.3","babel-loader":"^6.2.5","babel-plugin-array-includes":"^2.0.3","babel-plugin-inline-import":"^3.0.0","babel-plugin-transform-builtin-extend":"^1.1.2","babel-plugin-transform-inline-imports-commonjs":"^1.0.0","babel-plugin-transform-runtime":"^6.4.3","babel-preset-env":"^1.6.0","babel-preset-flow":"^6.23.0","babel-preset-stage-0":"^6.0.0","babylon":"^6.5.0","commitizen":"^2.9.6","cz-conventional-changelog":"^2.0.0","eslint":"^4.3.0","eslint-config-fb-strict":"^22.0.0","eslint-plugin-babel":"^5.0.0","eslint-plugin-flowtype":"^2.35.0","eslint-plugin-jasmine":"^2.6.2","eslint-plugin-jest":"^21.0.0","eslint-plugin-jsx-a11y":"^6.0.2","eslint-plugin-prefer-object-spread":"^1.2.1","eslint-plugin-prettier":"^2.1.2","eslint-plugin-react":"^7.1.0","eslint-plugin-relay":"^0.0.28","eslint-plugin-yarn-internal":"file:scripts/eslint-rules","execa":"^0.11.0","fancy-log":"^1.3.2","flow-bin":"^0.66.0","git-release-notes":"^3.0.0","gulp":"^4.0.0","gulp-babel":"^7.0.0","gulp-if":"^2.0.1","gulp-newer":"^1.0.0","gulp-plumber":"^1.0.1","gulp-sourcemaps":"^2.2.0","jest":"^22.4.4","jsinspect":"^0.12.6","minimatch":"^3.0.4","mock-stdin":"^0.3.0","prettier":"^1.5.2","string-replace-loader":"^2.1.1","temp":"^0.8.3","webpack":"^2.1.0-beta.25","yargs":"^6.3.0"},"resolutions":{"sshpk":"^1.14.2"},"engines":{"node":">=4.0.0"},"repository":"yarnpkg/yarn","bin":{"yarn":"./bin/yarn.js","yarnpkg":"./bin/yarn.js"},"scripts":{"build":"gulp build","build-bundle":"node ./scripts/build-webpack.js","build-chocolatey":"powershell ./scripts/build-chocolatey.ps1","build-deb":"./scripts/build-deb.sh","build-dist":"bash ./scripts/build-dist.sh","build-win-installer":"scripts\\build-windows-installer.bat","changelog":"git-release-notes $(git describe --tags --abbrev=0 $(git describe --tags --abbrev=0)^)..$(git describe --tags --abbrev=0) scripts/changelog.md","dupe-check":"yarn jsinspect ./src","lint":"eslint . && flow check","pkg-tests":"yarn --cwd packages/pkg-tests jest yarn.test.js","prettier":"eslint src __tests__ --fix","release-branch":"./scripts/release-branch.sh","test":"yarn lint && yarn test-only","test-only":"node --max_old_space_size=4096 node_modules/jest/bin/jest.js --verbose","test-only-debug":"node --inspect-brk --max_old_space_size=4096 node_modules/jest/bin/jest.js --runInBand --verbose","test-coverage":"node --max_old_space_size=4096 node_modules/jest/bin/jest.js --coverage --verbose","watch":"gulp watch","commit":"git-cz"},"jest":{"collectCoverageFrom":["src/**/*.js"],"testEnvironment":"node","modulePathIgnorePatterns":["__tests__/fixtures/","packages/pkg-tests/pkg-tests-fixtures","dist/"],"testPathIgnorePatterns":["__tests__/(fixtures|__mocks__)/","updates/","_(temp|mock|install|init|helpers).js$","packages/pkg-tests"]},"config":{"commitizen":{"path":"./node_modules/cz-conventional-changelog"}}}
-
 /***/ }),
 /* 195 */
 /***/ (function(module, exports) {
 
-module.exports = require("https");
+module.exports = {"name":"yarn","installationMethod":"unknown","version":"1.22.19","packageManager":"yarn@1.22.17","license":"BSD-2-Clause","preferGlobal":true,"description":"📦🐈 Fast, reliable, and secure dependency management.","dependencies":{"@zkochan/cmd-shim":"^3.1.0","babel-runtime":"^6.26.0","bytes":"^3.0.0","camelcase":"^4.0.0","chalk":"^2.1.0","cli-table3":"^0.4.0","commander":"^2.9.0","death":"^1.0.0","debug":"^3.0.0","deep-equal":"^1.0.1","detect-indent":"^5.0.0","dnscache":"^1.0.1","glob":"^7.1.1","gunzip-maybe":"^1.4.0","hash-for-dep":"^1.2.3","imports-loader":"^0.8.0","ini":"^1.3.4","inquirer":"^6.2.0","invariant":"^2.2.0","is-builtin-module":"^2.0.0","is-ci":"^1.0.10","is-webpack-bundle":"^1.0.0","js-yaml":"^3.13.1","leven":"^2.0.0","loud-rejection":"^1.2.0","micromatch":"^2.3.11","mkdirp":"^0.5.1","node-emoji":"^1.6.1","normalize-url":"^2.0.0","npm-logical-tree":"^1.2.1","object-path":"^0.11.2","proper-lockfile":"^2.0.0","puka":"^1.0.0","read":"^1.0.7","request":"^2.87.0","request-capture-har":"^1.2.2","rimraf":"^2.5.0","semver":"^5.1.0","ssri":"^5.3.0","strip-ansi":"^4.0.0","strip-bom":"^3.0.0","tar-fs":"^1.16.0","tar-stream":"^1.6.1","uuid":"^3.0.1","v8-compile-cache":"^2.0.0","validate-npm-package-license":"^3.0.4","yn":"^2.0.0"},"devDependencies":{"babel-core":"^6.26.0","babel-eslint":"^7.2.3","babel-loader":"^6.2.5","babel-plugin-array-includes":"^2.0.3","babel-plugin-inline-import":"^3.0.0","babel-plugin-transform-builtin-extend":"^1.1.2","babel-plugin-transform-inline-imports-commonjs":"^1.0.0","babel-plugin-transform-runtime":"^6.4.3","babel-preset-env":"^1.6.0","babel-preset-flow":"^6.23.0","babel-preset-stage-0":"^6.0.0","babylon":"^6.5.0","commitizen":"^2.9.6","cz-conventional-changelog":"^2.0.0","eslint":"^4.3.0","eslint-config-fb-strict":"^22.0.0","eslint-plugin-babel":"^5.0.0","eslint-plugin-flowtype":"^2.35.0","eslint-plugin-jasmine":"^2.6.2","eslint-plugin-jest":"^21.0.0","eslint-plugin-jsx-a11y":"^6.0.2","eslint-plugin-prefer-object-spread":"^1.2.1","eslint-plugin-prettier":"^2.1.2","eslint-plugin-react":"^7.1.0","eslint-plugin-relay":"^0.0.28","eslint-plugin-yarn-internal":"file:scripts/eslint-rules","execa":"^0.11.0","fancy-log":"^1.3.2","flow-bin":"^0.66.0","git-release-notes":"^3.0.0","gulp":"^4.0.0","gulp-babel":"^7.0.0","gulp-if":"^2.0.1","gulp-newer":"^1.0.0","gulp-plumber":"^1.0.1","gulp-sourcemaps":"^2.2.0","jest":"^22.4.4","jsinspect":"^0.12.6","minimatch":"^3.0.4","mock-stdin":"^0.3.0","prettier":"^1.5.2","string-replace-loader":"^2.1.1","temp":"^0.8.3","webpack":"^2.1.0-beta.25","yargs":"^6.3.0"},"resolutions":{"sshpk":"^1.14.2"},"engines":{"node":">=4.0.0"},"repository":"yarnpkg/yarn","bin":{"yarn":"./bin/yarn.js","yarnpkg":"./bin/yarn.js"},"scripts":{"build":"gulp build","build-bundle":"node ./scripts/build-webpack.js","build-chocolatey":"powershell ./scripts/build-chocolatey.ps1","build-deb":"./scripts/build-deb.sh","build-dist":"bash ./scripts/build-dist.sh","build-win-installer":"scripts\\build-windows-installer.bat","changelog":"git-release-notes $(git describe --tags --abbrev=0 $(git describe --tags --abbrev=0)^)..$(git describe --tags --abbrev=0) scripts/changelog.md","dupe-check":"yarn jsinspect ./src","lint":"eslint . && flow check","pkg-tests":"yarn --cwd packages/pkg-tests jest yarn.test.js","prettier":"eslint src __tests__ --fix","release-branch":"./scripts/release-branch.sh","test":"yarn lint && yarn test-only","test-only":"node --max_old_space_size=4096 node_modules/jest/bin/jest.js --verbose","test-only-debug":"node --inspect-brk --max_old_space_size=4096 node_modules/jest/bin/jest.js --runInBand --verbose","test-coverage":"node --max_old_space_size=4096 node_modules/jest/bin/jest.js --coverage --verbose","watch":"gulp watch","commit":"git-cz"},"jest":{"collectCoverageFrom":["src/**/*.js"],"testEnvironment":"node","modulePathIgnorePatterns":["__tests__/fixtures/","packages/pkg-tests/pkg-tests-fixtures","dist/"],"testPathIgnorePatterns":["__tests__/(fixtures|__mocks__)/","updates/","_(temp|mock|install|init|helpers).js$","packages/pkg-tests"]},"config":{"commitizen":{"path":"./node_modules/cz-conventional-changelog"}}}
 
 /***/ }),
 /* 196 */
 /***/ (function(module, exports) {
 
-module.exports = require("querystring");
+module.exports = require("https");
 
 /***/ }),
 /* 197 */
 /***/ (function(module, exports) {
 
-module.exports = require("readline");
+module.exports = require("querystring");
 
 /***/ }),
 /* 198 */
 /***/ (function(module, exports) {
 
-module.exports = require("zlib");
+module.exports = require("readline");
 
 /***/ }),
 /* 199 */
+/***/ (function(module, exports) {
+
+module.exports = require("zlib");
+
+/***/ }),
+/* 200 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -46732,7 +46916,7 @@ function _load_constants() {
 var _package;
 
 function _load_package() {
-  return _package = __webpack_require__(194);
+  return _package = __webpack_require__(195);
 }
 
 const NODE_VERSION = process.version;
@@ -46840,7 +47024,7 @@ function stringify(obj, noHeader, enableVersions) {
 }
 
 /***/ }),
-/* 200 */
+/* 201 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -46853,7 +47037,7 @@ Object.defineProperty(exports, "__esModule", {
 var _consoleReporter;
 
 function _load_consoleReporter() {
-  return _consoleReporter = __webpack_require__(561);
+  return _consoleReporter = __webpack_require__(529);
 }
 
 Object.defineProperty(exports, 'ConsoleReporter', {
@@ -46866,7 +47050,7 @@ Object.defineProperty(exports, 'ConsoleReporter', {
 var _bufferReporter;
 
 function _load_bufferReporter() {
-  return _bufferReporter = __webpack_require__(560);
+  return _bufferReporter = __webpack_require__(528);
 }
 
 Object.defineProperty(exports, 'BufferReporter', {
@@ -46879,7 +47063,7 @@ Object.defineProperty(exports, 'BufferReporter', {
 var _eventReporter;
 
 function _load_eventReporter() {
-  return _eventReporter = __webpack_require__(565);
+  return _eventReporter = __webpack_require__(533);
 }
 
 Object.defineProperty(exports, 'EventReporter', {
@@ -46892,7 +47076,7 @@ Object.defineProperty(exports, 'EventReporter', {
 var _jsonReporter;
 
 function _load_jsonReporter() {
-  return _jsonReporter = __webpack_require__(213);
+  return _jsonReporter = __webpack_require__(211);
 }
 
 Object.defineProperty(exports, 'JSONReporter', {
@@ -46905,7 +47089,7 @@ Object.defineProperty(exports, 'JSONReporter', {
 var _noopReporter;
 
 function _load_noopReporter() {
-  return _noopReporter = __webpack_require__(569);
+  return _noopReporter = __webpack_require__(537);
 }
 
 Object.defineProperty(exports, 'NoopReporter', {
@@ -46931,7 +47115,7 @@ Object.defineProperty(exports, 'Reporter', {
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /***/ }),
-/* 201 */
+/* 202 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -47203,389 +47387,8 @@ function normalizePathEnvVar (nodePath) {
 }
 
 
-/***/ }),
-/* 202 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var resolve = __webpack_require__(203);
-
-module.exports = {
-  Validation: errorSubclass(ValidationError),
-  MissingRef: errorSubclass(MissingRefError)
-};
-
-
-function ValidationError(errors) {
-  this.message = 'validation failed';
-  this.errors = errors;
-  this.ajv = this.validation = true;
-}
-
-
-MissingRefError.message = function (baseId, ref) {
-  return 'can\'t resolve reference ' + ref + ' from id ' + baseId;
-};
-
-
-function MissingRefError(baseId, ref, message) {
-  this.message = message || MissingRefError.message(baseId, ref);
-  this.missingRef = resolve.url(baseId, ref);
-  this.missingSchema = resolve.normalizeId(resolve.fullPath(this.missingRef));
-}
-
-
-function errorSubclass(Subclass) {
-  Subclass.prototype = Object.create(Error.prototype);
-  Subclass.prototype.constructor = Subclass;
-  return Subclass;
-}
-
-
 /***/ }),
 /* 203 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var url = __webpack_require__(24)
-  , equal = __webpack_require__(204)
-  , util = __webpack_require__(106)
-  , SchemaObject = __webpack_require__(339)
-  , traverse = __webpack_require__(503);
-
-module.exports = resolve;
-
-resolve.normalizeId = normalizeId;
-resolve.fullPath = getFullPath;
-resolve.url = resolveUrl;
-resolve.ids = resolveIds;
-resolve.inlineRef = inlineRef;
-resolve.schema = resolveSchema;
-
-/**
- * [resolve and compile the references ($ref)]
- * @this   Ajv
- * @param  {Function} compile reference to schema compilation funciton (localCompile)
- * @param  {Object} root object with information about the root schema for the current schema
- * @param  {String} ref reference to resolve
- * @return {Object|Function} schema object (if the schema can be inlined) or validation function
- */
-function resolve(compile, root, ref) {
-  /* jshint validthis: true */
-  var refVal = this._refs[ref];
-  if (typeof refVal == 'string') {
-    if (this._refs[refVal]) refVal = this._refs[refVal];
-    else return resolve.call(this, compile, root, refVal);
-  }
-
-  refVal = refVal || this._schemas[ref];
-  if (refVal instanceof SchemaObject) {
-    return inlineRef(refVal.schema, this._opts.inlineRefs)
-            ? refVal.schema
-            : refVal.validate || this._compile(refVal);
-  }
-
-  var res = resolveSchema.call(this, root, ref);
-  var schema, v, baseId;
-  if (res) {
-    schema = res.schema;
-    root = res.root;
-    baseId = res.baseId;
-  }
-
-  if (schema instanceof SchemaObject) {
-    v = schema.validate || compile.call(this, schema.schema, root, undefined, baseId);
-  } else if (schema !== undefined) {
-    v = inlineRef(schema, this._opts.inlineRefs)
-        ? schema
-        : compile.call(this, schema, root, undefined, baseId);
-  }
-
-  return v;
-}
-
-
-/**
- * Resolve schema, its root and baseId
- * @this Ajv
- * @param  {Object} root root object with properties schema, refVal, refs
- * @param  {String} ref  reference to resolve
- * @return {Object} object with properties schema, root, baseId
- */
-function resolveSchema(root, ref) {
-  /* jshint validthis: true */
-  var p = url.parse(ref, false, true)
-    , refPath = _getFullPath(p)
-    , baseId = getFullPath(this._getId(root.schema));
-  if (refPath !== baseId) {
-    var id = normalizeId(refPath);
-    var refVal = this._refs[id];
-    if (typeof refVal == 'string') {
-      return resolveRecursive.call(this, root, refVal, p);
-    } else if (refVal instanceof SchemaObject) {
-      if (!refVal.validate) this._compile(refVal);
-      root = refVal;
-    } else {
-      refVal = this._schemas[id];
-      if (refVal instanceof SchemaObject) {
-        if (!refVal.validate) this._compile(refVal);
-        if (id == normalizeId(ref))
-          return { schema: refVal, root: root, baseId: baseId };
-        root = refVal;
-      } else {
-        return;
-      }
-    }
-    if (!root.schema) return;
-    baseId = getFullPath(this._getId(root.schema));
-  }
-  return getJsonPointer.call(this, p, baseId, root.schema, root);
-}
-
-
-/* @this Ajv */
-function resolveRecursive(root, ref, parsedRef) {
-  /* jshint validthis: true */
-  var res = resolveSchema.call(this, root, ref);
-  if (res) {
-    var schema = res.schema;
-    var baseId = res.baseId;
-    root = res.root;
-    var id = this._getId(schema);
-    if (id) baseId = resolveUrl(baseId, id);
-    return getJsonPointer.call(this, parsedRef, baseId, schema, root);
-  }
-}
-
-
-var PREVENT_SCOPE_CHANGE = util.toHash(['properties', 'patternProperties', 'enum', 'dependencies', 'definitions']);
-/* @this Ajv */
-function getJsonPointer(parsedRef, baseId, schema, root) {
-  /* jshint validthis: true */
-  parsedRef.hash = parsedRef.hash || '';
-  if (parsedRef.hash.slice(0,2) != '#/') return;
-  var parts = parsedRef.hash.split('/');
-
-  for (var i = 1; i < parts.length; i++) {
-    var part = parts[i];
-    if (part) {
-      part = util.unescapeFragment(part);
-      schema = schema[part];
-      if (schema === undefined) break;
-      var id;
-      if (!PREVENT_SCOPE_CHANGE[part]) {
-        id = this._getId(schema);
-        if (id) baseId = resolveUrl(baseId, id);
-        if (schema.$ref) {
-          var $ref = resolveUrl(baseId, schema.$ref);
-          var res = resolveSchema.call(this, root, $ref);
-          if (res) {
-            schema = res.schema;
-            root = res.root;
-            baseId = res.baseId;
-          }
-        }
-      }
-    }
-  }
-  if (schema !== undefined && schema !== root.schema)
-    return { schema: schema, root: root, baseId: baseId };
-}
-
-
-var SIMPLE_INLINED = util.toHash([
-  'type', 'format', 'pattern',
-  'maxLength', 'minLength',
-  'maxProperties', 'minProperties',
-  'maxItems', 'minItems',
-  'maximum', 'minimum',
-  'uniqueItems', 'multipleOf',
-  'required', 'enum'
-]);
-function inlineRef(schema, limit) {
-  if (limit === false) return false;
-  if (limit === undefined || limit === true) return checkNoRef(schema);
-  else if (limit) return countKeys(schema) <= limit;
-}
-
-
-function checkNoRef(schema) {
-  var item;
-  if (Array.isArray(schema)) {
-    for (var i=0; i<schema.length; i++) {
-      item = schema[i];
-      if (typeof item == 'object' && !checkNoRef(item)) return false;
-    }
-  } else {
-    for (var key in schema) {
-      if (key == '$ref') return false;
-      item = schema[key];
-      if (typeof item == 'object' && !checkNoRef(item)) return false;
-    }
-  }
-  return true;
-}
-
-
-function countKeys(schema) {
-  var count = 0, item;
-  if (Array.isArray(schema)) {
-    for (var i=0; i<schema.length; i++) {
-      item = schema[i];
-      if (typeof item == 'object') count += countKeys(item);
-      if (count == Infinity) return Infinity;
-    }
-  } else {
-    for (var key in schema) {
-      if (key == '$ref') return Infinity;
-      if (SIMPLE_INLINED[key]) {
-        count++;
-      } else {
-        item = schema[key];
-        if (typeof item == 'object') count += countKeys(item) + 1;
-        if (count == Infinity) return Infinity;
-      }
-    }
-  }
-  return count;
-}
-
-
-function getFullPath(id, normalize) {
-  if (normalize !== false) id = normalizeId(id);
-  var p = url.parse(id, false, true);
-  return _getFullPath(p);
-}
-
-
-function _getFullPath(p) {
-  var protocolSeparator = p.protocol || p.href.slice(0,2) == '//' ? '//' : '';
-  return (p.protocol||'') + protocolSeparator + (p.host||'') + (p.path||'')  + '#';
-}
-
-
-var TRAILING_SLASH_HASH = /#\/?$/;
-function normalizeId(id) {
-  return id ? id.replace(TRAILING_SLASH_HASH, '') : '';
-}
-
-
-function resolveUrl(baseId, id) {
-  id = normalizeId(id);
-  return url.resolve(baseId, id);
-}
-
-
-/* @this Ajv */
-function resolveIds(schema) {
-  var schemaId = normalizeId(this._getId(schema));
-  var baseIds = {'': schemaId};
-  var fullPaths = {'': getFullPath(schemaId, false)};
-  var localRefs = {};
-  var self = this;
-
-  traverse(schema, {allKeys: true}, function(sch, jsonPtr, rootSchema, parentJsonPtr, parentKeyword, parentSchema, keyIndex) {
-    if (jsonPtr === '') return;
-    var id = self._getId(sch);
-    var baseId = baseIds[parentJsonPtr];
-    var fullPath = fullPaths[parentJsonPtr] + '/' + parentKeyword;
-    if (keyIndex !== undefined)
-      fullPath += '/' + (typeof keyIndex == 'number' ? keyIndex : util.escapeFragment(keyIndex));
-
-    if (typeof id == 'string') {
-      id = baseId = normalizeId(baseId ? url.resolve(baseId, id) : id);
-
-      var refVal = self._refs[id];
-      if (typeof refVal == 'string') refVal = self._refs[refVal];
-      if (refVal && refVal.schema) {
-        if (!equal(sch, refVal.schema))
-          throw new Error('id "' + id + '" resolves to more than one schema');
-      } else if (id != normalizeId(fullPath)) {
-        if (id[0] == '#') {
-          if (localRefs[id] && !equal(sch, localRefs[id]))
-            throw new Error('id "' + id + '" resolves to more than one schema');
-          localRefs[id] = sch;
-        } else {
-          self._refs[id] = fullPath;
-        }
-      }
-    }
-    baseIds[jsonPtr] = baseId;
-    fullPaths[jsonPtr] = fullPath;
-  });
-
-  return localRefs;
-}
-
-
-/***/ }),
-/* 204 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var isArray = Array.isArray;
-var keyList = Object.keys;
-var hasProp = Object.prototype.hasOwnProperty;
-
-module.exports = function equal(a, b) {
-  if (a === b) return true;
-
-  var arrA = isArray(a)
-    , arrB = isArray(b)
-    , i
-    , length
-    , key;
-
-  if (arrA && arrB) {
-    length = a.length;
-    if (length != b.length) return false;
-    for (i = 0; i < length; i++)
-      if (!equal(a[i], b[i])) return false;
-    return true;
-  }
-
-  if (arrA != arrB) return false;
-
-  var dateA = a instanceof Date
-    , dateB = b instanceof Date;
-  if (dateA != dateB) return false;
-  if (dateA && dateB) return a.getTime() == b.getTime();
-
-  var regexpA = a instanceof RegExp
-    , regexpB = b instanceof RegExp;
-  if (regexpA != regexpB) return false;
-  if (regexpA && regexpB) return a.toString() == b.toString();
-
-  if (a instanceof Object && b instanceof Object) {
-    var keys = keyList(a);
-    length = keys.length;
-
-    if (length !== keyList(b).length)
-      return false;
-
-    for (i = 0; i < length; i++)
-      if (!hasProp.call(b, keys[i])) return false;
-
-    for (i = 0; i < length; i++) {
-      key = keys[i];
-      if (!equal(a[key], b[key])) return false;
-    }
-
-    return true;
-  }
-
-  return false;
-};
-
-
-/***/ }),
-/* 205 */
 /***/ (function(module, exports) {
 
 // Copyright 2011 Mark Cavage <mcavage@gmail.com> All rights reserved.
@@ -47604,7 +47407,7 @@ module.exports = {
 
 
 /***/ }),
-/* 206 */
+/* 204 */
 /***/ (function(module, exports) {
 
 // Copyright 2011 Mark Cavage <mcavage@gmail.com> All rights reserved.
@@ -47646,7 +47449,7 @@ module.exports = {
 
 
 /***/ }),
-/* 207 */
+/* 205 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -47926,7 +47729,7 @@ function hasWrapper(commander, args) {
 const requireLockfile = exports.requireLockfile = true;
 
 /***/ }),
-/* 208 */
+/* 206 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -47940,7 +47743,7 @@ exports.integrityErrors = undefined;
 var _extends2;
 
 function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+  return _extends2 = _interopRequireDefault(__webpack_require__(20));
 }
 
 var _asyncToGenerator2;
@@ -47958,7 +47761,7 @@ function _load_constants() {
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 var _misc;
@@ -47970,7 +47773,7 @@ function _load_misc() {
 var _packageNameUtils;
 
 function _load_packageNameUtils() {
-  return _packageNameUtils = __webpack_require__(222);
+  return _packageNameUtils = __webpack_require__(220);
 }
 
 var _workspaceLayout;
@@ -48548,7 +48351,7 @@ class InstallationIntegrityChecker {
 exports.default = InstallationIntegrityChecker;
 
 /***/ }),
-/* 209 */
+/* 207 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -48583,13 +48386,13 @@ function _load_misc() {
 var _yarnVersion;
 
 function _load_yarnVersion() {
-  return _yarnVersion = __webpack_require__(120);
+  return _yarnVersion = __webpack_require__(105);
 }
 
 var _semver;
 
 function _load_semver() {
-  return _semver = __webpack_require__(224);
+  return _semver = __webpack_require__(170);
 }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -48720,9 +48523,7 @@ function checkOne(info, config, ignoreEngines) {
       ref.ignore = true;
       ref.incompatible = true;
 
-      reporter.info(`${human}: ${msg}`);
       if (!didIgnore) {
-        reporter.info(reporter.lang('optionalCompatibilityExcluded', human));
         didIgnore = true;
       }
     } else {
@@ -48817,7 +48618,7 @@ function shouldCheck(manifest, options) {
 }
 
 /***/ }),
-/* 210 */
+/* 208 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -48944,19 +48745,19 @@ function _load_errors() {
 var _index;
 
 function _load_index() {
-  return _index = _interopRequireWildcard(__webpack_require__(552));
+  return _index = _interopRequireWildcard(__webpack_require__(520));
 }
 
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 var _promise;
 
 function _load_promise() {
-  return _promise = _interopRequireWildcard(__webpack_require__(50));
+  return _promise = _interopRequireWildcard(__webpack_require__(51));
 }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
@@ -49043,7 +48844,7 @@ function fetch(pkgs, config) {
 }
 
 /***/ }),
-/* 211 */
+/* 209 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -49084,7 +48885,7 @@ let linkBin = exports.linkBin = (() => {
 var _packageHoister;
 
 function _load_packageHoister() {
-  return _packageHoister = _interopRequireDefault(__webpack_require__(556));
+  return _packageHoister = _interopRequireDefault(__webpack_require__(524));
 }
 
 var _constants;
@@ -49096,7 +48897,7 @@ function _load_constants() {
 var _promise;
 
 function _load_promise() {
-  return _promise = _interopRequireWildcard(__webpack_require__(50));
+  return _promise = _interopRequireWildcard(__webpack_require__(51));
 }
 
 var _normalizePattern2;
@@ -49114,19 +48915,19 @@ function _load_misc() {
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 var _mutex;
 
 function _load_mutex() {
-  return _mutex = _interopRequireDefault(__webpack_require__(375));
+  return _mutex = _interopRequireDefault(__webpack_require__(369));
 }
 
 var _semver;
 
 function _load_semver() {
-  return _semver = __webpack_require__(224);
+  return _semver = __webpack_require__(170);
 }
 
 var _workspaceLayout;
@@ -49141,7 +48942,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 const invariant = __webpack_require__(9);
 
-const cmdShim = __webpack_require__(201);
+const cmdShim = __webpack_require__(202);
 const path = __webpack_require__(0);
 const semver = __webpack_require__(22);
 // Concurrency for creating bin links disabled because of the issue #1961
@@ -50183,7 +49984,7 @@ class PackageLinker {
 exports.default = PackageLinker;
 
 /***/ }),
-/* 212 */
+/* 210 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -50205,7 +50006,7 @@ function _load_tty() {
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const readline = __webpack_require__(197);
+const readline = __webpack_require__(198);
 
 var _require = __webpack_require__(30);
 
@@ -50274,7 +50075,7 @@ function clearNthLine(stdout, n) {
 }
 
 /***/ }),
-/* 213 */
+/* 211 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -50287,7 +50088,7 @@ Object.defineProperty(exports, "__esModule", {
 var _extends2;
 
 function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+  return _extends2 = _interopRequireDefault(__webpack_require__(20));
 }
 
 var _baseReporter;
@@ -50468,7 +50269,7 @@ class JSONReporter extends (_baseReporter || _load_baseReporter()).default {
 exports.default = JSONReporter;
 
 /***/ }),
-/* 214 */
+/* 212 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -50506,13 +50307,13 @@ function _load_normalizePattern() {
 var _parsePackagePath;
 
 function _load_parsePackagePath() {
-  return _parsePackagePath = _interopRequireDefault(__webpack_require__(376));
+  return _parsePackagePath = _interopRequireDefault(__webpack_require__(370));
 }
 
 var _parsePackagePath2;
 
 function _load_parsePackagePath2() {
-  return _parsePackagePath2 = __webpack_require__(376);
+  return _parsePackagePath2 = __webpack_require__(370);
 }
 
 var _resolvers;
@@ -50616,7 +50417,7 @@ const shouldUpdateLockfile = exports.shouldUpdateLockfile = (lockfileEntry, reso
 };
 
 /***/ }),
-/* 215 */
+/* 213 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -50648,7 +50449,7 @@ function _load_invariant() {
 var _uuid;
 
 function _load_uuid() {
-  return _uuid = _interopRequireDefault(__webpack_require__(119));
+  return _uuid = _interopRequireDefault(__webpack_require__(120));
 }
 
 var _errors;
@@ -50672,7 +50473,7 @@ function _load_misc() {
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
@@ -50754,7 +50555,7 @@ FileResolver.protocol = 'file';
 FileResolver.prefixMatcher = /^\.{1,2}\//;
 
 /***/ }),
-/* 216 */
+/* 214 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -50830,7 +50631,7 @@ exports.default = GistResolver;
 GistResolver.protocol = 'gist';
 
 /***/ }),
-/* 217 */
+/* 215 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -50849,7 +50650,7 @@ function _load_asyncToGenerator() {
 var _cache;
 
 function _load_cache() {
-  return _cache = __webpack_require__(355);
+  return _cache = __webpack_require__(349);
 }
 
 var _errors;
@@ -50861,7 +50662,7 @@ function _load_errors() {
 var _registryResolver;
 
 function _load_registryResolver() {
-  return _registryResolver = _interopRequireDefault(__webpack_require__(575));
+  return _registryResolver = _interopRequireDefault(__webpack_require__(543));
 }
 
 var _npmRegistry;
@@ -50879,7 +50680,7 @@ function _load_map() {
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 var _constants;
@@ -50891,7 +50692,7 @@ function _load_constants() {
 var _packageNameUtils;
 
 function _load_packageNameUtils() {
-  return _packageNameUtils = __webpack_require__(222);
+  return _packageNameUtils = __webpack_require__(220);
 }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
@@ -51119,7 +50920,7 @@ exports.default = NpmResolver;
 NpmResolver.registry = NPM_REGISTRY_ID;
 
 /***/ }),
-/* 218 */
+/* 216 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -51199,19 +51000,19 @@ let fixTimes = (() => {
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireDefault(__webpack_require__(5));
+  return _fs = _interopRequireDefault(__webpack_require__(4));
 }
 
 var _promise;
 
 function _load_promise() {
-  return _promise = __webpack_require__(50);
+  return _promise = __webpack_require__(51);
 }
 
 var _fs2;
 
 function _load_fs2() {
-  return _fs2 = __webpack_require__(4);
+  return _fs2 = __webpack_require__(5);
 }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -51317,7 +51118,7 @@ const copyWithBuffer = (() => {
 };
 
 /***/ }),
-/* 219 */
+/* 217 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -51336,7 +51137,7 @@ function _load_asyncToGenerator() {
 var _extends2;
 
 function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+  return _extends2 = _interopRequireDefault(__webpack_require__(20));
 }
 
 var _invariant;
@@ -51354,7 +51155,7 @@ function _load_string_decoder() {
 var _tarFs;
 
 function _load_tarFs() {
-  return _tarFs = _interopRequireDefault(__webpack_require__(193));
+  return _tarFs = _interopRequireDefault(__webpack_require__(194));
 }
 
 var _tarStream;
@@ -51372,7 +51173,7 @@ function _load_url() {
 var _fs;
 
 function _load_fs() {
-  return _fs = __webpack_require__(5);
+  return _fs = __webpack_require__(4);
 }
 
 var _errors;
@@ -51384,13 +51185,13 @@ function _load_errors() {
 var _gitSpawn;
 
 function _load_gitSpawn() {
-  return _gitSpawn = __webpack_require__(373);
+  return _gitSpawn = __webpack_require__(367);
 }
 
 var _gitRefResolver;
 
 function _load_gitRefResolver() {
-  return _gitRefResolver = __webpack_require__(581);
+  return _gitRefResolver = __webpack_require__(549);
 }
 
 var _crypto;
@@ -51402,7 +51203,7 @@ function _load_crypto() {
 var _fs2;
 
 function _load_fs2() {
-  return _fs2 = _interopRequireWildcard(__webpack_require__(4));
+  return _fs2 = _interopRequireWildcard(__webpack_require__(5));
 }
 
 var _map;
@@ -51961,7 +51762,7 @@ class Git {
 exports.default = Git;
 
 /***/ }),
-/* 220 */
+/* 218 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -51980,7 +51781,7 @@ function _load_asyncToGenerator() {
 var _resolveRelative;
 
 function _load_resolveRelative() {
-  return _resolveRelative = _interopRequireDefault(__webpack_require__(586));
+  return _resolveRelative = _interopRequireDefault(__webpack_require__(554));
 }
 
 var _validate;
@@ -51992,7 +51793,7 @@ function _load_validate() {
 var _fix;
 
 function _load_fix() {
-  return _fix = _interopRequireDefault(__webpack_require__(583));
+  return _fix = _interopRequireDefault(__webpack_require__(551));
 }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -52048,7 +51849,7 @@ exports.default = (() => {
 })();
 
 /***/ }),
-/* 221 */
+/* 219 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -52177,7 +51978,7 @@ function extractRepositoryUrl(repository) {
 }
 
 /***/ }),
-/* 222 */
+/* 220 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -52201,7 +52002,7 @@ function getSystemParams() {
 }
 
 /***/ }),
-/* 223 */
+/* 221 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -52229,140 +52030,7 @@ function isRootUser(uid) {
 }
 
 /***/ }),
-/* 224 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.satisfiesWithPrereleases = satisfiesWithPrereleases;
-exports.diffWithUnstable = diffWithUnstable;
-
-var _semver;
-
-function _load_semver() {
-  return _semver = _interopRequireDefault(__webpack_require__(22));
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-/**
- * Returns whether the given semver version satisfies the given range. Notably this supports
- * prerelease versions so that "2.0.0-rc.0" satisfies the range ">=1.0.0", for example.
- */
-
-function satisfiesWithPrereleases(version, range, loose = false) {
-  let semverRange;
-  try {
-    // $FlowFixMe: Add a definition for the Range class
-    semverRange = new (_semver || _load_semver()).default.Range(range, loose);
-  } catch (err) {
-    return false;
-  }
-
-  if (!version) {
-    return false;
-  }
-  let semverVersion;
-  try {
-    semverVersion = new (_semver || _load_semver()).default.SemVer(version, semverRange.loose);
-  } catch (err) {
-    return false;
-  }
-
-  // A range has multiple sets of comparators. A version must satisfy all comparators in a set
-  // and at least one set to satisfy the range.
-  return semverRange.set.some(comparatorSet => {
-    // node-semver converts ~ and ^ ranges into pairs of >= and < ranges but the upper bounds don't
-    // properly exclude prerelease versions. For example, "^1.0.0" is converted to ">=1.0.0 <2.0.0",
-    // which includes "2.0.0-pre" since prerelease versions are lower than their non-prerelease
-    // counterparts. As a practical workaround we make upper-bound ranges exclude prereleases and
-    // convert "<2.0.0" to "<2.0.0-0", for example.
-    comparatorSet = comparatorSet.map(comparator => {
-      if (comparator.operator !== '<' || !comparator.value || comparator.semver.prerelease.length) {
-        return comparator;
-      }
-
-      // "0" is the lowest prerelease version
-      comparator.semver.inc('pre', 0);
-
-      const comparatorString = comparator.operator + comparator.semver.version;
-      // $FlowFixMe: Add a definition for the Comparator class
-      return new (_semver || _load_semver()).default.Comparator(comparatorString, comparator.loose);
-    });
-
-    return !comparatorSet.some(comparator => !comparator.test(semverVersion));
-  });
-}
-
-const PRE_RELEASES = {
-  major: 'premajor',
-  minor: 'preminor',
-  patch: 'prepatch'
-};
-
-/**
- * Returns the difference between two versions as a semantic string representation.
- * Similar to the `diff` method in node-semver, but it also accounts for unstable versions,
- * like 0.x.x or 0.0.x.
- */
-
-function diffWithUnstable(version1, version2) {
-  if ((_semver || _load_semver()).default.eq(version1, version2) === false) {
-    const v1 = (_semver || _load_semver()).default.parse(version1);
-    const v2 = (_semver || _load_semver()).default.parse(version2);
-
-    if (v1 != null && v2 != null) {
-      const isPreRelease = v1.prerelease.length > 0 || v2.prerelease.length > 0;
-      const preMajor = v1.major === 0 || v2.major === 0;
-      const preMinor = preMajor && (v1.minor === 0 || v2.minor === 0);
-
-      let diff = null;
-
-      if (v1.major !== v2.major) {
-        diff = 'major';
-      } else if (v1.minor !== v2.minor) {
-        if (preMajor) {
-          // If the major version number is zero (0.x.x), treat a change
-          // of the minor version number as a major change.
-          diff = 'major';
-        } else {
-          diff = 'minor';
-        }
-      } else if (v1.patch !== v2.patch) {
-        if (preMinor) {
-          // If the major & minor version numbers are zero (0.0.x), treat a change
-          // of the patch version number as a major change.
-          diff = 'major';
-        } else if (preMajor) {
-          // If the major version number is zero (0.x.x), treat a change
-          // of the patch version number as a minor change.
-          diff = 'minor';
-        } else {
-          diff = 'patch';
-        }
-      }
-
-      if (isPreRelease) {
-        if (diff != null) {
-          diff = PRE_RELEASES[diff];
-        } else {
-          diff = 'prerelease';
-        }
-      }
-
-      return diff;
-    }
-  }
-
-  return null;
-}
-
-/***/ }),
-/* 225 */
+/* 222 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -52428,7 +52096,7 @@ function getLocalAppDataDir() {
 }
 
 /***/ }),
-/* 226 */
+/* 223 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -52448,13 +52116,13 @@ function explodeHashedUrl(url) {
 }
 
 /***/ }),
-/* 227 */
+/* 224 */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = { "default": __webpack_require__(233), __esModule: true };
+module.exports = { "default": __webpack_require__(230), __esModule: true };
 
 /***/ }),
-/* 228 */
+/* 225 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -52520,11 +52188,11 @@ function range(a, b, str) {
 
 
 /***/ }),
-/* 229 */
+/* 226 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var concatMap = __webpack_require__(232);
-var balanced = __webpack_require__(228);
+var concatMap = __webpack_require__(229);
+var balanced = __webpack_require__(225);
 
 module.exports = expandTop;
 
@@ -52727,7 +52395,7 @@ function expand(str, isTop) {
 
 
 /***/ }),
-/* 230 */
+/* 227 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -52798,7 +52466,7 @@ module.exports = function (str) {
 
 
 /***/ }),
-/* 231 */
+/* 228 */
 /***/ (function(module, exports) {
 
 function Caseless (dict) {
@@ -52871,7 +52539,7 @@ module.exports.httpify = function (resp, headers) {
 
 
 /***/ }),
-/* 232 */
+/* 229 */
 /***/ (function(module, exports) {
 
 module.exports = function (xs, fn) {
@@ -52890,27 +52558,27 @@ var isArray = Array.isArray || function (xs) {
 
 
 /***/ }),
-/* 233 */
+/* 230 */
 /***/ (function(module, exports, __webpack_require__) {
 
-__webpack_require__(259);
+__webpack_require__(256);
+__webpack_require__(258);
 __webpack_require__(261);
-__webpack_require__(264);
+__webpack_require__(257);
+__webpack_require__(259);
 __webpack_require__(260);
-__webpack_require__(262);
-__webpack_require__(263);
 module.exports = __webpack_require__(31).Promise;
 
 
 /***/ }),
-/* 234 */
+/* 231 */
 /***/ (function(module, exports) {
 
 module.exports = function () { /* empty */ };
 
 
 /***/ }),
-/* 235 */
+/* 232 */
 /***/ (function(module, exports) {
 
 module.exports = function (it, Constructor, name, forbiddenField) {
@@ -52921,14 +52589,14 @@ module.exports = function (it, Constructor, name, forbiddenField) {
 
 
 /***/ }),
-/* 236 */
+/* 233 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // false -> Array#indexOf
 // true  -> Array#includes
 var toIObject = __webpack_require__(98);
 var toLength = __webpack_require__(136);
-var toAbsoluteIndex = __webpack_require__(254);
+var toAbsoluteIndex = __webpack_require__(251);
 module.exports = function (IS_INCLUDES) {
   return function ($this, el, fromIndex) {
     var O = toIObject($this);
@@ -52950,15 +52618,15 @@ module.exports = function (IS_INCLUDES) {
 
 
 /***/ }),
-/* 237 */
+/* 234 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var ctx = __webpack_require__(70);
-var call = __webpack_require__(241);
-var isArrayIter = __webpack_require__(240);
+var call = __webpack_require__(238);
+var isArrayIter = __webpack_require__(237);
 var anObject = __webpack_require__(35);
 var toLength = __webpack_require__(136);
-var getIterFn = __webpack_require__(257);
+var getIterFn = __webpack_require__(254);
 var BREAK = {};
 var RETURN = {};
 var exports = module.exports = function (iterable, entries, fn, that, ITERATOR) {
@@ -52981,16 +52649,16 @@ exports.RETURN = RETURN;
 
 
 /***/ }),
-/* 238 */
+/* 235 */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = !__webpack_require__(51) && !__webpack_require__(112)(function () {
+module.exports = !__webpack_require__(52) && !__webpack_require__(112)(function () {
   return Object.defineProperty(__webpack_require__(92)('div'), 'a', { get: function () { return 7; } }).a != 7;
 });
 
 
 /***/ }),
-/* 239 */
+/* 236 */
 /***/ (function(module, exports) {
 
 // fast apply, http://jsperf.lnkit.com/fast-apply/5
@@ -53012,12 +52680,12 @@ module.exports = function (fn, args, that) {
 
 
 /***/ }),
-/* 240 */
+/* 237 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // check on default Array iterator
-var Iterators = __webpack_require__(53);
-var ITERATOR = __webpack_require__(20)('iterator');
+var Iterators = __webpack_require__(54);
+var ITERATOR = __webpack_require__(21)('iterator');
 var ArrayProto = Array.prototype;
 
 module.exports = function (it) {
@@ -53026,7 +52694,7 @@ module.exports = function (it) {
 
 
 /***/ }),
-/* 241 */
+/* 238 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // call something on iterator step with safe closing on error
@@ -53044,18 +52712,18 @@ module.exports = function (iterator, fn, value, entries) {
 
 
 /***/ }),
-/* 242 */
+/* 239 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-var create = __webpack_require__(246);
+var create = __webpack_require__(243);
 var descriptor = __webpack_require__(132);
 var setToStringTag = __webpack_require__(95);
 var IteratorPrototype = {};
 
 // 25.1.2.1.1 %IteratorPrototype%[@@iterator]()
-__webpack_require__(42)(IteratorPrototype, __webpack_require__(20)('iterator'), function () { return this; });
+__webpack_require__(42)(IteratorPrototype, __webpack_require__(21)('iterator'), function () { return this; });
 
 module.exports = function (Constructor, NAME, next) {
   Constructor.prototype = create(IteratorPrototype, { next: descriptor(1, next) });
@@ -53064,10 +52732,10 @@ module.exports = function (Constructor, NAME, next) {
 
 
 /***/ }),
-/* 243 */
+/* 240 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var ITERATOR = __webpack_require__(20)('iterator');
+var ITERATOR = __webpack_require__(21)('iterator');
 var SAFE_CLOSING = false;
 
 try {
@@ -53092,7 +52760,7 @@ module.exports = function (exec, skipClosing) {
 
 
 /***/ }),
-/* 244 */
+/* 241 */
 /***/ (function(module, exports) {
 
 module.exports = function (done, value) {
@@ -53101,7 +52769,7 @@ module.exports = function (done, value) {
 
 
 /***/ }),
-/* 245 */
+/* 242 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var global = __webpack_require__(17);
@@ -53176,12 +52844,12 @@ module.exports = function () {
 
 
 /***/ }),
-/* 246 */
+/* 243 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // 19.1.2.2 / 15.2.3.5 Object.create(O [, Properties])
 var anObject = __webpack_require__(35);
-var dPs = __webpack_require__(247);
+var dPs = __webpack_require__(244);
 var enumBugKeys = __webpack_require__(127);
 var IE_PROTO = __webpack_require__(96)('IE_PROTO');
 var Empty = function () { /* empty */ };
@@ -53223,14 +52891,14 @@ module.exports = Object.create || function create(O, Properties) {
 
 
 /***/ }),
-/* 247 */
+/* 244 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var dP = __webpack_require__(72);
 var anObject = __webpack_require__(35);
-var getKeys = __webpack_require__(171);
+var getKeys = __webpack_require__(172);
 
-module.exports = __webpack_require__(51) ? Object.defineProperties : function defineProperties(O, Properties) {
+module.exports = __webpack_require__(52) ? Object.defineProperties : function defineProperties(O, Properties) {
   anObject(O);
   var keys = getKeys(Properties);
   var length = keys.length;
@@ -53242,12 +52910,12 @@ module.exports = __webpack_require__(51) ? Object.defineProperties : function de
 
 
 /***/ }),
-/* 248 */
+/* 245 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // 19.1.2.9 / 15.2.3.2 Object.getPrototypeOf(O)
 var has = __webpack_require__(71);
-var toObject = __webpack_require__(172);
+var toObject = __webpack_require__(173);
 var IE_PROTO = __webpack_require__(96)('IE_PROTO');
 var ObjectProto = Object.prototype;
 
@@ -53261,12 +52929,12 @@ module.exports = Object.getPrototypeOf || function (O) {
 
 
 /***/ }),
-/* 249 */
+/* 246 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var has = __webpack_require__(71);
 var toIObject = __webpack_require__(98);
-var arrayIndexOf = __webpack_require__(236)(false);
+var arrayIndexOf = __webpack_require__(233)(false);
 var IE_PROTO = __webpack_require__(96)('IE_PROTO');
 
 module.exports = function (object, names) {
@@ -53284,7 +52952,7 @@ module.exports = function (object, names) {
 
 
 /***/ }),
-/* 250 */
+/* 247 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var hide = __webpack_require__(42);
@@ -53297,14 +52965,14 @@ module.exports = function (target, src, safe) {
 
 
 /***/ }),
-/* 251 */
+/* 248 */
 /***/ (function(module, exports, __webpack_require__) {
 
 module.exports = __webpack_require__(42);
 
 
 /***/ }),
-/* 252 */
+/* 249 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -53312,8 +52980,8 @@ module.exports = __webpack_require__(42);
 var global = __webpack_require__(17);
 var core = __webpack_require__(31);
 var dP = __webpack_require__(72);
-var DESCRIPTORS = __webpack_require__(51);
-var SPECIES = __webpack_require__(20)('species');
+var DESCRIPTORS = __webpack_require__(52);
+var SPECIES = __webpack_require__(21)('species');
 
 module.exports = function (KEY) {
   var C = typeof core[KEY] == 'function' ? core[KEY] : global[KEY];
@@ -53325,7 +52993,7 @@ module.exports = function (KEY) {
 
 
 /***/ }),
-/* 253 */
+/* 250 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var toInteger = __webpack_require__(97);
@@ -53348,7 +53016,7 @@ module.exports = function (TO_STRING) {
 
 
 /***/ }),
-/* 254 */
+/* 251 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var toInteger = __webpack_require__(97);
@@ -53361,11 +53029,11 @@ module.exports = function (index, length) {
 
 
 /***/ }),
-/* 255 */
+/* 252 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // 7.1.1 ToPrimitive(input [, PreferredType])
-var isObject = __webpack_require__(52);
+var isObject = __webpack_require__(53);
 // instead of the ES6 spec version, we didn't implement @@toPrimitive case
 // and the second argument - flag - preferred type is a string
 module.exports = function (it, S) {
@@ -53379,7 +53047,7 @@ module.exports = function (it, S) {
 
 
 /***/ }),
-/* 256 */
+/* 253 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var global = __webpack_require__(17);
@@ -53389,12 +53057,12 @@ module.exports = navigator && navigator.userAgent || '';
 
 
 /***/ }),
-/* 257 */
+/* 254 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var classof = __webpack_require__(126);
-var ITERATOR = __webpack_require__(20)('iterator');
-var Iterators = __webpack_require__(53);
+var ITERATOR = __webpack_require__(21)('iterator');
+var Iterators = __webpack_require__(54);
 module.exports = __webpack_require__(31).getIteratorMethod = function (it) {
   if (it != undefined) return it[ITERATOR]
     || it['@@iterator']
@@ -53403,14 +53071,14 @@ module.exports = __webpack_require__(31).getIteratorMethod = function (it) {
 
 
 /***/ }),
-/* 258 */
+/* 255 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-var addToUnscopables = __webpack_require__(234);
-var step = __webpack_require__(244);
-var Iterators = __webpack_require__(53);
+var addToUnscopables = __webpack_require__(231);
+var step = __webpack_require__(241);
+var Iterators = __webpack_require__(54);
 var toIObject = __webpack_require__(98);
 
 // 22.1.3.4 Array.prototype.entries()
@@ -53444,13 +53112,13 @@ addToUnscopables('entries');
 
 
 /***/ }),
-/* 259 */
+/* 256 */
 /***/ (function(module, exports) {
 
 
 
 /***/ }),
-/* 260 */
+/* 257 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -53460,16 +53128,16 @@ var global = __webpack_require__(17);
 var ctx = __webpack_require__(70);
 var classof = __webpack_require__(126);
 var $export = __webpack_require__(60);
-var isObject = __webpack_require__(52);
+var isObject = __webpack_require__(53);
 var aFunction = __webpack_require__(68);
-var anInstance = __webpack_require__(235);
-var forOf = __webpack_require__(237);
+var anInstance = __webpack_require__(232);
+var forOf = __webpack_require__(234);
 var speciesConstructor = __webpack_require__(134);
 var task = __webpack_require__(135).set;
-var microtask = __webpack_require__(245)();
+var microtask = __webpack_require__(242)();
 var newPromiseCapabilityModule = __webpack_require__(94);
 var perform = __webpack_require__(130);
-var userAgent = __webpack_require__(256);
+var userAgent = __webpack_require__(253);
 var promiseResolve = __webpack_require__(131);
 var PROMISE = 'Promise';
 var TypeError = global.TypeError;
@@ -53486,7 +53154,7 @@ var USE_NATIVE = !!function () {
   try {
     // correct subclassing with @@species support
     var promise = $Promise.resolve(1);
-    var FakePromise = (promise.constructor = {})[__webpack_require__(20)('species')] = function (exec) {
+    var FakePromise = (promise.constructor = {})[__webpack_require__(21)('species')] = function (exec) {
       exec(empty, empty);
     };
     // unhandled rejections tracking support, NodeJS Promise without it fails @@species test
@@ -53645,7 +53313,7 @@ if (!USE_NATIVE) {
     this._h = 0;              // <- rejection state, 0 - default, 1 - handled, 2 - unhandled
     this._n = false;          // <- notify
   };
-  Internal.prototype = __webpack_require__(250)($Promise.prototype, {
+  Internal.prototype = __webpack_require__(247)($Promise.prototype, {
     // 25.4.5.3 Promise.prototype.then(onFulfilled, onRejected)
     then: function then(onFulfilled, onRejected) {
       var reaction = newPromiseCapability(speciesConstructor(this, $Promise));
@@ -53677,7 +53345,7 @@ if (!USE_NATIVE) {
 
 $export($export.G + $export.W + $export.F * !USE_NATIVE, { Promise: $Promise });
 __webpack_require__(95)($Promise, PROMISE);
-__webpack_require__(252)(PROMISE);
+__webpack_require__(249)(PROMISE);
 Wrapper = __webpack_require__(31)[PROMISE];
 
 // statics
@@ -53696,7 +53364,7 @@ $export($export.S + $export.F * (LIBRARY || !USE_NATIVE), PROMISE, {
     return promiseResolve(LIBRARY && this === Wrapper ? $Promise : this, x);
   }
 });
-$export($export.S + $export.F * !(USE_NATIVE && __webpack_require__(243)(function (iter) {
+$export($export.S + $export.F * !(USE_NATIVE && __webpack_require__(240)(function (iter) {
   $Promise.all(iter)['catch'](empty);
 })), PROMISE, {
   // 25.4.4.1 Promise.all(iterable)
@@ -53743,12 +53411,12 @@ $export($export.S + $export.F * !(USE_NATIVE && __webpack_require__(243)(functio
 
 
 /***/ }),
-/* 261 */
+/* 258 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-var $at = __webpack_require__(253)(true);
+var $at = __webpack_require__(250)(true);
 
 // 21.1.3.27 String.prototype[@@iterator]()
 __webpack_require__(129)(String, 'String', function (iterated) {
@@ -53767,7 +53435,7 @@ __webpack_require__(129)(String, 'String', function (iterated) {
 
 
 /***/ }),
-/* 262 */
+/* 259 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -53794,7 +53462,7 @@ $export($export.P + $export.R, 'Promise', { 'finally': function (onFinally) {
 
 
 /***/ }),
-/* 263 */
+/* 260 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -53813,14 +53481,14 @@ $export($export.S, 'Promise', { 'try': function (callbackfn) {
 
 
 /***/ }),
-/* 264 */
+/* 261 */
 /***/ (function(module, exports, __webpack_require__) {
 
-__webpack_require__(258);
+__webpack_require__(255);
 var global = __webpack_require__(17);
 var hide = __webpack_require__(42);
-var Iterators = __webpack_require__(53);
-var TO_STRING_TAG = __webpack_require__(20)('toStringTag');
+var Iterators = __webpack_require__(54);
+var TO_STRING_TAG = __webpack_require__(21)('toStringTag');
 
 var DOMIterables = ('CSSRuleList,CSSStyleDeclaration,CSSValueList,ClientRectList,DOMRectList,DOMStringList,' +
   'DOMTokenList,DataTransferItemList,FileList,HTMLAllCollection,HTMLCollection,HTMLFormElement,HTMLSelectElement,' +
@@ -53838,7 +53506,7 @@ for (var i = 0; i < DOMIterables.length; i++) {
 
 
 /***/ }),
-/* 265 */
+/* 262 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /**
@@ -54039,7 +53707,7 @@ function localstorage() {
 
 
 /***/ }),
-/* 266 */
+/* 263 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /**
@@ -54048,14 +53716,14 @@ function localstorage() {
  */
 
 if (typeof process === 'undefined' || process.type === 'renderer') {
-  module.exports = __webpack_require__(265);
+  module.exports = __webpack_require__(262);
 } else {
-  module.exports = __webpack_require__(267);
+  module.exports = __webpack_require__(264);
 }
 
 
 /***/ }),
-/* 267 */
+/* 264 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /**
@@ -54247,7 +53915,7 @@ exports.enable(load());
 
 
 /***/ }),
-/* 268 */
+/* 265 */
 /***/ (function(module, exports, __webpack_require__) {
 
 (function webpackUniversalModuleDefinition(root, factory) {
@@ -60961,7 +60629,7 @@ return /******/ (function(modules) { // webpackBootstrap
 ;
 
 /***/ }),
-/* 269 */
+/* 266 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -61085,12 +60753,12 @@ module.exports = function extend() {
 
 
 /***/ }),
-/* 270 */
+/* 267 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const escapeStringRegexp = __webpack_require__(388);
+const escapeStringRegexp = __webpack_require__(382);
 
 const platform = process.platform;
 
@@ -61239,7 +60907,7 @@ module.exports = Object.assign(fn, figures);
 
 
 /***/ }),
-/* 271 */
+/* 268 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // Copyright Joyent, Inc. and other Node contributors.
@@ -61265,7 +60933,7 @@ module.exports = Object.assign(fn, figures);
 
 var pathModule = __webpack_require__(0);
 var isWindows = process.platform === 'win32';
-var fs = __webpack_require__(5);
+var fs = __webpack_require__(4);
 
 // JavaScript implementation of realpath, ported from node pre-v6
 
@@ -61548,13 +61216,13 @@ exports.realpath = function realpath(p, cache, cb) {
 
 
 /***/ }),
-/* 272 */
+/* 269 */
 /***/ (function(module, exports, __webpack_require__) {
 
 module.exports = globSync
 globSync.GlobSync = GlobSync
 
-var fs = __webpack_require__(5)
+var fs = __webpack_require__(4)
 var rp = __webpack_require__(140)
 var minimatch = __webpack_require__(82)
 var Minimatch = minimatch.Minimatch
@@ -62039,6 +61707,387 @@ GlobSync.prototype._makeAbs = function (f) {
 }
 
 
+/***/ }),
+/* 270 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var resolve = __webpack_require__(271);
+
+module.exports = {
+  Validation: errorSubclass(ValidationError),
+  MissingRef: errorSubclass(MissingRefError)
+};
+
+
+function ValidationError(errors) {
+  this.message = 'validation failed';
+  this.errors = errors;
+  this.ajv = this.validation = true;
+}
+
+
+MissingRefError.message = function (baseId, ref) {
+  return 'can\'t resolve reference ' + ref + ' from id ' + baseId;
+};
+
+
+function MissingRefError(baseId, ref, message) {
+  this.message = message || MissingRefError.message(baseId, ref);
+  this.missingRef = resolve.url(baseId, ref);
+  this.missingSchema = resolve.normalizeId(resolve.fullPath(this.missingRef));
+}
+
+
+function errorSubclass(Subclass) {
+  Subclass.prototype = Object.create(Error.prototype);
+  Subclass.prototype.constructor = Subclass;
+  return Subclass;
+}
+
+
+/***/ }),
+/* 271 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var url = __webpack_require__(24)
+  , equal = __webpack_require__(272)
+  , util = __webpack_require__(114)
+  , SchemaObject = __webpack_require__(386)
+  , traverse = __webpack_require__(677);
+
+module.exports = resolve;
+
+resolve.normalizeId = normalizeId;
+resolve.fullPath = getFullPath;
+resolve.url = resolveUrl;
+resolve.ids = resolveIds;
+resolve.inlineRef = inlineRef;
+resolve.schema = resolveSchema;
+
+/**
+ * [resolve and compile the references ($ref)]
+ * @this   Ajv
+ * @param  {Function} compile reference to schema compilation funciton (localCompile)
+ * @param  {Object} root object with information about the root schema for the current schema
+ * @param  {String} ref reference to resolve
+ * @return {Object|Function} schema object (if the schema can be inlined) or validation function
+ */
+function resolve(compile, root, ref) {
+  /* jshint validthis: true */
+  var refVal = this._refs[ref];
+  if (typeof refVal == 'string') {
+    if (this._refs[refVal]) refVal = this._refs[refVal];
+    else return resolve.call(this, compile, root, refVal);
+  }
+
+  refVal = refVal || this._schemas[ref];
+  if (refVal instanceof SchemaObject) {
+    return inlineRef(refVal.schema, this._opts.inlineRefs)
+            ? refVal.schema
+            : refVal.validate || this._compile(refVal);
+  }
+
+  var res = resolveSchema.call(this, root, ref);
+  var schema, v, baseId;
+  if (res) {
+    schema = res.schema;
+    root = res.root;
+    baseId = res.baseId;
+  }
+
+  if (schema instanceof SchemaObject) {
+    v = schema.validate || compile.call(this, schema.schema, root, undefined, baseId);
+  } else if (schema !== undefined) {
+    v = inlineRef(schema, this._opts.inlineRefs)
+        ? schema
+        : compile.call(this, schema, root, undefined, baseId);
+  }
+
+  return v;
+}
+
+
+/**
+ * Resolve schema, its root and baseId
+ * @this Ajv
+ * @param  {Object} root root object with properties schema, refVal, refs
+ * @param  {String} ref  reference to resolve
+ * @return {Object} object with properties schema, root, baseId
+ */
+function resolveSchema(root, ref) {
+  /* jshint validthis: true */
+  var p = url.parse(ref, false, true)
+    , refPath = _getFullPath(p)
+    , baseId = getFullPath(this._getId(root.schema));
+  if (refPath !== baseId) {
+    var id = normalizeId(refPath);
+    var refVal = this._refs[id];
+    if (typeof refVal == 'string') {
+      return resolveRecursive.call(this, root, refVal, p);
+    } else if (refVal instanceof SchemaObject) {
+      if (!refVal.validate) this._compile(refVal);
+      root = refVal;
+    } else {
+      refVal = this._schemas[id];
+      if (refVal instanceof SchemaObject) {
+        if (!refVal.validate) this._compile(refVal);
+        if (id == normalizeId(ref))
+          return { schema: refVal, root: root, baseId: baseId };
+        root = refVal;
+      } else {
+        return;
+      }
+    }
+    if (!root.schema) return;
+    baseId = getFullPath(this._getId(root.schema));
+  }
+  return getJsonPointer.call(this, p, baseId, root.schema, root);
+}
+
+
+/* @this Ajv */
+function resolveRecursive(root, ref, parsedRef) {
+  /* jshint validthis: true */
+  var res = resolveSchema.call(this, root, ref);
+  if (res) {
+    var schema = res.schema;
+    var baseId = res.baseId;
+    root = res.root;
+    var id = this._getId(schema);
+    if (id) baseId = resolveUrl(baseId, id);
+    return getJsonPointer.call(this, parsedRef, baseId, schema, root);
+  }
+}
+
+
+var PREVENT_SCOPE_CHANGE = util.toHash(['properties', 'patternProperties', 'enum', 'dependencies', 'definitions']);
+/* @this Ajv */
+function getJsonPointer(parsedRef, baseId, schema, root) {
+  /* jshint validthis: true */
+  parsedRef.hash = parsedRef.hash || '';
+  if (parsedRef.hash.slice(0,2) != '#/') return;
+  var parts = parsedRef.hash.split('/');
+
+  for (var i = 1; i < parts.length; i++) {
+    var part = parts[i];
+    if (part) {
+      part = util.unescapeFragment(part);
+      schema = schema[part];
+      if (schema === undefined) break;
+      var id;
+      if (!PREVENT_SCOPE_CHANGE[part]) {
+        id = this._getId(schema);
+        if (id) baseId = resolveUrl(baseId, id);
+        if (schema.$ref) {
+          var $ref = resolveUrl(baseId, schema.$ref);
+          var res = resolveSchema.call(this, root, $ref);
+          if (res) {
+            schema = res.schema;
+            root = res.root;
+            baseId = res.baseId;
+          }
+        }
+      }
+    }
+  }
+  if (schema !== undefined && schema !== root.schema)
+    return { schema: schema, root: root, baseId: baseId };
+}
+
+
+var SIMPLE_INLINED = util.toHash([
+  'type', 'format', 'pattern',
+  'maxLength', 'minLength',
+  'maxProperties', 'minProperties',
+  'maxItems', 'minItems',
+  'maximum', 'minimum',
+  'uniqueItems', 'multipleOf',
+  'required', 'enum'
+]);
+function inlineRef(schema, limit) {
+  if (limit === false) return false;
+  if (limit === undefined || limit === true) return checkNoRef(schema);
+  else if (limit) return countKeys(schema) <= limit;
+}
+
+
+function checkNoRef(schema) {
+  var item;
+  if (Array.isArray(schema)) {
+    for (var i=0; i<schema.length; i++) {
+      item = schema[i];
+      if (typeof item == 'object' && !checkNoRef(item)) return false;
+    }
+  } else {
+    for (var key in schema) {
+      if (key == '$ref') return false;
+      item = schema[key];
+      if (typeof item == 'object' && !checkNoRef(item)) return false;
+    }
+  }
+  return true;
+}
+
+
+function countKeys(schema) {
+  var count = 0, item;
+  if (Array.isArray(schema)) {
+    for (var i=0; i<schema.length; i++) {
+      item = schema[i];
+      if (typeof item == 'object') count += countKeys(item);
+      if (count == Infinity) return Infinity;
+    }
+  } else {
+    for (var key in schema) {
+      if (key == '$ref') return Infinity;
+      if (SIMPLE_INLINED[key]) {
+        count++;
+      } else {
+        item = schema[key];
+        if (typeof item == 'object') count += countKeys(item) + 1;
+        if (count == Infinity) return Infinity;
+      }
+    }
+  }
+  return count;
+}
+
+
+function getFullPath(id, normalize) {
+  if (normalize !== false) id = normalizeId(id);
+  var p = url.parse(id, false, true);
+  return _getFullPath(p);
+}
+
+
+function _getFullPath(p) {
+  var protocolSeparator = p.protocol || p.href.slice(0,2) == '//' ? '//' : '';
+  return (p.protocol||'') + protocolSeparator + (p.host||'') + (p.path||'')  + '#';
+}
+
+
+var TRAILING_SLASH_HASH = /#\/?$/;
+function normalizeId(id) {
+  return id ? id.replace(TRAILING_SLASH_HASH, '') : '';
+}
+
+
+function resolveUrl(baseId, id) {
+  id = normalizeId(id);
+  return url.resolve(baseId, id);
+}
+
+
+/* @this Ajv */
+function resolveIds(schema) {
+  var schemaId = normalizeId(this._getId(schema));
+  var baseIds = {'': schemaId};
+  var fullPaths = {'': getFullPath(schemaId, false)};
+  var localRefs = {};
+  var self = this;
+
+  traverse(schema, {allKeys: true}, function(sch, jsonPtr, rootSchema, parentJsonPtr, parentKeyword, parentSchema, keyIndex) {
+    if (jsonPtr === '') return;
+    var id = self._getId(sch);
+    var baseId = baseIds[parentJsonPtr];
+    var fullPath = fullPaths[parentJsonPtr] + '/' + parentKeyword;
+    if (keyIndex !== undefined)
+      fullPath += '/' + (typeof keyIndex == 'number' ? keyIndex : util.escapeFragment(keyIndex));
+
+    if (typeof id == 'string') {
+      id = baseId = normalizeId(baseId ? url.resolve(baseId, id) : id);
+
+      var refVal = self._refs[id];
+      if (typeof refVal == 'string') refVal = self._refs[refVal];
+      if (refVal && refVal.schema) {
+        if (!equal(sch, refVal.schema))
+          throw new Error('id "' + id + '" resolves to more than one schema');
+      } else if (id != normalizeId(fullPath)) {
+        if (id[0] == '#') {
+          if (localRefs[id] && !equal(sch, localRefs[id]))
+            throw new Error('id "' + id + '" resolves to more than one schema');
+          localRefs[id] = sch;
+        } else {
+          self._refs[id] = fullPath;
+        }
+      }
+    }
+    baseIds[jsonPtr] = baseId;
+    fullPaths[jsonPtr] = fullPath;
+  });
+
+  return localRefs;
+}
+
+
+/***/ }),
+/* 272 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var isArray = Array.isArray;
+var keyList = Object.keys;
+var hasProp = Object.prototype.hasOwnProperty;
+
+module.exports = function equal(a, b) {
+  if (a === b) return true;
+
+  var arrA = isArray(a)
+    , arrB = isArray(b)
+    , i
+    , length
+    , key;
+
+  if (arrA && arrB) {
+    length = a.length;
+    if (length != b.length) return false;
+    for (i = 0; i < length; i++)
+      if (!equal(a[i], b[i])) return false;
+    return true;
+  }
+
+  if (arrA != arrB) return false;
+
+  var dateA = a instanceof Date
+    , dateB = b instanceof Date;
+  if (dateA != dateB) return false;
+  if (dateA && dateB) return a.getTime() == b.getTime();
+
+  var regexpA = a instanceof RegExp
+    , regexpB = b instanceof RegExp;
+  if (regexpA != regexpB) return false;
+  if (regexpA && regexpB) return a.toString() == b.toString();
+
+  if (a instanceof Object && b instanceof Object) {
+    var keys = keyList(a);
+    length = keys.length;
+
+    if (length !== keyList(b).length)
+      return false;
+
+    for (i = 0; i < length; i++)
+      if (!hasProp.call(b, keys[i])) return false;
+
+    for (i = 0; i < length; i++) {
+      key = keys[i];
+      if (!equal(a[key], b[key])) return false;
+    }
+
+    return true;
+  }
+
+  return false;
+};
+
+
 /***/ }),
 /* 273 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -62164,7 +62213,7 @@ var inquirer = module.exports;
 
 inquirer.prompts = {};
 
-inquirer.Separator = __webpack_require__(175);
+inquirer.Separator = __webpack_require__(176);
 
 inquirer.ui = {
   BottomBar: __webpack_require__(695),
@@ -62295,7 +62344,7 @@ module.exports.Schema              = __webpack_require__(44);
 module.exports.FAILSAFE_SCHEMA     = __webpack_require__(100);
 module.exports.JSON_SCHEMA         = __webpack_require__(144);
 module.exports.CORE_SCHEMA         = __webpack_require__(143);
-module.exports.DEFAULT_SAFE_SCHEMA = __webpack_require__(55);
+module.exports.DEFAULT_SAFE_SCHEMA = __webpack_require__(56);
 module.exports.DEFAULT_FULL_SCHEMA = __webpack_require__(73);
 module.exports.load                = loader.load;
 module.exports.loadAll             = loader.loadAll;
@@ -62303,11 +62352,11 @@ module.exports.safeLoad            = loader.safeLoad;
 module.exports.safeLoadAll         = loader.safeLoadAll;
 module.exports.dump                = dumper.dump;
 module.exports.safeDump            = dumper.safeDump;
-module.exports.YAMLException       = __webpack_require__(54);
+module.exports.YAMLException       = __webpack_require__(55);
 
 // Deprecated schema names from JS-YAML 2.0.x
 module.exports.MINIMAL_SCHEMA = __webpack_require__(100);
-module.exports.SAFE_SCHEMA    = __webpack_require__(55);
+module.exports.SAFE_SCHEMA    = __webpack_require__(56);
 module.exports.DEFAULT_SCHEMA = __webpack_require__(73);
 
 // Deprecated functions from JS-YAML 1.x.x
@@ -62327,9 +62376,9 @@ module.exports.addConstructor = deprecated('addConstructor');
 /*eslint-disable no-use-before-define*/
 
 var common              = __webpack_require__(43);
-var YAMLException       = __webpack_require__(54);
+var YAMLException       = __webpack_require__(55);
 var DEFAULT_FULL_SCHEMA = __webpack_require__(73);
-var DEFAULT_SAFE_SCHEMA = __webpack_require__(55);
+var DEFAULT_SAFE_SCHEMA = __webpack_require__(56);
 
 var _toString       = Object.prototype.toString;
 var _hasOwnProperty = Object.prototype.hasOwnProperty;
@@ -63161,9 +63210,9 @@ module.exports.safeDump = safeDump;
 /*eslint-disable max-len,no-use-before-define*/
 
 var common              = __webpack_require__(43);
-var YAMLException       = __webpack_require__(54);
+var YAMLException       = __webpack_require__(55);
 var Mark                = __webpack_require__(283);
-var DEFAULT_SAFE_SCHEMA = __webpack_require__(55);
+var DEFAULT_SAFE_SCHEMA = __webpack_require__(56);
 var DEFAULT_FULL_SCHEMA = __webpack_require__(73);
 
 
@@ -65375,7 +65424,7 @@ var esprima;
 try {
   // workaround to exclude package from browserify list.
   var _require = require;
-  esprima = __webpack_require__(268);
+  esprima = __webpack_require__(265);
 } catch (_) {
   /*global window */
   if (typeof window !== 'undefined') esprima = window.esprima;
@@ -65913,7 +65962,7 @@ module.exports = new Type('tag:yaml.org,2002:timestamp', {
 
 var win32 = process && process.platform === 'win32';
 var path = __webpack_require__(0);
-var fileRe = __webpack_require__(646);
+var fileRe = __webpack_require__(614);
 var utils = module.exports;
 
 /**
@@ -65923,11 +65972,11 @@ var utils = module.exports;
 utils.diff = __webpack_require__(755);
 utils.unique = __webpack_require__(756);
 utils.braces = __webpack_require__(757);
-utils.brackets = __webpack_require__(639);
-utils.extglob = __webpack_require__(644);
-utils.isExtglob = __webpack_require__(177);
-utils.isGlob = __webpack_require__(178);
-utils.typeOf = __webpack_require__(179);
+utils.brackets = __webpack_require__(607);
+utils.extglob = __webpack_require__(612);
+utils.isExtglob = __webpack_require__(178);
+utils.isGlob = __webpack_require__(179);
+utils.typeOf = __webpack_require__(180);
 utils.normalize = __webpack_require__(765);
 utils.omit = __webpack_require__(769);
 utils.parseGlob = __webpack_require__(773);
@@ -66763,7 +66812,7 @@ rimraf.sync = rimrafSync
 
 var assert = __webpack_require__(28)
 var path = __webpack_require__(0)
-var fs = __webpack_require__(5)
+var fs = __webpack_require__(4)
 var glob = __webpack_require__(99)
 var _0666 = parseInt('666', 8)
 
@@ -67135,7 +67184,7 @@ function rmkidsSync (p, options) {
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__scheduler_queue__ = __webpack_require__(439);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__Subscription__ = __webpack_require__(25);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__operators_observeOn__ = __webpack_require__(434);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_ObjectUnsubscribedError__ = __webpack_require__(189);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_ObjectUnsubscribedError__ = __webpack_require__(190);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__SubjectSubscription__ = __webpack_require__(422);
 /** PURE_IMPORTS_START tslib,_Subject,_scheduler_queue,_Subscription,_operators_observeOn,_util_ObjectUnsubscribedError,_SubjectSubscription PURE_IMPORTS_END */
 
@@ -67729,7 +67778,7 @@ var ZipBufferIterator = /*@__PURE__*/ (function (_super) {
 "use strict";
 /* harmony export (immutable) */ __webpack_exports__["a"] = mergeAll;
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__mergeMap__ = __webpack_require__(148);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_identity__ = __webpack_require__(118);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_identity__ = __webpack_require__(119);
 /** PURE_IMPORTS_START _mergeMap,_util_identity PURE_IMPORTS_END */
 
 
@@ -68180,7 +68229,7 @@ function hostReportError(err) {
 "use strict";
 /* harmony export (immutable) */ __webpack_exports__["a"] = pipe;
 /* harmony export (immutable) */ __webpack_exports__["b"] = pipeFromArray;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__noop__ = __webpack_require__(191);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__noop__ = __webpack_require__(192);
 /** PURE_IMPORTS_START _noop PURE_IMPORTS_END */
 
 function pipe() {
@@ -68254,7 +68303,7 @@ function DiffieHellman(key) {
 	} else if (key.type === 'ecdsa') {
 		if (!CRYPTO_HAVE_ECDH) {
 			if (ecdh === undefined)
-				ecdh = __webpack_require__(387);
+				ecdh = __webpack_require__(381);
 			if (ec === undefined)
 				ec = __webpack_require__(139);
 			if (jsbn === undefined)
@@ -68585,7 +68634,7 @@ function generateECDSA(curve) {
 		return (key);
 	} else {
 		if (ecdh === undefined)
-			ecdh = __webpack_require__(387);
+			ecdh = __webpack_require__(381);
 		if (ec === undefined)
 			ec = __webpack_require__(139);
 		if (jsbn === undefined)
@@ -69481,7 +69530,7 @@ function _load_constants() {
 var _access;
 
 function _load_access() {
-  return _access = _interopRequireWildcard(__webpack_require__(525));
+  return _access = _interopRequireWildcard(__webpack_require__(493));
 }
 
 var _add;
@@ -69493,55 +69542,55 @@ function _load_add() {
 var _audit;
 
 function _load_audit() {
-  return _audit = _interopRequireWildcard(__webpack_require__(353));
+  return _audit = _interopRequireWildcard(__webpack_require__(347));
 }
 
 var _autoclean;
 
 function _load_autoclean() {
-  return _autoclean = _interopRequireWildcard(__webpack_require__(354));
+  return _autoclean = _interopRequireWildcard(__webpack_require__(348));
 }
 
 var _bin;
 
 function _load_bin() {
-  return _bin = _interopRequireWildcard(__webpack_require__(526));
+  return _bin = _interopRequireWildcard(__webpack_require__(494));
 }
 
 var _cache;
 
 function _load_cache() {
-  return _cache = _interopRequireWildcard(__webpack_require__(355));
+  return _cache = _interopRequireWildcard(__webpack_require__(349));
 }
 
 var _check;
 
 function _load_check() {
-  return _check = _interopRequireWildcard(__webpack_require__(356));
+  return _check = _interopRequireWildcard(__webpack_require__(350));
 }
 
 var _config;
 
 function _load_config() {
-  return _config = _interopRequireWildcard(__webpack_require__(527));
+  return _config = _interopRequireWildcard(__webpack_require__(495));
 }
 
 var _create;
 
 function _load_create() {
-  return _create = _interopRequireWildcard(__webpack_require__(528));
+  return _create = _interopRequireWildcard(__webpack_require__(496));
 }
 
 var _exec;
 
 function _load_exec() {
-  return _exec = _interopRequireWildcard(__webpack_require__(529));
+  return _exec = _interopRequireWildcard(__webpack_require__(497));
 }
 
 var _generateLockEntry;
 
 function _load_generateLockEntry() {
-  return _generateLockEntry = _interopRequireWildcard(__webpack_require__(530));
+  return _generateLockEntry = _interopRequireWildcard(__webpack_require__(498));
 }
 
 var _global;
@@ -69553,25 +69602,25 @@ function _load_global() {
 var _help;
 
 function _load_help() {
-  return _help = _interopRequireWildcard(__webpack_require__(531));
+  return _help = _interopRequireWildcard(__webpack_require__(499));
 }
 
 var _import;
 
 function _load_import() {
-  return _import = _interopRequireWildcard(__webpack_require__(532));
+  return _import = _interopRequireWildcard(__webpack_require__(500));
 }
 
 var _info;
 
 function _load_info() {
-  return _info = _interopRequireWildcard(__webpack_require__(533));
+  return _info = _interopRequireWildcard(__webpack_require__(501));
 }
 
 var _init;
 
 function _load_init() {
-  return _init = _interopRequireWildcard(__webpack_require__(534));
+  return _init = _interopRequireWildcard(__webpack_require__(502));
 }
 
 var _install;
@@ -69583,13 +69632,13 @@ function _load_install() {
 var _licenses;
 
 function _load_licenses() {
-  return _licenses = _interopRequireWildcard(__webpack_require__(535));
+  return _licenses = _interopRequireWildcard(__webpack_require__(503));
 }
 
 var _link;
 
 function _load_link() {
-  return _link = _interopRequireWildcard(__webpack_require__(357));
+  return _link = _interopRequireWildcard(__webpack_require__(351));
 }
 
 var _login;
@@ -69601,31 +69650,31 @@ function _load_login() {
 var _logout;
 
 function _load_logout() {
-  return _logout = _interopRequireWildcard(__webpack_require__(536));
+  return _logout = _interopRequireWildcard(__webpack_require__(504));
 }
 
 var _list;
 
 function _load_list() {
-  return _list = _interopRequireWildcard(__webpack_require__(358));
+  return _list = _interopRequireWildcard(__webpack_require__(352));
 }
 
 var _node;
 
 function _load_node() {
-  return _node = _interopRequireWildcard(__webpack_require__(537));
+  return _node = _interopRequireWildcard(__webpack_require__(505));
 }
 
 var _outdated;
 
 function _load_outdated() {
-  return _outdated = _interopRequireWildcard(__webpack_require__(538));
+  return _outdated = _interopRequireWildcard(__webpack_require__(506));
 }
 
 var _owner;
 
 function _load_owner() {
-  return _owner = _interopRequireWildcard(__webpack_require__(539));
+  return _owner = _interopRequireWildcard(__webpack_require__(507));
 }
 
 var _pack;
@@ -69637,103 +69686,103 @@ function _load_pack() {
 var _policies;
 
 function _load_policies() {
-  return _policies = _interopRequireWildcard(__webpack_require__(540));
+  return _policies = _interopRequireWildcard(__webpack_require__(508));
 }
 
 var _publish;
 
 function _load_publish() {
-  return _publish = _interopRequireWildcard(__webpack_require__(541));
+  return _publish = _interopRequireWildcard(__webpack_require__(509));
 }
 
 var _remove;
 
 function _load_remove() {
-  return _remove = _interopRequireWildcard(__webpack_require__(359));
+  return _remove = _interopRequireWildcard(__webpack_require__(353));
 }
 
 var _run;
 
 function _load_run() {
-  return _run = _interopRequireWildcard(__webpack_require__(360));
+  return _run = _interopRequireWildcard(__webpack_require__(354));
 }
 
 var _tag;
 
 function _load_tag() {
-  return _tag = _interopRequireWildcard(__webpack_require__(361));
+  return _tag = _interopRequireWildcard(__webpack_require__(355));
 }
 
 var _team;
 
 function _load_team() {
-  return _team = _interopRequireWildcard(__webpack_require__(542));
+  return _team = _interopRequireWildcard(__webpack_require__(510));
 }
 
 var _unplug;
 
 function _load_unplug() {
-  return _unplug = _interopRequireWildcard(__webpack_require__(544));
+  return _unplug = _interopRequireWildcard(__webpack_require__(512));
 }
 
 var _unlink;
 
 function _load_unlink() {
-  return _unlink = _interopRequireWildcard(__webpack_require__(543));
+  return _unlink = _interopRequireWildcard(__webpack_require__(511));
 }
 
 var _upgrade;
 
 function _load_upgrade() {
-  return _upgrade = _interopRequireWildcard(__webpack_require__(207));
+  return _upgrade = _interopRequireWildcard(__webpack_require__(205));
 }
 
 var _version;
 
 function _load_version() {
-  return _version = _interopRequireWildcard(__webpack_require__(363));
+  return _version = _interopRequireWildcard(__webpack_require__(357));
 }
 
 var _versions;
 
 function _load_versions() {
-  return _versions = _interopRequireWildcard(__webpack_require__(545));
+  return _versions = _interopRequireWildcard(__webpack_require__(513));
 }
 
 var _why;
 
 function _load_why() {
-  return _why = _interopRequireWildcard(__webpack_require__(546));
+  return _why = _interopRequireWildcard(__webpack_require__(514));
 }
 
 var _workspaces;
 
 function _load_workspaces() {
-  return _workspaces = _interopRequireWildcard(__webpack_require__(548));
+  return _workspaces = _interopRequireWildcard(__webpack_require__(516));
 }
 
 var _workspace;
 
 function _load_workspace() {
-  return _workspace = _interopRequireWildcard(__webpack_require__(547));
+  return _workspace = _interopRequireWildcard(__webpack_require__(515));
 }
 
 var _upgradeInteractive;
 
 function _load_upgradeInteractive() {
-  return _upgradeInteractive = _interopRequireWildcard(__webpack_require__(362));
+  return _upgradeInteractive = _interopRequireWildcard(__webpack_require__(356));
 }
 
 var _useless;
 
 function _load_useless() {
-  return _useless = _interopRequireDefault(__webpack_require__(524));
+  return _useless = _interopRequireDefault(__webpack_require__(492));
 }
 
 var _aliases;
 
 function _load_aliases() {
-  return _aliases = _interopRequireDefault(__webpack_require__(352));
+  return _aliases = _interopRequireDefault(__webpack_require__(346));
 }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -69821,7 +69870,7 @@ exports.getRcArgs = getRcArgs;
 var _fs;
 
 function _load_fs() {
-  return _fs = __webpack_require__(5);
+  return _fs = __webpack_require__(4);
 }
 
 var _path;
@@ -69845,7 +69894,7 @@ function _load_lockfile() {
 var _rc;
 
 function _load_rc() {
-  return _rc = _interopRequireWildcard(__webpack_require__(590));
+  return _rc = _interopRequireWildcard(__webpack_require__(558));
 }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
@@ -70081,7 +70130,7 @@ var spawn = __webpack_require__(331).spawn;
 var path = __webpack_require__(0);
 var dirname = path.dirname;
 var basename = path.basename;
-var fs = __webpack_require__(5);
+var fs = __webpack_require__(4);
 
 /**
  * Inherit `Command` from `EventEmitter.prototype`.
@@ -71309,902 +71358,11 @@ function exists(file) {
 /* 339 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
-
-var util = __webpack_require__(106);
-
-module.exports = SchemaObject;
-
-function SchemaObject(obj) {
-  util.copy(obj, this);
-}
+module.exports = __webpack_require__(477)().Promise
 
 
 /***/ }),
 /* 340 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate__limit(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $errorKeyword;
-  var $data = 'data' + ($dataLvl || '');
-  var $isData = it.opts.$data && $schema && $schema.$data,
-    $schemaValue;
-  if ($isData) {
-    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
-    $schemaValue = 'schema' + $lvl;
-  } else {
-    $schemaValue = $schema;
-  }
-  var $isMax = $keyword == 'maximum',
-    $exclusiveKeyword = $isMax ? 'exclusiveMaximum' : 'exclusiveMinimum',
-    $schemaExcl = it.schema[$exclusiveKeyword],
-    $isDataExcl = it.opts.$data && $schemaExcl && $schemaExcl.$data,
-    $op = $isMax ? '<' : '>',
-    $notOp = $isMax ? '>' : '<',
-    $errorKeyword = undefined;
-  if ($isDataExcl) {
-    var $schemaValueExcl = it.util.getData($schemaExcl.$data, $dataLvl, it.dataPathArr),
-      $exclusive = 'exclusive' + $lvl,
-      $exclType = 'exclType' + $lvl,
-      $exclIsNumber = 'exclIsNumber' + $lvl,
-      $opExpr = 'op' + $lvl,
-      $opStr = '\' + ' + $opExpr + ' + \'';
-    out += ' var schemaExcl' + ($lvl) + ' = ' + ($schemaValueExcl) + '; ';
-    $schemaValueExcl = 'schemaExcl' + $lvl;
-    out += ' var ' + ($exclusive) + '; var ' + ($exclType) + ' = typeof ' + ($schemaValueExcl) + '; if (' + ($exclType) + ' != \'boolean\' && ' + ($exclType) + ' != \'undefined\' && ' + ($exclType) + ' != \'number\') { ';
-    var $errorKeyword = $exclusiveKeyword;
-    var $$outStack = $$outStack || [];
-    $$outStack.push(out);
-    out = ''; /* istanbul ignore else */
-    if (it.createErrors !== false) {
-      out += ' { keyword: \'' + ($errorKeyword || '_exclusiveLimit') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: {} ';
-      if (it.opts.messages !== false) {
-        out += ' , message: \'' + ($exclusiveKeyword) + ' should be boolean\' ';
-      }
-      if (it.opts.verbose) {
-        out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-      }
-      out += ' } ';
-    } else {
-      out += ' {} ';
-    }
-    var __err = out;
-    out = $$outStack.pop();
-    if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-      if (it.async) {
-        out += ' throw new ValidationError([' + (__err) + ']); ';
-      } else {
-        out += ' validate.errors = [' + (__err) + ']; return false; ';
-      }
-    } else {
-      out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-    }
-    out += ' } else if ( ';
-    if ($isData) {
-      out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'number\') || ';
-    }
-    out += ' ' + ($exclType) + ' == \'number\' ? ( (' + ($exclusive) + ' = ' + ($schemaValue) + ' === undefined || ' + ($schemaValueExcl) + ' ' + ($op) + '= ' + ($schemaValue) + ') ? ' + ($data) + ' ' + ($notOp) + '= ' + ($schemaValueExcl) + ' : ' + ($data) + ' ' + ($notOp) + ' ' + ($schemaValue) + ' ) : ( (' + ($exclusive) + ' = ' + ($schemaValueExcl) + ' === true) ? ' + ($data) + ' ' + ($notOp) + '= ' + ($schemaValue) + ' : ' + ($data) + ' ' + ($notOp) + ' ' + ($schemaValue) + ' ) || ' + ($data) + ' !== ' + ($data) + ') { var op' + ($lvl) + ' = ' + ($exclusive) + ' ? \'' + ($op) + '\' : \'' + ($op) + '=\';';
-  } else {
-    var $exclIsNumber = typeof $schemaExcl == 'number',
-      $opStr = $op;
-    if ($exclIsNumber && $isData) {
-      var $opExpr = '\'' + $opStr + '\'';
-      out += ' if ( ';
-      if ($isData) {
-        out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'number\') || ';
-      }
-      out += ' ( ' + ($schemaValue) + ' === undefined || ' + ($schemaExcl) + ' ' + ($op) + '= ' + ($schemaValue) + ' ? ' + ($data) + ' ' + ($notOp) + '= ' + ($schemaExcl) + ' : ' + ($data) + ' ' + ($notOp) + ' ' + ($schemaValue) + ' ) || ' + ($data) + ' !== ' + ($data) + ') { ';
-    } else {
-      if ($exclIsNumber && $schema === undefined) {
-        $exclusive = true;
-        $errorKeyword = $exclusiveKeyword;
-        $errSchemaPath = it.errSchemaPath + '/' + $exclusiveKeyword;
-        $schemaValue = $schemaExcl;
-        $notOp += '=';
-      } else {
-        if ($exclIsNumber) $schemaValue = Math[$isMax ? 'min' : 'max']($schemaExcl, $schema);
-        if ($schemaExcl === ($exclIsNumber ? $schemaValue : true)) {
-          $exclusive = true;
-          $errorKeyword = $exclusiveKeyword;
-          $errSchemaPath = it.errSchemaPath + '/' + $exclusiveKeyword;
-          $notOp += '=';
-        } else {
-          $exclusive = false;
-          $opStr += '=';
-        }
-      }
-      var $opExpr = '\'' + $opStr + '\'';
-      out += ' if ( ';
-      if ($isData) {
-        out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'number\') || ';
-      }
-      out += ' ' + ($data) + ' ' + ($notOp) + ' ' + ($schemaValue) + ' || ' + ($data) + ' !== ' + ($data) + ') { ';
-    }
-  }
-  $errorKeyword = $errorKeyword || $keyword;
-  var $$outStack = $$outStack || [];
-  $$outStack.push(out);
-  out = ''; /* istanbul ignore else */
-  if (it.createErrors !== false) {
-    out += ' { keyword: \'' + ($errorKeyword || '_limit') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { comparison: ' + ($opExpr) + ', limit: ' + ($schemaValue) + ', exclusive: ' + ($exclusive) + ' } ';
-    if (it.opts.messages !== false) {
-      out += ' , message: \'should be ' + ($opStr) + ' ';
-      if ($isData) {
-        out += '\' + ' + ($schemaValue);
-      } else {
-        out += '' + ($schemaValue) + '\'';
-      }
-    }
-    if (it.opts.verbose) {
-      out += ' , schema:  ';
-      if ($isData) {
-        out += 'validate.schema' + ($schemaPath);
-      } else {
-        out += '' + ($schema);
-      }
-      out += '         , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-    }
-    out += ' } ';
-  } else {
-    out += ' {} ';
-  }
-  var __err = out;
-  out = $$outStack.pop();
-  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-    if (it.async) {
-      out += ' throw new ValidationError([' + (__err) + ']); ';
-    } else {
-      out += ' validate.errors = [' + (__err) + ']; return false; ';
-    }
-  } else {
-    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-  }
-  out += ' } ';
-  if ($breakOnError) {
-    out += ' else { ';
-  }
-  return out;
-}
-
-
-/***/ }),
-/* 341 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate__limitItems(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $errorKeyword;
-  var $data = 'data' + ($dataLvl || '');
-  var $isData = it.opts.$data && $schema && $schema.$data,
-    $schemaValue;
-  if ($isData) {
-    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
-    $schemaValue = 'schema' + $lvl;
-  } else {
-    $schemaValue = $schema;
-  }
-  var $op = $keyword == 'maxItems' ? '>' : '<';
-  out += 'if ( ';
-  if ($isData) {
-    out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'number\') || ';
-  }
-  out += ' ' + ($data) + '.length ' + ($op) + ' ' + ($schemaValue) + ') { ';
-  var $errorKeyword = $keyword;
-  var $$outStack = $$outStack || [];
-  $$outStack.push(out);
-  out = ''; /* istanbul ignore else */
-  if (it.createErrors !== false) {
-    out += ' { keyword: \'' + ($errorKeyword || '_limitItems') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { limit: ' + ($schemaValue) + ' } ';
-    if (it.opts.messages !== false) {
-      out += ' , message: \'should NOT have ';
-      if ($keyword == 'maxItems') {
-        out += 'more';
-      } else {
-        out += 'less';
-      }
-      out += ' than ';
-      if ($isData) {
-        out += '\' + ' + ($schemaValue) + ' + \'';
-      } else {
-        out += '' + ($schema);
-      }
-      out += ' items\' ';
-    }
-    if (it.opts.verbose) {
-      out += ' , schema:  ';
-      if ($isData) {
-        out += 'validate.schema' + ($schemaPath);
-      } else {
-        out += '' + ($schema);
-      }
-      out += '         , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-    }
-    out += ' } ';
-  } else {
-    out += ' {} ';
-  }
-  var __err = out;
-  out = $$outStack.pop();
-  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-    if (it.async) {
-      out += ' throw new ValidationError([' + (__err) + ']); ';
-    } else {
-      out += ' validate.errors = [' + (__err) + ']; return false; ';
-    }
-  } else {
-    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-  }
-  out += '} ';
-  if ($breakOnError) {
-    out += ' else { ';
-  }
-  return out;
-}
-
-
-/***/ }),
-/* 342 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate__limitLength(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $errorKeyword;
-  var $data = 'data' + ($dataLvl || '');
-  var $isData = it.opts.$data && $schema && $schema.$data,
-    $schemaValue;
-  if ($isData) {
-    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
-    $schemaValue = 'schema' + $lvl;
-  } else {
-    $schemaValue = $schema;
-  }
-  var $op = $keyword == 'maxLength' ? '>' : '<';
-  out += 'if ( ';
-  if ($isData) {
-    out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'number\') || ';
-  }
-  if (it.opts.unicode === false) {
-    out += ' ' + ($data) + '.length ';
-  } else {
-    out += ' ucs2length(' + ($data) + ') ';
-  }
-  out += ' ' + ($op) + ' ' + ($schemaValue) + ') { ';
-  var $errorKeyword = $keyword;
-  var $$outStack = $$outStack || [];
-  $$outStack.push(out);
-  out = ''; /* istanbul ignore else */
-  if (it.createErrors !== false) {
-    out += ' { keyword: \'' + ($errorKeyword || '_limitLength') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { limit: ' + ($schemaValue) + ' } ';
-    if (it.opts.messages !== false) {
-      out += ' , message: \'should NOT be ';
-      if ($keyword == 'maxLength') {
-        out += 'longer';
-      } else {
-        out += 'shorter';
-      }
-      out += ' than ';
-      if ($isData) {
-        out += '\' + ' + ($schemaValue) + ' + \'';
-      } else {
-        out += '' + ($schema);
-      }
-      out += ' characters\' ';
-    }
-    if (it.opts.verbose) {
-      out += ' , schema:  ';
-      if ($isData) {
-        out += 'validate.schema' + ($schemaPath);
-      } else {
-        out += '' + ($schema);
-      }
-      out += '         , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-    }
-    out += ' } ';
-  } else {
-    out += ' {} ';
-  }
-  var __err = out;
-  out = $$outStack.pop();
-  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-    if (it.async) {
-      out += ' throw new ValidationError([' + (__err) + ']); ';
-    } else {
-      out += ' validate.errors = [' + (__err) + ']; return false; ';
-    }
-  } else {
-    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-  }
-  out += '} ';
-  if ($breakOnError) {
-    out += ' else { ';
-  }
-  return out;
-}
-
-
-/***/ }),
-/* 343 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate__limitProperties(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $errorKeyword;
-  var $data = 'data' + ($dataLvl || '');
-  var $isData = it.opts.$data && $schema && $schema.$data,
-    $schemaValue;
-  if ($isData) {
-    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
-    $schemaValue = 'schema' + $lvl;
-  } else {
-    $schemaValue = $schema;
-  }
-  var $op = $keyword == 'maxProperties' ? '>' : '<';
-  out += 'if ( ';
-  if ($isData) {
-    out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'number\') || ';
-  }
-  out += ' Object.keys(' + ($data) + ').length ' + ($op) + ' ' + ($schemaValue) + ') { ';
-  var $errorKeyword = $keyword;
-  var $$outStack = $$outStack || [];
-  $$outStack.push(out);
-  out = ''; /* istanbul ignore else */
-  if (it.createErrors !== false) {
-    out += ' { keyword: \'' + ($errorKeyword || '_limitProperties') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { limit: ' + ($schemaValue) + ' } ';
-    if (it.opts.messages !== false) {
-      out += ' , message: \'should NOT have ';
-      if ($keyword == 'maxProperties') {
-        out += 'more';
-      } else {
-        out += 'less';
-      }
-      out += ' than ';
-      if ($isData) {
-        out += '\' + ' + ($schemaValue) + ' + \'';
-      } else {
-        out += '' + ($schema);
-      }
-      out += ' properties\' ';
-    }
-    if (it.opts.verbose) {
-      out += ' , schema:  ';
-      if ($isData) {
-        out += 'validate.schema' + ($schemaPath);
-      } else {
-        out += '' + ($schema);
-      }
-      out += '         , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-    }
-    out += ' } ';
-  } else {
-    out += ' {} ';
-  }
-  var __err = out;
-  out = $$outStack.pop();
-  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-    if (it.async) {
-      out += ' throw new ValidationError([' + (__err) + ']); ';
-    } else {
-      out += ' validate.errors = [' + (__err) + ']; return false; ';
-    }
-  } else {
-    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-  }
-  out += '} ';
-  if ($breakOnError) {
-    out += ' else { ';
-  }
-  return out;
-}
-
-
-/***/ }),
-/* 344 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate_validate(it, $keyword, $ruleType) {
-  var out = '';
-  var $async = it.schema.$async === true,
-    $refKeywords = it.util.schemaHasRulesExcept(it.schema, it.RULES.all, '$ref'),
-    $id = it.self._getId(it.schema);
-  if (it.isTop) {
-    if ($async) {
-      it.async = true;
-      var $es7 = it.opts.async == 'es7';
-      it.yieldAwait = $es7 ? 'await' : 'yield';
-    }
-    out += ' var validate = ';
-    if ($async) {
-      if ($es7) {
-        out += ' (async function ';
-      } else {
-        if (it.opts.async != '*') {
-          out += 'co.wrap';
-        }
-        out += '(function* ';
-      }
-    } else {
-      out += ' (function ';
-    }
-    out += ' (data, dataPath, parentData, parentDataProperty, rootData) { \'use strict\'; ';
-    if ($id && (it.opts.sourceCode || it.opts.processCode)) {
-      out += ' ' + ('/\*# sourceURL=' + $id + ' */') + ' ';
-    }
-  }
-  if (typeof it.schema == 'boolean' || !($refKeywords || it.schema.$ref)) {
-    var $keyword = 'false schema';
-    var $lvl = it.level;
-    var $dataLvl = it.dataLevel;
-    var $schema = it.schema[$keyword];
-    var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-    var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-    var $breakOnError = !it.opts.allErrors;
-    var $errorKeyword;
-    var $data = 'data' + ($dataLvl || '');
-    var $valid = 'valid' + $lvl;
-    if (it.schema === false) {
-      if (it.isTop) {
-        $breakOnError = true;
-      } else {
-        out += ' var ' + ($valid) + ' = false; ';
-      }
-      var $$outStack = $$outStack || [];
-      $$outStack.push(out);
-      out = ''; /* istanbul ignore else */
-      if (it.createErrors !== false) {
-        out += ' { keyword: \'' + ($errorKeyword || 'false schema') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: {} ';
-        if (it.opts.messages !== false) {
-          out += ' , message: \'boolean schema is false\' ';
-        }
-        if (it.opts.verbose) {
-          out += ' , schema: false , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-        }
-        out += ' } ';
-      } else {
-        out += ' {} ';
-      }
-      var __err = out;
-      out = $$outStack.pop();
-      if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-        if (it.async) {
-          out += ' throw new ValidationError([' + (__err) + ']); ';
-        } else {
-          out += ' validate.errors = [' + (__err) + ']; return false; ';
-        }
-      } else {
-        out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-      }
-    } else {
-      if (it.isTop) {
-        if ($async) {
-          out += ' return data; ';
-        } else {
-          out += ' validate.errors = null; return true; ';
-        }
-      } else {
-        out += ' var ' + ($valid) + ' = true; ';
-      }
-    }
-    if (it.isTop) {
-      out += ' }); return validate; ';
-    }
-    return out;
-  }
-  if (it.isTop) {
-    var $top = it.isTop,
-      $lvl = it.level = 0,
-      $dataLvl = it.dataLevel = 0,
-      $data = 'data';
-    it.rootId = it.resolve.fullPath(it.self._getId(it.root.schema));
-    it.baseId = it.baseId || it.rootId;
-    delete it.isTop;
-    it.dataPathArr = [undefined];
-    out += ' var vErrors = null; ';
-    out += ' var errors = 0;     ';
-    out += ' if (rootData === undefined) rootData = data; ';
-  } else {
-    var $lvl = it.level,
-      $dataLvl = it.dataLevel,
-      $data = 'data' + ($dataLvl || '');
-    if ($id) it.baseId = it.resolve.url(it.baseId, $id);
-    if ($async && !it.async) throw new Error('async schema in sync schema');
-    out += ' var errs_' + ($lvl) + ' = errors;';
-  }
-  var $valid = 'valid' + $lvl,
-    $breakOnError = !it.opts.allErrors,
-    $closingBraces1 = '',
-    $closingBraces2 = '';
-  var $errorKeyword;
-  var $typeSchema = it.schema.type,
-    $typeIsArray = Array.isArray($typeSchema);
-  if ($typeIsArray && $typeSchema.length == 1) {
-    $typeSchema = $typeSchema[0];
-    $typeIsArray = false;
-  }
-  if (it.schema.$ref && $refKeywords) {
-    if (it.opts.extendRefs == 'fail') {
-      throw new Error('$ref: validation keywords used in schema at path "' + it.errSchemaPath + '" (see option extendRefs)');
-    } else if (it.opts.extendRefs !== true) {
-      $refKeywords = false;
-      it.logger.warn('$ref: keywords ignored in schema at path "' + it.errSchemaPath + '"');
-    }
-  }
-  if ($typeSchema) {
-    if (it.opts.coerceTypes) {
-      var $coerceToTypes = it.util.coerceToTypes(it.opts.coerceTypes, $typeSchema);
-    }
-    var $rulesGroup = it.RULES.types[$typeSchema];
-    if ($coerceToTypes || $typeIsArray || $rulesGroup === true || ($rulesGroup && !$shouldUseGroup($rulesGroup))) {
-      var $schemaPath = it.schemaPath + '.type',
-        $errSchemaPath = it.errSchemaPath + '/type';
-      var $schemaPath = it.schemaPath + '.type',
-        $errSchemaPath = it.errSchemaPath + '/type',
-        $method = $typeIsArray ? 'checkDataTypes' : 'checkDataType';
-      out += ' if (' + (it.util[$method]($typeSchema, $data, true)) + ') { ';
-      if ($coerceToTypes) {
-        var $dataType = 'dataType' + $lvl,
-          $coerced = 'coerced' + $lvl;
-        out += ' var ' + ($dataType) + ' = typeof ' + ($data) + '; ';
-        if (it.opts.coerceTypes == 'array') {
-          out += ' if (' + ($dataType) + ' == \'object\' && Array.isArray(' + ($data) + ')) ' + ($dataType) + ' = \'array\'; ';
-        }
-        out += ' var ' + ($coerced) + ' = undefined; ';
-        var $bracesCoercion = '';
-        var arr1 = $coerceToTypes;
-        if (arr1) {
-          var $type, $i = -1,
-            l1 = arr1.length - 1;
-          while ($i < l1) {
-            $type = arr1[$i += 1];
-            if ($i) {
-              out += ' if (' + ($coerced) + ' === undefined) { ';
-              $bracesCoercion += '}';
-            }
-            if (it.opts.coerceTypes == 'array' && $type != 'array') {
-              out += ' if (' + ($dataType) + ' == \'array\' && ' + ($data) + '.length == 1) { ' + ($coerced) + ' = ' + ($data) + ' = ' + ($data) + '[0]; ' + ($dataType) + ' = typeof ' + ($data) + ';  } ';
-            }
-            if ($type == 'string') {
-              out += ' if (' + ($dataType) + ' == \'number\' || ' + ($dataType) + ' == \'boolean\') ' + ($coerced) + ' = \'\' + ' + ($data) + '; else if (' + ($data) + ' === null) ' + ($coerced) + ' = \'\'; ';
-            } else if ($type == 'number' || $type == 'integer') {
-              out += ' if (' + ($dataType) + ' == \'boolean\' || ' + ($data) + ' === null || (' + ($dataType) + ' == \'string\' && ' + ($data) + ' && ' + ($data) + ' == +' + ($data) + ' ';
-              if ($type == 'integer') {
-                out += ' && !(' + ($data) + ' % 1)';
-              }
-              out += ')) ' + ($coerced) + ' = +' + ($data) + '; ';
-            } else if ($type == 'boolean') {
-              out += ' if (' + ($data) + ' === \'false\' || ' + ($data) + ' === 0 || ' + ($data) + ' === null) ' + ($coerced) + ' = false; else if (' + ($data) + ' === \'true\' || ' + ($data) + ' === 1) ' + ($coerced) + ' = true; ';
-            } else if ($type == 'null') {
-              out += ' if (' + ($data) + ' === \'\' || ' + ($data) + ' === 0 || ' + ($data) + ' === false) ' + ($coerced) + ' = null; ';
-            } else if (it.opts.coerceTypes == 'array' && $type == 'array') {
-              out += ' if (' + ($dataType) + ' == \'string\' || ' + ($dataType) + ' == \'number\' || ' + ($dataType) + ' == \'boolean\' || ' + ($data) + ' == null) ' + ($coerced) + ' = [' + ($data) + ']; ';
-            }
-          }
-        }
-        out += ' ' + ($bracesCoercion) + ' if (' + ($coerced) + ' === undefined) {   ';
-        var $$outStack = $$outStack || [];
-        $$outStack.push(out);
-        out = ''; /* istanbul ignore else */
-        if (it.createErrors !== false) {
-          out += ' { keyword: \'' + ($errorKeyword || 'type') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { type: \'';
-          if ($typeIsArray) {
-            out += '' + ($typeSchema.join(","));
-          } else {
-            out += '' + ($typeSchema);
-          }
-          out += '\' } ';
-          if (it.opts.messages !== false) {
-            out += ' , message: \'should be ';
-            if ($typeIsArray) {
-              out += '' + ($typeSchema.join(","));
-            } else {
-              out += '' + ($typeSchema);
-            }
-            out += '\' ';
-          }
-          if (it.opts.verbose) {
-            out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-          }
-          out += ' } ';
-        } else {
-          out += ' {} ';
-        }
-        var __err = out;
-        out = $$outStack.pop();
-        if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-          if (it.async) {
-            out += ' throw new ValidationError([' + (__err) + ']); ';
-          } else {
-            out += ' validate.errors = [' + (__err) + ']; return false; ';
-          }
-        } else {
-          out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-        }
-        out += ' } else {  ';
-        var $parentData = $dataLvl ? 'data' + (($dataLvl - 1) || '') : 'parentData',
-          $parentDataProperty = $dataLvl ? it.dataPathArr[$dataLvl] : 'parentDataProperty';
-        out += ' ' + ($data) + ' = ' + ($coerced) + '; ';
-        if (!$dataLvl) {
-          out += 'if (' + ($parentData) + ' !== undefined)';
-        }
-        out += ' ' + ($parentData) + '[' + ($parentDataProperty) + '] = ' + ($coerced) + '; } ';
-      } else {
-        var $$outStack = $$outStack || [];
-        $$outStack.push(out);
-        out = ''; /* istanbul ignore else */
-        if (it.createErrors !== false) {
-          out += ' { keyword: \'' + ($errorKeyword || 'type') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { type: \'';
-          if ($typeIsArray) {
-            out += '' + ($typeSchema.join(","));
-          } else {
-            out += '' + ($typeSchema);
-          }
-          out += '\' } ';
-          if (it.opts.messages !== false) {
-            out += ' , message: \'should be ';
-            if ($typeIsArray) {
-              out += '' + ($typeSchema.join(","));
-            } else {
-              out += '' + ($typeSchema);
-            }
-            out += '\' ';
-          }
-          if (it.opts.verbose) {
-            out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-          }
-          out += ' } ';
-        } else {
-          out += ' {} ';
-        }
-        var __err = out;
-        out = $$outStack.pop();
-        if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-          if (it.async) {
-            out += ' throw new ValidationError([' + (__err) + ']); ';
-          } else {
-            out += ' validate.errors = [' + (__err) + ']; return false; ';
-          }
-        } else {
-          out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-        }
-      }
-      out += ' } ';
-    }
-  }
-  if (it.schema.$ref && !$refKeywords) {
-    out += ' ' + (it.RULES.all.$ref.code(it, '$ref')) + ' ';
-    if ($breakOnError) {
-      out += ' } if (errors === ';
-      if ($top) {
-        out += '0';
-      } else {
-        out += 'errs_' + ($lvl);
-      }
-      out += ') { ';
-      $closingBraces2 += '}';
-    }
-  } else {
-    if (it.opts.v5 && it.schema.patternGroups) {
-      it.logger.warn('keyword "patternGroups" is deprecated and disabled. Use option patternGroups: true to enable.');
-    }
-    var arr2 = it.RULES;
-    if (arr2) {
-      var $rulesGroup, i2 = -1,
-        l2 = arr2.length - 1;
-      while (i2 < l2) {
-        $rulesGroup = arr2[i2 += 1];
-        if ($shouldUseGroup($rulesGroup)) {
-          if ($rulesGroup.type) {
-            out += ' if (' + (it.util.checkDataType($rulesGroup.type, $data)) + ') { ';
-          }
-          if (it.opts.useDefaults && !it.compositeRule) {
-            if ($rulesGroup.type == 'object' && it.schema.properties) {
-              var $schema = it.schema.properties,
-                $schemaKeys = Object.keys($schema);
-              var arr3 = $schemaKeys;
-              if (arr3) {
-                var $propertyKey, i3 = -1,
-                  l3 = arr3.length - 1;
-                while (i3 < l3) {
-                  $propertyKey = arr3[i3 += 1];
-                  var $sch = $schema[$propertyKey];
-                  if ($sch.default !== undefined) {
-                    var $passData = $data + it.util.getProperty($propertyKey);
-                    out += '  if (' + ($passData) + ' === undefined) ' + ($passData) + ' = ';
-                    if (it.opts.useDefaults == 'shared') {
-                      out += ' ' + (it.useDefault($sch.default)) + ' ';
-                    } else {
-                      out += ' ' + (JSON.stringify($sch.default)) + ' ';
-                    }
-                    out += '; ';
-                  }
-                }
-              }
-            } else if ($rulesGroup.type == 'array' && Array.isArray(it.schema.items)) {
-              var arr4 = it.schema.items;
-              if (arr4) {
-                var $sch, $i = -1,
-                  l4 = arr4.length - 1;
-                while ($i < l4) {
-                  $sch = arr4[$i += 1];
-                  if ($sch.default !== undefined) {
-                    var $passData = $data + '[' + $i + ']';
-                    out += '  if (' + ($passData) + ' === undefined) ' + ($passData) + ' = ';
-                    if (it.opts.useDefaults == 'shared') {
-                      out += ' ' + (it.useDefault($sch.default)) + ' ';
-                    } else {
-                      out += ' ' + (JSON.stringify($sch.default)) + ' ';
-                    }
-                    out += '; ';
-                  }
-                }
-              }
-            }
-          }
-          var arr5 = $rulesGroup.rules;
-          if (arr5) {
-            var $rule, i5 = -1,
-              l5 = arr5.length - 1;
-            while (i5 < l5) {
-              $rule = arr5[i5 += 1];
-              if ($shouldUseRule($rule)) {
-                var $code = $rule.code(it, $rule.keyword, $rulesGroup.type);
-                if ($code) {
-                  out += ' ' + ($code) + ' ';
-                  if ($breakOnError) {
-                    $closingBraces1 += '}';
-                  }
-                }
-              }
-            }
-          }
-          if ($breakOnError) {
-            out += ' ' + ($closingBraces1) + ' ';
-            $closingBraces1 = '';
-          }
-          if ($rulesGroup.type) {
-            out += ' } ';
-            if ($typeSchema && $typeSchema === $rulesGroup.type && !$coerceToTypes) {
-              out += ' else { ';
-              var $schemaPath = it.schemaPath + '.type',
-                $errSchemaPath = it.errSchemaPath + '/type';
-              var $$outStack = $$outStack || [];
-              $$outStack.push(out);
-              out = ''; /* istanbul ignore else */
-              if (it.createErrors !== false) {
-                out += ' { keyword: \'' + ($errorKeyword || 'type') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { type: \'';
-                if ($typeIsArray) {
-                  out += '' + ($typeSchema.join(","));
-                } else {
-                  out += '' + ($typeSchema);
-                }
-                out += '\' } ';
-                if (it.opts.messages !== false) {
-                  out += ' , message: \'should be ';
-                  if ($typeIsArray) {
-                    out += '' + ($typeSchema.join(","));
-                  } else {
-                    out += '' + ($typeSchema);
-                  }
-                  out += '\' ';
-                }
-                if (it.opts.verbose) {
-                  out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-                }
-                out += ' } ';
-              } else {
-                out += ' {} ';
-              }
-              var __err = out;
-              out = $$outStack.pop();
-              if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-                if (it.async) {
-                  out += ' throw new ValidationError([' + (__err) + ']); ';
-                } else {
-                  out += ' validate.errors = [' + (__err) + ']; return false; ';
-                }
-              } else {
-                out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-              }
-              out += ' } ';
-            }
-          }
-          if ($breakOnError) {
-            out += ' if (errors === ';
-            if ($top) {
-              out += '0';
-            } else {
-              out += 'errs_' + ($lvl);
-            }
-            out += ') { ';
-            $closingBraces2 += '}';
-          }
-        }
-      }
-    }
-  }
-  if ($breakOnError) {
-    out += ' ' + ($closingBraces2) + ' ';
-  }
-  if ($top) {
-    if ($async) {
-      out += ' if (errors === 0) return data;           ';
-      out += ' else throw new ValidationError(vErrors); ';
-    } else {
-      out += ' validate.errors = vErrors; ';
-      out += ' return errors === 0;       ';
-    }
-    out += ' }); return validate;';
-  } else {
-    out += ' var ' + ($valid) + ' = errors === errs_' + ($lvl) + ';';
-  }
-  out = it.util.cleanUpCode(out);
-  if ($top) {
-    out = it.util.finalCleanUpCode(out, $async);
-  }
-
-  function $shouldUseGroup($rulesGroup) {
-    var rules = $rulesGroup.rules;
-    for (var i = 0; i < rules.length; i++)
-      if ($shouldUseRule(rules[i])) return true;
-  }
-
-  function $shouldUseRule($rule) {
-    return it.schema[$rule.keyword] !== undefined || ($rule.implements && $ruleImplementsSomeKeyword($rule));
-  }
-
-  function $ruleImplementsSomeKeyword($rule) {
-    var impl = $rule.implements;
-    for (var i = 0; i < impl.length; i++)
-      if (it.schema[impl[i]] !== undefined) return true;
-  }
-  return out;
-}
-
-
-/***/ }),
-/* 345 */
-/***/ (function(module, exports, __webpack_require__) {
-
-module.exports = __webpack_require__(509)().Promise
-
-
-/***/ }),
-/* 346 */
 /***/ (function(module, exports) {
 
 // API
@@ -72239,10 +71397,10 @@ function clean(key)
 
 
 /***/ }),
-/* 347 */
+/* 341 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var defer = __webpack_require__(518);
+var defer = __webpack_require__(486);
 
 // API
 module.exports = async;
@@ -72279,11 +71437,11 @@ function async(callback)
 
 
 /***/ }),
-/* 348 */
+/* 342 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var async = __webpack_require__(347)
-  , abort = __webpack_require__(346)
+var async = __webpack_require__(341)
+  , abort = __webpack_require__(340)
   ;
 
 // API
@@ -72360,7 +71518,7 @@ function runJob(iterator, key, item, callback)
 
 
 /***/ }),
-/* 349 */
+/* 343 */
 /***/ (function(module, exports) {
 
 // API
@@ -72403,11 +71561,11 @@ function state(list, sortMethod)
 
 
 /***/ }),
-/* 350 */
+/* 344 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var abort = __webpack_require__(346)
-  , async = __webpack_require__(347)
+var abort = __webpack_require__(340)
+  , async = __webpack_require__(341)
   ;
 
 // API
@@ -72438,12 +71596,12 @@ function terminator(callback)
 
 
 /***/ }),
-/* 351 */
+/* 345 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var iterate    = __webpack_require__(348)
-  , initState  = __webpack_require__(349)
-  , terminator = __webpack_require__(350)
+var iterate    = __webpack_require__(342)
+  , initState  = __webpack_require__(343)
+  , terminator = __webpack_require__(344)
   ;
 
 // Public API
@@ -72519,7 +71677,7 @@ function descending(a, b)
 
 
 /***/ }),
-/* 352 */
+/* 346 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -72534,7 +71692,7 @@ exports.default = {
 };
 
 /***/ }),
-/* 353 */
+/* 347 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -72602,19 +71760,19 @@ exports.hasWrapper = hasWrapper;
 var _promise;
 
 function _load_promise() {
-  return _promise = __webpack_require__(50);
+  return _promise = __webpack_require__(51);
 }
 
 var _hoistedTreeBuilder;
 
 function _load_hoistedTreeBuilder() {
-  return _hoistedTreeBuilder = __webpack_require__(554);
+  return _hoistedTreeBuilder = __webpack_require__(522);
 }
 
 var _getTransitiveDevDependencies;
 
 function _load_getTransitiveDevDependencies() {
-  return _getTransitiveDevDependencies = __webpack_require__(580);
+  return _getTransitiveDevDependencies = __webpack_require__(548);
 }
 
 var _install;
@@ -72637,7 +71795,7 @@ function _load_constants() {
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const zlib = __webpack_require__(198);
+const zlib = __webpack_require__(199);
 
 const gzip = (0, (_promise || _load_promise()).promisify)(zlib.gzip);
 
@@ -72851,7 +72009,7 @@ class Audit {
 exports.default = Audit;
 
 /***/ }),
-/* 354 */
+/* 348 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -73087,13 +72245,13 @@ exports.hasWrapper = hasWrapper;
 var _index;
 
 function _load_index() {
-  return _index = __webpack_require__(57);
+  return _index = __webpack_require__(58);
 }
 
 var _filter;
 
 function _load_filter() {
-  return _filter = __webpack_require__(372);
+  return _filter = __webpack_require__(366);
 }
 
 var _constants;
@@ -73105,7 +72263,7 @@ function _load_constants() {
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
@@ -73178,7 +72336,7 @@ function hasWrapper(commander) {
 }
 
 /***/ }),
-/* 355 */
+/* 349 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -73378,7 +72536,7 @@ function _load_buildSubCommands() {
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
@@ -73387,7 +72545,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 const invariant = __webpack_require__(9);
 const path = __webpack_require__(0);
-const micromatch = __webpack_require__(114);
+const micromatch = __webpack_require__(115);
 
 function hasWrapper(flags, args) {
   return args[0] !== 'dir';
@@ -73426,7 +72584,7 @@ function setFlags(commander) {
 }
 
 /***/ }),
-/* 356 */
+/* 350 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -73895,13 +73053,13 @@ function _load_errors() {
 var _integrityChecker;
 
 function _load_integrityChecker() {
-  return _integrityChecker = _interopRequireDefault(__webpack_require__(208));
+  return _integrityChecker = _interopRequireDefault(__webpack_require__(206));
 }
 
 var _integrityChecker2;
 
 function _load_integrityChecker2() {
-  return _integrityChecker2 = __webpack_require__(208);
+  return _integrityChecker2 = __webpack_require__(206);
 }
 
 var _lockfile;
@@ -73913,7 +73071,7 @@ function _load_lockfile() {
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 var _install;
@@ -73949,7 +73107,7 @@ function setFlags(commander) {
 }
 
 /***/ }),
-/* 357 */
+/* 351 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -74078,7 +73236,7 @@ function _load_errors() {
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 var _global;
@@ -74093,7 +73251,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 const invariant = __webpack_require__(9);
 
-const cmdShim = __webpack_require__(201);
+const cmdShim = __webpack_require__(202);
 const path = __webpack_require__(0);
 
 function hasWrapper(commander, args) {
@@ -74105,7 +73263,7 @@ function setFlags(commander) {
 }
 
 /***/ }),
-/* 358 */
+/* 352 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -74378,7 +73536,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 const invariant = __webpack_require__(9);
 
-const micromatch = __webpack_require__(114);
+const micromatch = __webpack_require__(115);
 
 const requireLockfile = exports.requireLockfile = true;
 
@@ -74455,7 +73613,7 @@ function getDevDeps(manifest) {
 }
 
 /***/ }),
-/* 359 */
+/* 353 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -74469,7 +73627,7 @@ exports.run = exports.requireLockfile = undefined;
 var _extends2;
 
 function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+  return _extends2 = _interopRequireDefault(__webpack_require__(20));
 }
 
 var _asyncToGenerator2;
@@ -74622,7 +73780,7 @@ function _load_lockfile() {
 var _index;
 
 function _load_index() {
-  return _index = __webpack_require__(57);
+  return _index = __webpack_require__(58);
 }
 
 var _install;
@@ -74640,13 +73798,13 @@ function _load_errors() {
 var _index2;
 
 function _load_index2() {
-  return _index2 = __webpack_require__(200);
+  return _index2 = __webpack_require__(201);
 }
 
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 var _constants;
@@ -74676,7 +73834,7 @@ function hasWrapper(commander, args) {
 }
 
 /***/ }),
-/* 360 */
+/* 354 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -75014,13 +74172,13 @@ function _load_executeLifecycleScript() {
 var _dynamicRequire;
 
 function _load_dynamicRequire() {
-  return _dynamicRequire = __webpack_require__(371);
+  return _dynamicRequire = __webpack_require__(365);
 }
 
 var _hooks;
 
 function _load_hooks() {
-  return _hooks = __webpack_require__(374);
+  return _hooks = __webpack_require__(368);
 }
 
 var _errors;
@@ -75032,13 +74190,13 @@ function _load_errors() {
 var _packageCompatibility;
 
 function _load_packageCompatibility() {
-  return _packageCompatibility = __webpack_require__(209);
+  return _packageCompatibility = __webpack_require__(207);
 }
 
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 var _constants;
@@ -75097,7 +74255,7 @@ function hasWrapper(commander, args) {
 }
 
 /***/ }),
-/* 361 */
+/* 355 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -75328,7 +74486,7 @@ exports.hasWrapper = hasWrapper;
 exports.examples = examples;
 
 /***/ }),
-/* 362 */
+/* 356 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -75342,7 +74500,7 @@ exports.run = exports.requireLockfile = undefined;
 var _extends2;
 
 function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+  return _extends2 = _interopRequireDefault(__webpack_require__(20));
 }
 
 var _asyncToGenerator2;
@@ -75577,19 +74735,19 @@ function _load_add() {
 var _upgrade;
 
 function _load_upgrade() {
-  return _upgrade = __webpack_require__(207);
+  return _upgrade = __webpack_require__(205);
 }
 
 var _colorForVersions;
 
 function _load_colorForVersions() {
-  return _colorForVersions = _interopRequireDefault(__webpack_require__(369));
+  return _colorForVersions = _interopRequireDefault(__webpack_require__(363));
 }
 
 var _colorizeDiff;
 
 function _load_colorizeDiff() {
-  return _colorizeDiff = _interopRequireDefault(__webpack_require__(370));
+  return _colorizeDiff = _interopRequireDefault(__webpack_require__(364));
 }
 
 var _install;
@@ -75619,7 +74777,7 @@ function hasWrapper(commander, args) {
 }
 
 /***/ }),
-/* 363 */
+/* 357 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -75839,7 +74997,7 @@ exports.hasWrapper = hasWrapper;
 var _index;
 
 function _load_index() {
-  return _index = __webpack_require__(57);
+  return _index = __webpack_require__(58);
 }
 
 var _executeLifecycleScript;
@@ -75857,13 +75015,13 @@ function _load_errors() {
 var _gitSpawn;
 
 function _load_gitSpawn() {
-  return _gitSpawn = __webpack_require__(373);
+  return _gitSpawn = __webpack_require__(367);
 }
 
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 var _map;
@@ -75906,7 +75064,7 @@ function hasWrapper(commander, args) {
 }
 
 /***/ }),
-/* 364 */
+/* 358 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -75920,7 +75078,7 @@ exports.LocalTarballFetcher = undefined;
 var _extends2;
 
 function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+  return _extends2 = _interopRequireDefault(__webpack_require__(20));
 }
 
 var _asyncToGenerator2;
@@ -75950,7 +75108,7 @@ function _load_baseFetcher() {
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 var _misc;
@@ -75971,11 +75129,11 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 const crypto = __webpack_require__(11);
 const path = __webpack_require__(0);
-const tarFs = __webpack_require__(193);
+const tarFs = __webpack_require__(194);
 const url = __webpack_require__(24);
-const fs = __webpack_require__(5);
+const fs = __webpack_require__(4);
 const stream = __webpack_require__(23);
-const gunzip = __webpack_require__(656);
+const gunzip = __webpack_require__(624);
 const invariant = __webpack_require__(9);
 const ssri = __webpack_require__(65);
 
@@ -76063,7 +75221,7 @@ class TarballFetcher extends (_baseFetcher || _load_baseFetcher()).default {
 
     const now = new Date();
 
-    const fs = __webpack_require__(5);
+    const fs = __webpack_require__(4);
     const patchedFs = Object.assign({}, fs, {
       utimes: (path, atime, mtime, cb) => {
         fs.stat(path, (err, stat) => {
@@ -76350,7 +75508,7 @@ function urlParts(requestUrl) {
 }
 
 /***/ }),
-/* 365 */
+/* 359 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -76490,7 +75648,7 @@ class PackageReference {
 exports.default = PackageReference;
 
 /***/ }),
-/* 366 */
+/* 360 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -76527,7 +75685,7 @@ function _load_normalizePattern() {
 var _requestManager;
 
 function _load_requestManager() {
-  return _requestManager = _interopRequireDefault(__webpack_require__(378));
+  return _requestManager = _interopRequireDefault(__webpack_require__(372));
 }
 
 var _blockingQueue;
@@ -76557,13 +75715,13 @@ function _load_workspaceLayout() {
 var _resolutionMap;
 
 function _load_resolutionMap() {
-  return _resolutionMap = _interopRequireDefault(__webpack_require__(214));
+  return _resolutionMap = _interopRequireDefault(__webpack_require__(212));
 }
 
 var _resolutionMap2;
 
 function _load_resolutionMap2() {
-  return _resolutionMap2 = __webpack_require__(214);
+  return _resolutionMap2 = __webpack_require__(212);
 }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -77424,7 +76582,7 @@ class PackageResolver {
 exports.default = PackageResolver;
 
 /***/ }),
-/* 367 */
+/* 361 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -77483,7 +76641,7 @@ GitHubResolver.protocol = 'github';
 GitHubResolver.hostname = 'github.com';
 
 /***/ }),
-/* 368 */
+/* 362 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -77515,7 +76673,7 @@ function _load_misc() {
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
@@ -77563,7 +76721,7 @@ exports.default = LinkResolver;
 LinkResolver.protocol = 'link';
 
 /***/ }),
-/* 369 */
+/* 363 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -77592,7 +76750,7 @@ function _load_semver() {
 var _semver2;
 
 function _load_semver2() {
-  return _semver2 = __webpack_require__(224);
+  return _semver2 = __webpack_require__(170);
 }
 
 var _constants;
@@ -77604,7 +76762,7 @@ function _load_constants() {
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /***/ }),
-/* 370 */
+/* 364 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -77628,7 +76786,7 @@ exports.default = function (from, to, reporter) {
 };
 
 /***/ }),
-/* 371 */
+/* 365 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -77638,7 +76796,7 @@ exports.default = function (from, to, reporter) {
 exports.dynamicRequire =  true ? require : require; // eslint-disable-line
 
 /***/ }),
-/* 372 */
+/* 366 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -77658,7 +76816,7 @@ function _load_misc() {
   return _misc = __webpack_require__(18);
 }
 
-const mm = __webpack_require__(114);
+const mm = __webpack_require__(115);
 const path = __webpack_require__(0);
 
 const WHITESPACE_RE = /^\s+$/;
@@ -77880,7 +77038,7 @@ function filterOverridenGitignores(files) {
 }
 
 /***/ }),
-/* 373 */
+/* 367 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -77894,7 +77052,7 @@ exports.spawn = undefined;
 var _extends2;
 
 function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+  return _extends2 = _interopRequireDefault(__webpack_require__(20));
 }
 
 var _path;
@@ -77906,7 +77064,7 @@ function _load_path() {
 var _child;
 
 function _load_child() {
-  return _child = _interopRequireWildcard(__webpack_require__(58));
+  return _child = _interopRequireWildcard(__webpack_require__(50));
 }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
@@ -77938,7 +77096,7 @@ const spawn = exports.spawn = (args, opts = {}) => {
 };
 
 /***/ }),
-/* 374 */
+/* 368 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -77971,7 +77129,7 @@ function callThroughHook(type, fn, context) {
 }
 
 /***/ }),
-/* 375 */
+/* 369 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -77999,7 +77157,7 @@ exports.default = key => {
 };
 
 /***/ }),
-/* 376 */
+/* 370 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -78026,7 +77184,7 @@ function isValidPackagePath(input) {
 }
 
 /***/ }),
-/* 377 */
+/* 371 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -78060,7 +77218,7 @@ function resolveWithHome(path) {
 }
 
 /***/ }),
-/* 378 */
+/* 372 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -78073,7 +77231,7 @@ Object.defineProperty(exports, "__esModule", {
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireDefault(__webpack_require__(5));
+  return _fs = _interopRequireDefault(__webpack_require__(4));
 }
 
 var _http;
@@ -78091,7 +77249,7 @@ function _load_url() {
 var _dnscache;
 
 function _load_dnscache() {
-  return _dnscache = _interopRequireDefault(__webpack_require__(637));
+  return _dnscache = _interopRequireDefault(__webpack_require__(605));
 }
 
 var _invariant;
@@ -78507,9 +77665,8 @@ class RequestManager {
 
         if (res.statusCode === 401 && res.headers['www-authenticate']) {
           const authMethods = res.headers['www-authenticate'].split(/,\s*/).map(s => s.toLowerCase());
-
           if (authMethods.indexOf('otp') !== -1) {
-            reject(new (_errors || _load_errors()).OneTimePasswordError());
+            reject(new (_errors || _load_errors()).OneTimePasswordError(res.headers['npm-notice']));
             return;
           }
         }
@@ -78621,7 +77778,7 @@ class RequestManager {
 exports.default = RequestManager;
 
 /***/ }),
-/* 379 */
+/* 373 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -79184,11 +78341,11 @@ module.exports = {
 
 
 /***/ }),
-/* 380 */
+/* 374 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var bufferFill = __webpack_require__(594)
-var allocUnsafe = __webpack_require__(593)
+var bufferFill = __webpack_require__(562)
+var allocUnsafe = __webpack_require__(561)
 
 module.exports = function alloc (size, fill, encoding) {
   if (typeof size !== 'number') {
@@ -79222,7 +78379,7 @@ module.exports = function alloc (size, fill, encoding) {
 
 
 /***/ }),
-/* 381 */
+/* 375 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -79268,7 +78425,7 @@ exports.toggle = (force, stream) => {
 
 
 /***/ }),
-/* 382 */
+/* 376 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var objectAssign = __webpack_require__(303);
@@ -79578,7 +78735,7 @@ module.exports = {
 
 
 /***/ }),
-/* 383 */
+/* 377 */
 /***/ (function(module, exports) {
 
 
@@ -79821,11 +78978,11 @@ function isObject(val) {
 
 
 /***/ }),
-/* 384 */
+/* 378 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* MIT license */
-var cssKeywords = __webpack_require__(610);
+var cssKeywords = __webpack_require__(578);
 
 // NOTE: conversions should only return primitive values (i.e. arrays, or
 //       values that give correct `typeof` results).
@@ -80695,13 +79852,13 @@ convert.rgb.gray = function (rgb) {
 
 
 /***/ }),
-/* 385 */
+/* 379 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var util = __webpack_require__(3);
 var Stream = __webpack_require__(23).Stream;
-var DelayedStream = __webpack_require__(634);
-var defer = __webpack_require__(622);
+var DelayedStream = __webpack_require__(602);
+var defer = __webpack_require__(590);
 
 module.exports = CombinedStream;
 function CombinedStream() {
@@ -80890,11 +80047,11 @@ CombinedStream.prototype._emitError = function(err) {
 
 
 /***/ }),
-/* 386 */
+/* 380 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var stream = __webpack_require__(102)
-var eos = __webpack_require__(173)
+var eos = __webpack_require__(174)
 var inherits = __webpack_require__(61)
 var shift = __webpack_require__(942)
 
@@ -81131,14 +80288,14 @@ module.exports = Duplexify
 
 
 /***/ }),
-/* 387 */
+/* 381 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var crypto = __webpack_require__(11);
 var BigInteger = __webpack_require__(81).BigInteger;
 var ECPointFp = __webpack_require__(139).ECPointFp;
 var Buffer = __webpack_require__(15).Buffer;
-exports.ECCurves = __webpack_require__(638);
+exports.ECCurves = __webpack_require__(606);
 
 // zero prepad
 function unstupid(hex,len)
@@ -81195,7 +80352,7 @@ exports.ECKey = function(curve, key, isPublic)
 
 
 /***/ }),
-/* 388 */
+/* 382 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -81213,7 +80370,7 @@ module.exports = function (str) {
 
 
 /***/ }),
-/* 389 */
+/* 383 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -81279,13 +80436,13 @@ module.exports = function (data, opts) {
 
 
 /***/ }),
-/* 390 */
+/* 384 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var fs = __webpack_require__(5)
+var fs = __webpack_require__(4)
 
 module.exports = clone(fs)
 
@@ -81307,12 +80464,12 @@ function clone (obj) {
 
 
 /***/ }),
-/* 391 */
+/* 385 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var fs = __webpack_require__(5)
-var polyfills = __webpack_require__(655)
-var legacy = __webpack_require__(654)
+var fs = __webpack_require__(4)
+var polyfills = __webpack_require__(623)
+var legacy = __webpack_require__(622)
 var queue = []
 
 var util = __webpack_require__(3)
@@ -81336,7 +80493,7 @@ if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || '')) {
   })
 }
 
-module.exports = patch(__webpack_require__(390))
+module.exports = patch(__webpack_require__(384))
 if (process.env.TEST_GRACEFUL_FS_GLOBAL_PATCH) {
   module.exports = patch(fs)
 }
@@ -81574,6 +80731,897 @@ function retry () {
 }
 
 
+/***/ }),
+/* 386 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var util = __webpack_require__(114);
+
+module.exports = SchemaObject;
+
+function SchemaObject(obj) {
+  util.copy(obj, this);
+}
+
+
+/***/ }),
+/* 387 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate__limit(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $errorKeyword;
+  var $data = 'data' + ($dataLvl || '');
+  var $isData = it.opts.$data && $schema && $schema.$data,
+    $schemaValue;
+  if ($isData) {
+    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
+    $schemaValue = 'schema' + $lvl;
+  } else {
+    $schemaValue = $schema;
+  }
+  var $isMax = $keyword == 'maximum',
+    $exclusiveKeyword = $isMax ? 'exclusiveMaximum' : 'exclusiveMinimum',
+    $schemaExcl = it.schema[$exclusiveKeyword],
+    $isDataExcl = it.opts.$data && $schemaExcl && $schemaExcl.$data,
+    $op = $isMax ? '<' : '>',
+    $notOp = $isMax ? '>' : '<',
+    $errorKeyword = undefined;
+  if ($isDataExcl) {
+    var $schemaValueExcl = it.util.getData($schemaExcl.$data, $dataLvl, it.dataPathArr),
+      $exclusive = 'exclusive' + $lvl,
+      $exclType = 'exclType' + $lvl,
+      $exclIsNumber = 'exclIsNumber' + $lvl,
+      $opExpr = 'op' + $lvl,
+      $opStr = '\' + ' + $opExpr + ' + \'';
+    out += ' var schemaExcl' + ($lvl) + ' = ' + ($schemaValueExcl) + '; ';
+    $schemaValueExcl = 'schemaExcl' + $lvl;
+    out += ' var ' + ($exclusive) + '; var ' + ($exclType) + ' = typeof ' + ($schemaValueExcl) + '; if (' + ($exclType) + ' != \'boolean\' && ' + ($exclType) + ' != \'undefined\' && ' + ($exclType) + ' != \'number\') { ';
+    var $errorKeyword = $exclusiveKeyword;
+    var $$outStack = $$outStack || [];
+    $$outStack.push(out);
+    out = ''; /* istanbul ignore else */
+    if (it.createErrors !== false) {
+      out += ' { keyword: \'' + ($errorKeyword || '_exclusiveLimit') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: {} ';
+      if (it.opts.messages !== false) {
+        out += ' , message: \'' + ($exclusiveKeyword) + ' should be boolean\' ';
+      }
+      if (it.opts.verbose) {
+        out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+      }
+      out += ' } ';
+    } else {
+      out += ' {} ';
+    }
+    var __err = out;
+    out = $$outStack.pop();
+    if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+      if (it.async) {
+        out += ' throw new ValidationError([' + (__err) + ']); ';
+      } else {
+        out += ' validate.errors = [' + (__err) + ']; return false; ';
+      }
+    } else {
+      out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+    }
+    out += ' } else if ( ';
+    if ($isData) {
+      out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'number\') || ';
+    }
+    out += ' ' + ($exclType) + ' == \'number\' ? ( (' + ($exclusive) + ' = ' + ($schemaValue) + ' === undefined || ' + ($schemaValueExcl) + ' ' + ($op) + '= ' + ($schemaValue) + ') ? ' + ($data) + ' ' + ($notOp) + '= ' + ($schemaValueExcl) + ' : ' + ($data) + ' ' + ($notOp) + ' ' + ($schemaValue) + ' ) : ( (' + ($exclusive) + ' = ' + ($schemaValueExcl) + ' === true) ? ' + ($data) + ' ' + ($notOp) + '= ' + ($schemaValue) + ' : ' + ($data) + ' ' + ($notOp) + ' ' + ($schemaValue) + ' ) || ' + ($data) + ' !== ' + ($data) + ') { var op' + ($lvl) + ' = ' + ($exclusive) + ' ? \'' + ($op) + '\' : \'' + ($op) + '=\';';
+  } else {
+    var $exclIsNumber = typeof $schemaExcl == 'number',
+      $opStr = $op;
+    if ($exclIsNumber && $isData) {
+      var $opExpr = '\'' + $opStr + '\'';
+      out += ' if ( ';
+      if ($isData) {
+        out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'number\') || ';
+      }
+      out += ' ( ' + ($schemaValue) + ' === undefined || ' + ($schemaExcl) + ' ' + ($op) + '= ' + ($schemaValue) + ' ? ' + ($data) + ' ' + ($notOp) + '= ' + ($schemaExcl) + ' : ' + ($data) + ' ' + ($notOp) + ' ' + ($schemaValue) + ' ) || ' + ($data) + ' !== ' + ($data) + ') { ';
+    } else {
+      if ($exclIsNumber && $schema === undefined) {
+        $exclusive = true;
+        $errorKeyword = $exclusiveKeyword;
+        $errSchemaPath = it.errSchemaPath + '/' + $exclusiveKeyword;
+        $schemaValue = $schemaExcl;
+        $notOp += '=';
+      } else {
+        if ($exclIsNumber) $schemaValue = Math[$isMax ? 'min' : 'max']($schemaExcl, $schema);
+        if ($schemaExcl === ($exclIsNumber ? $schemaValue : true)) {
+          $exclusive = true;
+          $errorKeyword = $exclusiveKeyword;
+          $errSchemaPath = it.errSchemaPath + '/' + $exclusiveKeyword;
+          $notOp += '=';
+        } else {
+          $exclusive = false;
+          $opStr += '=';
+        }
+      }
+      var $opExpr = '\'' + $opStr + '\'';
+      out += ' if ( ';
+      if ($isData) {
+        out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'number\') || ';
+      }
+      out += ' ' + ($data) + ' ' + ($notOp) + ' ' + ($schemaValue) + ' || ' + ($data) + ' !== ' + ($data) + ') { ';
+    }
+  }
+  $errorKeyword = $errorKeyword || $keyword;
+  var $$outStack = $$outStack || [];
+  $$outStack.push(out);
+  out = ''; /* istanbul ignore else */
+  if (it.createErrors !== false) {
+    out += ' { keyword: \'' + ($errorKeyword || '_limit') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { comparison: ' + ($opExpr) + ', limit: ' + ($schemaValue) + ', exclusive: ' + ($exclusive) + ' } ';
+    if (it.opts.messages !== false) {
+      out += ' , message: \'should be ' + ($opStr) + ' ';
+      if ($isData) {
+        out += '\' + ' + ($schemaValue);
+      } else {
+        out += '' + ($schemaValue) + '\'';
+      }
+    }
+    if (it.opts.verbose) {
+      out += ' , schema:  ';
+      if ($isData) {
+        out += 'validate.schema' + ($schemaPath);
+      } else {
+        out += '' + ($schema);
+      }
+      out += '         , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+    }
+    out += ' } ';
+  } else {
+    out += ' {} ';
+  }
+  var __err = out;
+  out = $$outStack.pop();
+  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+    if (it.async) {
+      out += ' throw new ValidationError([' + (__err) + ']); ';
+    } else {
+      out += ' validate.errors = [' + (__err) + ']; return false; ';
+    }
+  } else {
+    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+  }
+  out += ' } ';
+  if ($breakOnError) {
+    out += ' else { ';
+  }
+  return out;
+}
+
+
+/***/ }),
+/* 388 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate__limitItems(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $errorKeyword;
+  var $data = 'data' + ($dataLvl || '');
+  var $isData = it.opts.$data && $schema && $schema.$data,
+    $schemaValue;
+  if ($isData) {
+    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
+    $schemaValue = 'schema' + $lvl;
+  } else {
+    $schemaValue = $schema;
+  }
+  var $op = $keyword == 'maxItems' ? '>' : '<';
+  out += 'if ( ';
+  if ($isData) {
+    out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'number\') || ';
+  }
+  out += ' ' + ($data) + '.length ' + ($op) + ' ' + ($schemaValue) + ') { ';
+  var $errorKeyword = $keyword;
+  var $$outStack = $$outStack || [];
+  $$outStack.push(out);
+  out = ''; /* istanbul ignore else */
+  if (it.createErrors !== false) {
+    out += ' { keyword: \'' + ($errorKeyword || '_limitItems') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { limit: ' + ($schemaValue) + ' } ';
+    if (it.opts.messages !== false) {
+      out += ' , message: \'should NOT have ';
+      if ($keyword == 'maxItems') {
+        out += 'more';
+      } else {
+        out += 'less';
+      }
+      out += ' than ';
+      if ($isData) {
+        out += '\' + ' + ($schemaValue) + ' + \'';
+      } else {
+        out += '' + ($schema);
+      }
+      out += ' items\' ';
+    }
+    if (it.opts.verbose) {
+      out += ' , schema:  ';
+      if ($isData) {
+        out += 'validate.schema' + ($schemaPath);
+      } else {
+        out += '' + ($schema);
+      }
+      out += '         , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+    }
+    out += ' } ';
+  } else {
+    out += ' {} ';
+  }
+  var __err = out;
+  out = $$outStack.pop();
+  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+    if (it.async) {
+      out += ' throw new ValidationError([' + (__err) + ']); ';
+    } else {
+      out += ' validate.errors = [' + (__err) + ']; return false; ';
+    }
+  } else {
+    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+  }
+  out += '} ';
+  if ($breakOnError) {
+    out += ' else { ';
+  }
+  return out;
+}
+
+
+/***/ }),
+/* 389 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate__limitLength(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $errorKeyword;
+  var $data = 'data' + ($dataLvl || '');
+  var $isData = it.opts.$data && $schema && $schema.$data,
+    $schemaValue;
+  if ($isData) {
+    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
+    $schemaValue = 'schema' + $lvl;
+  } else {
+    $schemaValue = $schema;
+  }
+  var $op = $keyword == 'maxLength' ? '>' : '<';
+  out += 'if ( ';
+  if ($isData) {
+    out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'number\') || ';
+  }
+  if (it.opts.unicode === false) {
+    out += ' ' + ($data) + '.length ';
+  } else {
+    out += ' ucs2length(' + ($data) + ') ';
+  }
+  out += ' ' + ($op) + ' ' + ($schemaValue) + ') { ';
+  var $errorKeyword = $keyword;
+  var $$outStack = $$outStack || [];
+  $$outStack.push(out);
+  out = ''; /* istanbul ignore else */
+  if (it.createErrors !== false) {
+    out += ' { keyword: \'' + ($errorKeyword || '_limitLength') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { limit: ' + ($schemaValue) + ' } ';
+    if (it.opts.messages !== false) {
+      out += ' , message: \'should NOT be ';
+      if ($keyword == 'maxLength') {
+        out += 'longer';
+      } else {
+        out += 'shorter';
+      }
+      out += ' than ';
+      if ($isData) {
+        out += '\' + ' + ($schemaValue) + ' + \'';
+      } else {
+        out += '' + ($schema);
+      }
+      out += ' characters\' ';
+    }
+    if (it.opts.verbose) {
+      out += ' , schema:  ';
+      if ($isData) {
+        out += 'validate.schema' + ($schemaPath);
+      } else {
+        out += '' + ($schema);
+      }
+      out += '         , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+    }
+    out += ' } ';
+  } else {
+    out += ' {} ';
+  }
+  var __err = out;
+  out = $$outStack.pop();
+  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+    if (it.async) {
+      out += ' throw new ValidationError([' + (__err) + ']); ';
+    } else {
+      out += ' validate.errors = [' + (__err) + ']; return false; ';
+    }
+  } else {
+    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+  }
+  out += '} ';
+  if ($breakOnError) {
+    out += ' else { ';
+  }
+  return out;
+}
+
+
+/***/ }),
+/* 390 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate__limitProperties(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $errorKeyword;
+  var $data = 'data' + ($dataLvl || '');
+  var $isData = it.opts.$data && $schema && $schema.$data,
+    $schemaValue;
+  if ($isData) {
+    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
+    $schemaValue = 'schema' + $lvl;
+  } else {
+    $schemaValue = $schema;
+  }
+  var $op = $keyword == 'maxProperties' ? '>' : '<';
+  out += 'if ( ';
+  if ($isData) {
+    out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'number\') || ';
+  }
+  out += ' Object.keys(' + ($data) + ').length ' + ($op) + ' ' + ($schemaValue) + ') { ';
+  var $errorKeyword = $keyword;
+  var $$outStack = $$outStack || [];
+  $$outStack.push(out);
+  out = ''; /* istanbul ignore else */
+  if (it.createErrors !== false) {
+    out += ' { keyword: \'' + ($errorKeyword || '_limitProperties') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { limit: ' + ($schemaValue) + ' } ';
+    if (it.opts.messages !== false) {
+      out += ' , message: \'should NOT have ';
+      if ($keyword == 'maxProperties') {
+        out += 'more';
+      } else {
+        out += 'less';
+      }
+      out += ' than ';
+      if ($isData) {
+        out += '\' + ' + ($schemaValue) + ' + \'';
+      } else {
+        out += '' + ($schema);
+      }
+      out += ' properties\' ';
+    }
+    if (it.opts.verbose) {
+      out += ' , schema:  ';
+      if ($isData) {
+        out += 'validate.schema' + ($schemaPath);
+      } else {
+        out += '' + ($schema);
+      }
+      out += '         , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+    }
+    out += ' } ';
+  } else {
+    out += ' {} ';
+  }
+  var __err = out;
+  out = $$outStack.pop();
+  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+    if (it.async) {
+      out += ' throw new ValidationError([' + (__err) + ']); ';
+    } else {
+      out += ' validate.errors = [' + (__err) + ']; return false; ';
+    }
+  } else {
+    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+  }
+  out += '} ';
+  if ($breakOnError) {
+    out += ' else { ';
+  }
+  return out;
+}
+
+
+/***/ }),
+/* 391 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate_validate(it, $keyword, $ruleType) {
+  var out = '';
+  var $async = it.schema.$async === true,
+    $refKeywords = it.util.schemaHasRulesExcept(it.schema, it.RULES.all, '$ref'),
+    $id = it.self._getId(it.schema);
+  if (it.isTop) {
+    if ($async) {
+      it.async = true;
+      var $es7 = it.opts.async == 'es7';
+      it.yieldAwait = $es7 ? 'await' : 'yield';
+    }
+    out += ' var validate = ';
+    if ($async) {
+      if ($es7) {
+        out += ' (async function ';
+      } else {
+        if (it.opts.async != '*') {
+          out += 'co.wrap';
+        }
+        out += '(function* ';
+      }
+    } else {
+      out += ' (function ';
+    }
+    out += ' (data, dataPath, parentData, parentDataProperty, rootData) { \'use strict\'; ';
+    if ($id && (it.opts.sourceCode || it.opts.processCode)) {
+      out += ' ' + ('/\*# sourceURL=' + $id + ' */') + ' ';
+    }
+  }
+  if (typeof it.schema == 'boolean' || !($refKeywords || it.schema.$ref)) {
+    var $keyword = 'false schema';
+    var $lvl = it.level;
+    var $dataLvl = it.dataLevel;
+    var $schema = it.schema[$keyword];
+    var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+    var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+    var $breakOnError = !it.opts.allErrors;
+    var $errorKeyword;
+    var $data = 'data' + ($dataLvl || '');
+    var $valid = 'valid' + $lvl;
+    if (it.schema === false) {
+      if (it.isTop) {
+        $breakOnError = true;
+      } else {
+        out += ' var ' + ($valid) + ' = false; ';
+      }
+      var $$outStack = $$outStack || [];
+      $$outStack.push(out);
+      out = ''; /* istanbul ignore else */
+      if (it.createErrors !== false) {
+        out += ' { keyword: \'' + ($errorKeyword || 'false schema') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: {} ';
+        if (it.opts.messages !== false) {
+          out += ' , message: \'boolean schema is false\' ';
+        }
+        if (it.opts.verbose) {
+          out += ' , schema: false , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+        }
+        out += ' } ';
+      } else {
+        out += ' {} ';
+      }
+      var __err = out;
+      out = $$outStack.pop();
+      if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+        if (it.async) {
+          out += ' throw new ValidationError([' + (__err) + ']); ';
+        } else {
+          out += ' validate.errors = [' + (__err) + ']; return false; ';
+        }
+      } else {
+        out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+      }
+    } else {
+      if (it.isTop) {
+        if ($async) {
+          out += ' return data; ';
+        } else {
+          out += ' validate.errors = null; return true; ';
+        }
+      } else {
+        out += ' var ' + ($valid) + ' = true; ';
+      }
+    }
+    if (it.isTop) {
+      out += ' }); return validate; ';
+    }
+    return out;
+  }
+  if (it.isTop) {
+    var $top = it.isTop,
+      $lvl = it.level = 0,
+      $dataLvl = it.dataLevel = 0,
+      $data = 'data';
+    it.rootId = it.resolve.fullPath(it.self._getId(it.root.schema));
+    it.baseId = it.baseId || it.rootId;
+    delete it.isTop;
+    it.dataPathArr = [undefined];
+    out += ' var vErrors = null; ';
+    out += ' var errors = 0;     ';
+    out += ' if (rootData === undefined) rootData = data; ';
+  } else {
+    var $lvl = it.level,
+      $dataLvl = it.dataLevel,
+      $data = 'data' + ($dataLvl || '');
+    if ($id) it.baseId = it.resolve.url(it.baseId, $id);
+    if ($async && !it.async) throw new Error('async schema in sync schema');
+    out += ' var errs_' + ($lvl) + ' = errors;';
+  }
+  var $valid = 'valid' + $lvl,
+    $breakOnError = !it.opts.allErrors,
+    $closingBraces1 = '',
+    $closingBraces2 = '';
+  var $errorKeyword;
+  var $typeSchema = it.schema.type,
+    $typeIsArray = Array.isArray($typeSchema);
+  if ($typeIsArray && $typeSchema.length == 1) {
+    $typeSchema = $typeSchema[0];
+    $typeIsArray = false;
+  }
+  if (it.schema.$ref && $refKeywords) {
+    if (it.opts.extendRefs == 'fail') {
+      throw new Error('$ref: validation keywords used in schema at path "' + it.errSchemaPath + '" (see option extendRefs)');
+    } else if (it.opts.extendRefs !== true) {
+      $refKeywords = false;
+      it.logger.warn('$ref: keywords ignored in schema at path "' + it.errSchemaPath + '"');
+    }
+  }
+  if ($typeSchema) {
+    if (it.opts.coerceTypes) {
+      var $coerceToTypes = it.util.coerceToTypes(it.opts.coerceTypes, $typeSchema);
+    }
+    var $rulesGroup = it.RULES.types[$typeSchema];
+    if ($coerceToTypes || $typeIsArray || $rulesGroup === true || ($rulesGroup && !$shouldUseGroup($rulesGroup))) {
+      var $schemaPath = it.schemaPath + '.type',
+        $errSchemaPath = it.errSchemaPath + '/type';
+      var $schemaPath = it.schemaPath + '.type',
+        $errSchemaPath = it.errSchemaPath + '/type',
+        $method = $typeIsArray ? 'checkDataTypes' : 'checkDataType';
+      out += ' if (' + (it.util[$method]($typeSchema, $data, true)) + ') { ';
+      if ($coerceToTypes) {
+        var $dataType = 'dataType' + $lvl,
+          $coerced = 'coerced' + $lvl;
+        out += ' var ' + ($dataType) + ' = typeof ' + ($data) + '; ';
+        if (it.opts.coerceTypes == 'array') {
+          out += ' if (' + ($dataType) + ' == \'object\' && Array.isArray(' + ($data) + ')) ' + ($dataType) + ' = \'array\'; ';
+        }
+        out += ' var ' + ($coerced) + ' = undefined; ';
+        var $bracesCoercion = '';
+        var arr1 = $coerceToTypes;
+        if (arr1) {
+          var $type, $i = -1,
+            l1 = arr1.length - 1;
+          while ($i < l1) {
+            $type = arr1[$i += 1];
+            if ($i) {
+              out += ' if (' + ($coerced) + ' === undefined) { ';
+              $bracesCoercion += '}';
+            }
+            if (it.opts.coerceTypes == 'array' && $type != 'array') {
+              out += ' if (' + ($dataType) + ' == \'array\' && ' + ($data) + '.length == 1) { ' + ($coerced) + ' = ' + ($data) + ' = ' + ($data) + '[0]; ' + ($dataType) + ' = typeof ' + ($data) + ';  } ';
+            }
+            if ($type == 'string') {
+              out += ' if (' + ($dataType) + ' == \'number\' || ' + ($dataType) + ' == \'boolean\') ' + ($coerced) + ' = \'\' + ' + ($data) + '; else if (' + ($data) + ' === null) ' + ($coerced) + ' = \'\'; ';
+            } else if ($type == 'number' || $type == 'integer') {
+              out += ' if (' + ($dataType) + ' == \'boolean\' || ' + ($data) + ' === null || (' + ($dataType) + ' == \'string\' && ' + ($data) + ' && ' + ($data) + ' == +' + ($data) + ' ';
+              if ($type == 'integer') {
+                out += ' && !(' + ($data) + ' % 1)';
+              }
+              out += ')) ' + ($coerced) + ' = +' + ($data) + '; ';
+            } else if ($type == 'boolean') {
+              out += ' if (' + ($data) + ' === \'false\' || ' + ($data) + ' === 0 || ' + ($data) + ' === null) ' + ($coerced) + ' = false; else if (' + ($data) + ' === \'true\' || ' + ($data) + ' === 1) ' + ($coerced) + ' = true; ';
+            } else if ($type == 'null') {
+              out += ' if (' + ($data) + ' === \'\' || ' + ($data) + ' === 0 || ' + ($data) + ' === false) ' + ($coerced) + ' = null; ';
+            } else if (it.opts.coerceTypes == 'array' && $type == 'array') {
+              out += ' if (' + ($dataType) + ' == \'string\' || ' + ($dataType) + ' == \'number\' || ' + ($dataType) + ' == \'boolean\' || ' + ($data) + ' == null) ' + ($coerced) + ' = [' + ($data) + ']; ';
+            }
+          }
+        }
+        out += ' ' + ($bracesCoercion) + ' if (' + ($coerced) + ' === undefined) {   ';
+        var $$outStack = $$outStack || [];
+        $$outStack.push(out);
+        out = ''; /* istanbul ignore else */
+        if (it.createErrors !== false) {
+          out += ' { keyword: \'' + ($errorKeyword || 'type') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { type: \'';
+          if ($typeIsArray) {
+            out += '' + ($typeSchema.join(","));
+          } else {
+            out += '' + ($typeSchema);
+          }
+          out += '\' } ';
+          if (it.opts.messages !== false) {
+            out += ' , message: \'should be ';
+            if ($typeIsArray) {
+              out += '' + ($typeSchema.join(","));
+            } else {
+              out += '' + ($typeSchema);
+            }
+            out += '\' ';
+          }
+          if (it.opts.verbose) {
+            out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+          }
+          out += ' } ';
+        } else {
+          out += ' {} ';
+        }
+        var __err = out;
+        out = $$outStack.pop();
+        if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+          if (it.async) {
+            out += ' throw new ValidationError([' + (__err) + ']); ';
+          } else {
+            out += ' validate.errors = [' + (__err) + ']; return false; ';
+          }
+        } else {
+          out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+        }
+        out += ' } else {  ';
+        var $parentData = $dataLvl ? 'data' + (($dataLvl - 1) || '') : 'parentData',
+          $parentDataProperty = $dataLvl ? it.dataPathArr[$dataLvl] : 'parentDataProperty';
+        out += ' ' + ($data) + ' = ' + ($coerced) + '; ';
+        if (!$dataLvl) {
+          out += 'if (' + ($parentData) + ' !== undefined)';
+        }
+        out += ' ' + ($parentData) + '[' + ($parentDataProperty) + '] = ' + ($coerced) + '; } ';
+      } else {
+        var $$outStack = $$outStack || [];
+        $$outStack.push(out);
+        out = ''; /* istanbul ignore else */
+        if (it.createErrors !== false) {
+          out += ' { keyword: \'' + ($errorKeyword || 'type') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { type: \'';
+          if ($typeIsArray) {
+            out += '' + ($typeSchema.join(","));
+          } else {
+            out += '' + ($typeSchema);
+          }
+          out += '\' } ';
+          if (it.opts.messages !== false) {
+            out += ' , message: \'should be ';
+            if ($typeIsArray) {
+              out += '' + ($typeSchema.join(","));
+            } else {
+              out += '' + ($typeSchema);
+            }
+            out += '\' ';
+          }
+          if (it.opts.verbose) {
+            out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+          }
+          out += ' } ';
+        } else {
+          out += ' {} ';
+        }
+        var __err = out;
+        out = $$outStack.pop();
+        if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+          if (it.async) {
+            out += ' throw new ValidationError([' + (__err) + ']); ';
+          } else {
+            out += ' validate.errors = [' + (__err) + ']; return false; ';
+          }
+        } else {
+          out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+        }
+      }
+      out += ' } ';
+    }
+  }
+  if (it.schema.$ref && !$refKeywords) {
+    out += ' ' + (it.RULES.all.$ref.code(it, '$ref')) + ' ';
+    if ($breakOnError) {
+      out += ' } if (errors === ';
+      if ($top) {
+        out += '0';
+      } else {
+        out += 'errs_' + ($lvl);
+      }
+      out += ') { ';
+      $closingBraces2 += '}';
+    }
+  } else {
+    if (it.opts.v5 && it.schema.patternGroups) {
+      it.logger.warn('keyword "patternGroups" is deprecated and disabled. Use option patternGroups: true to enable.');
+    }
+    var arr2 = it.RULES;
+    if (arr2) {
+      var $rulesGroup, i2 = -1,
+        l2 = arr2.length - 1;
+      while (i2 < l2) {
+        $rulesGroup = arr2[i2 += 1];
+        if ($shouldUseGroup($rulesGroup)) {
+          if ($rulesGroup.type) {
+            out += ' if (' + (it.util.checkDataType($rulesGroup.type, $data)) + ') { ';
+          }
+          if (it.opts.useDefaults && !it.compositeRule) {
+            if ($rulesGroup.type == 'object' && it.schema.properties) {
+              var $schema = it.schema.properties,
+                $schemaKeys = Object.keys($schema);
+              var arr3 = $schemaKeys;
+              if (arr3) {
+                var $propertyKey, i3 = -1,
+                  l3 = arr3.length - 1;
+                while (i3 < l3) {
+                  $propertyKey = arr3[i3 += 1];
+                  var $sch = $schema[$propertyKey];
+                  if ($sch.default !== undefined) {
+                    var $passData = $data + it.util.getProperty($propertyKey);
+                    out += '  if (' + ($passData) + ' === undefined) ' + ($passData) + ' = ';
+                    if (it.opts.useDefaults == 'shared') {
+                      out += ' ' + (it.useDefault($sch.default)) + ' ';
+                    } else {
+                      out += ' ' + (JSON.stringify($sch.default)) + ' ';
+                    }
+                    out += '; ';
+                  }
+                }
+              }
+            } else if ($rulesGroup.type == 'array' && Array.isArray(it.schema.items)) {
+              var arr4 = it.schema.items;
+              if (arr4) {
+                var $sch, $i = -1,
+                  l4 = arr4.length - 1;
+                while ($i < l4) {
+                  $sch = arr4[$i += 1];
+                  if ($sch.default !== undefined) {
+                    var $passData = $data + '[' + $i + ']';
+                    out += '  if (' + ($passData) + ' === undefined) ' + ($passData) + ' = ';
+                    if (it.opts.useDefaults == 'shared') {
+                      out += ' ' + (it.useDefault($sch.default)) + ' ';
+                    } else {
+                      out += ' ' + (JSON.stringify($sch.default)) + ' ';
+                    }
+                    out += '; ';
+                  }
+                }
+              }
+            }
+          }
+          var arr5 = $rulesGroup.rules;
+          if (arr5) {
+            var $rule, i5 = -1,
+              l5 = arr5.length - 1;
+            while (i5 < l5) {
+              $rule = arr5[i5 += 1];
+              if ($shouldUseRule($rule)) {
+                var $code = $rule.code(it, $rule.keyword, $rulesGroup.type);
+                if ($code) {
+                  out += ' ' + ($code) + ' ';
+                  if ($breakOnError) {
+                    $closingBraces1 += '}';
+                  }
+                }
+              }
+            }
+          }
+          if ($breakOnError) {
+            out += ' ' + ($closingBraces1) + ' ';
+            $closingBraces1 = '';
+          }
+          if ($rulesGroup.type) {
+            out += ' } ';
+            if ($typeSchema && $typeSchema === $rulesGroup.type && !$coerceToTypes) {
+              out += ' else { ';
+              var $schemaPath = it.schemaPath + '.type',
+                $errSchemaPath = it.errSchemaPath + '/type';
+              var $$outStack = $$outStack || [];
+              $$outStack.push(out);
+              out = ''; /* istanbul ignore else */
+              if (it.createErrors !== false) {
+                out += ' { keyword: \'' + ($errorKeyword || 'type') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { type: \'';
+                if ($typeIsArray) {
+                  out += '' + ($typeSchema.join(","));
+                } else {
+                  out += '' + ($typeSchema);
+                }
+                out += '\' } ';
+                if (it.opts.messages !== false) {
+                  out += ' , message: \'should be ';
+                  if ($typeIsArray) {
+                    out += '' + ($typeSchema.join(","));
+                  } else {
+                    out += '' + ($typeSchema);
+                  }
+                  out += '\' ';
+                }
+                if (it.opts.verbose) {
+                  out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+                }
+                out += ' } ';
+              } else {
+                out += ' {} ';
+              }
+              var __err = out;
+              out = $$outStack.pop();
+              if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+                if (it.async) {
+                  out += ' throw new ValidationError([' + (__err) + ']); ';
+                } else {
+                  out += ' validate.errors = [' + (__err) + ']; return false; ';
+                }
+              } else {
+                out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+              }
+              out += ' } ';
+            }
+          }
+          if ($breakOnError) {
+            out += ' if (errors === ';
+            if ($top) {
+              out += '0';
+            } else {
+              out += 'errs_' + ($lvl);
+            }
+            out += ') { ';
+            $closingBraces2 += '}';
+          }
+        }
+      }
+    }
+  }
+  if ($breakOnError) {
+    out += ' ' + ($closingBraces2) + ' ';
+  }
+  if ($top) {
+    if ($async) {
+      out += ' if (errors === 0) return data;           ';
+      out += ' else throw new ValidationError(vErrors); ';
+    } else {
+      out += ' validate.errors = vErrors; ';
+      out += ' return errors === 0;       ';
+    }
+    out += ' }); return validate;';
+  } else {
+    out += ' var ' + ($valid) + ' = errors === errs_' + ($lvl) + ';';
+  }
+  out = it.util.cleanUpCode(out);
+  if ($top) {
+    out = it.util.finalCleanUpCode(out, $async);
+  }
+
+  function $shouldUseGroup($rulesGroup) {
+    var rules = $rulesGroup.rules;
+    for (var i = 0; i < rules.length; i++)
+      if ($shouldUseRule(rules[i])) return true;
+  }
+
+  function $shouldUseRule($rule) {
+    return it.schema[$rule.keyword] !== undefined || ($rule.implements && $ruleImplementsSomeKeyword($rule));
+  }
+
+  function $ruleImplementsSomeKeyword($rule) {
+    var impl = $rule.implements;
+    for (var i = 0; i < impl.length; i++)
+      if (it.schema[impl[i]] !== undefined) return true;
+  }
+  return out;
+}
+
+
 /***/ }),
 /* 392 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -81699,7 +81747,7 @@ module.exports = InputPrompt;
 
 var _ = __webpack_require__(38);
 var MuteStream = __webpack_require__(401);
-var readline = __webpack_require__(197);
+var readline = __webpack_require__(198);
 
 /**
  * Base interface class other can inherits from
@@ -81786,7 +81834,7 @@ module.exports = UI;
 
 "use strict";
 
-var ansiEscapes = __webpack_require__(504);
+var ansiEscapes = __webpack_require__(472);
 
 /**
  * Move cursor left by `x`
@@ -81857,7 +81905,7 @@ module.exports = [["a140","",62],["a180","",32],["a240","",62],["a280",
 "use strict";
 
 
-module.exports = __webpack_require__(601).isCI
+module.exports = __webpack_require__(569).isCI
 
 
 /***/ }),
@@ -82713,7 +82761,7 @@ module.exports = {
 
 /*<replacement>*/
 
-var pna = __webpack_require__(180);
+var pna = __webpack_require__(181);
 /*</replacement>*/
 
 module.exports = Readable;
@@ -82789,7 +82837,7 @@ function prependListener(emitter, event, fn) {
 }
 
 function ReadableState(options, stream) {
-  Duplex = Duplex || __webpack_require__(115);
+  Duplex = Duplex || __webpack_require__(116);
 
   options = options || {};
 
@@ -82866,7 +82914,7 @@ function ReadableState(options, stream) {
 }
 
 function Readable(options) {
-  Duplex = Duplex || __webpack_require__(115);
+  Duplex = Duplex || __webpack_require__(116);
 
   if (!(this instanceof Readable)) return new Readable(options);
 
@@ -83780,7 +83828,7 @@ function indexOf(xs, x) {
 
 module.exports = Transform;
 
-var Duplex = __webpack_require__(115);
+var Duplex = __webpack_require__(116);
 
 /*<replacement>*/
 var util = __webpack_require__(113);
@@ -83962,7 +84010,7 @@ function done(stream, er, data) {
 
 /*<replacement>*/
 
-var pna = __webpack_require__(180);
+var pna = __webpack_require__(181);
 /*</replacement>*/
 
 module.exports = Writable;
@@ -84033,7 +84081,7 @@ util.inherits(Writable, Stream);
 function nop() {}
 
 function WritableState(options, stream) {
-  Duplex = Duplex || __webpack_require__(115);
+  Duplex = Duplex || __webpack_require__(116);
 
   options = options || {};
 
@@ -84183,7 +84231,7 @@ if (typeof Symbol === 'function' && Symbol.hasInstance && typeof Function.protot
 }
 
 function Writable(options) {
-  Duplex = Duplex || __webpack_require__(115);
+  Duplex = Duplex || __webpack_require__(116);
 
   // Writable ctor is applied to Duplexes, too.
   // `realHasInstance` is necessary because using plain `instanceof`
@@ -84630,7 +84678,7 @@ Writable.prototype._destroy = function (err, cb) {
 
 /*<replacement>*/
 
-var pna = __webpack_require__(180);
+var pna = __webpack_require__(181);
 /*</replacement>*/
 
 // undocumented cb() API, needed for core, not for public API
@@ -85111,7 +85159,7 @@ module.exports = function () {
 /***/ (function(module, exports, __webpack_require__) {
 
 var path = __webpack_require__(0);
-var fs = __webpack_require__(5);
+var fs = __webpack_require__(4);
 var parse = path.parse || __webpack_require__(774);
 
 module.exports = function nodeModulesPaths(start, opts) {
@@ -85165,7 +85213,7 @@ module.exports = function nodeModulesPaths(start, opts) {
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return BehaviorSubject; });
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(36);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_ObjectUnsubscribedError__ = __webpack_require__(189);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_ObjectUnsubscribedError__ = __webpack_require__(190);
 /** PURE_IMPORTS_START tslib,_Subject,_util_ObjectUnsubscribedError PURE_IMPORTS_END */
 
 
@@ -85217,7 +85265,7 @@ var BehaviorSubject = /*@__PURE__*/ (function (_super) {
 
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return empty; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__config__ = __webpack_require__(185);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__config__ = __webpack_require__(186);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_hostReportError__ = __webpack_require__(323);
 /** PURE_IMPORTS_START _config,_util_hostReportError PURE_IMPORTS_END */
 
@@ -85513,7 +85561,7 @@ function merge() {
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return NEVER; });
 /* harmony export (immutable) */ __webpack_exports__["a"] = never;
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_noop__ = __webpack_require__(191);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_noop__ = __webpack_require__(192);
 /** PURE_IMPORTS_START _Observable,_util_noop PURE_IMPORTS_END */
 
 
@@ -85625,7 +85673,7 @@ var RaceSubscriber = /*@__PURE__*/ (function (_super) {
 /* harmony export (immutable) */ __webpack_exports__["a"] = timer;
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__scheduler_async__ = __webpack_require__(40);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isNumeric__ = __webpack_require__(190);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isNumeric__ = __webpack_require__(191);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_isScheduler__ = __webpack_require__(49);
 /** PURE_IMPORTS_START _Observable,_scheduler_async,_util_isNumeric,_util_isScheduler PURE_IMPORTS_END */
 
@@ -85677,7 +85725,7 @@ function dispatch(state) {
 "use strict";
 /* harmony export (immutable) */ __webpack_exports__["a"] = audit;
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_tryCatch__ = __webpack_require__(56);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_tryCatch__ = __webpack_require__(57);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_errorObject__ = __webpack_require__(48);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(13);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(14);
@@ -85790,7 +85838,7 @@ function concatMap(project, resultSelector) {
 /* harmony export (immutable) */ __webpack_exports__["a"] = distinctUntilChanged;
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(56);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(57);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(48);
 /** PURE_IMPORTS_START tslib,_Subscriber,_util_tryCatch,_util_errorObject PURE_IMPORTS_END */
 
@@ -86131,7 +86179,7 @@ var InnerRefCountSubscription = /*@__PURE__*/ (function (_super) {
 /* unused harmony export ObserveOnMessage */
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Notification__ = __webpack_require__(184);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Notification__ = __webpack_require__(185);
 /** PURE_IMPORTS_START tslib,_Subscriber,_Notification PURE_IMPORTS_END */
 
 
@@ -86211,7 +86259,7 @@ var ObserveOnMessage = /*@__PURE__*/ (function () {
 /* harmony export (immutable) */ __webpack_exports__["a"] = tap;
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_noop__ = __webpack_require__(191);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_noop__ = __webpack_require__(192);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_isFunction__ = __webpack_require__(154);
 /** PURE_IMPORTS_START tslib,_Subscriber,_util_noop,_util_isFunction PURE_IMPORTS_END */
 
@@ -86607,7 +86655,7 @@ function isPromise(value) {
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__isPromise__ = __webpack_require__(445);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__isObject__ = __webpack_require__(444);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__symbol_iterator__ = __webpack_require__(151);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__symbol_observable__ = __webpack_require__(117);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__symbol_observable__ = __webpack_require__(118);
 /** PURE_IMPORTS_START _Observable,_subscribeToArray,_subscribeToPromise,_subscribeToIterable,_subscribeToObservable,_isArrayLike,_isPromise,_isObject,_symbol_iterator,_symbol_observable PURE_IMPORTS_END */
 
 
@@ -86716,7 +86764,7 @@ var subscribeToIterable = function (iterable) {
 
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return subscribeToObservable; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__symbol_observable__ = __webpack_require__(117);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__symbol_observable__ = __webpack_require__(118);
 /** PURE_IMPORTS_START _symbol_observable PURE_IMPORTS_END */
 
 var subscribeToObservable = function (obj) {
@@ -87176,7 +87224,7 @@ var utils = __webpack_require__(26);
 var Key = __webpack_require__(27);
 var PrivateKey = __webpack_require__(33);
 
-var sshpriv = __webpack_require__(192);
+var sshpriv = __webpack_require__(193);
 
 /*JSSTYLED*/
 var SSHKEY_RE = /^([a-z0-9-]+)[ \t]+([a-zA-Z0-9+\/]+[=]*)([ \t]+([^ \t][^\n]*[\n]*)?)?$/;
@@ -88321,7 +88369,7 @@ function simpleEnd(buf) {
 /***/ (function(module, exports, __webpack_require__) {
 
 var toBuffer = __webpack_require__(462)
-var alloc = __webpack_require__(380)
+var alloc = __webpack_require__(374)
 
 var ZEROS = '0000000000000000000'
 var SEVENS = '7777777777777777777'
@@ -88831,7 +88879,7 @@ exports.default = handleSignals;
 var _child;
 
 function _load_child() {
-  return _child = __webpack_require__(58);
+  return _child = __webpack_require__(50);
 }
 
 function forwardSignalAndExit(signal) {
@@ -88925,7 +88973,7 @@ module.exports = function (arg) {
 
 var util = __webpack_require__(3);
 var onExit = __webpack_require__(451);
-var currentlyUnhandled = __webpack_require__(629);
+var currentlyUnhandled = __webpack_require__(597);
 
 var installed = false;
 
@@ -88967,7 +89015,7 @@ module.exports = function (log) {
 "use strict";
 
 
-const fs = __webpack_require__(391);
+const fs = __webpack_require__(385);
 const path = __webpack_require__(0);
 const retry = __webpack_require__(819);
 const syncFs = __webpack_require__(779);
@@ -89353,4084 +89401,6 @@ module.exports.checkSync = checkSync;
 
 "use strict";
 
-
-var KEYWORDS = [
-  'multipleOf',
-  'maximum',
-  'exclusiveMaximum',
-  'minimum',
-  'exclusiveMinimum',
-  'maxLength',
-  'minLength',
-  'pattern',
-  'additionalItems',
-  'maxItems',
-  'minItems',
-  'uniqueItems',
-  'maxProperties',
-  'minProperties',
-  'required',
-  'additionalProperties',
-  'enum',
-  'format',
-  'const'
-];
-
-module.exports = function (metaSchema, keywordsJsonPointers) {
-  for (var i=0; i<keywordsJsonPointers.length; i++) {
-    metaSchema = JSON.parse(JSON.stringify(metaSchema));
-    var segments = keywordsJsonPointers[i].split('/');
-    var keywords = metaSchema;
-    var j;
-    for (j=1; j<segments.length; j++)
-      keywords = keywords[segments[j]];
-
-    for (j=0; j<KEYWORDS.length; j++) {
-      var key = KEYWORDS[j];
-      var schema = keywords[key];
-      if (schema) {
-        keywords[key] = {
-          anyOf: [
-            schema,
-            { $ref: 'https://raw.githubusercontent.com/epoberezkin/ajv/master/lib/refs/$data.json#' }
-          ]
-        };
-      }
-    }
-  }
-
-  return metaSchema;
-};
-
-
-/***/ }),
-/* 473 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var compileSchema = __webpack_require__(478)
-  , resolve = __webpack_require__(203)
-  , Cache = __webpack_require__(474)
-  , SchemaObject = __webpack_require__(339)
-  , stableStringify = __webpack_require__(389)
-  , formats = __webpack_require__(477)
-  , rules = __webpack_require__(479)
-  , $dataMetaSchema = __webpack_require__(472)
-  , patternGroups = __webpack_require__(500)
-  , util = __webpack_require__(106)
-  , co = __webpack_require__(383);
-
-module.exports = Ajv;
-
-Ajv.prototype.validate = validate;
-Ajv.prototype.compile = compile;
-Ajv.prototype.addSchema = addSchema;
-Ajv.prototype.addMetaSchema = addMetaSchema;
-Ajv.prototype.validateSchema = validateSchema;
-Ajv.prototype.getSchema = getSchema;
-Ajv.prototype.removeSchema = removeSchema;
-Ajv.prototype.addFormat = addFormat;
-Ajv.prototype.errorsText = errorsText;
-
-Ajv.prototype._addSchema = _addSchema;
-Ajv.prototype._compile = _compile;
-
-Ajv.prototype.compileAsync = __webpack_require__(476);
-var customKeyword = __webpack_require__(499);
-Ajv.prototype.addKeyword = customKeyword.add;
-Ajv.prototype.getKeyword = customKeyword.get;
-Ajv.prototype.removeKeyword = customKeyword.remove;
-
-var errorClasses = __webpack_require__(202);
-Ajv.ValidationError = errorClasses.Validation;
-Ajv.MissingRefError = errorClasses.MissingRef;
-Ajv.$dataMetaSchema = $dataMetaSchema;
-
-var META_SCHEMA_ID = 'http://json-schema.org/draft-06/schema';
-
-var META_IGNORE_OPTIONS = [ 'removeAdditional', 'useDefaults', 'coerceTypes' ];
-var META_SUPPORT_DATA = ['/properties'];
-
-/**
- * Creates validator instance.
- * Usage: `Ajv(opts)`
- * @param {Object} opts optional options
- * @return {Object} ajv instance
- */
-function Ajv(opts) {
-  if (!(this instanceof Ajv)) return new Ajv(opts);
-  opts = this._opts = util.copy(opts) || {};
-  setLogger(this);
-  this._schemas = {};
-  this._refs = {};
-  this._fragments = {};
-  this._formats = formats(opts.format);
-  var schemaUriFormat = this._schemaUriFormat = this._formats['uri-reference'];
-  this._schemaUriFormatFunc = function (str) { return schemaUriFormat.test(str); };
-
-  this._cache = opts.cache || new Cache;
-  this._loadingSchemas = {};
-  this._compilations = [];
-  this.RULES = rules();
-  this._getId = chooseGetId(opts);
-
-  opts.loopRequired = opts.loopRequired || Infinity;
-  if (opts.errorDataPath == 'property') opts._errorDataPathProperty = true;
-  if (opts.serialize === undefined) opts.serialize = stableStringify;
-  this._metaOpts = getMetaSchemaOptions(this);
-
-  if (opts.formats) addInitialFormats(this);
-  addDraft6MetaSchema(this);
-  if (typeof opts.meta == 'object') this.addMetaSchema(opts.meta);
-  addInitialSchemas(this);
-  if (opts.patternGroups) patternGroups(this);
-}
-
-
-
-/**
- * Validate data using schema
- * Schema will be compiled and cached (using serialized JSON as key. [fast-json-stable-stringify](https://github.com/epoberezkin/fast-json-stable-stringify) is used to serialize.
- * @this   Ajv
- * @param  {String|Object} schemaKeyRef key, ref or schema object
- * @param  {Any} data to be validated
- * @return {Boolean} validation result. Errors from the last validation will be available in `ajv.errors` (and also in compiled schema: `schema.errors`).
- */
-function validate(schemaKeyRef, data) {
-  var v;
-  if (typeof schemaKeyRef == 'string') {
-    v = this.getSchema(schemaKeyRef);
-    if (!v) throw new Error('no schema with key or ref "' + schemaKeyRef + '"');
-  } else {
-    var schemaObj = this._addSchema(schemaKeyRef);
-    v = schemaObj.validate || this._compile(schemaObj);
-  }
-
-  var valid = v(data);
-  if (v.$async === true)
-    return this._opts.async == '*' ? co(valid) : valid;
-  this.errors = v.errors;
-  return valid;
-}
-
-
-/**
- * Create validating function for passed schema.
- * @this   Ajv
- * @param  {Object} schema schema object
- * @param  {Boolean} _meta true if schema is a meta-schema. Used internally to compile meta schemas of custom keywords.
- * @return {Function} validating function
- */
-function compile(schema, _meta) {
-  var schemaObj = this._addSchema(schema, undefined, _meta);
-  return schemaObj.validate || this._compile(schemaObj);
-}
-
-
-/**
- * Adds schema to the instance.
- * @this   Ajv
- * @param {Object|Array} schema schema or array of schemas. If array is passed, `key` and other parameters will be ignored.
- * @param {String} key Optional schema key. Can be passed to `validate` method instead of schema object or id/ref. One schema per instance can have empty `id` and `key`.
- * @param {Boolean} _skipValidation true to skip schema validation. Used internally, option validateSchema should be used instead.
- * @param {Boolean} _meta true if schema is a meta-schema. Used internally, addMetaSchema should be used instead.
- * @return {Ajv} this for method chaining
- */
-function addSchema(schema, key, _skipValidation, _meta) {
-  if (Array.isArray(schema)){
-    for (var i=0; i<schema.length; i++) this.addSchema(schema[i], undefined, _skipValidation, _meta);
-    return this;
-  }
-  var id = this._getId(schema);
-  if (id !== undefined && typeof id != 'string')
-    throw new Error('schema id must be string');
-  key = resolve.normalizeId(key || id);
-  checkUnique(this, key);
-  this._schemas[key] = this._addSchema(schema, _skipValidation, _meta, true);
-  return this;
-}
-
-
-/**
- * Add schema that will be used to validate other schemas
- * options in META_IGNORE_OPTIONS are alway set to false
- * @this   Ajv
- * @param {Object} schema schema object
- * @param {String} key optional schema key
- * @param {Boolean} skipValidation true to skip schema validation, can be used to override validateSchema option for meta-schema
- * @return {Ajv} this for method chaining
- */
-function addMetaSchema(schema, key, skipValidation) {
-  this.addSchema(schema, key, skipValidation, true);
-  return this;
-}
-
-
-/**
- * Validate schema
- * @this   Ajv
- * @param {Object} schema schema to validate
- * @param {Boolean} throwOrLogError pass true to throw (or log) an error if invalid
- * @return {Boolean} true if schema is valid
- */
-function validateSchema(schema, throwOrLogError) {
-  var $schema = schema.$schema;
-  if ($schema !== undefined && typeof $schema != 'string')
-    throw new Error('$schema must be a string');
-  $schema = $schema || this._opts.defaultMeta || defaultMeta(this);
-  if (!$schema) {
-    this.logger.warn('meta-schema not available');
-    this.errors = null;
-    return true;
-  }
-  var currentUriFormat = this._formats.uri;
-  this._formats.uri = typeof currentUriFormat == 'function'
-                      ? this._schemaUriFormatFunc
-                      : this._schemaUriFormat;
-  var valid;
-  try { valid = this.validate($schema, schema); }
-  finally { this._formats.uri = currentUriFormat; }
-  if (!valid && throwOrLogError) {
-    var message = 'schema is invalid: ' + this.errorsText();
-    if (this._opts.validateSchema == 'log') this.logger.error(message);
-    else throw new Error(message);
-  }
-  return valid;
-}
-
-
-function defaultMeta(self) {
-  var meta = self._opts.meta;
-  self._opts.defaultMeta = typeof meta == 'object'
-                            ? self._getId(meta) || meta
-                            : self.getSchema(META_SCHEMA_ID)
-                              ? META_SCHEMA_ID
-                              : undefined;
-  return self._opts.defaultMeta;
-}
-
-
-/**
- * Get compiled schema from the instance by `key` or `ref`.
- * @this   Ajv
- * @param  {String} keyRef `key` that was passed to `addSchema` or full schema reference (`schema.id` or resolved id).
- * @return {Function} schema validating function (with property `schema`).
- */
-function getSchema(keyRef) {
-  var schemaObj = _getSchemaObj(this, keyRef);
-  switch (typeof schemaObj) {
-    case 'object': return schemaObj.validate || this._compile(schemaObj);
-    case 'string': return this.getSchema(schemaObj);
-    case 'undefined': return _getSchemaFragment(this, keyRef);
-  }
-}
-
-
-function _getSchemaFragment(self, ref) {
-  var res = resolve.schema.call(self, { schema: {} }, ref);
-  if (res) {
-    var schema = res.schema
-      , root = res.root
-      , baseId = res.baseId;
-    var v = compileSchema.call(self, schema, root, undefined, baseId);
-    self._fragments[ref] = new SchemaObject({
-      ref: ref,
-      fragment: true,
-      schema: schema,
-      root: root,
-      baseId: baseId,
-      validate: v
-    });
-    return v;
-  }
-}
-
-
-function _getSchemaObj(self, keyRef) {
-  keyRef = resolve.normalizeId(keyRef);
-  return self._schemas[keyRef] || self._refs[keyRef] || self._fragments[keyRef];
-}
-
-
-/**
- * Remove cached schema(s).
- * If no parameter is passed all schemas but meta-schemas are removed.
- * If RegExp is passed all schemas with key/id matching pattern but meta-schemas are removed.
- * Even if schema is referenced by other schemas it still can be removed as other schemas have local references.
- * @this   Ajv
- * @param  {String|Object|RegExp} schemaKeyRef key, ref, pattern to match key/ref or schema object
- * @return {Ajv} this for method chaining
- */
-function removeSchema(schemaKeyRef) {
-  if (schemaKeyRef instanceof RegExp) {
-    _removeAllSchemas(this, this._schemas, schemaKeyRef);
-    _removeAllSchemas(this, this._refs, schemaKeyRef);
-    return this;
-  }
-  switch (typeof schemaKeyRef) {
-    case 'undefined':
-      _removeAllSchemas(this, this._schemas);
-      _removeAllSchemas(this, this._refs);
-      this._cache.clear();
-      return this;
-    case 'string':
-      var schemaObj = _getSchemaObj(this, schemaKeyRef);
-      if (schemaObj) this._cache.del(schemaObj.cacheKey);
-      delete this._schemas[schemaKeyRef];
-      delete this._refs[schemaKeyRef];
-      return this;
-    case 'object':
-      var serialize = this._opts.serialize;
-      var cacheKey = serialize ? serialize(schemaKeyRef) : schemaKeyRef;
-      this._cache.del(cacheKey);
-      var id = this._getId(schemaKeyRef);
-      if (id) {
-        id = resolve.normalizeId(id);
-        delete this._schemas[id];
-        delete this._refs[id];
-      }
-  }
-  return this;
-}
-
-
-function _removeAllSchemas(self, schemas, regex) {
-  for (var keyRef in schemas) {
-    var schemaObj = schemas[keyRef];
-    if (!schemaObj.meta && (!regex || regex.test(keyRef))) {
-      self._cache.del(schemaObj.cacheKey);
-      delete schemas[keyRef];
-    }
-  }
-}
-
-
-/* @this   Ajv */
-function _addSchema(schema, skipValidation, meta, shouldAddSchema) {
-  if (typeof schema != 'object' && typeof schema != 'boolean')
-    throw new Error('schema should be object or boolean');
-  var serialize = this._opts.serialize;
-  var cacheKey = serialize ? serialize(schema) : schema;
-  var cached = this._cache.get(cacheKey);
-  if (cached) return cached;
-
-  shouldAddSchema = shouldAddSchema || this._opts.addUsedSchema !== false;
-
-  var id = resolve.normalizeId(this._getId(schema));
-  if (id && shouldAddSchema) checkUnique(this, id);
-
-  var willValidate = this._opts.validateSchema !== false && !skipValidation;
-  var recursiveMeta;
-  if (willValidate && !(recursiveMeta = id && id == resolve.normalizeId(schema.$schema)))
-    this.validateSchema(schema, true);
-
-  var localRefs = resolve.ids.call(this, schema);
-
-  var schemaObj = new SchemaObject({
-    id: id,
-    schema: schema,
-    localRefs: localRefs,
-    cacheKey: cacheKey,
-    meta: meta
-  });
-
-  if (id[0] != '#' && shouldAddSchema) this._refs[id] = schemaObj;
-  this._cache.put(cacheKey, schemaObj);
-
-  if (willValidate && recursiveMeta) this.validateSchema(schema, true);
-
-  return schemaObj;
-}
-
-
-/* @this   Ajv */
-function _compile(schemaObj, root) {
-  if (schemaObj.compiling) {
-    schemaObj.validate = callValidate;
-    callValidate.schema = schemaObj.schema;
-    callValidate.errors = null;
-    callValidate.root = root ? root : callValidate;
-    if (schemaObj.schema.$async === true)
-      callValidate.$async = true;
-    return callValidate;
-  }
-  schemaObj.compiling = true;
-
-  var currentOpts;
-  if (schemaObj.meta) {
-    currentOpts = this._opts;
-    this._opts = this._metaOpts;
-  }
-
-  var v;
-  try { v = compileSchema.call(this, schemaObj.schema, root, schemaObj.localRefs); }
-  finally {
-    schemaObj.compiling = false;
-    if (schemaObj.meta) this._opts = currentOpts;
-  }
-
-  schemaObj.validate = v;
-  schemaObj.refs = v.refs;
-  schemaObj.refVal = v.refVal;
-  schemaObj.root = v.root;
-  return v;
-
-
-  function callValidate() {
-    var _validate = schemaObj.validate;
-    var result = _validate.apply(null, arguments);
-    callValidate.errors = _validate.errors;
-    return result;
-  }
-}
-
-
-function chooseGetId(opts) {
-  switch (opts.schemaId) {
-    case '$id': return _get$Id;
-    case 'id': return _getId;
-    default: return _get$IdOrId;
-  }
-}
-
-/* @this   Ajv */
-function _getId(schema) {
-  if (schema.$id) this.logger.warn('schema $id ignored', schema.$id);
-  return schema.id;
-}
-
-/* @this   Ajv */
-function _get$Id(schema) {
-  if (schema.id) this.logger.warn('schema id ignored', schema.id);
-  return schema.$id;
-}
-
-
-function _get$IdOrId(schema) {
-  if (schema.$id && schema.id && schema.$id != schema.id)
-    throw new Error('schema $id is different from id');
-  return schema.$id || schema.id;
-}
-
-
-/**
- * Convert array of error message objects to string
- * @this   Ajv
- * @param  {Array<Object>} errors optional array of validation errors, if not passed errors from the instance are used.
- * @param  {Object} options optional options with properties `separator` and `dataVar`.
- * @return {String} human readable string with all errors descriptions
- */
-function errorsText(errors, options) {
-  errors = errors || this.errors;
-  if (!errors) return 'No errors';
-  options = options || {};
-  var separator = options.separator === undefined ? ', ' : options.separator;
-  var dataVar = options.dataVar === undefined ? 'data' : options.dataVar;
-
-  var text = '';
-  for (var i=0; i<errors.length; i++) {
-    var e = errors[i];
-    if (e) text += dataVar + e.dataPath + ' ' + e.message + separator;
-  }
-  return text.slice(0, -separator.length);
-}
-
-
-/**
- * Add custom format
- * @this   Ajv
- * @param {String} name format name
- * @param {String|RegExp|Function} format string is converted to RegExp; function should return boolean (true when valid)
- * @return {Ajv} this for method chaining
- */
-function addFormat(name, format) {
-  if (typeof format == 'string') format = new RegExp(format);
-  this._formats[name] = format;
-  return this;
-}
-
-
-function addDraft6MetaSchema(self) {
-  var $dataSchema;
-  if (self._opts.$data) {
-    $dataSchema = __webpack_require__(501);
-    self.addMetaSchema($dataSchema, $dataSchema.$id, true);
-  }
-  if (self._opts.meta === false) return;
-  var metaSchema = __webpack_require__(502);
-  if (self._opts.$data) metaSchema = $dataMetaSchema(metaSchema, META_SUPPORT_DATA);
-  self.addMetaSchema(metaSchema, META_SCHEMA_ID, true);
-  self._refs['http://json-schema.org/schema'] = META_SCHEMA_ID;
-}
-
-
-function addInitialSchemas(self) {
-  var optsSchemas = self._opts.schemas;
-  if (!optsSchemas) return;
-  if (Array.isArray(optsSchemas)) self.addSchema(optsSchemas);
-  else for (var key in optsSchemas) self.addSchema(optsSchemas[key], key);
-}
-
-
-function addInitialFormats(self) {
-  for (var name in self._opts.formats) {
-    var format = self._opts.formats[name];
-    self.addFormat(name, format);
-  }
-}
-
-
-function checkUnique(self, id) {
-  if (self._schemas[id] || self._refs[id])
-    throw new Error('schema with key or id "' + id + '" already exists');
-}
-
-
-function getMetaSchemaOptions(self) {
-  var metaOpts = util.copy(self._opts);
-  for (var i=0; i<META_IGNORE_OPTIONS.length; i++)
-    delete metaOpts[META_IGNORE_OPTIONS[i]];
-  return metaOpts;
-}
-
-
-function setLogger(self) {
-  var logger = self._opts.logger;
-  if (logger === false) {
-    self.logger = {log: noop, warn: noop, error: noop};
-  } else {
-    if (logger === undefined) logger = console;
-    if (!(typeof logger == 'object' && logger.log && logger.warn && logger.error))
-      throw new Error('logger must implement log, warn and error methods');
-    self.logger = logger;
-  }
-}
-
-
-function noop() {}
-
-
-/***/ }),
-/* 474 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-
-var Cache = module.exports = function Cache() {
-  this._cache = {};
-};
-
-
-Cache.prototype.put = function Cache_put(key, value) {
-  this._cache[key] = value;
-};
-
-
-Cache.prototype.get = function Cache_get(key) {
-  return this._cache[key];
-};
-
-
-Cache.prototype.del = function Cache_del(key) {
-  delete this._cache[key];
-};
-
-
-Cache.prototype.clear = function Cache_clear() {
-  this._cache = {};
-};
-
-
-/***/ }),
-/* 475 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-//all requires must be explicit because browserify won't work with dynamic requires
-module.exports = {
-  '$ref': __webpack_require__(496),
-  allOf: __webpack_require__(481),
-  anyOf: __webpack_require__(482),
-  const: __webpack_require__(483),
-  contains: __webpack_require__(484),
-  dependencies: __webpack_require__(486),
-  'enum': __webpack_require__(487),
-  format: __webpack_require__(488),
-  items: __webpack_require__(489),
-  maximum: __webpack_require__(340),
-  minimum: __webpack_require__(340),
-  maxItems: __webpack_require__(341),
-  minItems: __webpack_require__(341),
-  maxLength: __webpack_require__(342),
-  minLength: __webpack_require__(342),
-  maxProperties: __webpack_require__(343),
-  minProperties: __webpack_require__(343),
-  multipleOf: __webpack_require__(490),
-  not: __webpack_require__(491),
-  oneOf: __webpack_require__(492),
-  pattern: __webpack_require__(493),
-  properties: __webpack_require__(494),
-  propertyNames: __webpack_require__(495),
-  required: __webpack_require__(497),
-  uniqueItems: __webpack_require__(498),
-  validate: __webpack_require__(344)
-};
-
-
-/***/ }),
-/* 476 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var MissingRefError = __webpack_require__(202).MissingRef;
-
-module.exports = compileAsync;
-
-
-/**
- * Creates validating function for passed schema with asynchronous loading of missing schemas.
- * `loadSchema` option should be a function that accepts schema uri and returns promise that resolves with the schema.
- * @this  Ajv
- * @param {Object}   schema schema object
- * @param {Boolean}  meta optional true to compile meta-schema; this parameter can be skipped
- * @param {Function} callback an optional node-style callback, it is called with 2 parameters: error (or null) and validating function.
- * @return {Promise} promise that resolves with a validating function.
- */
-function compileAsync(schema, meta, callback) {
-  /* eslint no-shadow: 0 */
-  /* global Promise */
-  /* jshint validthis: true */
-  var self = this;
-  if (typeof this._opts.loadSchema != 'function')
-    throw new Error('options.loadSchema should be a function');
-
-  if (typeof meta == 'function') {
-    callback = meta;
-    meta = undefined;
-  }
-
-  var p = loadMetaSchemaOf(schema).then(function () {
-    var schemaObj = self._addSchema(schema, undefined, meta);
-    return schemaObj.validate || _compileAsync(schemaObj);
-  });
-
-  if (callback) {
-    p.then(
-      function(v) { callback(null, v); },
-      callback
-    );
-  }
-
-  return p;
-
-
-  function loadMetaSchemaOf(sch) {
-    var $schema = sch.$schema;
-    return $schema && !self.getSchema($schema)
-            ? compileAsync.call(self, { $ref: $schema }, true)
-            : Promise.resolve();
-  }
-
-
-  function _compileAsync(schemaObj) {
-    try { return self._compile(schemaObj); }
-    catch(e) {
-      if (e instanceof MissingRefError) return loadMissingSchema(e);
-      throw e;
-    }
-
-
-    function loadMissingSchema(e) {
-      var ref = e.missingSchema;
-      if (added(ref)) throw new Error('Schema ' + ref + ' is loaded but ' + e.missingRef + ' cannot be resolved');
-
-      var schemaPromise = self._loadingSchemas[ref];
-      if (!schemaPromise) {
-        schemaPromise = self._loadingSchemas[ref] = self._opts.loadSchema(ref);
-        schemaPromise.then(removePromise, removePromise);
-      }
-
-      return schemaPromise.then(function (sch) {
-        if (!added(ref)) {
-          return loadMetaSchemaOf(sch).then(function () {
-            if (!added(ref)) self.addSchema(sch, ref, undefined, meta);
-          });
-        }
-      }).then(function() {
-        return _compileAsync(schemaObj);
-      });
-
-      function removePromise() {
-        delete self._loadingSchemas[ref];
-      }
-
-      function added(ref) {
-        return self._refs[ref] || self._schemas[ref];
-      }
-    }
-  }
-}
-
-
-/***/ }),
-/* 477 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var util = __webpack_require__(106);
-
-var DATE = /^\d\d\d\d-(\d\d)-(\d\d)$/;
-var DAYS = [0,31,29,31,30,31,30,31,31,30,31,30,31];
-var TIME = /^(\d\d):(\d\d):(\d\d)(\.\d+)?(z|[+-]\d\d:\d\d)?$/i;
-var HOSTNAME = /^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?(?:\.[a-z0-9](?:[-0-9a-z]{0,61}[0-9a-z])?)*$/i;
-var URI = /^(?:[a-z][a-z0-9+\-.]*:)(?:\/?\/(?:(?:[a-z0-9\-._~!$&'()*+,;=:]|%[0-9a-f]{2})*@)?(?:\[(?:(?:(?:(?:[0-9a-f]{1,4}:){6}|::(?:[0-9a-f]{1,4}:){5}|(?:[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){4}|(?:(?:[0-9a-f]{1,4}:){0,1}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){3}|(?:(?:[0-9a-f]{1,4}:){0,2}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){2}|(?:(?:[0-9a-f]{1,4}:){0,3}[0-9a-f]{1,4})?::[0-9a-f]{1,4}:|(?:(?:[0-9a-f]{1,4}:){0,4}[0-9a-f]{1,4})?::)(?:[0-9a-f]{1,4}:[0-9a-f]{1,4}|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?))|(?:(?:[0-9a-f]{1,4}:){0,5}[0-9a-f]{1,4})?::[0-9a-f]{1,4}|(?:(?:[0-9a-f]{1,4}:){0,6}[0-9a-f]{1,4})?::)|[Vv][0-9a-f]+\.[a-z0-9\-._~!$&'()*+,;=:]+)\]|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?)|(?:[a-z0-9\-._~!$&'()*+,;=]|%[0-9a-f]{2})*)(?::\d*)?(?:\/(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})*)*|\/(?:(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})*)*)?|(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})*)*)(?:\?(?:[a-z0-9\-._~!$&'()*+,;=:@/?]|%[0-9a-f]{2})*)?(?:#(?:[a-z0-9\-._~!$&'()*+,;=:@/?]|%[0-9a-f]{2})*)?$/i;
-var URIREF = /^(?:[a-z][a-z0-9+\-.]*:)?(?:\/?\/(?:(?:[a-z0-9\-._~!$&'()*+,;=:]|%[0-9a-f]{2})*@)?(?:\[(?:(?:(?:(?:[0-9a-f]{1,4}:){6}|::(?:[0-9a-f]{1,4}:){5}|(?:[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){4}|(?:(?:[0-9a-f]{1,4}:){0,1}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){3}|(?:(?:[0-9a-f]{1,4}:){0,2}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){2}|(?:(?:[0-9a-f]{1,4}:){0,3}[0-9a-f]{1,4})?::[0-9a-f]{1,4}:|(?:(?:[0-9a-f]{1,4}:){0,4}[0-9a-f]{1,4})?::)(?:[0-9a-f]{1,4}:[0-9a-f]{1,4}|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?))|(?:(?:[0-9a-f]{1,4}:){0,5}[0-9a-f]{1,4})?::[0-9a-f]{1,4}|(?:(?:[0-9a-f]{1,4}:){0,6}[0-9a-f]{1,4})?::)|[Vv][0-9a-f]+\.[a-z0-9\-._~!$&'()*+,;=:]+)\]|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?)|(?:[a-z0-9\-._~!$&'"()*+,;=]|%[0-9a-f]{2})*)(?::\d*)?(?:\/(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})*)*|\/(?:(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})*)*)?|(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})*)*)?(?:\?(?:[a-z0-9\-._~!$&'"()*+,;=:@/?]|%[0-9a-f]{2})*)?(?:#(?:[a-z0-9\-._~!$&'"()*+,;=:@/?]|%[0-9a-f]{2})*)?$/i;
-// uri-template: https://tools.ietf.org/html/rfc6570
-var URITEMPLATE = /^(?:(?:[^\x00-\x20"'<>%\\^`{|}]|%[0-9a-f]{2})|\{[+#./;?&=,!@|]?(?:[a-z0-9_]|%[0-9a-f]{2})+(?::[1-9][0-9]{0,3}|\*)?(?:,(?:[a-z0-9_]|%[0-9a-f]{2})+(?::[1-9][0-9]{0,3}|\*)?)*\})*$/i;
-// For the source: https://gist.github.com/dperini/729294
-// For test cases: https://mathiasbynens.be/demo/url-regex
-// @todo Delete current URL in favour of the commented out URL rule when this issue is fixed https://github.com/eslint/eslint/issues/7983.
-// var URL = /^(?:(?:https?|ftp):\/\/)(?:\S+(?::\S*)?@)?(?:(?!10(?:\.\d{1,3}){3})(?!127(?:\.\d{1,3}){3})(?!169\.254(?:\.\d{1,3}){2})(?!192\.168(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u{00a1}-\u{ffff}0-9]+-?)*[a-z\u{00a1}-\u{ffff}0-9]+)(?:\.(?:[a-z\u{00a1}-\u{ffff}0-9]+-?)*[a-z\u{00a1}-\u{ffff}0-9]+)*(?:\.(?:[a-z\u{00a1}-\u{ffff}]{2,})))(?::\d{2,5})?(?:\/[^\s]*)?$/iu;
-var URL = /^(?:(?:http[s\u017F]?|ftp):\/\/)(?:(?:[\0-\x08\x0E-\x1F!-\x9F\xA1-\u167F\u1681-\u1FFF\u200B-\u2027\u202A-\u202E\u2030-\u205E\u2060-\u2FFF\u3001-\uD7FF\uE000-\uFEFE\uFF00-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+(?::(?:[\0-\x08\x0E-\x1F!-\x9F\xA1-\u167F\u1681-\u1FFF\u200B-\u2027\u202A-\u202E\u2030-\u205E\u2060-\u2FFF\u3001-\uD7FF\uE000-\uFEFE\uFF00-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])*)?@)?(?:(?!10(?:\.[0-9]{1,3}){3})(?!127(?:\.[0-9]{1,3}){3})(?!169\.254(?:\.[0-9]{1,3}){2})(?!192\.168(?:\.[0-9]{1,3}){2})(?!172\.(?:1[6-9]|2[0-9]|3[01])(?:\.[0-9]{1,3}){2})(?:[1-9][0-9]?|1[0-9][0-9]|2[01][0-9]|22[0-3])(?:\.(?:1?[0-9]{1,2}|2[0-4][0-9]|25[0-5])){2}(?:\.(?:[1-9][0-9]?|1[0-9][0-9]|2[0-4][0-9]|25[0-4]))|(?:(?:(?:[0-9KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+-?)*(?:[0-9KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+)(?:\.(?:(?:[0-9KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+-?)*(?:[0-9KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+)*(?:\.(?:(?:[KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]){2,})))(?::[0-9]{2,5})?(?:\/(?:[\0-\x08\x0E-\x1F!-\x9F\xA1-\u167F\u1681-\u1FFF\u200B-\u2027\u202A-\u202E\u2030-\u205E\u2060-\u2FFF\u3001-\uD7FF\uE000-\uFEFE\uFF00-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])*)?$/i;
-var UUID = /^(?:urn:uuid:)?[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}$/i;
-var JSON_POINTER = /^(?:\/(?:[^~/]|~0|~1)*)*$|^#(?:\/(?:[a-z0-9_\-.!$&'()*+,;:=@]|%[0-9a-f]{2}|~0|~1)*)*$/i;
-var RELATIVE_JSON_POINTER = /^(?:0|[1-9][0-9]*)(?:#|(?:\/(?:[^~/]|~0|~1)*)*)$/;
-
-
-module.exports = formats;
-
-function formats(mode) {
-  mode = mode == 'full' ? 'full' : 'fast';
-  return util.copy(formats[mode]);
-}
-
-
-formats.fast = {
-  // date: http://tools.ietf.org/html/rfc3339#section-5.6
-  date: /^\d\d\d\d-[0-1]\d-[0-3]\d$/,
-  // date-time: http://tools.ietf.org/html/rfc3339#section-5.6
-  time: /^[0-2]\d:[0-5]\d:[0-5]\d(?:\.\d+)?(?:z|[+-]\d\d:\d\d)?$/i,
-  'date-time': /^\d\d\d\d-[0-1]\d-[0-3]\d[t\s][0-2]\d:[0-5]\d:[0-5]\d(?:\.\d+)?(?:z|[+-]\d\d:\d\d)$/i,
-  // uri: https://github.com/mafintosh/is-my-json-valid/blob/master/formats.js
-  uri: /^(?:[a-z][a-z0-9+-.]*)(?::|\/)\/?[^\s]*$/i,
-  'uri-reference': /^(?:(?:[a-z][a-z0-9+-.]*:)?\/\/)?[^\s]*$/i,
-  'uri-template': URITEMPLATE,
-  url: URL,
-  // email (sources from jsen validator):
-  // http://stackoverflow.com/questions/201323/using-a-regular-expression-to-validate-an-email-address#answer-8829363
-  // http://www.w3.org/TR/html5/forms.html#valid-e-mail-address (search for 'willful violation')
-  email: /^[a-z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?(?:\.[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?)*$/i,
-  hostname: HOSTNAME,
-  // optimized https://www.safaribooksonline.com/library/view/regular-expressions-cookbook/9780596802837/ch07s16.html
-  ipv4: /^(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?)$/,
-  // optimized http://stackoverflow.com/questions/53497/regular-expression-that-matches-valid-ipv6-addresses
-  ipv6: /^\s*(?:(?:(?:[0-9a-f]{1,4}:){7}(?:[0-9a-f]{1,4}|:))|(?:(?:[0-9a-f]{1,4}:){6}(?::[0-9a-f]{1,4}|(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(?:(?:[0-9a-f]{1,4}:){5}(?:(?:(?::[0-9a-f]{1,4}){1,2})|:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(?:(?:[0-9a-f]{1,4}:){4}(?:(?:(?::[0-9a-f]{1,4}){1,3})|(?:(?::[0-9a-f]{1,4})?:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){3}(?:(?:(?::[0-9a-f]{1,4}){1,4})|(?:(?::[0-9a-f]{1,4}){0,2}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){2}(?:(?:(?::[0-9a-f]{1,4}){1,5})|(?:(?::[0-9a-f]{1,4}){0,3}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){1}(?:(?:(?::[0-9a-f]{1,4}){1,6})|(?:(?::[0-9a-f]{1,4}){0,4}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?::(?:(?:(?::[0-9a-f]{1,4}){1,7})|(?:(?::[0-9a-f]{1,4}){0,5}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(?:%.+)?\s*$/i,
-  regex: regex,
-  // uuid: http://tools.ietf.org/html/rfc4122
-  uuid: UUID,
-  // JSON-pointer: https://tools.ietf.org/html/rfc6901
-  // uri fragment: https://tools.ietf.org/html/rfc3986#appendix-A
-  'json-pointer': JSON_POINTER,
-  // relative JSON-pointer: http://tools.ietf.org/html/draft-luff-relative-json-pointer-00
-  'relative-json-pointer': RELATIVE_JSON_POINTER
-};
-
-
-formats.full = {
-  date: date,
-  time: time,
-  'date-time': date_time,
-  uri: uri,
-  'uri-reference': URIREF,
-  'uri-template': URITEMPLATE,
-  url: URL,
-  email: /^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&''*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/i,
-  hostname: hostname,
-  ipv4: /^(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?)$/,
-  ipv6: /^\s*(?:(?:(?:[0-9a-f]{1,4}:){7}(?:[0-9a-f]{1,4}|:))|(?:(?:[0-9a-f]{1,4}:){6}(?::[0-9a-f]{1,4}|(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(?:(?:[0-9a-f]{1,4}:){5}(?:(?:(?::[0-9a-f]{1,4}){1,2})|:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(?:(?:[0-9a-f]{1,4}:){4}(?:(?:(?::[0-9a-f]{1,4}){1,3})|(?:(?::[0-9a-f]{1,4})?:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){3}(?:(?:(?::[0-9a-f]{1,4}){1,4})|(?:(?::[0-9a-f]{1,4}){0,2}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){2}(?:(?:(?::[0-9a-f]{1,4}){1,5})|(?:(?::[0-9a-f]{1,4}){0,3}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){1}(?:(?:(?::[0-9a-f]{1,4}){1,6})|(?:(?::[0-9a-f]{1,4}){0,4}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?::(?:(?:(?::[0-9a-f]{1,4}){1,7})|(?:(?::[0-9a-f]{1,4}){0,5}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(?:%.+)?\s*$/i,
-  regex: regex,
-  uuid: UUID,
-  'json-pointer': JSON_POINTER,
-  'relative-json-pointer': RELATIVE_JSON_POINTER
-};
-
-
-function date(str) {
-  // full-date from http://tools.ietf.org/html/rfc3339#section-5.6
-  var matches = str.match(DATE);
-  if (!matches) return false;
-
-  var month = +matches[1];
-  var day = +matches[2];
-  return month >= 1 && month <= 12 && day >= 1 && day <= DAYS[month];
-}
-
-
-function time(str, full) {
-  var matches = str.match(TIME);
-  if (!matches) return false;
-
-  var hour = matches[1];
-  var minute = matches[2];
-  var second = matches[3];
-  var timeZone = matches[5];
-  return hour <= 23 && minute <= 59 && second <= 59 && (!full || timeZone);
-}
-
-
-var DATE_TIME_SEPARATOR = /t|\s/i;
-function date_time(str) {
-  // http://tools.ietf.org/html/rfc3339#section-5.6
-  var dateTime = str.split(DATE_TIME_SEPARATOR);
-  return dateTime.length == 2 && date(dateTime[0]) && time(dateTime[1], true);
-}
-
-
-function hostname(str) {
-  // https://tools.ietf.org/html/rfc1034#section-3.5
-  // https://tools.ietf.org/html/rfc1123#section-2
-  return str.length <= 255 && HOSTNAME.test(str);
-}
-
-
-var NOT_URI_FRAGMENT = /\/|:/;
-function uri(str) {
-  // http://jmrware.com/articles/2009/uri_regexp/URI_regex.html + optional protocol + required "."
-  return NOT_URI_FRAGMENT.test(str) && URI.test(str);
-}
-
-
-var Z_ANCHOR = /[^\\]\\Z/;
-function regex(str) {
-  if (Z_ANCHOR.test(str)) return false;
-  try {
-    new RegExp(str);
-    return true;
-  } catch(e) {
-    return false;
-  }
-}
-
-
-/***/ }),
-/* 478 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var resolve = __webpack_require__(203)
-  , util = __webpack_require__(106)
-  , errorClasses = __webpack_require__(202)
-  , stableStringify = __webpack_require__(389);
-
-var validateGenerator = __webpack_require__(344);
-
-/**
- * Functions below are used inside compiled validations function
- */
-
-var co = __webpack_require__(383);
-var ucs2length = util.ucs2length;
-var equal = __webpack_require__(204);
-
-// this error is thrown by async schemas to return validation errors via exception
-var ValidationError = errorClasses.Validation;
-
-module.exports = compile;
-
-
-/**
- * Compiles schema to validation function
- * @this   Ajv
- * @param  {Object} schema schema object
- * @param  {Object} root object with information about the root schema for this schema
- * @param  {Object} localRefs the hash of local references inside the schema (created by resolve.id), used for inline resolution
- * @param  {String} baseId base ID for IDs in the schema
- * @return {Function} validation function
- */
-function compile(schema, root, localRefs, baseId) {
-  /* jshint validthis: true, evil: true */
-  /* eslint no-shadow: 0 */
-  var self = this
-    , opts = this._opts
-    , refVal = [ undefined ]
-    , refs = {}
-    , patterns = []
-    , patternsHash = {}
-    , defaults = []
-    , defaultsHash = {}
-    , customRules = [];
-
-  root = root || { schema: schema, refVal: refVal, refs: refs };
-
-  var c = checkCompiling.call(this, schema, root, baseId);
-  var compilation = this._compilations[c.index];
-  if (c.compiling) return (compilation.callValidate = callValidate);
-
-  var formats = this._formats;
-  var RULES = this.RULES;
-
-  try {
-    var v = localCompile(schema, root, localRefs, baseId);
-    compilation.validate = v;
-    var cv = compilation.callValidate;
-    if (cv) {
-      cv.schema = v.schema;
-      cv.errors = null;
-      cv.refs = v.refs;
-      cv.refVal = v.refVal;
-      cv.root = v.root;
-      cv.$async = v.$async;
-      if (opts.sourceCode) cv.source = v.source;
-    }
-    return v;
-  } finally {
-    endCompiling.call(this, schema, root, baseId);
-  }
-
-  function callValidate() {
-    var validate = compilation.validate;
-    var result = validate.apply(null, arguments);
-    callValidate.errors = validate.errors;
-    return result;
-  }
-
-  function localCompile(_schema, _root, localRefs, baseId) {
-    var isRoot = !_root || (_root && _root.schema == _schema);
-    if (_root.schema != root.schema)
-      return compile.call(self, _schema, _root, localRefs, baseId);
-
-    var $async = _schema.$async === true;
-
-    var sourceCode = validateGenerator({
-      isTop: true,
-      schema: _schema,
-      isRoot: isRoot,
-      baseId: baseId,
-      root: _root,
-      schemaPath: '',
-      errSchemaPath: '#',
-      errorPath: '""',
-      MissingRefError: errorClasses.MissingRef,
-      RULES: RULES,
-      validate: validateGenerator,
-      util: util,
-      resolve: resolve,
-      resolveRef: resolveRef,
-      usePattern: usePattern,
-      useDefault: useDefault,
-      useCustomRule: useCustomRule,
-      opts: opts,
-      formats: formats,
-      logger: self.logger,
-      self: self
-    });
-
-    sourceCode = vars(refVal, refValCode) + vars(patterns, patternCode)
-                   + vars(defaults, defaultCode) + vars(customRules, customRuleCode)
-                   + sourceCode;
-
-    if (opts.processCode) sourceCode = opts.processCode(sourceCode);
-    // console.log('\n\n\n *** \n', JSON.stringify(sourceCode));
-    var validate;
-    try {
-      var makeValidate = new Function(
-        'self',
-        'RULES',
-        'formats',
-        'root',
-        'refVal',
-        'defaults',
-        'customRules',
-        'co',
-        'equal',
-        'ucs2length',
-        'ValidationError',
-        sourceCode
-      );
-
-      validate = makeValidate(
-        self,
-        RULES,
-        formats,
-        root,
-        refVal,
-        defaults,
-        customRules,
-        co,
-        equal,
-        ucs2length,
-        ValidationError
-      );
-
-      refVal[0] = validate;
-    } catch(e) {
-      self.logger.error('Error compiling schema, function code:', sourceCode);
-      throw e;
-    }
-
-    validate.schema = _schema;
-    validate.errors = null;
-    validate.refs = refs;
-    validate.refVal = refVal;
-    validate.root = isRoot ? validate : _root;
-    if ($async) validate.$async = true;
-    if (opts.sourceCode === true) {
-      validate.source = {
-        code: sourceCode,
-        patterns: patterns,
-        defaults: defaults
-      };
-    }
-
-    return validate;
-  }
-
-  function resolveRef(baseId, ref, isRoot) {
-    ref = resolve.url(baseId, ref);
-    var refIndex = refs[ref];
-    var _refVal, refCode;
-    if (refIndex !== undefined) {
-      _refVal = refVal[refIndex];
-      refCode = 'refVal[' + refIndex + ']';
-      return resolvedRef(_refVal, refCode);
-    }
-    if (!isRoot && root.refs) {
-      var rootRefId = root.refs[ref];
-      if (rootRefId !== undefined) {
-        _refVal = root.refVal[rootRefId];
-        refCode = addLocalRef(ref, _refVal);
-        return resolvedRef(_refVal, refCode);
-      }
-    }
-
-    refCode = addLocalRef(ref);
-    var v = resolve.call(self, localCompile, root, ref);
-    if (v === undefined) {
-      var localSchema = localRefs && localRefs[ref];
-      if (localSchema) {
-        v = resolve.inlineRef(localSchema, opts.inlineRefs)
-            ? localSchema
-            : compile.call(self, localSchema, root, localRefs, baseId);
-      }
-    }
-
-    if (v === undefined) {
-      removeLocalRef(ref);
-    } else {
-      replaceLocalRef(ref, v);
-      return resolvedRef(v, refCode);
-    }
-  }
-
-  function addLocalRef(ref, v) {
-    var refId = refVal.length;
-    refVal[refId] = v;
-    refs[ref] = refId;
-    return 'refVal' + refId;
-  }
-
-  function removeLocalRef(ref) {
-    delete refs[ref];
-  }
-
-  function replaceLocalRef(ref, v) {
-    var refId = refs[ref];
-    refVal[refId] = v;
-  }
-
-  function resolvedRef(refVal, code) {
-    return typeof refVal == 'object' || typeof refVal == 'boolean'
-            ? { code: code, schema: refVal, inline: true }
-            : { code: code, $async: refVal && refVal.$async };
-  }
-
-  function usePattern(regexStr) {
-    var index = patternsHash[regexStr];
-    if (index === undefined) {
-      index = patternsHash[regexStr] = patterns.length;
-      patterns[index] = regexStr;
-    }
-    return 'pattern' + index;
-  }
-
-  function useDefault(value) {
-    switch (typeof value) {
-      case 'boolean':
-      case 'number':
-        return '' + value;
-      case 'string':
-        return util.toQuotedString(value);
-      case 'object':
-        if (value === null) return 'null';
-        var valueStr = stableStringify(value);
-        var index = defaultsHash[valueStr];
-        if (index === undefined) {
-          index = defaultsHash[valueStr] = defaults.length;
-          defaults[index] = value;
-        }
-        return 'default' + index;
-    }
-  }
-
-  function useCustomRule(rule, schema, parentSchema, it) {
-    var validateSchema = rule.definition.validateSchema;
-    if (validateSchema && self._opts.validateSchema !== false) {
-      var valid = validateSchema(schema);
-      if (!valid) {
-        var message = 'keyword schema is invalid: ' + self.errorsText(validateSchema.errors);
-        if (self._opts.validateSchema == 'log') self.logger.error(message);
-        else throw new Error(message);
-      }
-    }
-
-    var compile = rule.definition.compile
-      , inline = rule.definition.inline
-      , macro = rule.definition.macro;
-
-    var validate;
-    if (compile) {
-      validate = compile.call(self, schema, parentSchema, it);
-    } else if (macro) {
-      validate = macro.call(self, schema, parentSchema, it);
-      if (opts.validateSchema !== false) self.validateSchema(validate, true);
-    } else if (inline) {
-      validate = inline.call(self, it, rule.keyword, schema, parentSchema);
-    } else {
-      validate = rule.definition.validate;
-      if (!validate) return;
-    }
-
-    if (validate === undefined)
-      throw new Error('custom keyword "' + rule.keyword + '"failed to compile');
-
-    var index = customRules.length;
-    customRules[index] = validate;
-
-    return {
-      code: 'customRule' + index,
-      validate: validate
-    };
-  }
-}
-
-
-/**
- * Checks if the schema is currently compiled
- * @this   Ajv
- * @param  {Object} schema schema to compile
- * @param  {Object} root root object
- * @param  {String} baseId base schema ID
- * @return {Object} object with properties "index" (compilation index) and "compiling" (boolean)
- */
-function checkCompiling(schema, root, baseId) {
-  /* jshint validthis: true */
-  var index = compIndex.call(this, schema, root, baseId);
-  if (index >= 0) return { index: index, compiling: true };
-  index = this._compilations.length;
-  this._compilations[index] = {
-    schema: schema,
-    root: root,
-    baseId: baseId
-  };
-  return { index: index, compiling: false };
-}
-
-
-/**
- * Removes the schema from the currently compiled list
- * @this   Ajv
- * @param  {Object} schema schema to compile
- * @param  {Object} root root object
- * @param  {String} baseId base schema ID
- */
-function endCompiling(schema, root, baseId) {
-  /* jshint validthis: true */
-  var i = compIndex.call(this, schema, root, baseId);
-  if (i >= 0) this._compilations.splice(i, 1);
-}
-
-
-/**
- * Index of schema compilation in the currently compiled list
- * @this   Ajv
- * @param  {Object} schema schema to compile
- * @param  {Object} root root object
- * @param  {String} baseId base schema ID
- * @return {Integer} compilation index
- */
-function compIndex(schema, root, baseId) {
-  /* jshint validthis: true */
-  for (var i=0; i<this._compilations.length; i++) {
-    var c = this._compilations[i];
-    if (c.schema == schema && c.root == root && c.baseId == baseId) return i;
-  }
-  return -1;
-}
-
-
-function patternCode(i, patterns) {
-  return 'var pattern' + i + ' = new RegExp(' + util.toQuotedString(patterns[i]) + ');';
-}
-
-
-function defaultCode(i) {
-  return 'var default' + i + ' = defaults[' + i + '];';
-}
-
-
-function refValCode(i, refVal) {
-  return refVal[i] === undefined ? '' : 'var refVal' + i + ' = refVal[' + i + '];';
-}
-
-
-function customRuleCode(i) {
-  return 'var customRule' + i + ' = customRules[' + i + '];';
-}
-
-
-function vars(arr, statement) {
-  if (!arr.length) return '';
-  var code = '';
-  for (var i=0; i<arr.length; i++)
-    code += statement(i, arr);
-  return code;
-}
-
-
-/***/ }),
-/* 479 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var ruleModules = __webpack_require__(475)
-  , toHash = __webpack_require__(106).toHash;
-
-module.exports = function rules() {
-  var RULES = [
-    { type: 'number',
-      rules: [ { 'maximum': ['exclusiveMaximum'] },
-               { 'minimum': ['exclusiveMinimum'] }, 'multipleOf', 'format'] },
-    { type: 'string',
-      rules: [ 'maxLength', 'minLength', 'pattern', 'format' ] },
-    { type: 'array',
-      rules: [ 'maxItems', 'minItems', 'uniqueItems', 'contains', 'items' ] },
-    { type: 'object',
-      rules: [ 'maxProperties', 'minProperties', 'required', 'dependencies', 'propertyNames',
-               { 'properties': ['additionalProperties', 'patternProperties'] } ] },
-    { rules: [ '$ref', 'const', 'enum', 'not', 'anyOf', 'oneOf', 'allOf' ] }
-  ];
-
-  var ALL = [ 'type' ];
-  var KEYWORDS = [
-    'additionalItems', '$schema', '$id', 'id', 'title',
-    'description', 'default', 'definitions'
-  ];
-  var TYPES = [ 'number', 'integer', 'string', 'array', 'object', 'boolean', 'null' ];
-  RULES.all = toHash(ALL);
-  RULES.types = toHash(TYPES);
-
-  RULES.forEach(function (group) {
-    group.rules = group.rules.map(function (keyword) {
-      var implKeywords;
-      if (typeof keyword == 'object') {
-        var key = Object.keys(keyword)[0];
-        implKeywords = keyword[key];
-        keyword = key;
-        implKeywords.forEach(function (k) {
-          ALL.push(k);
-          RULES.all[k] = true;
-        });
-      }
-      ALL.push(keyword);
-      var rule = RULES.all[keyword] = {
-        keyword: keyword,
-        code: ruleModules[keyword],
-        implements: implKeywords
-      };
-      return rule;
-    });
-
-    if (group.type) RULES.types[group.type] = group;
-  });
-
-  RULES.keywords = toHash(ALL.concat(KEYWORDS));
-  RULES.custom = {};
-
-  return RULES;
-};
-
-
-/***/ }),
-/* 480 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-// https://mathiasbynens.be/notes/javascript-encoding
-// https://github.com/bestiejs/punycode.js - punycode.ucs2.decode
-module.exports = function ucs2length(str) {
-  var length = 0
-    , len = str.length
-    , pos = 0
-    , value;
-  while (pos < len) {
-    length++;
-    value = str.charCodeAt(pos++);
-    if (value >= 0xD800 && value <= 0xDBFF && pos < len) {
-      // high surrogate, and there is a next character
-      value = str.charCodeAt(pos);
-      if ((value & 0xFC00) == 0xDC00) pos++; // low surrogate
-    }
-  }
-  return length;
-};
-
-
-/***/ }),
-/* 481 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate_allOf(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $it = it.util.copy(it);
-  var $closingBraces = '';
-  $it.level++;
-  var $nextValid = 'valid' + $it.level;
-  var $currentBaseId = $it.baseId,
-    $allSchemasEmpty = true;
-  var arr1 = $schema;
-  if (arr1) {
-    var $sch, $i = -1,
-      l1 = arr1.length - 1;
-    while ($i < l1) {
-      $sch = arr1[$i += 1];
-      if (it.util.schemaHasRules($sch, it.RULES.all)) {
-        $allSchemasEmpty = false;
-        $it.schema = $sch;
-        $it.schemaPath = $schemaPath + '[' + $i + ']';
-        $it.errSchemaPath = $errSchemaPath + '/' + $i;
-        out += '  ' + (it.validate($it)) + ' ';
-        $it.baseId = $currentBaseId;
-        if ($breakOnError) {
-          out += ' if (' + ($nextValid) + ') { ';
-          $closingBraces += '}';
-        }
-      }
-    }
-  }
-  if ($breakOnError) {
-    if ($allSchemasEmpty) {
-      out += ' if (true) { ';
-    } else {
-      out += ' ' + ($closingBraces.slice(0, -1)) + ' ';
-    }
-  }
-  out = it.util.cleanUpCode(out);
-  return out;
-}
-
-
-/***/ }),
-/* 482 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate_anyOf(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $data = 'data' + ($dataLvl || '');
-  var $valid = 'valid' + $lvl;
-  var $errs = 'errs__' + $lvl;
-  var $it = it.util.copy(it);
-  var $closingBraces = '';
-  $it.level++;
-  var $nextValid = 'valid' + $it.level;
-  var $noEmptySchema = $schema.every(function($sch) {
-    return it.util.schemaHasRules($sch, it.RULES.all);
-  });
-  if ($noEmptySchema) {
-    var $currentBaseId = $it.baseId;
-    out += ' var ' + ($errs) + ' = errors; var ' + ($valid) + ' = false;  ';
-    var $wasComposite = it.compositeRule;
-    it.compositeRule = $it.compositeRule = true;
-    var arr1 = $schema;
-    if (arr1) {
-      var $sch, $i = -1,
-        l1 = arr1.length - 1;
-      while ($i < l1) {
-        $sch = arr1[$i += 1];
-        $it.schema = $sch;
-        $it.schemaPath = $schemaPath + '[' + $i + ']';
-        $it.errSchemaPath = $errSchemaPath + '/' + $i;
-        out += '  ' + (it.validate($it)) + ' ';
-        $it.baseId = $currentBaseId;
-        out += ' ' + ($valid) + ' = ' + ($valid) + ' || ' + ($nextValid) + '; if (!' + ($valid) + ') { ';
-        $closingBraces += '}';
-      }
-    }
-    it.compositeRule = $it.compositeRule = $wasComposite;
-    out += ' ' + ($closingBraces) + ' if (!' + ($valid) + ') {   var err =   '; /* istanbul ignore else */
-    if (it.createErrors !== false) {
-      out += ' { keyword: \'' + ('anyOf') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: {} ';
-      if (it.opts.messages !== false) {
-        out += ' , message: \'should match some schema in anyOf\' ';
-      }
-      if (it.opts.verbose) {
-        out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-      }
-      out += ' } ';
-    } else {
-      out += ' {} ';
-    }
-    out += ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-    if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-      if (it.async) {
-        out += ' throw new ValidationError(vErrors); ';
-      } else {
-        out += ' validate.errors = vErrors; return false; ';
-      }
-    }
-    out += ' } else {  errors = ' + ($errs) + '; if (vErrors !== null) { if (' + ($errs) + ') vErrors.length = ' + ($errs) + '; else vErrors = null; } ';
-    if (it.opts.allErrors) {
-      out += ' } ';
-    }
-    out = it.util.cleanUpCode(out);
-  } else {
-    if ($breakOnError) {
-      out += ' if (true) { ';
-    }
-  }
-  return out;
-}
-
-
-/***/ }),
-/* 483 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate_const(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $data = 'data' + ($dataLvl || '');
-  var $valid = 'valid' + $lvl;
-  var $isData = it.opts.$data && $schema && $schema.$data,
-    $schemaValue;
-  if ($isData) {
-    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
-    $schemaValue = 'schema' + $lvl;
-  } else {
-    $schemaValue = $schema;
-  }
-  if (!$isData) {
-    out += ' var schema' + ($lvl) + ' = validate.schema' + ($schemaPath) + ';';
-  }
-  out += 'var ' + ($valid) + ' = equal(' + ($data) + ', schema' + ($lvl) + '); if (!' + ($valid) + ') {   ';
-  var $$outStack = $$outStack || [];
-  $$outStack.push(out);
-  out = ''; /* istanbul ignore else */
-  if (it.createErrors !== false) {
-    out += ' { keyword: \'' + ('const') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: {} ';
-    if (it.opts.messages !== false) {
-      out += ' , message: \'should be equal to constant\' ';
-    }
-    if (it.opts.verbose) {
-      out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-    }
-    out += ' } ';
-  } else {
-    out += ' {} ';
-  }
-  var __err = out;
-  out = $$outStack.pop();
-  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-    if (it.async) {
-      out += ' throw new ValidationError([' + (__err) + ']); ';
-    } else {
-      out += ' validate.errors = [' + (__err) + ']; return false; ';
-    }
-  } else {
-    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-  }
-  out += ' }';
-  if ($breakOnError) {
-    out += ' else { ';
-  }
-  return out;
-}
-
-
-/***/ }),
-/* 484 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate_contains(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $data = 'data' + ($dataLvl || '');
-  var $valid = 'valid' + $lvl;
-  var $errs = 'errs__' + $lvl;
-  var $it = it.util.copy(it);
-  var $closingBraces = '';
-  $it.level++;
-  var $nextValid = 'valid' + $it.level;
-  var $idx = 'i' + $lvl,
-    $dataNxt = $it.dataLevel = it.dataLevel + 1,
-    $nextData = 'data' + $dataNxt,
-    $currentBaseId = it.baseId,
-    $nonEmptySchema = it.util.schemaHasRules($schema, it.RULES.all);
-  out += 'var ' + ($errs) + ' = errors;var ' + ($valid) + ';';
-  if ($nonEmptySchema) {
-    var $wasComposite = it.compositeRule;
-    it.compositeRule = $it.compositeRule = true;
-    $it.schema = $schema;
-    $it.schemaPath = $schemaPath;
-    $it.errSchemaPath = $errSchemaPath;
-    out += ' var ' + ($nextValid) + ' = false; for (var ' + ($idx) + ' = 0; ' + ($idx) + ' < ' + ($data) + '.length; ' + ($idx) + '++) { ';
-    $it.errorPath = it.util.getPathExpr(it.errorPath, $idx, it.opts.jsonPointers, true);
-    var $passData = $data + '[' + $idx + ']';
-    $it.dataPathArr[$dataNxt] = $idx;
-    var $code = it.validate($it);
-    $it.baseId = $currentBaseId;
-    if (it.util.varOccurences($code, $nextData) < 2) {
-      out += ' ' + (it.util.varReplace($code, $nextData, $passData)) + ' ';
-    } else {
-      out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ' + ($code) + ' ';
-    }
-    out += ' if (' + ($nextValid) + ') break; }  ';
-    it.compositeRule = $it.compositeRule = $wasComposite;
-    out += ' ' + ($closingBraces) + ' if (!' + ($nextValid) + ') {';
-  } else {
-    out += ' if (' + ($data) + '.length == 0) {';
-  }
-  var $$outStack = $$outStack || [];
-  $$outStack.push(out);
-  out = ''; /* istanbul ignore else */
-  if (it.createErrors !== false) {
-    out += ' { keyword: \'' + ('contains') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: {} ';
-    if (it.opts.messages !== false) {
-      out += ' , message: \'should contain a valid item\' ';
-    }
-    if (it.opts.verbose) {
-      out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-    }
-    out += ' } ';
-  } else {
-    out += ' {} ';
-  }
-  var __err = out;
-  out = $$outStack.pop();
-  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-    if (it.async) {
-      out += ' throw new ValidationError([' + (__err) + ']); ';
-    } else {
-      out += ' validate.errors = [' + (__err) + ']; return false; ';
-    }
-  } else {
-    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-  }
-  out += ' } else { ';
-  if ($nonEmptySchema) {
-    out += '  errors = ' + ($errs) + '; if (vErrors !== null) { if (' + ($errs) + ') vErrors.length = ' + ($errs) + '; else vErrors = null; } ';
-  }
-  if (it.opts.allErrors) {
-    out += ' } ';
-  }
-  out = it.util.cleanUpCode(out);
-  return out;
-}
-
-
-/***/ }),
-/* 485 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate_custom(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $errorKeyword;
-  var $data = 'data' + ($dataLvl || '');
-  var $valid = 'valid' + $lvl;
-  var $errs = 'errs__' + $lvl;
-  var $isData = it.opts.$data && $schema && $schema.$data,
-    $schemaValue;
-  if ($isData) {
-    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
-    $schemaValue = 'schema' + $lvl;
-  } else {
-    $schemaValue = $schema;
-  }
-  var $rule = this,
-    $definition = 'definition' + $lvl,
-    $rDef = $rule.definition,
-    $closingBraces = '';
-  var $compile, $inline, $macro, $ruleValidate, $validateCode;
-  if ($isData && $rDef.$data) {
-    $validateCode = 'keywordValidate' + $lvl;
-    var $validateSchema = $rDef.validateSchema;
-    out += ' var ' + ($definition) + ' = RULES.custom[\'' + ($keyword) + '\'].definition; var ' + ($validateCode) + ' = ' + ($definition) + '.validate;';
-  } else {
-    $ruleValidate = it.useCustomRule($rule, $schema, it.schema, it);
-    if (!$ruleValidate) return;
-    $schemaValue = 'validate.schema' + $schemaPath;
-    $validateCode = $ruleValidate.code;
-    $compile = $rDef.compile;
-    $inline = $rDef.inline;
-    $macro = $rDef.macro;
-  }
-  var $ruleErrs = $validateCode + '.errors',
-    $i = 'i' + $lvl,
-    $ruleErr = 'ruleErr' + $lvl,
-    $asyncKeyword = $rDef.async;
-  if ($asyncKeyword && !it.async) throw new Error('async keyword in sync schema');
-  if (!($inline || $macro)) {
-    out += '' + ($ruleErrs) + ' = null;';
-  }
-  out += 'var ' + ($errs) + ' = errors;var ' + ($valid) + ';';
-  if ($isData && $rDef.$data) {
-    $closingBraces += '}';
-    out += ' if (' + ($schemaValue) + ' === undefined) { ' + ($valid) + ' = true; } else { ';
-    if ($validateSchema) {
-      $closingBraces += '}';
-      out += ' ' + ($valid) + ' = ' + ($definition) + '.validateSchema(' + ($schemaValue) + '); if (' + ($valid) + ') { ';
-    }
-  }
-  if ($inline) {
-    if ($rDef.statements) {
-      out += ' ' + ($ruleValidate.validate) + ' ';
-    } else {
-      out += ' ' + ($valid) + ' = ' + ($ruleValidate.validate) + '; ';
-    }
-  } else if ($macro) {
-    var $it = it.util.copy(it);
-    var $closingBraces = '';
-    $it.level++;
-    var $nextValid = 'valid' + $it.level;
-    $it.schema = $ruleValidate.validate;
-    $it.schemaPath = '';
-    var $wasComposite = it.compositeRule;
-    it.compositeRule = $it.compositeRule = true;
-    var $code = it.validate($it).replace(/validate\.schema/g, $validateCode);
-    it.compositeRule = $it.compositeRule = $wasComposite;
-    out += ' ' + ($code);
-  } else {
-    var $$outStack = $$outStack || [];
-    $$outStack.push(out);
-    out = '';
-    out += '  ' + ($validateCode) + '.call( ';
-    if (it.opts.passContext) {
-      out += 'this';
-    } else {
-      out += 'self';
-    }
-    if ($compile || $rDef.schema === false) {
-      out += ' , ' + ($data) + ' ';
-    } else {
-      out += ' , ' + ($schemaValue) + ' , ' + ($data) + ' , validate.schema' + (it.schemaPath) + ' ';
-    }
-    out += ' , (dataPath || \'\')';
-    if (it.errorPath != '""') {
-      out += ' + ' + (it.errorPath);
-    }
-    var $parentData = $dataLvl ? 'data' + (($dataLvl - 1) || '') : 'parentData',
-      $parentDataProperty = $dataLvl ? it.dataPathArr[$dataLvl] : 'parentDataProperty';
-    out += ' , ' + ($parentData) + ' , ' + ($parentDataProperty) + ' , rootData )  ';
-    var def_callRuleValidate = out;
-    out = $$outStack.pop();
-    if ($rDef.errors === false) {
-      out += ' ' + ($valid) + ' = ';
-      if ($asyncKeyword) {
-        out += '' + (it.yieldAwait);
-      }
-      out += '' + (def_callRuleValidate) + '; ';
-    } else {
-      if ($asyncKeyword) {
-        $ruleErrs = 'customErrors' + $lvl;
-        out += ' var ' + ($ruleErrs) + ' = null; try { ' + ($valid) + ' = ' + (it.yieldAwait) + (def_callRuleValidate) + '; } catch (e) { ' + ($valid) + ' = false; if (e instanceof ValidationError) ' + ($ruleErrs) + ' = e.errors; else throw e; } ';
-      } else {
-        out += ' ' + ($ruleErrs) + ' = null; ' + ($valid) + ' = ' + (def_callRuleValidate) + '; ';
-      }
-    }
-  }
-  if ($rDef.modifying) {
-    out += ' if (' + ($parentData) + ') ' + ($data) + ' = ' + ($parentData) + '[' + ($parentDataProperty) + '];';
-  }
-  out += '' + ($closingBraces);
-  if ($rDef.valid) {
-    if ($breakOnError) {
-      out += ' if (true) { ';
-    }
-  } else {
-    out += ' if ( ';
-    if ($rDef.valid === undefined) {
-      out += ' !';
-      if ($macro) {
-        out += '' + ($nextValid);
-      } else {
-        out += '' + ($valid);
-      }
-    } else {
-      out += ' ' + (!$rDef.valid) + ' ';
-    }
-    out += ') { ';
-    $errorKeyword = $rule.keyword;
-    var $$outStack = $$outStack || [];
-    $$outStack.push(out);
-    out = '';
-    var $$outStack = $$outStack || [];
-    $$outStack.push(out);
-    out = ''; /* istanbul ignore else */
-    if (it.createErrors !== false) {
-      out += ' { keyword: \'' + ($errorKeyword || 'custom') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { keyword: \'' + ($rule.keyword) + '\' } ';
-      if (it.opts.messages !== false) {
-        out += ' , message: \'should pass "' + ($rule.keyword) + '" keyword validation\' ';
-      }
-      if (it.opts.verbose) {
-        out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-      }
-      out += ' } ';
-    } else {
-      out += ' {} ';
-    }
-    var __err = out;
-    out = $$outStack.pop();
-    if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-      if (it.async) {
-        out += ' throw new ValidationError([' + (__err) + ']); ';
-      } else {
-        out += ' validate.errors = [' + (__err) + ']; return false; ';
-      }
-    } else {
-      out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-    }
-    var def_customError = out;
-    out = $$outStack.pop();
-    if ($inline) {
-      if ($rDef.errors) {
-        if ($rDef.errors != 'full') {
-          out += '  for (var ' + ($i) + '=' + ($errs) + '; ' + ($i) + '<errors; ' + ($i) + '++) { var ' + ($ruleErr) + ' = vErrors[' + ($i) + ']; if (' + ($ruleErr) + '.dataPath === undefined) ' + ($ruleErr) + '.dataPath = (dataPath || \'\') + ' + (it.errorPath) + '; if (' + ($ruleErr) + '.schemaPath === undefined) { ' + ($ruleErr) + '.schemaPath = "' + ($errSchemaPath) + '"; } ';
-          if (it.opts.verbose) {
-            out += ' ' + ($ruleErr) + '.schema = ' + ($schemaValue) + '; ' + ($ruleErr) + '.data = ' + ($data) + '; ';
-          }
-          out += ' } ';
-        }
-      } else {
-        if ($rDef.errors === false) {
-          out += ' ' + (def_customError) + ' ';
-        } else {
-          out += ' if (' + ($errs) + ' == errors) { ' + (def_customError) + ' } else {  for (var ' + ($i) + '=' + ($errs) + '; ' + ($i) + '<errors; ' + ($i) + '++) { var ' + ($ruleErr) + ' = vErrors[' + ($i) + ']; if (' + ($ruleErr) + '.dataPath === undefined) ' + ($ruleErr) + '.dataPath = (dataPath || \'\') + ' + (it.errorPath) + '; if (' + ($ruleErr) + '.schemaPath === undefined) { ' + ($ruleErr) + '.schemaPath = "' + ($errSchemaPath) + '"; } ';
-          if (it.opts.verbose) {
-            out += ' ' + ($ruleErr) + '.schema = ' + ($schemaValue) + '; ' + ($ruleErr) + '.data = ' + ($data) + '; ';
-          }
-          out += ' } } ';
-        }
-      }
-    } else if ($macro) {
-      out += '   var err =   '; /* istanbul ignore else */
-      if (it.createErrors !== false) {
-        out += ' { keyword: \'' + ($errorKeyword || 'custom') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { keyword: \'' + ($rule.keyword) + '\' } ';
-        if (it.opts.messages !== false) {
-          out += ' , message: \'should pass "' + ($rule.keyword) + '" keyword validation\' ';
-        }
-        if (it.opts.verbose) {
-          out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-        }
-        out += ' } ';
-      } else {
-        out += ' {} ';
-      }
-      out += ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-      if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-        if (it.async) {
-          out += ' throw new ValidationError(vErrors); ';
-        } else {
-          out += ' validate.errors = vErrors; return false; ';
-        }
-      }
-    } else {
-      if ($rDef.errors === false) {
-        out += ' ' + (def_customError) + ' ';
-      } else {
-        out += ' if (Array.isArray(' + ($ruleErrs) + ')) { if (vErrors === null) vErrors = ' + ($ruleErrs) + '; else vErrors = vErrors.concat(' + ($ruleErrs) + '); errors = vErrors.length;  for (var ' + ($i) + '=' + ($errs) + '; ' + ($i) + '<errors; ' + ($i) + '++) { var ' + ($ruleErr) + ' = vErrors[' + ($i) + ']; if (' + ($ruleErr) + '.dataPath === undefined) ' + ($ruleErr) + '.dataPath = (dataPath || \'\') + ' + (it.errorPath) + ';  ' + ($ruleErr) + '.schemaPath = "' + ($errSchemaPath) + '";  ';
-        if (it.opts.verbose) {
-          out += ' ' + ($ruleErr) + '.schema = ' + ($schemaValue) + '; ' + ($ruleErr) + '.data = ' + ($data) + '; ';
-        }
-        out += ' } } else { ' + (def_customError) + ' } ';
-      }
-    }
-    out += ' } ';
-    if ($breakOnError) {
-      out += ' else { ';
-    }
-  }
-  return out;
-}
-
-
-/***/ }),
-/* 486 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate_dependencies(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $data = 'data' + ($dataLvl || '');
-  var $errs = 'errs__' + $lvl;
-  var $it = it.util.copy(it);
-  var $closingBraces = '';
-  $it.level++;
-  var $nextValid = 'valid' + $it.level;
-  var $schemaDeps = {},
-    $propertyDeps = {},
-    $ownProperties = it.opts.ownProperties;
-  for ($property in $schema) {
-    var $sch = $schema[$property];
-    var $deps = Array.isArray($sch) ? $propertyDeps : $schemaDeps;
-    $deps[$property] = $sch;
-  }
-  out += 'var ' + ($errs) + ' = errors;';
-  var $currentErrorPath = it.errorPath;
-  out += 'var missing' + ($lvl) + ';';
-  for (var $property in $propertyDeps) {
-    $deps = $propertyDeps[$property];
-    if ($deps.length) {
-      out += ' if ( ' + ($data) + (it.util.getProperty($property)) + ' !== undefined ';
-      if ($ownProperties) {
-        out += ' && Object.prototype.hasOwnProperty.call(' + ($data) + ', \'' + (it.util.escapeQuotes($property)) + '\') ';
-      }
-      if ($breakOnError) {
-        out += ' && ( ';
-        var arr1 = $deps;
-        if (arr1) {
-          var $propertyKey, $i = -1,
-            l1 = arr1.length - 1;
-          while ($i < l1) {
-            $propertyKey = arr1[$i += 1];
-            if ($i) {
-              out += ' || ';
-            }
-            var $prop = it.util.getProperty($propertyKey),
-              $useData = $data + $prop;
-            out += ' ( ( ' + ($useData) + ' === undefined ';
-            if ($ownProperties) {
-              out += ' || ! Object.prototype.hasOwnProperty.call(' + ($data) + ', \'' + (it.util.escapeQuotes($propertyKey)) + '\') ';
-            }
-            out += ') && (missing' + ($lvl) + ' = ' + (it.util.toQuotedString(it.opts.jsonPointers ? $propertyKey : $prop)) + ') ) ';
-          }
-        }
-        out += ')) {  ';
-        var $propertyPath = 'missing' + $lvl,
-          $missingProperty = '\' + ' + $propertyPath + ' + \'';
-        if (it.opts._errorDataPathProperty) {
-          it.errorPath = it.opts.jsonPointers ? it.util.getPathExpr($currentErrorPath, $propertyPath, true) : $currentErrorPath + ' + ' + $propertyPath;
-        }
-        var $$outStack = $$outStack || [];
-        $$outStack.push(out);
-        out = ''; /* istanbul ignore else */
-        if (it.createErrors !== false) {
-          out += ' { keyword: \'' + ('dependencies') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { property: \'' + (it.util.escapeQuotes($property)) + '\', missingProperty: \'' + ($missingProperty) + '\', depsCount: ' + ($deps.length) + ', deps: \'' + (it.util.escapeQuotes($deps.length == 1 ? $deps[0] : $deps.join(", "))) + '\' } ';
-          if (it.opts.messages !== false) {
-            out += ' , message: \'should have ';
-            if ($deps.length == 1) {
-              out += 'property ' + (it.util.escapeQuotes($deps[0]));
-            } else {
-              out += 'properties ' + (it.util.escapeQuotes($deps.join(", ")));
-            }
-            out += ' when property ' + (it.util.escapeQuotes($property)) + ' is present\' ';
-          }
-          if (it.opts.verbose) {
-            out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-          }
-          out += ' } ';
-        } else {
-          out += ' {} ';
-        }
-        var __err = out;
-        out = $$outStack.pop();
-        if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-          if (it.async) {
-            out += ' throw new ValidationError([' + (__err) + ']); ';
-          } else {
-            out += ' validate.errors = [' + (__err) + ']; return false; ';
-          }
-        } else {
-          out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-        }
-      } else {
-        out += ' ) { ';
-        var arr2 = $deps;
-        if (arr2) {
-          var $propertyKey, i2 = -1,
-            l2 = arr2.length - 1;
-          while (i2 < l2) {
-            $propertyKey = arr2[i2 += 1];
-            var $prop = it.util.getProperty($propertyKey),
-              $missingProperty = it.util.escapeQuotes($propertyKey),
-              $useData = $data + $prop;
-            if (it.opts._errorDataPathProperty) {
-              it.errorPath = it.util.getPath($currentErrorPath, $propertyKey, it.opts.jsonPointers);
-            }
-            out += ' if ( ' + ($useData) + ' === undefined ';
-            if ($ownProperties) {
-              out += ' || ! Object.prototype.hasOwnProperty.call(' + ($data) + ', \'' + (it.util.escapeQuotes($propertyKey)) + '\') ';
-            }
-            out += ') {  var err =   '; /* istanbul ignore else */
-            if (it.createErrors !== false) {
-              out += ' { keyword: \'' + ('dependencies') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { property: \'' + (it.util.escapeQuotes($property)) + '\', missingProperty: \'' + ($missingProperty) + '\', depsCount: ' + ($deps.length) + ', deps: \'' + (it.util.escapeQuotes($deps.length == 1 ? $deps[0] : $deps.join(", "))) + '\' } ';
-              if (it.opts.messages !== false) {
-                out += ' , message: \'should have ';
-                if ($deps.length == 1) {
-                  out += 'property ' + (it.util.escapeQuotes($deps[0]));
-                } else {
-                  out += 'properties ' + (it.util.escapeQuotes($deps.join(", ")));
-                }
-                out += ' when property ' + (it.util.escapeQuotes($property)) + ' is present\' ';
-              }
-              if (it.opts.verbose) {
-                out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-              }
-              out += ' } ';
-            } else {
-              out += ' {} ';
-            }
-            out += ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; } ';
-          }
-        }
-      }
-      out += ' }   ';
-      if ($breakOnError) {
-        $closingBraces += '}';
-        out += ' else { ';
-      }
-    }
-  }
-  it.errorPath = $currentErrorPath;
-  var $currentBaseId = $it.baseId;
-  for (var $property in $schemaDeps) {
-    var $sch = $schemaDeps[$property];
-    if (it.util.schemaHasRules($sch, it.RULES.all)) {
-      out += ' ' + ($nextValid) + ' = true; if ( ' + ($data) + (it.util.getProperty($property)) + ' !== undefined ';
-      if ($ownProperties) {
-        out += ' && Object.prototype.hasOwnProperty.call(' + ($data) + ', \'' + (it.util.escapeQuotes($property)) + '\') ';
-      }
-      out += ') { ';
-      $it.schema = $sch;
-      $it.schemaPath = $schemaPath + it.util.getProperty($property);
-      $it.errSchemaPath = $errSchemaPath + '/' + it.util.escapeFragment($property);
-      out += '  ' + (it.validate($it)) + ' ';
-      $it.baseId = $currentBaseId;
-      out += ' }  ';
-      if ($breakOnError) {
-        out += ' if (' + ($nextValid) + ') { ';
-        $closingBraces += '}';
-      }
-    }
-  }
-  if ($breakOnError) {
-    out += '   ' + ($closingBraces) + ' if (' + ($errs) + ' == errors) {';
-  }
-  out = it.util.cleanUpCode(out);
-  return out;
-}
-
-
-/***/ }),
-/* 487 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate_enum(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $data = 'data' + ($dataLvl || '');
-  var $valid = 'valid' + $lvl;
-  var $isData = it.opts.$data && $schema && $schema.$data,
-    $schemaValue;
-  if ($isData) {
-    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
-    $schemaValue = 'schema' + $lvl;
-  } else {
-    $schemaValue = $schema;
-  }
-  var $i = 'i' + $lvl,
-    $vSchema = 'schema' + $lvl;
-  if (!$isData) {
-    out += ' var ' + ($vSchema) + ' = validate.schema' + ($schemaPath) + ';';
-  }
-  out += 'var ' + ($valid) + ';';
-  if ($isData) {
-    out += ' if (schema' + ($lvl) + ' === undefined) ' + ($valid) + ' = true; else if (!Array.isArray(schema' + ($lvl) + ')) ' + ($valid) + ' = false; else {';
-  }
-  out += '' + ($valid) + ' = false;for (var ' + ($i) + '=0; ' + ($i) + '<' + ($vSchema) + '.length; ' + ($i) + '++) if (equal(' + ($data) + ', ' + ($vSchema) + '[' + ($i) + '])) { ' + ($valid) + ' = true; break; }';
-  if ($isData) {
-    out += '  }  ';
-  }
-  out += ' if (!' + ($valid) + ') {   ';
-  var $$outStack = $$outStack || [];
-  $$outStack.push(out);
-  out = ''; /* istanbul ignore else */
-  if (it.createErrors !== false) {
-    out += ' { keyword: \'' + ('enum') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { allowedValues: schema' + ($lvl) + ' } ';
-    if (it.opts.messages !== false) {
-      out += ' , message: \'should be equal to one of the allowed values\' ';
-    }
-    if (it.opts.verbose) {
-      out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-    }
-    out += ' } ';
-  } else {
-    out += ' {} ';
-  }
-  var __err = out;
-  out = $$outStack.pop();
-  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-    if (it.async) {
-      out += ' throw new ValidationError([' + (__err) + ']); ';
-    } else {
-      out += ' validate.errors = [' + (__err) + ']; return false; ';
-    }
-  } else {
-    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-  }
-  out += ' }';
-  if ($breakOnError) {
-    out += ' else { ';
-  }
-  return out;
-}
-
-
-/***/ }),
-/* 488 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate_format(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $data = 'data' + ($dataLvl || '');
-  if (it.opts.format === false) {
-    if ($breakOnError) {
-      out += ' if (true) { ';
-    }
-    return out;
-  }
-  var $isData = it.opts.$data && $schema && $schema.$data,
-    $schemaValue;
-  if ($isData) {
-    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
-    $schemaValue = 'schema' + $lvl;
-  } else {
-    $schemaValue = $schema;
-  }
-  var $unknownFormats = it.opts.unknownFormats,
-    $allowUnknown = Array.isArray($unknownFormats);
-  if ($isData) {
-    var $format = 'format' + $lvl,
-      $isObject = 'isObject' + $lvl,
-      $formatType = 'formatType' + $lvl;
-    out += ' var ' + ($format) + ' = formats[' + ($schemaValue) + ']; var ' + ($isObject) + ' = typeof ' + ($format) + ' == \'object\' && !(' + ($format) + ' instanceof RegExp) && ' + ($format) + '.validate; var ' + ($formatType) + ' = ' + ($isObject) + ' && ' + ($format) + '.type || \'string\'; if (' + ($isObject) + ') { ';
-    if (it.async) {
-      out += ' var async' + ($lvl) + ' = ' + ($format) + '.async; ';
-    }
-    out += ' ' + ($format) + ' = ' + ($format) + '.validate; } if (  ';
-    if ($isData) {
-      out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'string\') || ';
-    }
-    out += ' (';
-    if ($unknownFormats != 'ignore') {
-      out += ' (' + ($schemaValue) + ' && !' + ($format) + ' ';
-      if ($allowUnknown) {
-        out += ' && self._opts.unknownFormats.indexOf(' + ($schemaValue) + ') == -1 ';
-      }
-      out += ') || ';
-    }
-    out += ' (' + ($format) + ' && ' + ($formatType) + ' == \'' + ($ruleType) + '\' && !(typeof ' + ($format) + ' == \'function\' ? ';
-    if (it.async) {
-      out += ' (async' + ($lvl) + ' ? ' + (it.yieldAwait) + ' ' + ($format) + '(' + ($data) + ') : ' + ($format) + '(' + ($data) + ')) ';
-    } else {
-      out += ' ' + ($format) + '(' + ($data) + ') ';
-    }
-    out += ' : ' + ($format) + '.test(' + ($data) + '))))) {';
-  } else {
-    var $format = it.formats[$schema];
-    if (!$format) {
-      if ($unknownFormats == 'ignore') {
-        it.logger.warn('unknown format "' + $schema + '" ignored in schema at path "' + it.errSchemaPath + '"');
-        if ($breakOnError) {
-          out += ' if (true) { ';
-        }
-        return out;
-      } else if ($allowUnknown && $unknownFormats.indexOf($schema) >= 0) {
-        if ($breakOnError) {
-          out += ' if (true) { ';
-        }
-        return out;
-      } else {
-        throw new Error('unknown format "' + $schema + '" is used in schema at path "' + it.errSchemaPath + '"');
-      }
-    }
-    var $isObject = typeof $format == 'object' && !($format instanceof RegExp) && $format.validate;
-    var $formatType = $isObject && $format.type || 'string';
-    if ($isObject) {
-      var $async = $format.async === true;
-      $format = $format.validate;
-    }
-    if ($formatType != $ruleType) {
-      if ($breakOnError) {
-        out += ' if (true) { ';
-      }
-      return out;
-    }
-    if ($async) {
-      if (!it.async) throw new Error('async format in sync schema');
-      var $formatRef = 'formats' + it.util.getProperty($schema) + '.validate';
-      out += ' if (!(' + (it.yieldAwait) + ' ' + ($formatRef) + '(' + ($data) + '))) { ';
-    } else {
-      out += ' if (! ';
-      var $formatRef = 'formats' + it.util.getProperty($schema);
-      if ($isObject) $formatRef += '.validate';
-      if (typeof $format == 'function') {
-        out += ' ' + ($formatRef) + '(' + ($data) + ') ';
-      } else {
-        out += ' ' + ($formatRef) + '.test(' + ($data) + ') ';
-      }
-      out += ') { ';
-    }
-  }
-  var $$outStack = $$outStack || [];
-  $$outStack.push(out);
-  out = ''; /* istanbul ignore else */
-  if (it.createErrors !== false) {
-    out += ' { keyword: \'' + ('format') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { format:  ';
-    if ($isData) {
-      out += '' + ($schemaValue);
-    } else {
-      out += '' + (it.util.toQuotedString($schema));
-    }
-    out += '  } ';
-    if (it.opts.messages !== false) {
-      out += ' , message: \'should match format "';
-      if ($isData) {
-        out += '\' + ' + ($schemaValue) + ' + \'';
-      } else {
-        out += '' + (it.util.escapeQuotes($schema));
-      }
-      out += '"\' ';
-    }
-    if (it.opts.verbose) {
-      out += ' , schema:  ';
-      if ($isData) {
-        out += 'validate.schema' + ($schemaPath);
-      } else {
-        out += '' + (it.util.toQuotedString($schema));
-      }
-      out += '         , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-    }
-    out += ' } ';
-  } else {
-    out += ' {} ';
-  }
-  var __err = out;
-  out = $$outStack.pop();
-  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-    if (it.async) {
-      out += ' throw new ValidationError([' + (__err) + ']); ';
-    } else {
-      out += ' validate.errors = [' + (__err) + ']; return false; ';
-    }
-  } else {
-    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-  }
-  out += ' } ';
-  if ($breakOnError) {
-    out += ' else { ';
-  }
-  return out;
-}
-
-
-/***/ }),
-/* 489 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate_items(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $data = 'data' + ($dataLvl || '');
-  var $valid = 'valid' + $lvl;
-  var $errs = 'errs__' + $lvl;
-  var $it = it.util.copy(it);
-  var $closingBraces = '';
-  $it.level++;
-  var $nextValid = 'valid' + $it.level;
-  var $idx = 'i' + $lvl,
-    $dataNxt = $it.dataLevel = it.dataLevel + 1,
-    $nextData = 'data' + $dataNxt,
-    $currentBaseId = it.baseId;
-  out += 'var ' + ($errs) + ' = errors;var ' + ($valid) + ';';
-  if (Array.isArray($schema)) {
-    var $additionalItems = it.schema.additionalItems;
-    if ($additionalItems === false) {
-      out += ' ' + ($valid) + ' = ' + ($data) + '.length <= ' + ($schema.length) + '; ';
-      var $currErrSchemaPath = $errSchemaPath;
-      $errSchemaPath = it.errSchemaPath + '/additionalItems';
-      out += '  if (!' + ($valid) + ') {   ';
-      var $$outStack = $$outStack || [];
-      $$outStack.push(out);
-      out = ''; /* istanbul ignore else */
-      if (it.createErrors !== false) {
-        out += ' { keyword: \'' + ('additionalItems') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { limit: ' + ($schema.length) + ' } ';
-        if (it.opts.messages !== false) {
-          out += ' , message: \'should NOT have more than ' + ($schema.length) + ' items\' ';
-        }
-        if (it.opts.verbose) {
-          out += ' , schema: false , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-        }
-        out += ' } ';
-      } else {
-        out += ' {} ';
-      }
-      var __err = out;
-      out = $$outStack.pop();
-      if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-        if (it.async) {
-          out += ' throw new ValidationError([' + (__err) + ']); ';
-        } else {
-          out += ' validate.errors = [' + (__err) + ']; return false; ';
-        }
-      } else {
-        out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-      }
-      out += ' } ';
-      $errSchemaPath = $currErrSchemaPath;
-      if ($breakOnError) {
-        $closingBraces += '}';
-        out += ' else { ';
-      }
-    }
-    var arr1 = $schema;
-    if (arr1) {
-      var $sch, $i = -1,
-        l1 = arr1.length - 1;
-      while ($i < l1) {
-        $sch = arr1[$i += 1];
-        if (it.util.schemaHasRules($sch, it.RULES.all)) {
-          out += ' ' + ($nextValid) + ' = true; if (' + ($data) + '.length > ' + ($i) + ') { ';
-          var $passData = $data + '[' + $i + ']';
-          $it.schema = $sch;
-          $it.schemaPath = $schemaPath + '[' + $i + ']';
-          $it.errSchemaPath = $errSchemaPath + '/' + $i;
-          $it.errorPath = it.util.getPathExpr(it.errorPath, $i, it.opts.jsonPointers, true);
-          $it.dataPathArr[$dataNxt] = $i;
-          var $code = it.validate($it);
-          $it.baseId = $currentBaseId;
-          if (it.util.varOccurences($code, $nextData) < 2) {
-            out += ' ' + (it.util.varReplace($code, $nextData, $passData)) + ' ';
-          } else {
-            out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ' + ($code) + ' ';
-          }
-          out += ' }  ';
-          if ($breakOnError) {
-            out += ' if (' + ($nextValid) + ') { ';
-            $closingBraces += '}';
-          }
-        }
-      }
-    }
-    if (typeof $additionalItems == 'object' && it.util.schemaHasRules($additionalItems, it.RULES.all)) {
-      $it.schema = $additionalItems;
-      $it.schemaPath = it.schemaPath + '.additionalItems';
-      $it.errSchemaPath = it.errSchemaPath + '/additionalItems';
-      out += ' ' + ($nextValid) + ' = true; if (' + ($data) + '.length > ' + ($schema.length) + ') {  for (var ' + ($idx) + ' = ' + ($schema.length) + '; ' + ($idx) + ' < ' + ($data) + '.length; ' + ($idx) + '++) { ';
-      $it.errorPath = it.util.getPathExpr(it.errorPath, $idx, it.opts.jsonPointers, true);
-      var $passData = $data + '[' + $idx + ']';
-      $it.dataPathArr[$dataNxt] = $idx;
-      var $code = it.validate($it);
-      $it.baseId = $currentBaseId;
-      if (it.util.varOccurences($code, $nextData) < 2) {
-        out += ' ' + (it.util.varReplace($code, $nextData, $passData)) + ' ';
-      } else {
-        out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ' + ($code) + ' ';
-      }
-      if ($breakOnError) {
-        out += ' if (!' + ($nextValid) + ') break; ';
-      }
-      out += ' } }  ';
-      if ($breakOnError) {
-        out += ' if (' + ($nextValid) + ') { ';
-        $closingBraces += '}';
-      }
-    }
-  } else if (it.util.schemaHasRules($schema, it.RULES.all)) {
-    $it.schema = $schema;
-    $it.schemaPath = $schemaPath;
-    $it.errSchemaPath = $errSchemaPath;
-    out += '  for (var ' + ($idx) + ' = ' + (0) + '; ' + ($idx) + ' < ' + ($data) + '.length; ' + ($idx) + '++) { ';
-    $it.errorPath = it.util.getPathExpr(it.errorPath, $idx, it.opts.jsonPointers, true);
-    var $passData = $data + '[' + $idx + ']';
-    $it.dataPathArr[$dataNxt] = $idx;
-    var $code = it.validate($it);
-    $it.baseId = $currentBaseId;
-    if (it.util.varOccurences($code, $nextData) < 2) {
-      out += ' ' + (it.util.varReplace($code, $nextData, $passData)) + ' ';
-    } else {
-      out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ' + ($code) + ' ';
-    }
-    if ($breakOnError) {
-      out += ' if (!' + ($nextValid) + ') break; ';
-    }
-    out += ' }';
-  }
-  if ($breakOnError) {
-    out += ' ' + ($closingBraces) + ' if (' + ($errs) + ' == errors) {';
-  }
-  out = it.util.cleanUpCode(out);
-  return out;
-}
-
-
-/***/ }),
-/* 490 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate_multipleOf(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $data = 'data' + ($dataLvl || '');
-  var $isData = it.opts.$data && $schema && $schema.$data,
-    $schemaValue;
-  if ($isData) {
-    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
-    $schemaValue = 'schema' + $lvl;
-  } else {
-    $schemaValue = $schema;
-  }
-  out += 'var division' + ($lvl) + ';if (';
-  if ($isData) {
-    out += ' ' + ($schemaValue) + ' !== undefined && ( typeof ' + ($schemaValue) + ' != \'number\' || ';
-  }
-  out += ' (division' + ($lvl) + ' = ' + ($data) + ' / ' + ($schemaValue) + ', ';
-  if (it.opts.multipleOfPrecision) {
-    out += ' Math.abs(Math.round(division' + ($lvl) + ') - division' + ($lvl) + ') > 1e-' + (it.opts.multipleOfPrecision) + ' ';
-  } else {
-    out += ' division' + ($lvl) + ' !== parseInt(division' + ($lvl) + ') ';
-  }
-  out += ' ) ';
-  if ($isData) {
-    out += '  )  ';
-  }
-  out += ' ) {   ';
-  var $$outStack = $$outStack || [];
-  $$outStack.push(out);
-  out = ''; /* istanbul ignore else */
-  if (it.createErrors !== false) {
-    out += ' { keyword: \'' + ('multipleOf') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { multipleOf: ' + ($schemaValue) + ' } ';
-    if (it.opts.messages !== false) {
-      out += ' , message: \'should be multiple of ';
-      if ($isData) {
-        out += '\' + ' + ($schemaValue);
-      } else {
-        out += '' + ($schemaValue) + '\'';
-      }
-    }
-    if (it.opts.verbose) {
-      out += ' , schema:  ';
-      if ($isData) {
-        out += 'validate.schema' + ($schemaPath);
-      } else {
-        out += '' + ($schema);
-      }
-      out += '         , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-    }
-    out += ' } ';
-  } else {
-    out += ' {} ';
-  }
-  var __err = out;
-  out = $$outStack.pop();
-  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-    if (it.async) {
-      out += ' throw new ValidationError([' + (__err) + ']); ';
-    } else {
-      out += ' validate.errors = [' + (__err) + ']; return false; ';
-    }
-  } else {
-    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-  }
-  out += '} ';
-  if ($breakOnError) {
-    out += ' else { ';
-  }
-  return out;
-}
-
-
-/***/ }),
-/* 491 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate_not(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $data = 'data' + ($dataLvl || '');
-  var $errs = 'errs__' + $lvl;
-  var $it = it.util.copy(it);
-  $it.level++;
-  var $nextValid = 'valid' + $it.level;
-  if (it.util.schemaHasRules($schema, it.RULES.all)) {
-    $it.schema = $schema;
-    $it.schemaPath = $schemaPath;
-    $it.errSchemaPath = $errSchemaPath;
-    out += ' var ' + ($errs) + ' = errors;  ';
-    var $wasComposite = it.compositeRule;
-    it.compositeRule = $it.compositeRule = true;
-    $it.createErrors = false;
-    var $allErrorsOption;
-    if ($it.opts.allErrors) {
-      $allErrorsOption = $it.opts.allErrors;
-      $it.opts.allErrors = false;
-    }
-    out += ' ' + (it.validate($it)) + ' ';
-    $it.createErrors = true;
-    if ($allErrorsOption) $it.opts.allErrors = $allErrorsOption;
-    it.compositeRule = $it.compositeRule = $wasComposite;
-    out += ' if (' + ($nextValid) + ') {   ';
-    var $$outStack = $$outStack || [];
-    $$outStack.push(out);
-    out = ''; /* istanbul ignore else */
-    if (it.createErrors !== false) {
-      out += ' { keyword: \'' + ('not') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: {} ';
-      if (it.opts.messages !== false) {
-        out += ' , message: \'should NOT be valid\' ';
-      }
-      if (it.opts.verbose) {
-        out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-      }
-      out += ' } ';
-    } else {
-      out += ' {} ';
-    }
-    var __err = out;
-    out = $$outStack.pop();
-    if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-      if (it.async) {
-        out += ' throw new ValidationError([' + (__err) + ']); ';
-      } else {
-        out += ' validate.errors = [' + (__err) + ']; return false; ';
-      }
-    } else {
-      out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-    }
-    out += ' } else {  errors = ' + ($errs) + '; if (vErrors !== null) { if (' + ($errs) + ') vErrors.length = ' + ($errs) + '; else vErrors = null; } ';
-    if (it.opts.allErrors) {
-      out += ' } ';
-    }
-  } else {
-    out += '  var err =   '; /* istanbul ignore else */
-    if (it.createErrors !== false) {
-      out += ' { keyword: \'' + ('not') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: {} ';
-      if (it.opts.messages !== false) {
-        out += ' , message: \'should NOT be valid\' ';
-      }
-      if (it.opts.verbose) {
-        out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-      }
-      out += ' } ';
-    } else {
-      out += ' {} ';
-    }
-    out += ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-    if ($breakOnError) {
-      out += ' if (false) { ';
-    }
-  }
-  return out;
-}
-
-
-/***/ }),
-/* 492 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate_oneOf(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $data = 'data' + ($dataLvl || '');
-  var $valid = 'valid' + $lvl;
-  var $errs = 'errs__' + $lvl;
-  var $it = it.util.copy(it);
-  var $closingBraces = '';
-  $it.level++;
-  var $nextValid = 'valid' + $it.level;
-  out += 'var ' + ($errs) + ' = errors;var prevValid' + ($lvl) + ' = false;var ' + ($valid) + ' = false;';
-  var $currentBaseId = $it.baseId;
-  var $wasComposite = it.compositeRule;
-  it.compositeRule = $it.compositeRule = true;
-  var arr1 = $schema;
-  if (arr1) {
-    var $sch, $i = -1,
-      l1 = arr1.length - 1;
-    while ($i < l1) {
-      $sch = arr1[$i += 1];
-      if (it.util.schemaHasRules($sch, it.RULES.all)) {
-        $it.schema = $sch;
-        $it.schemaPath = $schemaPath + '[' + $i + ']';
-        $it.errSchemaPath = $errSchemaPath + '/' + $i;
-        out += '  ' + (it.validate($it)) + ' ';
-        $it.baseId = $currentBaseId;
-      } else {
-        out += ' var ' + ($nextValid) + ' = true; ';
-      }
-      if ($i) {
-        out += ' if (' + ($nextValid) + ' && prevValid' + ($lvl) + ') ' + ($valid) + ' = false; else { ';
-        $closingBraces += '}';
-      }
-      out += ' if (' + ($nextValid) + ') ' + ($valid) + ' = prevValid' + ($lvl) + ' = true;';
-    }
-  }
-  it.compositeRule = $it.compositeRule = $wasComposite;
-  out += '' + ($closingBraces) + 'if (!' + ($valid) + ') {   var err =   '; /* istanbul ignore else */
-  if (it.createErrors !== false) {
-    out += ' { keyword: \'' + ('oneOf') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: {} ';
-    if (it.opts.messages !== false) {
-      out += ' , message: \'should match exactly one schema in oneOf\' ';
-    }
-    if (it.opts.verbose) {
-      out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-    }
-    out += ' } ';
-  } else {
-    out += ' {} ';
-  }
-  out += ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-    if (it.async) {
-      out += ' throw new ValidationError(vErrors); ';
-    } else {
-      out += ' validate.errors = vErrors; return false; ';
-    }
-  }
-  out += '} else {  errors = ' + ($errs) + '; if (vErrors !== null) { if (' + ($errs) + ') vErrors.length = ' + ($errs) + '; else vErrors = null; }';
-  if (it.opts.allErrors) {
-    out += ' } ';
-  }
-  return out;
-}
-
-
-/***/ }),
-/* 493 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate_pattern(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $data = 'data' + ($dataLvl || '');
-  var $isData = it.opts.$data && $schema && $schema.$data,
-    $schemaValue;
-  if ($isData) {
-    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
-    $schemaValue = 'schema' + $lvl;
-  } else {
-    $schemaValue = $schema;
-  }
-  var $regexp = $isData ? '(new RegExp(' + $schemaValue + '))' : it.usePattern($schema);
-  out += 'if ( ';
-  if ($isData) {
-    out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'string\') || ';
-  }
-  out += ' !' + ($regexp) + '.test(' + ($data) + ') ) {   ';
-  var $$outStack = $$outStack || [];
-  $$outStack.push(out);
-  out = ''; /* istanbul ignore else */
-  if (it.createErrors !== false) {
-    out += ' { keyword: \'' + ('pattern') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { pattern:  ';
-    if ($isData) {
-      out += '' + ($schemaValue);
-    } else {
-      out += '' + (it.util.toQuotedString($schema));
-    }
-    out += '  } ';
-    if (it.opts.messages !== false) {
-      out += ' , message: \'should match pattern "';
-      if ($isData) {
-        out += '\' + ' + ($schemaValue) + ' + \'';
-      } else {
-        out += '' + (it.util.escapeQuotes($schema));
-      }
-      out += '"\' ';
-    }
-    if (it.opts.verbose) {
-      out += ' , schema:  ';
-      if ($isData) {
-        out += 'validate.schema' + ($schemaPath);
-      } else {
-        out += '' + (it.util.toQuotedString($schema));
-      }
-      out += '         , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-    }
-    out += ' } ';
-  } else {
-    out += ' {} ';
-  }
-  var __err = out;
-  out = $$outStack.pop();
-  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-    if (it.async) {
-      out += ' throw new ValidationError([' + (__err) + ']); ';
-    } else {
-      out += ' validate.errors = [' + (__err) + ']; return false; ';
-    }
-  } else {
-    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-  }
-  out += '} ';
-  if ($breakOnError) {
-    out += ' else { ';
-  }
-  return out;
-}
-
-
-/***/ }),
-/* 494 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate_properties(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $data = 'data' + ($dataLvl || '');
-  var $valid = 'valid' + $lvl;
-  var $errs = 'errs__' + $lvl;
-  var $it = it.util.copy(it);
-  var $closingBraces = '';
-  $it.level++;
-  var $nextValid = 'valid' + $it.level;
-  var $key = 'key' + $lvl,
-    $idx = 'idx' + $lvl,
-    $dataNxt = $it.dataLevel = it.dataLevel + 1,
-    $nextData = 'data' + $dataNxt,
-    $dataProperties = 'dataProperties' + $lvl;
-  var $schemaKeys = Object.keys($schema || {}),
-    $pProperties = it.schema.patternProperties || {},
-    $pPropertyKeys = Object.keys($pProperties),
-    $aProperties = it.schema.additionalProperties,
-    $someProperties = $schemaKeys.length || $pPropertyKeys.length,
-    $noAdditional = $aProperties === false,
-    $additionalIsSchema = typeof $aProperties == 'object' && Object.keys($aProperties).length,
-    $removeAdditional = it.opts.removeAdditional,
-    $checkAdditional = $noAdditional || $additionalIsSchema || $removeAdditional,
-    $ownProperties = it.opts.ownProperties,
-    $currentBaseId = it.baseId;
-  var $required = it.schema.required;
-  if ($required && !(it.opts.v5 && $required.$data) && $required.length < it.opts.loopRequired) var $requiredHash = it.util.toHash($required);
-  if (it.opts.patternGroups) {
-    var $pgProperties = it.schema.patternGroups || {},
-      $pgPropertyKeys = Object.keys($pgProperties);
-  }
-  out += 'var ' + ($errs) + ' = errors;var ' + ($nextValid) + ' = true;';
-  if ($ownProperties) {
-    out += ' var ' + ($dataProperties) + ' = undefined;';
-  }
-  if ($checkAdditional) {
-    if ($ownProperties) {
-      out += ' ' + ($dataProperties) + ' = ' + ($dataProperties) + ' || Object.keys(' + ($data) + '); for (var ' + ($idx) + '=0; ' + ($idx) + '<' + ($dataProperties) + '.length; ' + ($idx) + '++) { var ' + ($key) + ' = ' + ($dataProperties) + '[' + ($idx) + ']; ';
-    } else {
-      out += ' for (var ' + ($key) + ' in ' + ($data) + ') { ';
-    }
-    if ($someProperties) {
-      out += ' var isAdditional' + ($lvl) + ' = !(false ';
-      if ($schemaKeys.length) {
-        if ($schemaKeys.length > 5) {
-          out += ' || validate.schema' + ($schemaPath) + '[' + ($key) + '] ';
-        } else {
-          var arr1 = $schemaKeys;
-          if (arr1) {
-            var $propertyKey, i1 = -1,
-              l1 = arr1.length - 1;
-            while (i1 < l1) {
-              $propertyKey = arr1[i1 += 1];
-              out += ' || ' + ($key) + ' == ' + (it.util.toQuotedString($propertyKey)) + ' ';
-            }
-          }
-        }
-      }
-      if ($pPropertyKeys.length) {
-        var arr2 = $pPropertyKeys;
-        if (arr2) {
-          var $pProperty, $i = -1,
-            l2 = arr2.length - 1;
-          while ($i < l2) {
-            $pProperty = arr2[$i += 1];
-            out += ' || ' + (it.usePattern($pProperty)) + '.test(' + ($key) + ') ';
-          }
-        }
-      }
-      if (it.opts.patternGroups && $pgPropertyKeys.length) {
-        var arr3 = $pgPropertyKeys;
-        if (arr3) {
-          var $pgProperty, $i = -1,
-            l3 = arr3.length - 1;
-          while ($i < l3) {
-            $pgProperty = arr3[$i += 1];
-            out += ' || ' + (it.usePattern($pgProperty)) + '.test(' + ($key) + ') ';
-          }
-        }
-      }
-      out += ' ); if (isAdditional' + ($lvl) + ') { ';
-    }
-    if ($removeAdditional == 'all') {
-      out += ' delete ' + ($data) + '[' + ($key) + ']; ';
-    } else {
-      var $currentErrorPath = it.errorPath;
-      var $additionalProperty = '\' + ' + $key + ' + \'';
-      if (it.opts._errorDataPathProperty) {
-        it.errorPath = it.util.getPathExpr(it.errorPath, $key, it.opts.jsonPointers);
-      }
-      if ($noAdditional) {
-        if ($removeAdditional) {
-          out += ' delete ' + ($data) + '[' + ($key) + ']; ';
-        } else {
-          out += ' ' + ($nextValid) + ' = false; ';
-          var $currErrSchemaPath = $errSchemaPath;
-          $errSchemaPath = it.errSchemaPath + '/additionalProperties';
-          var $$outStack = $$outStack || [];
-          $$outStack.push(out);
-          out = ''; /* istanbul ignore else */
-          if (it.createErrors !== false) {
-            out += ' { keyword: \'' + ('additionalProperties') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { additionalProperty: \'' + ($additionalProperty) + '\' } ';
-            if (it.opts.messages !== false) {
-              out += ' , message: \'should NOT have additional properties\' ';
-            }
-            if (it.opts.verbose) {
-              out += ' , schema: false , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-            }
-            out += ' } ';
-          } else {
-            out += ' {} ';
-          }
-          var __err = out;
-          out = $$outStack.pop();
-          if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-            if (it.async) {
-              out += ' throw new ValidationError([' + (__err) + ']); ';
-            } else {
-              out += ' validate.errors = [' + (__err) + ']; return false; ';
-            }
-          } else {
-            out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-          }
-          $errSchemaPath = $currErrSchemaPath;
-          if ($breakOnError) {
-            out += ' break; ';
-          }
-        }
-      } else if ($additionalIsSchema) {
-        if ($removeAdditional == 'failing') {
-          out += ' var ' + ($errs) + ' = errors;  ';
-          var $wasComposite = it.compositeRule;
-          it.compositeRule = $it.compositeRule = true;
-          $it.schema = $aProperties;
-          $it.schemaPath = it.schemaPath + '.additionalProperties';
-          $it.errSchemaPath = it.errSchemaPath + '/additionalProperties';
-          $it.errorPath = it.opts._errorDataPathProperty ? it.errorPath : it.util.getPathExpr(it.errorPath, $key, it.opts.jsonPointers);
-          var $passData = $data + '[' + $key + ']';
-          $it.dataPathArr[$dataNxt] = $key;
-          var $code = it.validate($it);
-          $it.baseId = $currentBaseId;
-          if (it.util.varOccurences($code, $nextData) < 2) {
-            out += ' ' + (it.util.varReplace($code, $nextData, $passData)) + ' ';
-          } else {
-            out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ' + ($code) + ' ';
-          }
-          out += ' if (!' + ($nextValid) + ') { errors = ' + ($errs) + '; if (validate.errors !== null) { if (errors) validate.errors.length = errors; else validate.errors = null; } delete ' + ($data) + '[' + ($key) + ']; }  ';
-          it.compositeRule = $it.compositeRule = $wasComposite;
-        } else {
-          $it.schema = $aProperties;
-          $it.schemaPath = it.schemaPath + '.additionalProperties';
-          $it.errSchemaPath = it.errSchemaPath + '/additionalProperties';
-          $it.errorPath = it.opts._errorDataPathProperty ? it.errorPath : it.util.getPathExpr(it.errorPath, $key, it.opts.jsonPointers);
-          var $passData = $data + '[' + $key + ']';
-          $it.dataPathArr[$dataNxt] = $key;
-          var $code = it.validate($it);
-          $it.baseId = $currentBaseId;
-          if (it.util.varOccurences($code, $nextData) < 2) {
-            out += ' ' + (it.util.varReplace($code, $nextData, $passData)) + ' ';
-          } else {
-            out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ' + ($code) + ' ';
-          }
-          if ($breakOnError) {
-            out += ' if (!' + ($nextValid) + ') break; ';
-          }
-        }
-      }
-      it.errorPath = $currentErrorPath;
-    }
-    if ($someProperties) {
-      out += ' } ';
-    }
-    out += ' }  ';
-    if ($breakOnError) {
-      out += ' if (' + ($nextValid) + ') { ';
-      $closingBraces += '}';
-    }
-  }
-  var $useDefaults = it.opts.useDefaults && !it.compositeRule;
-  if ($schemaKeys.length) {
-    var arr4 = $schemaKeys;
-    if (arr4) {
-      var $propertyKey, i4 = -1,
-        l4 = arr4.length - 1;
-      while (i4 < l4) {
-        $propertyKey = arr4[i4 += 1];
-        var $sch = $schema[$propertyKey];
-        if (it.util.schemaHasRules($sch, it.RULES.all)) {
-          var $prop = it.util.getProperty($propertyKey),
-            $passData = $data + $prop,
-            $hasDefault = $useDefaults && $sch.default !== undefined;
-          $it.schema = $sch;
-          $it.schemaPath = $schemaPath + $prop;
-          $it.errSchemaPath = $errSchemaPath + '/' + it.util.escapeFragment($propertyKey);
-          $it.errorPath = it.util.getPath(it.errorPath, $propertyKey, it.opts.jsonPointers);
-          $it.dataPathArr[$dataNxt] = it.util.toQuotedString($propertyKey);
-          var $code = it.validate($it);
-          $it.baseId = $currentBaseId;
-          if (it.util.varOccurences($code, $nextData) < 2) {
-            $code = it.util.varReplace($code, $nextData, $passData);
-            var $useData = $passData;
-          } else {
-            var $useData = $nextData;
-            out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ';
-          }
-          if ($hasDefault) {
-            out += ' ' + ($code) + ' ';
-          } else {
-            if ($requiredHash && $requiredHash[$propertyKey]) {
-              out += ' if ( ' + ($useData) + ' === undefined ';
-              if ($ownProperties) {
-                out += ' || ! Object.prototype.hasOwnProperty.call(' + ($data) + ', \'' + (it.util.escapeQuotes($propertyKey)) + '\') ';
-              }
-              out += ') { ' + ($nextValid) + ' = false; ';
-              var $currentErrorPath = it.errorPath,
-                $currErrSchemaPath = $errSchemaPath,
-                $missingProperty = it.util.escapeQuotes($propertyKey);
-              if (it.opts._errorDataPathProperty) {
-                it.errorPath = it.util.getPath($currentErrorPath, $propertyKey, it.opts.jsonPointers);
-              }
-              $errSchemaPath = it.errSchemaPath + '/required';
-              var $$outStack = $$outStack || [];
-              $$outStack.push(out);
-              out = ''; /* istanbul ignore else */
-              if (it.createErrors !== false) {
-                out += ' { keyword: \'' + ('required') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { missingProperty: \'' + ($missingProperty) + '\' } ';
-                if (it.opts.messages !== false) {
-                  out += ' , message: \'';
-                  if (it.opts._errorDataPathProperty) {
-                    out += 'is a required property';
-                  } else {
-                    out += 'should have required property \\\'' + ($missingProperty) + '\\\'';
-                  }
-                  out += '\' ';
-                }
-                if (it.opts.verbose) {
-                  out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-                }
-                out += ' } ';
-              } else {
-                out += ' {} ';
-              }
-              var __err = out;
-              out = $$outStack.pop();
-              if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-                if (it.async) {
-                  out += ' throw new ValidationError([' + (__err) + ']); ';
-                } else {
-                  out += ' validate.errors = [' + (__err) + ']; return false; ';
-                }
-              } else {
-                out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-              }
-              $errSchemaPath = $currErrSchemaPath;
-              it.errorPath = $currentErrorPath;
-              out += ' } else { ';
-            } else {
-              if ($breakOnError) {
-                out += ' if ( ' + ($useData) + ' === undefined ';
-                if ($ownProperties) {
-                  out += ' || ! Object.prototype.hasOwnProperty.call(' + ($data) + ', \'' + (it.util.escapeQuotes($propertyKey)) + '\') ';
-                }
-                out += ') { ' + ($nextValid) + ' = true; } else { ';
-              } else {
-                out += ' if (' + ($useData) + ' !== undefined ';
-                if ($ownProperties) {
-                  out += ' &&   Object.prototype.hasOwnProperty.call(' + ($data) + ', \'' + (it.util.escapeQuotes($propertyKey)) + '\') ';
-                }
-                out += ' ) { ';
-              }
-            }
-            out += ' ' + ($code) + ' } ';
-          }
-        }
-        if ($breakOnError) {
-          out += ' if (' + ($nextValid) + ') { ';
-          $closingBraces += '}';
-        }
-      }
-    }
-  }
-  if ($pPropertyKeys.length) {
-    var arr5 = $pPropertyKeys;
-    if (arr5) {
-      var $pProperty, i5 = -1,
-        l5 = arr5.length - 1;
-      while (i5 < l5) {
-        $pProperty = arr5[i5 += 1];
-        var $sch = $pProperties[$pProperty];
-        if (it.util.schemaHasRules($sch, it.RULES.all)) {
-          $it.schema = $sch;
-          $it.schemaPath = it.schemaPath + '.patternProperties' + it.util.getProperty($pProperty);
-          $it.errSchemaPath = it.errSchemaPath + '/patternProperties/' + it.util.escapeFragment($pProperty);
-          if ($ownProperties) {
-            out += ' ' + ($dataProperties) + ' = ' + ($dataProperties) + ' || Object.keys(' + ($data) + '); for (var ' + ($idx) + '=0; ' + ($idx) + '<' + ($dataProperties) + '.length; ' + ($idx) + '++) { var ' + ($key) + ' = ' + ($dataProperties) + '[' + ($idx) + ']; ';
-          } else {
-            out += ' for (var ' + ($key) + ' in ' + ($data) + ') { ';
-          }
-          out += ' if (' + (it.usePattern($pProperty)) + '.test(' + ($key) + ')) { ';
-          $it.errorPath = it.util.getPathExpr(it.errorPath, $key, it.opts.jsonPointers);
-          var $passData = $data + '[' + $key + ']';
-          $it.dataPathArr[$dataNxt] = $key;
-          var $code = it.validate($it);
-          $it.baseId = $currentBaseId;
-          if (it.util.varOccurences($code, $nextData) < 2) {
-            out += ' ' + (it.util.varReplace($code, $nextData, $passData)) + ' ';
-          } else {
-            out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ' + ($code) + ' ';
-          }
-          if ($breakOnError) {
-            out += ' if (!' + ($nextValid) + ') break; ';
-          }
-          out += ' } ';
-          if ($breakOnError) {
-            out += ' else ' + ($nextValid) + ' = true; ';
-          }
-          out += ' }  ';
-          if ($breakOnError) {
-            out += ' if (' + ($nextValid) + ') { ';
-            $closingBraces += '}';
-          }
-        }
-      }
-    }
-  }
-  if (it.opts.patternGroups && $pgPropertyKeys.length) {
-    var arr6 = $pgPropertyKeys;
-    if (arr6) {
-      var $pgProperty, i6 = -1,
-        l6 = arr6.length - 1;
-      while (i6 < l6) {
-        $pgProperty = arr6[i6 += 1];
-        var $pgSchema = $pgProperties[$pgProperty],
-          $sch = $pgSchema.schema;
-        if (it.util.schemaHasRules($sch, it.RULES.all)) {
-          $it.schema = $sch;
-          $it.schemaPath = it.schemaPath + '.patternGroups' + it.util.getProperty($pgProperty) + '.schema';
-          $it.errSchemaPath = it.errSchemaPath + '/patternGroups/' + it.util.escapeFragment($pgProperty) + '/schema';
-          out += ' var pgPropCount' + ($lvl) + ' = 0;  ';
-          if ($ownProperties) {
-            out += ' ' + ($dataProperties) + ' = ' + ($dataProperties) + ' || Object.keys(' + ($data) + '); for (var ' + ($idx) + '=0; ' + ($idx) + '<' + ($dataProperties) + '.length; ' + ($idx) + '++) { var ' + ($key) + ' = ' + ($dataProperties) + '[' + ($idx) + ']; ';
-          } else {
-            out += ' for (var ' + ($key) + ' in ' + ($data) + ') { ';
-          }
-          out += ' if (' + (it.usePattern($pgProperty)) + '.test(' + ($key) + ')) { pgPropCount' + ($lvl) + '++; ';
-          $it.errorPath = it.util.getPathExpr(it.errorPath, $key, it.opts.jsonPointers);
-          var $passData = $data + '[' + $key + ']';
-          $it.dataPathArr[$dataNxt] = $key;
-          var $code = it.validate($it);
-          $it.baseId = $currentBaseId;
-          if (it.util.varOccurences($code, $nextData) < 2) {
-            out += ' ' + (it.util.varReplace($code, $nextData, $passData)) + ' ';
-          } else {
-            out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ' + ($code) + ' ';
-          }
-          if ($breakOnError) {
-            out += ' if (!' + ($nextValid) + ') break; ';
-          }
-          out += ' } ';
-          if ($breakOnError) {
-            out += ' else ' + ($nextValid) + ' = true; ';
-          }
-          out += ' }  ';
-          if ($breakOnError) {
-            out += ' if (' + ($nextValid) + ') { ';
-            $closingBraces += '}';
-          }
-          var $pgMin = $pgSchema.minimum,
-            $pgMax = $pgSchema.maximum;
-          if ($pgMin !== undefined || $pgMax !== undefined) {
-            out += ' var ' + ($valid) + ' = true; ';
-            var $currErrSchemaPath = $errSchemaPath;
-            if ($pgMin !== undefined) {
-              var $limit = $pgMin,
-                $reason = 'minimum',
-                $moreOrLess = 'less';
-              out += ' ' + ($valid) + ' = pgPropCount' + ($lvl) + ' >= ' + ($pgMin) + '; ';
-              $errSchemaPath = it.errSchemaPath + '/patternGroups/minimum';
-              out += '  if (!' + ($valid) + ') {   ';
-              var $$outStack = $$outStack || [];
-              $$outStack.push(out);
-              out = ''; /* istanbul ignore else */
-              if (it.createErrors !== false) {
-                out += ' { keyword: \'' + ('patternGroups') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { reason: \'' + ($reason) + '\', limit: ' + ($limit) + ', pattern: \'' + (it.util.escapeQuotes($pgProperty)) + '\' } ';
-                if (it.opts.messages !== false) {
-                  out += ' , message: \'should NOT have ' + ($moreOrLess) + ' than ' + ($limit) + ' properties matching pattern "' + (it.util.escapeQuotes($pgProperty)) + '"\' ';
-                }
-                if (it.opts.verbose) {
-                  out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-                }
-                out += ' } ';
-              } else {
-                out += ' {} ';
-              }
-              var __err = out;
-              out = $$outStack.pop();
-              if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-                if (it.async) {
-                  out += ' throw new ValidationError([' + (__err) + ']); ';
-                } else {
-                  out += ' validate.errors = [' + (__err) + ']; return false; ';
-                }
-              } else {
-                out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-              }
-              out += ' } ';
-              if ($pgMax !== undefined) {
-                out += ' else ';
-              }
-            }
-            if ($pgMax !== undefined) {
-              var $limit = $pgMax,
-                $reason = 'maximum',
-                $moreOrLess = 'more';
-              out += ' ' + ($valid) + ' = pgPropCount' + ($lvl) + ' <= ' + ($pgMax) + '; ';
-              $errSchemaPath = it.errSchemaPath + '/patternGroups/maximum';
-              out += '  if (!' + ($valid) + ') {   ';
-              var $$outStack = $$outStack || [];
-              $$outStack.push(out);
-              out = ''; /* istanbul ignore else */
-              if (it.createErrors !== false) {
-                out += ' { keyword: \'' + ('patternGroups') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { reason: \'' + ($reason) + '\', limit: ' + ($limit) + ', pattern: \'' + (it.util.escapeQuotes($pgProperty)) + '\' } ';
-                if (it.opts.messages !== false) {
-                  out += ' , message: \'should NOT have ' + ($moreOrLess) + ' than ' + ($limit) + ' properties matching pattern "' + (it.util.escapeQuotes($pgProperty)) + '"\' ';
-                }
-                if (it.opts.verbose) {
-                  out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-                }
-                out += ' } ';
-              } else {
-                out += ' {} ';
-              }
-              var __err = out;
-              out = $$outStack.pop();
-              if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-                if (it.async) {
-                  out += ' throw new ValidationError([' + (__err) + ']); ';
-                } else {
-                  out += ' validate.errors = [' + (__err) + ']; return false; ';
-                }
-              } else {
-                out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-              }
-              out += ' } ';
-            }
-            $errSchemaPath = $currErrSchemaPath;
-            if ($breakOnError) {
-              out += ' if (' + ($valid) + ') { ';
-              $closingBraces += '}';
-            }
-          }
-        }
-      }
-    }
-  }
-  if ($breakOnError) {
-    out += ' ' + ($closingBraces) + ' if (' + ($errs) + ' == errors) {';
-  }
-  out = it.util.cleanUpCode(out);
-  return out;
-}
-
-
-/***/ }),
-/* 495 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate_propertyNames(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $data = 'data' + ($dataLvl || '');
-  var $errs = 'errs__' + $lvl;
-  var $it = it.util.copy(it);
-  var $closingBraces = '';
-  $it.level++;
-  var $nextValid = 'valid' + $it.level;
-  if (it.util.schemaHasRules($schema, it.RULES.all)) {
-    $it.schema = $schema;
-    $it.schemaPath = $schemaPath;
-    $it.errSchemaPath = $errSchemaPath;
-    var $key = 'key' + $lvl,
-      $idx = 'idx' + $lvl,
-      $i = 'i' + $lvl,
-      $invalidName = '\' + ' + $key + ' + \'',
-      $dataNxt = $it.dataLevel = it.dataLevel + 1,
-      $nextData = 'data' + $dataNxt,
-      $dataProperties = 'dataProperties' + $lvl,
-      $ownProperties = it.opts.ownProperties,
-      $currentBaseId = it.baseId;
-    out += ' var ' + ($errs) + ' = errors; ';
-    if ($ownProperties) {
-      out += ' var ' + ($dataProperties) + ' = undefined; ';
-    }
-    if ($ownProperties) {
-      out += ' ' + ($dataProperties) + ' = ' + ($dataProperties) + ' || Object.keys(' + ($data) + '); for (var ' + ($idx) + '=0; ' + ($idx) + '<' + ($dataProperties) + '.length; ' + ($idx) + '++) { var ' + ($key) + ' = ' + ($dataProperties) + '[' + ($idx) + ']; ';
-    } else {
-      out += ' for (var ' + ($key) + ' in ' + ($data) + ') { ';
-    }
-    out += ' var startErrs' + ($lvl) + ' = errors; ';
-    var $passData = $key;
-    var $wasComposite = it.compositeRule;
-    it.compositeRule = $it.compositeRule = true;
-    var $code = it.validate($it);
-    $it.baseId = $currentBaseId;
-    if (it.util.varOccurences($code, $nextData) < 2) {
-      out += ' ' + (it.util.varReplace($code, $nextData, $passData)) + ' ';
-    } else {
-      out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ' + ($code) + ' ';
-    }
-    it.compositeRule = $it.compositeRule = $wasComposite;
-    out += ' if (!' + ($nextValid) + ') { for (var ' + ($i) + '=startErrs' + ($lvl) + '; ' + ($i) + '<errors; ' + ($i) + '++) { vErrors[' + ($i) + '].propertyName = ' + ($key) + '; }   var err =   '; /* istanbul ignore else */
-    if (it.createErrors !== false) {
-      out += ' { keyword: \'' + ('propertyNames') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { propertyName: \'' + ($invalidName) + '\' } ';
-      if (it.opts.messages !== false) {
-        out += ' , message: \'property name \\\'' + ($invalidName) + '\\\' is invalid\' ';
-      }
-      if (it.opts.verbose) {
-        out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-      }
-      out += ' } ';
-    } else {
-      out += ' {} ';
-    }
-    out += ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-    if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-      if (it.async) {
-        out += ' throw new ValidationError(vErrors); ';
-      } else {
-        out += ' validate.errors = vErrors; return false; ';
-      }
-    }
-    if ($breakOnError) {
-      out += ' break; ';
-    }
-    out += ' } }';
-  }
-  if ($breakOnError) {
-    out += ' ' + ($closingBraces) + ' if (' + ($errs) + ' == errors) {';
-  }
-  out = it.util.cleanUpCode(out);
-  return out;
-}
-
-
-/***/ }),
-/* 496 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate_ref(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $data = 'data' + ($dataLvl || '');
-  var $valid = 'valid' + $lvl;
-  var $async, $refCode;
-  if ($schema == '#' || $schema == '#/') {
-    if (it.isRoot) {
-      $async = it.async;
-      $refCode = 'validate';
-    } else {
-      $async = it.root.schema.$async === true;
-      $refCode = 'root.refVal[0]';
-    }
-  } else {
-    var $refVal = it.resolveRef(it.baseId, $schema, it.isRoot);
-    if ($refVal === undefined) {
-      var $message = it.MissingRefError.message(it.baseId, $schema);
-      if (it.opts.missingRefs == 'fail') {
-        it.logger.error($message);
-        var $$outStack = $$outStack || [];
-        $$outStack.push(out);
-        out = ''; /* istanbul ignore else */
-        if (it.createErrors !== false) {
-          out += ' { keyword: \'' + ('$ref') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { ref: \'' + (it.util.escapeQuotes($schema)) + '\' } ';
-          if (it.opts.messages !== false) {
-            out += ' , message: \'can\\\'t resolve reference ' + (it.util.escapeQuotes($schema)) + '\' ';
-          }
-          if (it.opts.verbose) {
-            out += ' , schema: ' + (it.util.toQuotedString($schema)) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-          }
-          out += ' } ';
-        } else {
-          out += ' {} ';
-        }
-        var __err = out;
-        out = $$outStack.pop();
-        if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-          if (it.async) {
-            out += ' throw new ValidationError([' + (__err) + ']); ';
-          } else {
-            out += ' validate.errors = [' + (__err) + ']; return false; ';
-          }
-        } else {
-          out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-        }
-        if ($breakOnError) {
-          out += ' if (false) { ';
-        }
-      } else if (it.opts.missingRefs == 'ignore') {
-        it.logger.warn($message);
-        if ($breakOnError) {
-          out += ' if (true) { ';
-        }
-      } else {
-        throw new it.MissingRefError(it.baseId, $schema, $message);
-      }
-    } else if ($refVal.inline) {
-      var $it = it.util.copy(it);
-      $it.level++;
-      var $nextValid = 'valid' + $it.level;
-      $it.schema = $refVal.schema;
-      $it.schemaPath = '';
-      $it.errSchemaPath = $schema;
-      var $code = it.validate($it).replace(/validate\.schema/g, $refVal.code);
-      out += ' ' + ($code) + ' ';
-      if ($breakOnError) {
-        out += ' if (' + ($nextValid) + ') { ';
-      }
-    } else {
-      $async = $refVal.$async === true;
-      $refCode = $refVal.code;
-    }
-  }
-  if ($refCode) {
-    var $$outStack = $$outStack || [];
-    $$outStack.push(out);
-    out = '';
-    if (it.opts.passContext) {
-      out += ' ' + ($refCode) + '.call(this, ';
-    } else {
-      out += ' ' + ($refCode) + '( ';
-    }
-    out += ' ' + ($data) + ', (dataPath || \'\')';
-    if (it.errorPath != '""') {
-      out += ' + ' + (it.errorPath);
-    }
-    var $parentData = $dataLvl ? 'data' + (($dataLvl - 1) || '') : 'parentData',
-      $parentDataProperty = $dataLvl ? it.dataPathArr[$dataLvl] : 'parentDataProperty';
-    out += ' , ' + ($parentData) + ' , ' + ($parentDataProperty) + ', rootData)  ';
-    var __callValidate = out;
-    out = $$outStack.pop();
-    if ($async) {
-      if (!it.async) throw new Error('async schema referenced by sync schema');
-      if ($breakOnError) {
-        out += ' var ' + ($valid) + '; ';
-      }
-      out += ' try { ' + (it.yieldAwait) + ' ' + (__callValidate) + '; ';
-      if ($breakOnError) {
-        out += ' ' + ($valid) + ' = true; ';
-      }
-      out += ' } catch (e) { if (!(e instanceof ValidationError)) throw e; if (vErrors === null) vErrors = e.errors; else vErrors = vErrors.concat(e.errors); errors = vErrors.length; ';
-      if ($breakOnError) {
-        out += ' ' + ($valid) + ' = false; ';
-      }
-      out += ' } ';
-      if ($breakOnError) {
-        out += ' if (' + ($valid) + ') { ';
-      }
-    } else {
-      out += ' if (!' + (__callValidate) + ') { if (vErrors === null) vErrors = ' + ($refCode) + '.errors; else vErrors = vErrors.concat(' + ($refCode) + '.errors); errors = vErrors.length; } ';
-      if ($breakOnError) {
-        out += ' else { ';
-      }
-    }
-  }
-  return out;
-}
-
-
-/***/ }),
-/* 497 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate_required(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $data = 'data' + ($dataLvl || '');
-  var $valid = 'valid' + $lvl;
-  var $isData = it.opts.$data && $schema && $schema.$data,
-    $schemaValue;
-  if ($isData) {
-    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
-    $schemaValue = 'schema' + $lvl;
-  } else {
-    $schemaValue = $schema;
-  }
-  var $vSchema = 'schema' + $lvl;
-  if (!$isData) {
-    if ($schema.length < it.opts.loopRequired && it.schema.properties && Object.keys(it.schema.properties).length) {
-      var $required = [];
-      var arr1 = $schema;
-      if (arr1) {
-        var $property, i1 = -1,
-          l1 = arr1.length - 1;
-        while (i1 < l1) {
-          $property = arr1[i1 += 1];
-          var $propertySch = it.schema.properties[$property];
-          if (!($propertySch && it.util.schemaHasRules($propertySch, it.RULES.all))) {
-            $required[$required.length] = $property;
-          }
-        }
-      }
-    } else {
-      var $required = $schema;
-    }
-  }
-  if ($isData || $required.length) {
-    var $currentErrorPath = it.errorPath,
-      $loopRequired = $isData || $required.length >= it.opts.loopRequired,
-      $ownProperties = it.opts.ownProperties;
-    if ($breakOnError) {
-      out += ' var missing' + ($lvl) + '; ';
-      if ($loopRequired) {
-        if (!$isData) {
-          out += ' var ' + ($vSchema) + ' = validate.schema' + ($schemaPath) + '; ';
-        }
-        var $i = 'i' + $lvl,
-          $propertyPath = 'schema' + $lvl + '[' + $i + ']',
-          $missingProperty = '\' + ' + $propertyPath + ' + \'';
-        if (it.opts._errorDataPathProperty) {
-          it.errorPath = it.util.getPathExpr($currentErrorPath, $propertyPath, it.opts.jsonPointers);
-        }
-        out += ' var ' + ($valid) + ' = true; ';
-        if ($isData) {
-          out += ' if (schema' + ($lvl) + ' === undefined) ' + ($valid) + ' = true; else if (!Array.isArray(schema' + ($lvl) + ')) ' + ($valid) + ' = false; else {';
-        }
-        out += ' for (var ' + ($i) + ' = 0; ' + ($i) + ' < ' + ($vSchema) + '.length; ' + ($i) + '++) { ' + ($valid) + ' = ' + ($data) + '[' + ($vSchema) + '[' + ($i) + ']] !== undefined ';
-        if ($ownProperties) {
-          out += ' &&   Object.prototype.hasOwnProperty.call(' + ($data) + ', ' + ($vSchema) + '[' + ($i) + ']) ';
-        }
-        out += '; if (!' + ($valid) + ') break; } ';
-        if ($isData) {
-          out += '  }  ';
-        }
-        out += '  if (!' + ($valid) + ') {   ';
-        var $$outStack = $$outStack || [];
-        $$outStack.push(out);
-        out = ''; /* istanbul ignore else */
-        if (it.createErrors !== false) {
-          out += ' { keyword: \'' + ('required') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { missingProperty: \'' + ($missingProperty) + '\' } ';
-          if (it.opts.messages !== false) {
-            out += ' , message: \'';
-            if (it.opts._errorDataPathProperty) {
-              out += 'is a required property';
-            } else {
-              out += 'should have required property \\\'' + ($missingProperty) + '\\\'';
-            }
-            out += '\' ';
-          }
-          if (it.opts.verbose) {
-            out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-          }
-          out += ' } ';
-        } else {
-          out += ' {} ';
-        }
-        var __err = out;
-        out = $$outStack.pop();
-        if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-          if (it.async) {
-            out += ' throw new ValidationError([' + (__err) + ']); ';
-          } else {
-            out += ' validate.errors = [' + (__err) + ']; return false; ';
-          }
-        } else {
-          out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-        }
-        out += ' } else { ';
-      } else {
-        out += ' if ( ';
-        var arr2 = $required;
-        if (arr2) {
-          var $propertyKey, $i = -1,
-            l2 = arr2.length - 1;
-          while ($i < l2) {
-            $propertyKey = arr2[$i += 1];
-            if ($i) {
-              out += ' || ';
-            }
-            var $prop = it.util.getProperty($propertyKey),
-              $useData = $data + $prop;
-            out += ' ( ( ' + ($useData) + ' === undefined ';
-            if ($ownProperties) {
-              out += ' || ! Object.prototype.hasOwnProperty.call(' + ($data) + ', \'' + (it.util.escapeQuotes($propertyKey)) + '\') ';
-            }
-            out += ') && (missing' + ($lvl) + ' = ' + (it.util.toQuotedString(it.opts.jsonPointers ? $propertyKey : $prop)) + ') ) ';
-          }
-        }
-        out += ') {  ';
-        var $propertyPath = 'missing' + $lvl,
-          $missingProperty = '\' + ' + $propertyPath + ' + \'';
-        if (it.opts._errorDataPathProperty) {
-          it.errorPath = it.opts.jsonPointers ? it.util.getPathExpr($currentErrorPath, $propertyPath, true) : $currentErrorPath + ' + ' + $propertyPath;
-        }
-        var $$outStack = $$outStack || [];
-        $$outStack.push(out);
-        out = ''; /* istanbul ignore else */
-        if (it.createErrors !== false) {
-          out += ' { keyword: \'' + ('required') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { missingProperty: \'' + ($missingProperty) + '\' } ';
-          if (it.opts.messages !== false) {
-            out += ' , message: \'';
-            if (it.opts._errorDataPathProperty) {
-              out += 'is a required property';
-            } else {
-              out += 'should have required property \\\'' + ($missingProperty) + '\\\'';
-            }
-            out += '\' ';
-          }
-          if (it.opts.verbose) {
-            out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-          }
-          out += ' } ';
-        } else {
-          out += ' {} ';
-        }
-        var __err = out;
-        out = $$outStack.pop();
-        if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-          if (it.async) {
-            out += ' throw new ValidationError([' + (__err) + ']); ';
-          } else {
-            out += ' validate.errors = [' + (__err) + ']; return false; ';
-          }
-        } else {
-          out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-        }
-        out += ' } else { ';
-      }
-    } else {
-      if ($loopRequired) {
-        if (!$isData) {
-          out += ' var ' + ($vSchema) + ' = validate.schema' + ($schemaPath) + '; ';
-        }
-        var $i = 'i' + $lvl,
-          $propertyPath = 'schema' + $lvl + '[' + $i + ']',
-          $missingProperty = '\' + ' + $propertyPath + ' + \'';
-        if (it.opts._errorDataPathProperty) {
-          it.errorPath = it.util.getPathExpr($currentErrorPath, $propertyPath, it.opts.jsonPointers);
-        }
-        if ($isData) {
-          out += ' if (' + ($vSchema) + ' && !Array.isArray(' + ($vSchema) + ')) {  var err =   '; /* istanbul ignore else */
-          if (it.createErrors !== false) {
-            out += ' { keyword: \'' + ('required') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { missingProperty: \'' + ($missingProperty) + '\' } ';
-            if (it.opts.messages !== false) {
-              out += ' , message: \'';
-              if (it.opts._errorDataPathProperty) {
-                out += 'is a required property';
-              } else {
-                out += 'should have required property \\\'' + ($missingProperty) + '\\\'';
-              }
-              out += '\' ';
-            }
-            if (it.opts.verbose) {
-              out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-            }
-            out += ' } ';
-          } else {
-            out += ' {} ';
-          }
-          out += ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; } else if (' + ($vSchema) + ' !== undefined) { ';
-        }
-        out += ' for (var ' + ($i) + ' = 0; ' + ($i) + ' < ' + ($vSchema) + '.length; ' + ($i) + '++) { if (' + ($data) + '[' + ($vSchema) + '[' + ($i) + ']] === undefined ';
-        if ($ownProperties) {
-          out += ' || ! Object.prototype.hasOwnProperty.call(' + ($data) + ', ' + ($vSchema) + '[' + ($i) + ']) ';
-        }
-        out += ') {  var err =   '; /* istanbul ignore else */
-        if (it.createErrors !== false) {
-          out += ' { keyword: \'' + ('required') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { missingProperty: \'' + ($missingProperty) + '\' } ';
-          if (it.opts.messages !== false) {
-            out += ' , message: \'';
-            if (it.opts._errorDataPathProperty) {
-              out += 'is a required property';
-            } else {
-              out += 'should have required property \\\'' + ($missingProperty) + '\\\'';
-            }
-            out += '\' ';
-          }
-          if (it.opts.verbose) {
-            out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-          }
-          out += ' } ';
-        } else {
-          out += ' {} ';
-        }
-        out += ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; } } ';
-        if ($isData) {
-          out += '  }  ';
-        }
-      } else {
-        var arr3 = $required;
-        if (arr3) {
-          var $propertyKey, i3 = -1,
-            l3 = arr3.length - 1;
-          while (i3 < l3) {
-            $propertyKey = arr3[i3 += 1];
-            var $prop = it.util.getProperty($propertyKey),
-              $missingProperty = it.util.escapeQuotes($propertyKey),
-              $useData = $data + $prop;
-            if (it.opts._errorDataPathProperty) {
-              it.errorPath = it.util.getPath($currentErrorPath, $propertyKey, it.opts.jsonPointers);
-            }
-            out += ' if ( ' + ($useData) + ' === undefined ';
-            if ($ownProperties) {
-              out += ' || ! Object.prototype.hasOwnProperty.call(' + ($data) + ', \'' + (it.util.escapeQuotes($propertyKey)) + '\') ';
-            }
-            out += ') {  var err =   '; /* istanbul ignore else */
-            if (it.createErrors !== false) {
-              out += ' { keyword: \'' + ('required') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { missingProperty: \'' + ($missingProperty) + '\' } ';
-              if (it.opts.messages !== false) {
-                out += ' , message: \'';
-                if (it.opts._errorDataPathProperty) {
-                  out += 'is a required property';
-                } else {
-                  out += 'should have required property \\\'' + ($missingProperty) + '\\\'';
-                }
-                out += '\' ';
-              }
-              if (it.opts.verbose) {
-                out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-              }
-              out += ' } ';
-            } else {
-              out += ' {} ';
-            }
-            out += ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; } ';
-          }
-        }
-      }
-    }
-    it.errorPath = $currentErrorPath;
-  } else if ($breakOnError) {
-    out += ' if (true) {';
-  }
-  return out;
-}
-
-
-/***/ }),
-/* 498 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function generate_uniqueItems(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $data = 'data' + ($dataLvl || '');
-  var $valid = 'valid' + $lvl;
-  var $isData = it.opts.$data && $schema && $schema.$data,
-    $schemaValue;
-  if ($isData) {
-    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
-    $schemaValue = 'schema' + $lvl;
-  } else {
-    $schemaValue = $schema;
-  }
-  if (($schema || $isData) && it.opts.uniqueItems !== false) {
-    if ($isData) {
-      out += ' var ' + ($valid) + '; if (' + ($schemaValue) + ' === false || ' + ($schemaValue) + ' === undefined) ' + ($valid) + ' = true; else if (typeof ' + ($schemaValue) + ' != \'boolean\') ' + ($valid) + ' = false; else { ';
-    }
-    out += ' var ' + ($valid) + ' = true; if (' + ($data) + '.length > 1) { var i = ' + ($data) + '.length, j; outer: for (;i--;) { for (j = i; j--;) { if (equal(' + ($data) + '[i], ' + ($data) + '[j])) { ' + ($valid) + ' = false; break outer; } } } } ';
-    if ($isData) {
-      out += '  }  ';
-    }
-    out += ' if (!' + ($valid) + ') {   ';
-    var $$outStack = $$outStack || [];
-    $$outStack.push(out);
-    out = ''; /* istanbul ignore else */
-    if (it.createErrors !== false) {
-      out += ' { keyword: \'' + ('uniqueItems') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { i: i, j: j } ';
-      if (it.opts.messages !== false) {
-        out += ' , message: \'should NOT have duplicate items (items ## \' + j + \' and \' + i + \' are identical)\' ';
-      }
-      if (it.opts.verbose) {
-        out += ' , schema:  ';
-        if ($isData) {
-          out += 'validate.schema' + ($schemaPath);
-        } else {
-          out += '' + ($schema);
-        }
-        out += '         , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-      }
-      out += ' } ';
-    } else {
-      out += ' {} ';
-    }
-    var __err = out;
-    out = $$outStack.pop();
-    if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
-      if (it.async) {
-        out += ' throw new ValidationError([' + (__err) + ']); ';
-      } else {
-        out += ' validate.errors = [' + (__err) + ']; return false; ';
-      }
-    } else {
-      out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
-    }
-    out += ' } ';
-    if ($breakOnError) {
-      out += ' else { ';
-    }
-  } else {
-    if ($breakOnError) {
-      out += ' if (true) { ';
-    }
-  }
-  return out;
-}
-
-
-/***/ }),
-/* 499 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var IDENTIFIER = /^[a-z_$][a-z0-9_$-]*$/i;
-var customRuleCode = __webpack_require__(485);
-
-module.exports = {
-  add: addKeyword,
-  get: getKeyword,
-  remove: removeKeyword
-};
-
-/**
- * Define custom keyword
- * @this  Ajv
- * @param {String} keyword custom keyword, should be unique (including different from all standard, custom and macro keywords).
- * @param {Object} definition keyword definition object with properties `type` (type(s) which the keyword applies to), `validate` or `compile`.
- * @return {Ajv} this for method chaining
- */
-function addKeyword(keyword, definition) {
-  /* jshint validthis: true */
-  /* eslint no-shadow: 0 */
-  var RULES = this.RULES;
-
-  if (RULES.keywords[keyword])
-    throw new Error('Keyword ' + keyword + ' is already defined');
-
-  if (!IDENTIFIER.test(keyword))
-    throw new Error('Keyword ' + keyword + ' is not a valid identifier');
-
-  if (definition) {
-    if (definition.macro && definition.valid !== undefined)
-      throw new Error('"valid" option cannot be used with macro keywords');
-
-    var dataType = definition.type;
-    if (Array.isArray(dataType)) {
-      var i, len = dataType.length;
-      for (i=0; i<len; i++) checkDataType(dataType[i]);
-      for (i=0; i<len; i++) _addRule(keyword, dataType[i], definition);
-    } else {
-      if (dataType) checkDataType(dataType);
-      _addRule(keyword, dataType, definition);
-    }
-
-    var $data = definition.$data === true && this._opts.$data;
-    if ($data && !definition.validate)
-      throw new Error('$data support: "validate" function is not defined');
-
-    var metaSchema = definition.metaSchema;
-    if (metaSchema) {
-      if ($data) {
-        metaSchema = {
-          anyOf: [
-            metaSchema,
-            { '$ref': 'https://raw.githubusercontent.com/epoberezkin/ajv/master/lib/refs/$data.json#' }
-          ]
-        };
-      }
-      definition.validateSchema = this.compile(metaSchema, true);
-    }
-  }
-
-  RULES.keywords[keyword] = RULES.all[keyword] = true;
-
-
-  function _addRule(keyword, dataType, definition) {
-    var ruleGroup;
-    for (var i=0; i<RULES.length; i++) {
-      var rg = RULES[i];
-      if (rg.type == dataType) {
-        ruleGroup = rg;
-        break;
-      }
-    }
-
-    if (!ruleGroup) {
-      ruleGroup = { type: dataType, rules: [] };
-      RULES.push(ruleGroup);
-    }
-
-    var rule = {
-      keyword: keyword,
-      definition: definition,
-      custom: true,
-      code: customRuleCode,
-      implements: definition.implements
-    };
-    ruleGroup.rules.push(rule);
-    RULES.custom[keyword] = rule;
-  }
-
-
-  function checkDataType(dataType) {
-    if (!RULES.types[dataType]) throw new Error('Unknown type ' + dataType);
-  }
-
-  return this;
-}
-
-
-/**
- * Get keyword
- * @this  Ajv
- * @param {String} keyword pre-defined or custom keyword.
- * @return {Object|Boolean} custom keyword definition, `true` if it is a predefined keyword, `false` otherwise.
- */
-function getKeyword(keyword) {
-  /* jshint validthis: true */
-  var rule = this.RULES.custom[keyword];
-  return rule ? rule.definition : this.RULES.keywords[keyword] || false;
-}
-
-
-/**
- * Remove keyword
- * @this  Ajv
- * @param {String} keyword pre-defined or custom keyword.
- * @return {Ajv} this for method chaining
- */
-function removeKeyword(keyword) {
-  /* jshint validthis: true */
-  var RULES = this.RULES;
-  delete RULES.keywords[keyword];
-  delete RULES.all[keyword];
-  delete RULES.custom[keyword];
-  for (var i=0; i<RULES.length; i++) {
-    var rules = RULES[i].rules;
-    for (var j=0; j<rules.length; j++) {
-      if (rules[j].keyword == keyword) {
-        rules.splice(j, 1);
-        break;
-      }
-    }
-  }
-  return this;
-}
-
-
-/***/ }),
-/* 500 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var META_SCHEMA_ID = 'http://json-schema.org/draft-06/schema';
-
-module.exports = function (ajv) {
-  var defaultMeta = ajv._opts.defaultMeta;
-  var metaSchemaRef = typeof defaultMeta == 'string'
-                      ? { $ref: defaultMeta }
-                      : ajv.getSchema(META_SCHEMA_ID)
-                        ? { $ref: META_SCHEMA_ID }
-                        : {};
-
-  ajv.addKeyword('patternGroups', {
-    // implemented in properties.jst
-    metaSchema: {
-      type: 'object',
-      additionalProperties: {
-        type: 'object',
-        required: [ 'schema' ],
-        properties: {
-          maximum: {
-            type: 'integer',
-            minimum: 0
-          },
-          minimum: {
-            type: 'integer',
-            minimum: 0
-          },
-          schema: metaSchemaRef
-        },
-        additionalProperties: false
-      }
-    }
-  });
-  ajv.RULES.all.properties.implements.push('patternGroups');
-};
-
-
-/***/ }),
-/* 501 */
-/***/ (function(module, exports) {
-
-module.exports = {"$schema":"http://json-schema.org/draft-06/schema#","$id":"https://raw.githubusercontent.com/epoberezkin/ajv/master/lib/refs/$data.json#","description":"Meta-schema for $data reference (JSON-schema extension proposal)","type":"object","required":["$data"],"properties":{"$data":{"type":"string","anyOf":[{"format":"relative-json-pointer"},{"format":"json-pointer"}]}},"additionalProperties":false}
-
-/***/ }),
-/* 502 */
-/***/ (function(module, exports) {
-
-module.exports = {"$schema":"http://json-schema.org/draft-06/schema#","$id":"http://json-schema.org/draft-06/schema#","title":"Core schema meta-schema","definitions":{"schemaArray":{"type":"array","minItems":1,"items":{"$ref":"#"}},"nonNegativeInteger":{"type":"integer","minimum":0},"nonNegativeIntegerDefault0":{"allOf":[{"$ref":"#/definitions/nonNegativeInteger"},{"default":0}]},"simpleTypes":{"enum":["array","boolean","integer","null","number","object","string"]},"stringArray":{"type":"array","items":{"type":"string"},"uniqueItems":true,"default":[]}},"type":["object","boolean"],"properties":{"$id":{"type":"string","format":"uri-reference"},"$schema":{"type":"string","format":"uri"},"$ref":{"type":"string","format":"uri-reference"},"title":{"type":"string"},"description":{"type":"string"},"default":{},"examples":{"type":"array","items":{}},"multipleOf":{"type":"number","exclusiveMinimum":0},"maximum":{"type":"number"},"exclusiveMaximum":{"type":"number"},"minimum":{"type":"number"},"exclusiveMinimum":{"type":"number"},"maxLength":{"$ref":"#/definitions/nonNegativeInteger"},"minLength":{"$ref":"#/definitions/nonNegativeIntegerDefault0"},"pattern":{"type":"string","format":"regex"},"additionalItems":{"$ref":"#"},"items":{"anyOf":[{"$ref":"#"},{"$ref":"#/definitions/schemaArray"}],"default":{}},"maxItems":{"$ref":"#/definitions/nonNegativeInteger"},"minItems":{"$ref":"#/definitions/nonNegativeIntegerDefault0"},"uniqueItems":{"type":"boolean","default":false},"contains":{"$ref":"#"},"maxProperties":{"$ref":"#/definitions/nonNegativeInteger"},"minProperties":{"$ref":"#/definitions/nonNegativeIntegerDefault0"},"required":{"$ref":"#/definitions/stringArray"},"additionalProperties":{"$ref":"#"},"definitions":{"type":"object","additionalProperties":{"$ref":"#"},"default":{}},"properties":{"type":"object","additionalProperties":{"$ref":"#"},"default":{}},"patternProperties":{"type":"object","additionalProperties":{"$ref":"#"},"default":{}},"dependencies":{"type":"object","additionalProperties":{"anyOf":[{"$ref":"#"},{"$ref":"#/definitions/stringArray"}]}},"propertyNames":{"$ref":"#"},"const":{},"enum":{"type":"array","minItems":1,"uniqueItems":true},"type":{"anyOf":[{"$ref":"#/definitions/simpleTypes"},{"type":"array","items":{"$ref":"#/definitions/simpleTypes"},"minItems":1,"uniqueItems":true}]},"format":{"type":"string"},"allOf":{"$ref":"#/definitions/schemaArray"},"anyOf":{"$ref":"#/definitions/schemaArray"},"oneOf":{"$ref":"#/definitions/schemaArray"},"not":{"$ref":"#"}},"default":{}}
-
-/***/ }),
-/* 503 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var traverse = module.exports = function (schema, opts, cb) {
-  if (typeof opts == 'function') {
-    cb = opts;
-    opts = {};
-  }
-  _traverse(opts, cb, schema, '', schema);
-};
-
-
-traverse.keywords = {
-  additionalItems: true,
-  items: true,
-  contains: true,
-  additionalProperties: true,
-  propertyNames: true,
-  not: true
-};
-
-traverse.arrayKeywords = {
-  items: true,
-  allOf: true,
-  anyOf: true,
-  oneOf: true
-};
-
-traverse.propsKeywords = {
-  definitions: true,
-  properties: true,
-  patternProperties: true,
-  dependencies: true
-};
-
-traverse.skipKeywords = {
-  enum: true,
-  const: true,
-  required: true,
-  maximum: true,
-  minimum: true,
-  exclusiveMaximum: true,
-  exclusiveMinimum: true,
-  multipleOf: true,
-  maxLength: true,
-  minLength: true,
-  pattern: true,
-  format: true,
-  maxItems: true,
-  minItems: true,
-  uniqueItems: true,
-  maxProperties: true,
-  minProperties: true
-};
-
-
-function _traverse(opts, cb, schema, jsonPtr, rootSchema, parentJsonPtr, parentKeyword, parentSchema, keyIndex) {
-  if (schema && typeof schema == 'object' && !Array.isArray(schema)) {
-    cb(schema, jsonPtr, rootSchema, parentJsonPtr, parentKeyword, parentSchema, keyIndex);
-    for (var key in schema) {
-      var sch = schema[key];
-      if (Array.isArray(sch)) {
-        if (key in traverse.arrayKeywords) {
-          for (var i=0; i<sch.length; i++)
-            _traverse(opts, cb, sch[i], jsonPtr + '/' + key + '/' + i, rootSchema, jsonPtr, key, schema, i);
-        }
-      } else if (key in traverse.propsKeywords) {
-        if (sch && typeof sch == 'object') {
-          for (var prop in sch)
-            _traverse(opts, cb, sch[prop], jsonPtr + '/' + key + '/' + escapeJsonPtr(prop), rootSchema, jsonPtr, key, schema, prop);
-        }
-      } else if (key in traverse.keywords || (opts.allKeys && !(key in traverse.skipKeywords))) {
-        _traverse(opts, cb, sch, jsonPtr + '/' + key, rootSchema, jsonPtr, key, schema);
-      }
-    }
-  }
-}
-
-
-function escapeJsonPtr(str) {
-  return str.replace(/~/g, '~0').replace(/\//g, '~1');
-}
-
-
-/***/ }),
-/* 504 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
 const x = module.exports;
 const ESC = '\u001B[';
 const OSC = '\u001B]';
@@ -93555,7 +89525,7 @@ x.iTerm.setCwd = cwd => OSC + '50;CurrentDir=' + (cwd || process.cwd()) + BEL;
 
 
 /***/ }),
-/* 505 */
+/* 473 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -93566,12 +89536,12 @@ module.exports = function () {
 
 
 /***/ }),
-/* 506 */
+/* 474 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 /* WEBPACK VAR INJECTION */(function(module) {
-const colorConvert = __webpack_require__(608);
+const colorConvert = __webpack_require__(576);
 
 const wrapAnsi16 = (fn, offset) => function () {
 	const code = fn.apply(colorConvert, arguments);
@@ -93739,7 +89709,7 @@ Object.defineProperty(module, 'exports', {
 /* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(163)(module)))
 
 /***/ }),
-/* 507 */
+/* 475 */
 /***/ (function(module, exports) {
 
 function webpackEmptyContext(req) {
@@ -93748,10 +89718,10 @@ function webpackEmptyContext(req) {
 webpackEmptyContext.keys = function() { return []; };
 webpackEmptyContext.resolve = webpackEmptyContext;
 module.exports = webpackEmptyContext;
-webpackEmptyContext.id = 507;
+webpackEmptyContext.id = 475;
 
 /***/ }),
-/* 508 */
+/* 476 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -93836,12 +89806,12 @@ module.exports = function(root, loadImplementation){
 
 
 /***/ }),
-/* 509 */
+/* 477 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-module.exports = __webpack_require__(508)(global, loadImplementation);
+module.exports = __webpack_require__(476)(global, loadImplementation);
 
 /**
  * Node.js version of loadImplementation.
@@ -93937,7 +89907,7 @@ function tryAutoDetect(){
 
 
 /***/ }),
-/* 510 */
+/* 478 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -93966,7 +89936,7 @@ function flat(arr, res) {
 
 
 /***/ }),
-/* 511 */
+/* 479 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -93998,13 +89968,13 @@ module.exports = function (arr, predicate, ctx) {
 
 
 /***/ }),
-/* 512 */
+/* 480 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var rawAsap = __webpack_require__(513);
+var rawAsap = __webpack_require__(481);
 var freeTasks = [];
 
 /**
@@ -94070,7 +90040,7 @@ RawTask.prototype.call = function () {
 
 
 /***/ }),
-/* 513 */
+/* 481 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -94178,16 +90148,16 @@ function requestFlush() {
 
 
 /***/ }),
-/* 514 */
+/* 482 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // Copyright 2011 Mark Cavage <mcavage@gmail.com> All rights reserved.
 
-var errors = __webpack_require__(205);
-var types = __webpack_require__(206);
+var errors = __webpack_require__(203);
+var types = __webpack_require__(204);
 
-var Reader = __webpack_require__(515);
-var Writer = __webpack_require__(516);
+var Reader = __webpack_require__(483);
+var Writer = __webpack_require__(484);
 
 
 // --- Exports
@@ -94211,7 +90181,7 @@ for (var e in errors) {
 
 
 /***/ }),
-/* 515 */
+/* 483 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // Copyright 2011 Mark Cavage <mcavage@gmail.com> All rights reserved.
@@ -94219,8 +90189,8 @@ for (var e in errors) {
 var assert = __webpack_require__(28);
 var Buffer = __webpack_require__(15).Buffer;
 
-var ASN1 = __webpack_require__(206);
-var errors = __webpack_require__(205);
+var ASN1 = __webpack_require__(204);
+var errors = __webpack_require__(203);
 
 
 // --- Globals
@@ -94479,15 +90449,15 @@ module.exports = Reader;
 
 
 /***/ }),
-/* 516 */
+/* 484 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // Copyright 2011 Mark Cavage <mcavage@gmail.com> All rights reserved.
 
 var assert = __webpack_require__(28);
 var Buffer = __webpack_require__(15).Buffer;
-var ASN1 = __webpack_require__(206);
-var errors = __webpack_require__(205);
+var ASN1 = __webpack_require__(204);
+var errors = __webpack_require__(203);
 
 
 // --- Globals
@@ -94802,19 +90772,19 @@ module.exports = Writer;
 
 
 /***/ }),
-/* 517 */
+/* 485 */
 /***/ (function(module, exports, __webpack_require__) {
 
 module.exports =
 {
-  parallel      : __webpack_require__(519),
-  serial        : __webpack_require__(520),
-  serialOrdered : __webpack_require__(351)
+  parallel      : __webpack_require__(487),
+  serial        : __webpack_require__(488),
+  serialOrdered : __webpack_require__(345)
 };
 
 
 /***/ }),
-/* 518 */
+/* 486 */
 /***/ (function(module, exports) {
 
 module.exports = defer;
@@ -94846,12 +90816,12 @@ function defer(fn)
 
 
 /***/ }),
-/* 519 */
+/* 487 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var iterate    = __webpack_require__(348)
-  , initState  = __webpack_require__(349)
-  , terminator = __webpack_require__(350)
+var iterate    = __webpack_require__(342)
+  , initState  = __webpack_require__(343)
+  , terminator = __webpack_require__(344)
   ;
 
 // Public API
@@ -94895,10 +90865,10 @@ function parallel(list, iterator, callback)
 
 
 /***/ }),
-/* 520 */
+/* 488 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var serialOrdered = __webpack_require__(351);
+var serialOrdered = __webpack_require__(345);
 
 // Public API
 module.exports = serial;
@@ -94918,7 +90888,7 @@ function serial(list, iterator, callback)
 
 
 /***/ }),
-/* 521 */
+/* 489 */
 /***/ (function(module, exports, __webpack_require__) {
 
 
@@ -95136,14 +91106,14 @@ module.exports.canonicalizeResource = canonicalizeResource
 
 
 /***/ }),
-/* 522 */
+/* 490 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var aws4 = exports,
     url = __webpack_require__(24),
-    querystring = __webpack_require__(196),
+    querystring = __webpack_require__(197),
     crypto = __webpack_require__(11),
-    lru = __webpack_require__(523),
+    lru = __webpack_require__(491),
     credentialsCache = lru(1000)
 
 // http://docs.amazonwebservices.com/general/latest/gr/signature-version-4.html
@@ -95474,7 +91444,7 @@ aws4.sign = function(request, credentials) {
 
 
 /***/ }),
-/* 523 */
+/* 491 */
 /***/ (function(module, exports) {
 
 module.exports = function(size) {
@@ -95576,7 +91546,7 @@ function DoublyLinkedNode(key, val) {
 
 
 /***/ }),
-/* 524 */
+/* 492 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -95604,7 +91574,7 @@ function _load_errors() {
 }
 
 /***/ }),
-/* 525 */
+/* 493 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -95648,7 +91618,7 @@ exports.hasWrapper = hasWrapper;
 exports.examples = examples;
 
 /***/ }),
-/* 526 */
+/* 494 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -95695,7 +91665,7 @@ exports.setFlags = setFlags;
 var _run;
 
 function _load_run() {
-  return _run = __webpack_require__(360);
+  return _run = __webpack_require__(354);
 }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -95711,7 +91681,7 @@ function setFlags(commander) {
 }
 
 /***/ }),
-/* 527 */
+/* 495 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -95831,7 +91801,7 @@ exports.run = run;
 exports.examples = examples;
 
 /***/ }),
-/* 528 */
+/* 496 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -95851,7 +91821,7 @@ function _load_asyncToGenerator() {
 var _extends2;
 
 function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+  return _extends2 = _interopRequireDefault(__webpack_require__(20));
 }
 
 let run = exports.run = (() => {
@@ -95903,7 +91873,7 @@ function _load_errors() {
 var _child;
 
 function _load_child() {
-  return _child = _interopRequireWildcard(__webpack_require__(58));
+  return _child = _interopRequireWildcard(__webpack_require__(50));
 }
 
 var _executeLifecycleScript;
@@ -95915,7 +91885,7 @@ function _load_executeLifecycleScript() {
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 var _global;
@@ -95971,7 +91941,7 @@ function coerceCreatePackageName(str) {
 }
 
 /***/ }),
-/* 529 */
+/* 497 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -96019,7 +91989,7 @@ function _load_errors() {
 var _child;
 
 function _load_child() {
-  return _child = _interopRequireWildcard(__webpack_require__(58));
+  return _child = _interopRequireWildcard(__webpack_require__(50));
 }
 
 var _executeLifecycleScript;
@@ -96039,7 +92009,7 @@ function hasWrapper(commander, args) {
 }
 
 /***/ }),
-/* 530 */
+/* 498 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -96121,7 +92091,7 @@ function setFlags(commander) {
 const examples = exports.examples = ['generate-lock-entry', 'generate-lock-entry --use-manifest ./package.json', 'generate-lock-entry --resolved local-file.tgz#hash'];
 
 /***/ }),
-/* 531 */
+/* 499 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -96155,7 +92125,7 @@ function _load_misc() {
 var _aliases;
 
 function _load_aliases() {
-  return _aliases = _interopRequireDefault(__webpack_require__(352));
+  return _aliases = _interopRequireDefault(__webpack_require__(346));
 }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
@@ -96230,7 +92200,7 @@ function run(config, reporter, commander, args) {
 }
 
 /***/ }),
-/* 532 */
+/* 500 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -96270,7 +92240,7 @@ function _load_install() {
 var _check;
 
 function _load_check() {
-  return _check = __webpack_require__(356);
+  return _check = __webpack_require__(350);
 }
 
 var _errors;
@@ -96306,13 +92276,13 @@ function _load_hostedGitResolver2() {
 var _gistResolver;
 
 function _load_gistResolver() {
-  return _gistResolver = _interopRequireDefault(__webpack_require__(216));
+  return _gistResolver = _interopRequireDefault(__webpack_require__(214));
 }
 
 var _gistResolver2;
 
 function _load_gistResolver2() {
-  return _gistResolver2 = __webpack_require__(216);
+  return _gistResolver2 = __webpack_require__(214);
 }
 
 var _gitResolver;
@@ -96324,13 +92294,13 @@ function _load_gitResolver() {
 var _fileResolver;
 
 function _load_fileResolver() {
-  return _fileResolver = _interopRequireDefault(__webpack_require__(215));
+  return _fileResolver = _interopRequireDefault(__webpack_require__(213));
 }
 
 var _packageResolver;
 
 function _load_packageResolver() {
-  return _packageResolver = _interopRequireDefault(__webpack_require__(366));
+  return _packageResolver = _interopRequireDefault(__webpack_require__(360));
 }
 
 var _packageRequest;
@@ -96342,25 +92312,25 @@ function _load_packageRequest() {
 var _packageReference;
 
 function _load_packageReference() {
-  return _packageReference = _interopRequireDefault(__webpack_require__(365));
+  return _packageReference = _interopRequireDefault(__webpack_require__(359));
 }
 
 var _packageFetcher;
 
 function _load_packageFetcher() {
-  return _packageFetcher = _interopRequireWildcard(__webpack_require__(210));
+  return _packageFetcher = _interopRequireWildcard(__webpack_require__(208));
 }
 
 var _packageLinker;
 
 function _load_packageLinker() {
-  return _packageLinker = _interopRequireDefault(__webpack_require__(211));
+  return _packageLinker = _interopRequireDefault(__webpack_require__(209));
 }
 
 var _packageCompatibility;
 
 function _load_packageCompatibility() {
-  return _packageCompatibility = _interopRequireWildcard(__webpack_require__(209));
+  return _packageCompatibility = _interopRequireWildcard(__webpack_require__(207));
 }
 
 var _lockfile;
@@ -96378,13 +92348,13 @@ function _load_normalizePattern() {
 var _logicalDependencyTree;
 
 function _load_logicalDependencyTree() {
-  return _logicalDependencyTree = __webpack_require__(582);
+  return _logicalDependencyTree = __webpack_require__(550);
 }
 
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 var _misc;
@@ -96411,7 +92381,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 const invariant = __webpack_require__(9);
 const path = __webpack_require__(0);
-const uuid = __webpack_require__(119);
+const uuid = __webpack_require__(120);
 const ssri = __webpack_require__(65);
 const nodeVersion = process.versions.node.split('-')[0];
 
@@ -96852,7 +92822,7 @@ function hasWrapper(commander, args) {
 }
 
 /***/ }),
-/* 533 */
+/* 501 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -96942,7 +92912,7 @@ function _load_npmRegistry() {
 var _parsePackageName2;
 
 function _load_parsePackageName() {
-  return _parsePackageName2 = _interopRequireDefault(__webpack_require__(588));
+  return _parsePackageName2 = _interopRequireDefault(__webpack_require__(556));
 }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -96988,7 +92958,7 @@ function hasWrapper(commander, args) {
 }
 
 /***/ }),
-/* 534 */
+/* 502 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -97008,20 +92978,28 @@ function _load_asyncToGenerator() {
 let run = exports.run = (() => {
   var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, reporter, flags, args) {
     const installVersion = flags[`2`] ? `berry` : flags.install;
+    const forwardedArgs = process.argv.slice(process.argv.indexOf('init', 2) + 1);
 
     if (installVersion) {
-      const lockfilePath = path.resolve(config.cwd, 'yarn.lock');
-      if (!(yield (_fs || _load_fs()).exists(lockfilePath))) {
-        yield (_fs || _load_fs()).writeFile(lockfilePath, '');
+      if (flags[`2`] && process.env.COREPACK_ROOT) {
+        yield (_child || _load_child()).spawn((_constants || _load_constants()).NODE_BIN_PATH, [path.join(process.env.COREPACK_ROOT, 'dist/corepack.js'), `yarn@${flags.install || `stable`}`, `init`, ...forwardedArgs, `--install=self`], {
+          stdio: 'inherit',
+          cwd: config.cwd
+        });
+      } else {
+        const lockfilePath = path.resolve(config.cwd, 'yarn.lock');
+        if (!(yield (_fs || _load_fs()).exists(lockfilePath))) {
+          yield (_fs || _load_fs()).writeFile(lockfilePath, '');
+        }
+        yield (_child || _load_child()).spawn((_constants || _load_constants()).NODE_BIN_PATH, [process.argv[1], 'policies', 'set-version', installVersion, '--silent'], {
+          stdio: 'inherit',
+          cwd: config.cwd
+        });
+        yield (_child || _load_child()).spawn((_constants || _load_constants()).NODE_BIN_PATH, [process.argv[1], 'init', ...forwardedArgs], {
+          stdio: 'inherit',
+          cwd: config.cwd
+        });
       }
-      yield (_child || _load_child()).spawn((_constants || _load_constants()).NODE_BIN_PATH, [process.argv[1], 'policies', 'set-version', installVersion], {
-        stdio: 'inherit',
-        cwd: config.cwd
-      });
-      yield (_child || _load_child()).spawn((_constants || _load_constants()).NODE_BIN_PATH, [process.argv[1], 'init', ...(flags.yes ? ['-y'] : []), ...(flags.private ? ['-p'] : [])], {
-        stdio: 'inherit',
-        cwd: config.cwd
-      });
       return;
     }
 
@@ -97256,31 +93234,31 @@ exports.hasWrapper = hasWrapper;
 var _util;
 
 function _load_util() {
-  return _util = __webpack_require__(221);
+  return _util = __webpack_require__(219);
 }
 
 var _index;
 
 function _load_index() {
-  return _index = __webpack_require__(57);
+  return _index = __webpack_require__(58);
 }
 
 var _githubResolver;
 
 function _load_githubResolver() {
-  return _githubResolver = _interopRequireDefault(__webpack_require__(367));
+  return _githubResolver = _interopRequireDefault(__webpack_require__(361));
 }
 
 var _child;
 
 function _load_child() {
-  return _child = _interopRequireWildcard(__webpack_require__(58));
+  return _child = _interopRequireWildcard(__webpack_require__(50));
 }
 
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 var _validate;
@@ -97319,7 +93297,7 @@ function hasWrapper(commander, args) {
 const shouldRunInCurrentCwd = exports.shouldRunInCurrentCwd = true;
 
 /***/ }),
-/* 535 */
+/* 503 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -97333,7 +93311,7 @@ exports.examples = exports.run = undefined;
 var _extends2;
 
 function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+  return _extends2 = _interopRequireDefault(__webpack_require__(20));
 }
 
 var _asyncToGenerator2;
@@ -97656,7 +93634,7 @@ exports.run = run;
 exports.examples = examples;
 
 /***/ }),
-/* 536 */
+/* 504 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -97702,7 +93680,7 @@ function hasWrapper(commander, args) {
 }
 
 /***/ }),
-/* 537 */
+/* 505 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -97716,7 +93694,7 @@ exports.run = undefined;
 var _extends2;
 
 function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+  return _extends2 = _interopRequireDefault(__webpack_require__(20));
 }
 
 var _asyncToGenerator2;
@@ -97756,13 +93734,13 @@ exports.hasWrapper = hasWrapper;
 var _child;
 
 function _load_child() {
-  return _child = _interopRequireWildcard(__webpack_require__(58));
+  return _child = _interopRequireWildcard(__webpack_require__(50));
 }
 
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 var _constants;
@@ -97786,7 +93764,7 @@ function hasWrapper(commander, args) {
 }
 
 /***/ }),
-/* 538 */
+/* 506 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -97800,7 +93778,7 @@ exports.run = exports.requireLockfile = undefined;
 var _extends2;
 
 function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+  return _extends2 = _interopRequireDefault(__webpack_require__(20));
 }
 
 var _asyncToGenerator2;
@@ -97885,13 +93863,13 @@ function _load_install() {
 var _colorForVersions;
 
 function _load_colorForVersions() {
-  return _colorForVersions = _interopRequireDefault(__webpack_require__(369));
+  return _colorForVersions = _interopRequireDefault(__webpack_require__(363));
 }
 
 var _colorizeDiff;
 
 function _load_colorizeDiff() {
-  return _colorizeDiff = _interopRequireDefault(__webpack_require__(370));
+  return _colorizeDiff = _interopRequireDefault(__webpack_require__(364));
 }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -97908,7 +93886,7 @@ function hasWrapper(commander, args) {
 }
 
 /***/ }),
-/* 539 */
+/* 507 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -98062,7 +94040,7 @@ function _load_validate() {
 var _tag;
 
 function _load_tag() {
-  return _tag = __webpack_require__(361);
+  return _tag = __webpack_require__(355);
 }
 
 var _login;
@@ -98165,7 +94143,7 @@ exports.hasWrapper = hasWrapper;
 exports.examples = examples;
 
 /***/ }),
-/* 540 */
+/* 508 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -98176,6 +94154,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.examples = exports.setFlags = exports.run = undefined;
 
+var _extends2;
+
+function _load_extends() {
+  return _extends2 = _interopRequireDefault(__webpack_require__(20));
+}
+
 var _asyncToGenerator2;
 
 function _load_asyncToGenerator() {
@@ -98186,6 +94170,7 @@ let fetchReleases = (() => {
   var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (config, { includePrereleases = false } = {}) {
     const token = process.env.GITHUB_TOKEN;
     const tokenUrlParameter = token ? `?access_token=${token}` : '';
+
     const request = yield config.requestManager.request({
       url: `https://api.github.com/repos/yarnpkg/yarn/releases${tokenUrlParameter}`,
       json: true
@@ -98229,6 +94214,18 @@ let fetchReleases = (() => {
 
 exports.hasWrapper = hasWrapper;
 
+var _yarnVersion;
+
+function _load_yarnVersion() {
+  return _yarnVersion = __webpack_require__(105);
+}
+
+var _child;
+
+function _load_child() {
+  return _child = _interopRequireWildcard(__webpack_require__(50));
+}
+
 var _buildSubCommands2;
 
 function _load_buildSubCommands() {
@@ -98244,7 +94241,7 @@ function _load_rc() {
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 var _lockfile;
@@ -98253,10 +94250,29 @@ function _load_lockfile() {
   return _lockfile = __webpack_require__(19);
 }
 
+var _semver;
+
+function _load_semver() {
+  return _semver = __webpack_require__(170);
+}
+
+var _constants;
+
+function _load_constants() {
+  return _constants = __webpack_require__(8);
+}
+
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+/* eslint-disable max-len */
+
+const V2_NAMES = ['berry', 'stable', 'canary', 'v2', '2'];
+
+const isLocalFile = version => version.match(/^\.{0,2}[\\/]/) || path.isAbsolute(version);
+const isV2Version = version => (0, (_semver || _load_semver()).satisfiesWithPrereleases)(version, '>=2.0.0');
+
 const chalk = __webpack_require__(30);
 const invariant = __webpack_require__(9);
 const path = __webpack_require__(0);
@@ -98282,32 +94298,73 @@ function hasWrapper(flags, args) {
 var _buildSubCommands = (0, (_buildSubCommands2 || _load_buildSubCommands()).default)('policies', {
   setVersion(config, reporter, flags, args) {
     return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
-      let range = args[0] || 'latest';
+      const initialRange = args[0] || 'latest';
+      let range = initialRange;
+
       let allowRc = flags.rc;
 
-      reporter.log(`Resolving ${chalk.yellow(range)} to a url...`);
-
       if (range === 'rc') {
-        range = 'latest';
+        reporter.log(`${chalk.yellow(`Warning:`)} Your current Yarn binary is currently Yarn ${(_yarnVersion || _load_yarnVersion()).version}; to avoid potential breaking changes, 'set version rc' won't receive upgrades past the 1.22.x branch.\n         To upgrade to the latest versions, run ${chalk.cyan(`yarn set version`)} ${chalk.yellow.underline(`canary`)} instead. Sorry for the inconvenience.\n`);
+
+        range = '*';
         allowRc = true;
       }
 
       if (range === 'latest') {
+        reporter.log(`${chalk.yellow(`Warning:`)} Your current Yarn binary is currently Yarn ${(_yarnVersion || _load_yarnVersion()).version}; to avoid potential breaking changes, 'set version latest' won't receive upgrades past the 1.22.x branch.\n         To upgrade to the latest versions, run ${chalk.cyan(`yarn set version`)} ${chalk.yellow.underline(`stable`)} instead. Sorry for the inconvenience.\n`);
+
+        range = '*';
+      }
+
+      if (range === 'classic') {
         range = '*';
       }
 
       let bundleUrl;
       let bundleVersion;
-      let isV2 = false;
+      const isV2 = false;
 
       if (range === 'nightly' || range === 'nightlies') {
+        reporter.log(`${chalk.yellow(`Warning:`)} Nightlies only exist for Yarn 1.x; starting from 2.x onwards, you should use 'canary' instead`);
+
         bundleUrl = 'https://nightly.yarnpkg.com/latest.js';
         bundleVersion = 'nightly';
-      } else if (range === 'berry' || range === 'v2' || range === '2') {
-        bundleUrl = 'https://github.com/yarnpkg/berry/raw/master/packages/berry-cli/bin/berry.js';
-        bundleVersion = 'berry';
-        isV2 = true;
+      } else if (V2_NAMES.includes(range) || isLocalFile(range) || isV2Version(range)) {
+        const normalizedRange = range === `canary` ? `canary` : `stable`;
+
+        if (process.env.COREPACK_ROOT) {
+          yield (_child || _load_child()).spawn((_constants || _load_constants()).NODE_BIN_PATH, [path.join(process.env.COREPACK_ROOT, 'dist/corepack.js'), `yarn@${normalizedRange}`, `set`, `version`, normalizedRange], {
+            stdio: 'inherit',
+            cwd: config.cwd
+          });
+
+          return;
+        } else {
+          const bundle = yield fetchBundle(config, 'https://github.com/yarnpkg/berry/raw/master/packages/yarnpkg-cli/bin/yarn.js');
+
+          const yarnPath = path.resolve(config.lockfileFolder, `.yarn/releases/yarn-stable-temp.cjs`);
+          yield (_fs || _load_fs()).mkdirp(path.dirname(yarnPath));
+          yield (_fs || _load_fs()).writeFile(yarnPath, bundle);
+          yield (_fs || _load_fs()).chmod(yarnPath, 0o755);
+
+          try {
+            yield (_child || _load_child()).spawn((_constants || _load_constants()).NODE_BIN_PATH, [yarnPath, 'set', 'version', range], {
+              stdio: 'inherit',
+              cwd: config.lockfileFolder,
+              env: (0, (_extends2 || _load_extends()).default)({}, process.env, {
+                YARN_IGNORE_PATH: `1`
+              })
+            });
+          } catch (err) {
+            // eslint-disable-next-line no-process-exit
+            process.exit(1);
+          }
+
+          return;
+        }
       } else {
+        reporter.log(`Resolving ${chalk.yellow(initialRange)} to a url...`);
+
         let releases = [];
 
         try {
@@ -98375,7 +94432,7 @@ exports.setFlags = setFlags;
 exports.examples = examples;
 
 /***/ }),
-/* 541 */
+/* 509 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -98570,13 +94627,13 @@ function _load_errors() {
 var _version;
 
 function _load_version() {
-  return _version = __webpack_require__(363);
+  return _version = __webpack_require__(357);
 }
 
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 var _pack;
@@ -98605,7 +94662,7 @@ const invariant = __webpack_require__(9);
 
 const crypto = __webpack_require__(11);
 const url = __webpack_require__(24);
-const fs2 = __webpack_require__(5);
+const fs2 = __webpack_require__(4);
 const ssri = __webpack_require__(65);
 
 function setFlags(commander) {
@@ -98621,7 +94678,7 @@ function hasWrapper(commander, args) {
 }
 
 /***/ }),
-/* 542 */
+/* 510 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -98635,7 +94692,7 @@ exports.examples = exports.hasWrapper = exports.run = undefined;
 var _extends2;
 
 function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+  return _extends2 = _interopRequireDefault(__webpack_require__(20));
 }
 
 var _asyncToGenerator2;
@@ -98862,7 +94919,7 @@ exports.hasWrapper = hasWrapper;
 exports.examples = examples;
 
 /***/ }),
-/* 543 */
+/* 511 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -98957,13 +95014,13 @@ function _load_errors() {
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 var _link;
 
 function _load_link() {
-  return _link = __webpack_require__(357);
+  return _link = __webpack_require__(351);
 }
 
 var _global;
@@ -98987,7 +95044,7 @@ function hasWrapper(commander, args) {
 }
 
 /***/ }),
-/* 544 */
+/* 512 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -99147,7 +95204,7 @@ function _load_errors() {
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
@@ -99168,7 +95225,7 @@ function setFlags(commander) {
 }
 
 /***/ }),
-/* 545 */
+/* 513 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -99210,7 +95267,7 @@ exports.hasWrapper = hasWrapper;
 var _yarnVersion;
 
 function _load_yarnVersion() {
-  return _yarnVersion = __webpack_require__(120);
+  return _yarnVersion = __webpack_require__(105);
 }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -99224,7 +95281,7 @@ function hasWrapper(commander, args) {
 }
 
 /***/ }),
-/* 546 */
+/* 514 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -99514,7 +95571,7 @@ function _load_constants() {
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 var _lockfile;
@@ -99536,7 +95593,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const requireLockfile = exports.requireLockfile = true;
 
 const invariant = __webpack_require__(9);
-const bytes = __webpack_require__(596);
+const bytes = __webpack_require__(564);
 const emoji = __webpack_require__(302);
 const path = __webpack_require__(0);
 
@@ -99657,7 +95714,7 @@ function queryWhy(pattern, hoisted) {
 }
 
 /***/ }),
-/* 547 */
+/* 515 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -99734,7 +95791,7 @@ function _load_errors() {
 var _child;
 
 function _load_child() {
-  return _child = _interopRequireWildcard(__webpack_require__(58));
+  return _child = _interopRequireWildcard(__webpack_require__(50));
 }
 
 var _constants;
@@ -99756,7 +95813,7 @@ function hasWrapper(commander, args) {
 }
 
 /***/ }),
-/* 548 */
+/* 516 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -99936,7 +95993,7 @@ function _load_constants() {
 var _child;
 
 function _load_child() {
-  return _child = _interopRequireWildcard(__webpack_require__(58));
+  return _child = _interopRequireWildcard(__webpack_require__(50));
 }
 
 var _constants2;
@@ -99979,7 +96036,7 @@ exports.setFlags = setFlags;
 exports.examples = examples;
 
 /***/ }),
-/* 549 */
+/* 517 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -99993,7 +96050,7 @@ exports.autoRun = exports.main = undefined;
 var _extends2;
 
 function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+  return _extends2 = _interopRequireDefault(__webpack_require__(20));
 }
 
 var _asyncToGenerator2;
@@ -100604,6 +96661,8 @@ let start = (() => {
         // innermost process, whose end will cause our own to exit.
       });
 
+      (0, (_signalHandler || _load_signalHandler()).default)();
+
       try {
         if (/\.[cm]?js$/.test(yarnPath)) {
           exitCode = yield (0, (_child || _load_child()).spawnp)(process.execPath, [yarnPath, ...argv], opts);
@@ -100668,7 +96727,7 @@ function _load_commander() {
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireDefault(__webpack_require__(5));
+  return _fs = _interopRequireDefault(__webpack_require__(4));
 }
 
 var _invariant;
@@ -100704,13 +96763,13 @@ function _load_semver() {
 var _index;
 
 function _load_index() {
-  return _index = __webpack_require__(200);
+  return _index = __webpack_require__(201);
 }
 
 var _index2;
 
 function _load_index2() {
-  return _index2 = __webpack_require__(57);
+  return _index2 = __webpack_require__(58);
 }
 
 var _index3;
@@ -100752,13 +96811,13 @@ function _load_rc() {
 var _child;
 
 function _load_child() {
-  return _child = __webpack_require__(58);
+  return _child = __webpack_require__(50);
 }
 
 var _yarnVersion;
 
 function _load_yarnVersion() {
-  return _yarnVersion = __webpack_require__(120);
+  return _yarnVersion = __webpack_require__(105);
 }
 
 var _signalHandler;
@@ -100820,7 +96879,7 @@ exports.default = start;
 /* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(163)(module)))
 
 /***/ }),
-/* 550 */
+/* 518 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -100845,7 +96904,7 @@ function _load_baseFetcher() {
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
@@ -100868,7 +96927,7 @@ class CopyFetcher extends (_baseFetcher || _load_baseFetcher()).default {
 exports.default = CopyFetcher;
 
 /***/ }),
-/* 551 */
+/* 519 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -100899,13 +96958,13 @@ function _load_baseFetcher() {
 var _git;
 
 function _load_git() {
-  return _git = _interopRequireDefault(__webpack_require__(219));
+  return _git = _interopRequireDefault(__webpack_require__(217));
 }
 
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 var _constants;
@@ -100948,10 +97007,10 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const tarFs = __webpack_require__(193);
+const tarFs = __webpack_require__(194);
 const url = __webpack_require__(24);
 const path = __webpack_require__(0);
-const fs = __webpack_require__(5);
+const fs = __webpack_require__(4);
 
 const invariant = __webpack_require__(9);
 
@@ -101216,7 +97275,7 @@ class GitFetcher extends (_baseFetcher || _load_baseFetcher()).default {
 exports.default = GitFetcher;
 
 /***/ }),
-/* 552 */
+/* 520 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -101236,25 +97295,25 @@ function _load_baseFetcher() {
 var _copyFetcher;
 
 function _load_copyFetcher() {
-  return _copyFetcher = _interopRequireDefault(__webpack_require__(550));
+  return _copyFetcher = _interopRequireDefault(__webpack_require__(518));
 }
 
 var _gitFetcher;
 
 function _load_gitFetcher() {
-  return _gitFetcher = _interopRequireDefault(__webpack_require__(551));
+  return _gitFetcher = _interopRequireDefault(__webpack_require__(519));
 }
 
 var _tarballFetcher;
 
 function _load_tarballFetcher() {
-  return _tarballFetcher = _interopRequireDefault(__webpack_require__(364));
+  return _tarballFetcher = _interopRequireDefault(__webpack_require__(358));
 }
 
 var _workspaceFetcher;
 
 function _load_workspaceFetcher() {
-  return _workspaceFetcher = _interopRequireDefault(__webpack_require__(553));
+  return _workspaceFetcher = _interopRequireDefault(__webpack_require__(521));
 }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -101266,7 +97325,7 @@ exports.tarball = (_tarballFetcher || _load_tarballFetcher()).default;
 exports.workspace = (_workspaceFetcher || _load_workspaceFetcher()).default;
 
 /***/ }),
-/* 553 */
+/* 521 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -101279,7 +97338,7 @@ Object.defineProperty(exports, "__esModule", {
 var _extends2;
 
 function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+  return _extends2 = _interopRequireDefault(__webpack_require__(20));
 }
 
 var _asyncToGenerator2;
@@ -101291,7 +97350,7 @@ function _load_asyncToGenerator() {
 var _packageFetcher;
 
 function _load_packageFetcher() {
-  return _packageFetcher = __webpack_require__(210);
+  return _packageFetcher = __webpack_require__(208);
 }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -101338,7 +97397,7 @@ class WorkspaceFetcher {
 exports.default = WorkspaceFetcher;
 
 /***/ }),
-/* 554 */
+/* 522 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -101477,7 +97536,7 @@ function getParent(key, treesByKey) {
 }
 
 /***/ }),
-/* 555 */
+/* 523 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -101510,7 +97569,7 @@ class PackageConstraintResolver {
 exports.default = PackageConstraintResolver;
 
 /***/ }),
-/* 556 */
+/* 524 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -101524,7 +97583,7 @@ exports.NohoistResolver = exports.HoistManifest = undefined;
 var _extends2;
 
 function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+  return _extends2 = _interopRequireDefault(__webpack_require__(20));
 }
 
 var _config;
@@ -101542,7 +97601,7 @@ function _load_misc() {
 var _micromatch;
 
 function _load_micromatch() {
-  return _micromatch = _interopRequireDefault(__webpack_require__(114));
+  return _micromatch = _interopRequireDefault(__webpack_require__(115));
 }
 
 var _workspaceLayout2;
@@ -102675,7 +98734,7 @@ class NohoistResolver {
 exports.NohoistResolver = NohoistResolver;
 
 /***/ }),
-/* 557 */
+/* 525 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -102712,13 +98771,13 @@ function _load_crypto() {
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 var _packageNameUtils;
 
 function _load_packageNameUtils() {
-  return _packageNameUtils = __webpack_require__(222);
+  return _packageNameUtils = __webpack_require__(220);
 }
 
 var _pack;
@@ -102731,7 +98790,7 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const fs = __webpack_require__(5);
+const fs = __webpack_require__(4);
 
 const invariant = __webpack_require__(9);
 const path = __webpack_require__(0);
@@ -103268,7 +99327,7 @@ class PackageInstallScripts {
 exports.default = PackageInstallScripts;
 
 /***/ }),
-/* 558 */
+/* 526 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -103287,7 +99346,7 @@ function _load_asyncToGenerator() {
 var _extends2;
 
 function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+  return _extends2 = _interopRequireDefault(__webpack_require__(20));
 }
 
 var _misc;
@@ -103465,7 +99524,7 @@ class BaseRegistry {
 exports.default = BaseRegistry;
 
 /***/ }),
-/* 559 */
+/* 527 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -103503,13 +99562,13 @@ function _load_lockfile() {
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 var _yarnVersion;
 
 function _load_yarnVersion() {
-  return _yarnVersion = __webpack_require__(120);
+  return _yarnVersion = __webpack_require__(105);
 }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
@@ -103678,7 +99737,7 @@ exports.default = YarnRegistry;
 YarnRegistry.filename = 'yarn.json';
 
 /***/ }),
-/* 560 */
+/* 528 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -103691,7 +99750,7 @@ Object.defineProperty(exports, "__esModule", {
 var _jsonReporter;
 
 function _load_jsonReporter() {
-  return _jsonReporter = _interopRequireDefault(__webpack_require__(213));
+  return _jsonReporter = _interopRequireDefault(__webpack_require__(211));
 }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -103725,7 +99784,7 @@ class BufferReporter extends (_jsonReporter || _load_jsonReporter()).default {
 exports.default = BufferReporter;
 
 /***/ }),
-/* 561 */
+/* 529 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -103750,19 +99809,19 @@ function _load_baseReporter() {
 var _progressBar;
 
 function _load_progressBar() {
-  return _progressBar = _interopRequireDefault(__webpack_require__(563));
+  return _progressBar = _interopRequireDefault(__webpack_require__(531));
 }
 
 var _spinnerProgress;
 
 function _load_spinnerProgress() {
-  return _spinnerProgress = _interopRequireDefault(__webpack_require__(564));
+  return _spinnerProgress = _interopRequireDefault(__webpack_require__(532));
 }
 
 var _util;
 
 function _load_util() {
-  return _util = __webpack_require__(212);
+  return _util = __webpack_require__(210);
 }
 
 var _misc;
@@ -103774,7 +99833,7 @@ function _load_misc() {
 var _treeHelper;
 
 function _load_treeHelper() {
-  return _treeHelper = __webpack_require__(562);
+  return _treeHelper = __webpack_require__(530);
 }
 
 var _inquirer;
@@ -103786,7 +99845,7 @@ function _load_inquirer() {
 var _cliTable;
 
 function _load_cliTable() {
-  return _cliTable = _interopRequireDefault(__webpack_require__(602));
+  return _cliTable = _interopRequireDefault(__webpack_require__(570));
 }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -103795,7 +99854,7 @@ var _require = __webpack_require__(3);
 
 const inspect = _require.inspect;
 
-const readline = __webpack_require__(197);
+const readline = __webpack_require__(198);
 const chalk = __webpack_require__(30);
 const stripAnsi = __webpack_require__(329);
 const read = __webpack_require__(790);
@@ -104382,7 +100441,7 @@ class ConsoleReporter extends (_baseReporter || _load_baseReporter()).default {
 exports.default = ConsoleReporter;
 
 /***/ }),
-/* 562 */
+/* 530 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -104438,7 +100497,7 @@ function formatColor(color, strToFormat, formatter) {
 }
 
 /***/ }),
-/* 563 */
+/* 531 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -104451,7 +100510,7 @@ Object.defineProperty(exports, "__esModule", {
 var _util;
 
 function _load_util() {
-  return _util = __webpack_require__(212);
+  return _util = __webpack_require__(210);
 }
 
 class ProgressBar {
@@ -104523,7 +100582,7 @@ exports.default = ProgressBar;
 ProgressBar.bars = [['#', '-']];
 
 /***/ }),
-/* 564 */
+/* 532 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -104536,7 +100595,7 @@ Object.defineProperty(exports, "__esModule", {
 var _util;
 
 function _load_util() {
-  return _util = __webpack_require__(212);
+  return _util = __webpack_require__(210);
 }
 
 class Spinner {
@@ -104585,7 +100644,7 @@ exports.default = Spinner;
 Spinner.spinners = ['|/-\\', '⠂-–—–-', '◐◓◑◒', '◴◷◶◵', '◰◳◲◱', '▖▘▝▗', '■□▪▫', '▌▀▐▄', '▉▊▋▌▍▎▏▎▍▌▋▊▉', '▁▃▄▅▆▇█▇▆▅▄▃', '←↖↑↗→↘↓↙', '┤┘┴└├┌┬┐', '◢◣◤◥', '.oO°Oo.', '.oO@*', '🌍🌎🌏', '◡◡ ⊙⊙ ◠◠', '☱☲☴', '⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏', '⠋⠙⠚⠞⠖⠦⠴⠲⠳⠓', '⠄⠆⠇⠋⠙⠸⠰⠠⠰⠸⠙⠋⠇⠆', '⠋⠙⠚⠒⠂⠂⠒⠲⠴⠦⠖⠒⠐⠐⠒⠓⠋', '⠁⠉⠙⠚⠒⠂⠂⠒⠲⠴⠤⠄⠄⠤⠴⠲⠒⠂⠂⠒⠚⠙⠉⠁', '⠈⠉⠋⠓⠒⠐⠐⠒⠖⠦⠤⠠⠠⠤⠦⠖⠒⠐⠐⠒⠓⠋⠉⠈', '⠁⠁⠉⠙⠚⠒⠂⠂⠒⠲⠴⠤⠄⠄⠤⠠⠠⠤⠦⠖⠒⠐⠐⠒⠓⠋⠉⠈⠈', '⢄⢂⢁⡁⡈⡐⡠', '⢹⢺⢼⣸⣇⡧⡗⡏', '⣾⣽⣻⢿⡿⣟⣯⣷', '⠁⠂⠄⡀⢀⠠⠐⠈'];
 
 /***/ }),
-/* 565 */
+/* 533 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -104598,7 +100657,7 @@ Object.defineProperty(exports, "__esModule", {
 var _jsonReporter;
 
 function _load_jsonReporter() {
-  return _jsonReporter = _interopRequireDefault(__webpack_require__(213));
+  return _jsonReporter = _interopRequireDefault(__webpack_require__(211));
 }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -104624,7 +100683,7 @@ exports.default = EventReporter;
 Object.assign(EventReporter.prototype, EventEmitter.prototype);
 
 /***/ }),
-/* 566 */
+/* 534 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -104658,7 +100717,7 @@ const defaultFormatter = exports.defaultFormatter = {
 };
 
 /***/ }),
-/* 567 */
+/* 535 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -105072,7 +101131,7 @@ const messages = {
 exports.default = messages;
 
 /***/ }),
-/* 568 */
+/* 536 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -105086,7 +101145,7 @@ exports.en = undefined;
 var _en;
 
 function _load_en() {
-  return _en = _interopRequireDefault(__webpack_require__(567));
+  return _en = _interopRequireDefault(__webpack_require__(535));
 }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -105094,7 +101153,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 exports.en = (_en || _load_en()).default;
 
 /***/ }),
-/* 569 */
+/* 537 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -105197,7 +101256,7 @@ class NoopReporter extends (_baseReporter || _load_baseReporter()).default {
 exports.default = NoopReporter;
 
 /***/ }),
-/* 570 */
+/* 538 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -105210,7 +101269,7 @@ Object.defineProperty(exports, "__esModule", {
 var _extends2;
 
 function _load_extends() {
-  return _extends2 = _interopRequireDefault(__webpack_require__(21));
+  return _extends2 = _interopRequireDefault(__webpack_require__(20));
 }
 
 var _packageRequest;
@@ -105290,7 +101349,7 @@ class WorkspaceResolver extends (_baseResolver || _load_baseResolver()).default
 exports.default = WorkspaceResolver;
 
 /***/ }),
-/* 571 */
+/* 539 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -105359,7 +101418,7 @@ BitbucketResolver.hostname = 'bitbucket.org';
 BitbucketResolver.protocol = 'bitbucket';
 
 /***/ }),
-/* 572 */
+/* 540 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -105404,7 +101463,7 @@ GitLabResolver.hostname = 'gitlab.com';
 GitLabResolver.protocol = 'gitlab';
 
 /***/ }),
-/* 573 */
+/* 541 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -105451,7 +101510,7 @@ class RegistryResolver extends (_exoticResolver || _load_exoticResolver()).defau
 exports.default = RegistryResolver;
 
 /***/ }),
-/* 574 */
+/* 542 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -105470,7 +101529,7 @@ function _load_asyncToGenerator() {
 var _tarballFetcher;
 
 function _load_tarballFetcher() {
-  return _tarballFetcher = _interopRequireDefault(__webpack_require__(364));
+  return _tarballFetcher = _interopRequireDefault(__webpack_require__(358));
 }
 
 var _exoticResolver;
@@ -105494,7 +101553,7 @@ function _load_guessName() {
 var _version;
 
 function _load_version() {
-  return _version = _interopRequireWildcard(__webpack_require__(226));
+  return _version = _interopRequireWildcard(__webpack_require__(223));
 }
 
 var _crypto;
@@ -105506,7 +101565,7 @@ function _load_crypto() {
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
@@ -105619,7 +101678,7 @@ class TarballResolver extends (_exoticResolver || _load_exoticResolver()).defaul
 exports.default = TarballResolver;
 
 /***/ }),
-/* 575 */
+/* 543 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -105650,7 +101709,7 @@ class RegistryResolver extends (_baseResolver || _load_baseResolver()).default {
 exports.default = RegistryResolver;
 
 /***/ }),
-/* 576 */
+/* 544 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -105663,7 +101722,7 @@ Object.defineProperty(exports, "__esModule", {
 var _npmResolver;
 
 function _load_npmResolver() {
-  return _npmResolver = _interopRequireDefault(__webpack_require__(217));
+  return _npmResolver = _interopRequireDefault(__webpack_require__(215));
 }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -105672,7 +101731,7 @@ class YarnResolver extends (_npmResolver || _load_npmResolver()).default {}
 exports.default = YarnResolver;
 
 /***/ }),
-/* 577 */
+/* 545 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -105701,7 +101760,7 @@ function envReplace(value, env = process.env) {
 }
 
 /***/ }),
-/* 578 */
+/* 546 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -105742,7 +101801,7 @@ function fixCmdWinSlashes(cmd) {
 }
 
 /***/ }),
-/* 579 */
+/* 547 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -106167,7 +102226,7 @@ let generatePnpMap = exports.generatePnpMap = (() => {
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
@@ -106413,7 +102472,7 @@ function generateFindPackageLocator(packageInformationStores) {
 }
 
 /***/ }),
-/* 580 */
+/* 548 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -106534,7 +102593,7 @@ function getTransitiveDevDependencies(packageManifest, workspaceLayout, lockfile
 }
 
 /***/ }),
-/* 581 */
+/* 549 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -106775,7 +102834,7 @@ const parseRefs = exports.parseRefs = stdout => {
 };
 
 /***/ }),
-/* 582 */
+/* 550 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -106816,7 +102875,7 @@ class LogicalDependencyTree {
 exports.LogicalDependencyTree = LogicalDependencyTree;
 
 /***/ }),
-/* 583 */
+/* 551 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -106841,7 +102900,7 @@ function _load_constants() {
 var _util;
 
 function _load_util() {
-  return _util = __webpack_require__(221);
+  return _util = __webpack_require__(219);
 }
 
 var _index;
@@ -106853,13 +102912,13 @@ function _load_index() {
 var _inferLicense;
 
 function _load_inferLicense() {
-  return _inferLicense = _interopRequireDefault(__webpack_require__(584));
+  return _inferLicense = _interopRequireDefault(__webpack_require__(552));
 }
 
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
@@ -107299,7 +103358,7 @@ exports.default = (() => {
 })();
 
 /***/ }),
-/* 584 */
+/* 552 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -107313,7 +103372,7 @@ exports.default = inferLicense;
 var _licenses;
 
 function _load_licenses() {
-  return _licenses = _interopRequireDefault(__webpack_require__(585));
+  return _licenses = _interopRequireDefault(__webpack_require__(553));
 }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -107367,7 +103426,7 @@ function inferLicense(license) {
 }
 
 /***/ }),
-/* 585 */
+/* 553 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -107394,7 +103453,7 @@ exports.default = {
 };
 
 /***/ }),
-/* 586 */
+/* 554 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -107491,13 +103550,13 @@ function _load_constants() {
 var _fileResolver;
 
 function _load_fileResolver() {
-  return _fileResolver = __webpack_require__(215);
+  return _fileResolver = __webpack_require__(213);
 }
 
 var _linkResolver;
 
 function _load_linkResolver() {
-  return _linkResolver = __webpack_require__(368);
+  return _linkResolver = __webpack_require__(362);
 }
 
 var _invariant;
@@ -107511,7 +103570,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const path = __webpack_require__(0);
 
 /***/ }),
-/* 587 */
+/* 555 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -107543,7 +103602,7 @@ exports.default = {
 };
 
 /***/ }),
-/* 588 */
+/* 556 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -107567,7 +103626,7 @@ function parsePackageName(input) {
 }
 
 /***/ }),
-/* 589 */
+/* 557 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -107623,7 +103682,7 @@ exports.makePortableProxyScript = makePortableProxyScript;
 var _fs;
 
 function _load_fs() {
-  return _fs = _interopRequireWildcard(__webpack_require__(4));
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
@@ -107639,7 +103698,7 @@ options = {}) {
 }
 
 /***/ }),
-/* 590 */
+/* 558 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -107653,7 +103712,7 @@ exports.findRc = findRc;
 var _fs;
 
 function _load_fs() {
-  return _fs = __webpack_require__(5);
+  return _fs = __webpack_require__(4);
 }
 
 var _path;
@@ -107747,13 +103806,13 @@ function findRc(name, cwd, parser) {
 }
 
 /***/ }),
-/* 591 */
+/* 559 */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = { "default": __webpack_require__(623), __esModule: true };
+module.exports = { "default": __webpack_require__(591), __esModule: true };
 
 /***/ }),
-/* 592 */
+/* 560 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var DuplexStream = __webpack_require__(791)
@@ -108040,7 +104099,7 @@ module.exports = BufferList
 
 
 /***/ }),
-/* 593 */
+/* 561 */
 /***/ (function(module, exports) {
 
 function allocUnsafe (size) {
@@ -108063,7 +104122,7 @@ module.exports = allocUnsafe
 
 
 /***/ }),
-/* 594 */
+/* 562 */
 /***/ (function(module, exports) {
 
 /* Node.js 6.4.0 and up has full support */
@@ -108182,7 +104241,7 @@ module.exports = fill
 
 
 /***/ }),
-/* 595 */
+/* 563 */
 /***/ (function(module, exports) {
 
 var toString = Object.prototype.toString
@@ -108257,7 +104316,7 @@ module.exports = bufferFrom
 
 
 /***/ }),
-/* 596 */
+/* 564 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -108423,7 +104482,7 @@ function parse(val) {
 
 
 /***/ }),
-/* 597 */
+/* 565 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -108438,13 +104497,13 @@ module.exports = (flag, argv) => {
 
 
 /***/ }),
-/* 598 */
+/* 566 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const os = __webpack_require__(46);
-const hasFlag = __webpack_require__(597);
+const hasFlag = __webpack_require__(565);
 
 const env = process.env;
 
@@ -108576,7 +104635,7 @@ module.exports = {
 
 
 /***/ }),
-/* 599 */
+/* 567 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -108711,13 +104770,13 @@ module.exports = (chalk, tmp) => {
 
 
 /***/ }),
-/* 600 */
+/* 568 */
 /***/ (function(module, exports, __webpack_require__) {
 
 module.exports = chownr
 chownr.sync = chownrSync
 
-var fs = __webpack_require__(5)
+var fs = __webpack_require__(4)
 , path = __webpack_require__(0)
 
 function chownr (p, uid, gid, cb) {
@@ -108769,7 +104828,7 @@ function chownrSync (p, uid, gid) {
 
 
 /***/ }),
-/* 601 */
+/* 569 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -108824,17 +104883,17 @@ exports.isCI = !!(
 
 
 /***/ }),
-/* 602 */
+/* 570 */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = __webpack_require__(605);
+module.exports = __webpack_require__(573);
 
 /***/ }),
-/* 603 */
+/* 571 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var kindOf = __webpack_require__(179);
-var utils = __webpack_require__(382);
+var kindOf = __webpack_require__(180);
+var utils = __webpack_require__(376);
 
 /**
  * A representation of a cell within the table.
@@ -109025,7 +105084,7 @@ Cell.prototype._topLeftChar = function(offset){
 Cell.prototype.wrapWithStyleColors = function(styleProperty,content){
   if(this[styleProperty] && this[styleProperty].length){
     try {
-      var colors = __webpack_require__(621);
+      var colors = __webpack_require__(589);
       for(var i = this[styleProperty].length - 1; i >= 0; i--){
         colors = colors[this[styleProperty][i]];
       }
@@ -109207,12 +105266,12 @@ module.exports.RowSpanCell = RowSpanCell;
 
 
 /***/ }),
-/* 604 */
+/* 572 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var kindOf = __webpack_require__(179);
+var kindOf = __webpack_require__(180);
 var objectAssign = __webpack_require__(303);
-var Cell = __webpack_require__(603);
+var Cell = __webpack_require__(571);
 var RowSpanCell = Cell.RowSpanCell;
 var ColSpanCell = Cell.ColSpanCell;
 
@@ -109449,11 +105508,11 @@ function makeComputeWidths(colSpan,desiredWidth,x,forcedMin){
 
 
 /***/ }),
-/* 605 */
+/* 573 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var utils = __webpack_require__(382);
-var tableLayout = __webpack_require__(604);
+var utils = __webpack_require__(376);
+var tableLayout = __webpack_require__(572);
 
 function Table(options){
   this.options = utils.mergeOptions(options);
@@ -109531,7 +105590,7 @@ module.exports = Table;
 
 
 /***/ }),
-/* 606 */
+/* 574 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -109587,7 +105646,7 @@ function cliWidth(options) {
 
 
 /***/ }),
-/* 607 */
+/* 575 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -109626,11 +105685,11 @@ module.exports = function (str, pos) {
 
 
 /***/ }),
-/* 608 */
+/* 576 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var conversions = __webpack_require__(384);
-var route = __webpack_require__(609);
+var conversions = __webpack_require__(378);
+var route = __webpack_require__(577);
 
 var convert = {};
 
@@ -109710,10 +105769,10 @@ module.exports = convert;
 
 
 /***/ }),
-/* 609 */
+/* 577 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var conversions = __webpack_require__(384);
+var conversions = __webpack_require__(378);
 
 /*
 	this function routes a model to all other models.
@@ -109813,162 +105872,162 @@ module.exports = function (fromModel) {
 
 
 /***/ }),
-/* 610 */
+/* 578 */
 /***/ (function(module, exports) {
 
-module.exports = {
-	"aliceblue": [240, 248, 255],
-	"antiquewhite": [250, 235, 215],
-	"aqua": [0, 255, 255],
-	"aquamarine": [127, 255, 212],
-	"azure": [240, 255, 255],
-	"beige": [245, 245, 220],
-	"bisque": [255, 228, 196],
-	"black": [0, 0, 0],
-	"blanchedalmond": [255, 235, 205],
-	"blue": [0, 0, 255],
-	"blueviolet": [138, 43, 226],
-	"brown": [165, 42, 42],
-	"burlywood": [222, 184, 135],
-	"cadetblue": [95, 158, 160],
-	"chartreuse": [127, 255, 0],
-	"chocolate": [210, 105, 30],
-	"coral": [255, 127, 80],
-	"cornflowerblue": [100, 149, 237],
-	"cornsilk": [255, 248, 220],
-	"crimson": [220, 20, 60],
-	"cyan": [0, 255, 255],
-	"darkblue": [0, 0, 139],
-	"darkcyan": [0, 139, 139],
-	"darkgoldenrod": [184, 134, 11],
-	"darkgray": [169, 169, 169],
-	"darkgreen": [0, 100, 0],
-	"darkgrey": [169, 169, 169],
-	"darkkhaki": [189, 183, 107],
-	"darkmagenta": [139, 0, 139],
-	"darkolivegreen": [85, 107, 47],
-	"darkorange": [255, 140, 0],
-	"darkorchid": [153, 50, 204],
-	"darkred": [139, 0, 0],
-	"darksalmon": [233, 150, 122],
-	"darkseagreen": [143, 188, 143],
-	"darkslateblue": [72, 61, 139],
-	"darkslategray": [47, 79, 79],
-	"darkslategrey": [47, 79, 79],
-	"darkturquoise": [0, 206, 209],
-	"darkviolet": [148, 0, 211],
-	"deeppink": [255, 20, 147],
-	"deepskyblue": [0, 191, 255],
-	"dimgray": [105, 105, 105],
-	"dimgrey": [105, 105, 105],
-	"dodgerblue": [30, 144, 255],
-	"firebrick": [178, 34, 34],
-	"floralwhite": [255, 250, 240],
-	"forestgreen": [34, 139, 34],
-	"fuchsia": [255, 0, 255],
-	"gainsboro": [220, 220, 220],
-	"ghostwhite": [248, 248, 255],
-	"gold": [255, 215, 0],
-	"goldenrod": [218, 165, 32],
-	"gray": [128, 128, 128],
-	"green": [0, 128, 0],
-	"greenyellow": [173, 255, 47],
-	"grey": [128, 128, 128],
-	"honeydew": [240, 255, 240],
-	"hotpink": [255, 105, 180],
-	"indianred": [205, 92, 92],
-	"indigo": [75, 0, 130],
-	"ivory": [255, 255, 240],
-	"khaki": [240, 230, 140],
-	"lavender": [230, 230, 250],
-	"lavenderblush": [255, 240, 245],
-	"lawngreen": [124, 252, 0],
-	"lemonchiffon": [255, 250, 205],
-	"lightblue": [173, 216, 230],
-	"lightcoral": [240, 128, 128],
-	"lightcyan": [224, 255, 255],
-	"lightgoldenrodyellow": [250, 250, 210],
-	"lightgray": [211, 211, 211],
-	"lightgreen": [144, 238, 144],
-	"lightgrey": [211, 211, 211],
-	"lightpink": [255, 182, 193],
-	"lightsalmon": [255, 160, 122],
-	"lightseagreen": [32, 178, 170],
-	"lightskyblue": [135, 206, 250],
-	"lightslategray": [119, 136, 153],
-	"lightslategrey": [119, 136, 153],
-	"lightsteelblue": [176, 196, 222],
-	"lightyellow": [255, 255, 224],
-	"lime": [0, 255, 0],
-	"limegreen": [50, 205, 50],
-	"linen": [250, 240, 230],
-	"magenta": [255, 0, 255],
-	"maroon": [128, 0, 0],
-	"mediumaquamarine": [102, 205, 170],
-	"mediumblue": [0, 0, 205],
-	"mediumorchid": [186, 85, 211],
-	"mediumpurple": [147, 112, 219],
-	"mediumseagreen": [60, 179, 113],
-	"mediumslateblue": [123, 104, 238],
-	"mediumspringgreen": [0, 250, 154],
-	"mediumturquoise": [72, 209, 204],
-	"mediumvioletred": [199, 21, 133],
-	"midnightblue": [25, 25, 112],
-	"mintcream": [245, 255, 250],
-	"mistyrose": [255, 228, 225],
-	"moccasin": [255, 228, 181],
-	"navajowhite": [255, 222, 173],
-	"navy": [0, 0, 128],
-	"oldlace": [253, 245, 230],
-	"olive": [128, 128, 0],
-	"olivedrab": [107, 142, 35],
-	"orange": [255, 165, 0],
-	"orangered": [255, 69, 0],
-	"orchid": [218, 112, 214],
-	"palegoldenrod": [238, 232, 170],
-	"palegreen": [152, 251, 152],
-	"paleturquoise": [175, 238, 238],
-	"palevioletred": [219, 112, 147],
-	"papayawhip": [255, 239, 213],
-	"peachpuff": [255, 218, 185],
-	"peru": [205, 133, 63],
-	"pink": [255, 192, 203],
-	"plum": [221, 160, 221],
-	"powderblue": [176, 224, 230],
-	"purple": [128, 0, 128],
-	"rebeccapurple": [102, 51, 153],
-	"red": [255, 0, 0],
-	"rosybrown": [188, 143, 143],
-	"royalblue": [65, 105, 225],
-	"saddlebrown": [139, 69, 19],
-	"salmon": [250, 128, 114],
-	"sandybrown": [244, 164, 96],
-	"seagreen": [46, 139, 87],
-	"seashell": [255, 245, 238],
-	"sienna": [160, 82, 45],
-	"silver": [192, 192, 192],
-	"skyblue": [135, 206, 235],
-	"slateblue": [106, 90, 205],
-	"slategray": [112, 128, 144],
-	"slategrey": [112, 128, 144],
-	"snow": [255, 250, 250],
-	"springgreen": [0, 255, 127],
-	"steelblue": [70, 130, 180],
-	"tan": [210, 180, 140],
-	"teal": [0, 128, 128],
-	"thistle": [216, 191, 216],
-	"tomato": [255, 99, 71],
-	"turquoise": [64, 224, 208],
-	"violet": [238, 130, 238],
-	"wheat": [245, 222, 179],
-	"white": [255, 255, 255],
-	"whitesmoke": [245, 245, 245],
-	"yellow": [255, 255, 0],
-	"yellowgreen": [154, 205, 50]
+module.exports = {
+	"aliceblue": [240, 248, 255],
+	"antiquewhite": [250, 235, 215],
+	"aqua": [0, 255, 255],
+	"aquamarine": [127, 255, 212],
+	"azure": [240, 255, 255],
+	"beige": [245, 245, 220],
+	"bisque": [255, 228, 196],
+	"black": [0, 0, 0],
+	"blanchedalmond": [255, 235, 205],
+	"blue": [0, 0, 255],
+	"blueviolet": [138, 43, 226],
+	"brown": [165, 42, 42],
+	"burlywood": [222, 184, 135],
+	"cadetblue": [95, 158, 160],
+	"chartreuse": [127, 255, 0],
+	"chocolate": [210, 105, 30],
+	"coral": [255, 127, 80],
+	"cornflowerblue": [100, 149, 237],
+	"cornsilk": [255, 248, 220],
+	"crimson": [220, 20, 60],
+	"cyan": [0, 255, 255],
+	"darkblue": [0, 0, 139],
+	"darkcyan": [0, 139, 139],
+	"darkgoldenrod": [184, 134, 11],
+	"darkgray": [169, 169, 169],
+	"darkgreen": [0, 100, 0],
+	"darkgrey": [169, 169, 169],
+	"darkkhaki": [189, 183, 107],
+	"darkmagenta": [139, 0, 139],
+	"darkolivegreen": [85, 107, 47],
+	"darkorange": [255, 140, 0],
+	"darkorchid": [153, 50, 204],
+	"darkred": [139, 0, 0],
+	"darksalmon": [233, 150, 122],
+	"darkseagreen": [143, 188, 143],
+	"darkslateblue": [72, 61, 139],
+	"darkslategray": [47, 79, 79],
+	"darkslategrey": [47, 79, 79],
+	"darkturquoise": [0, 206, 209],
+	"darkviolet": [148, 0, 211],
+	"deeppink": [255, 20, 147],
+	"deepskyblue": [0, 191, 255],
+	"dimgray": [105, 105, 105],
+	"dimgrey": [105, 105, 105],
+	"dodgerblue": [30, 144, 255],
+	"firebrick": [178, 34, 34],
+	"floralwhite": [255, 250, 240],
+	"forestgreen": [34, 139, 34],
+	"fuchsia": [255, 0, 255],
+	"gainsboro": [220, 220, 220],
+	"ghostwhite": [248, 248, 255],
+	"gold": [255, 215, 0],
+	"goldenrod": [218, 165, 32],
+	"gray": [128, 128, 128],
+	"green": [0, 128, 0],
+	"greenyellow": [173, 255, 47],
+	"grey": [128, 128, 128],
+	"honeydew": [240, 255, 240],
+	"hotpink": [255, 105, 180],
+	"indianred": [205, 92, 92],
+	"indigo": [75, 0, 130],
+	"ivory": [255, 255, 240],
+	"khaki": [240, 230, 140],
+	"lavender": [230, 230, 250],
+	"lavenderblush": [255, 240, 245],
+	"lawngreen": [124, 252, 0],
+	"lemonchiffon": [255, 250, 205],
+	"lightblue": [173, 216, 230],
+	"lightcoral": [240, 128, 128],
+	"lightcyan": [224, 255, 255],
+	"lightgoldenrodyellow": [250, 250, 210],
+	"lightgray": [211, 211, 211],
+	"lightgreen": [144, 238, 144],
+	"lightgrey": [211, 211, 211],
+	"lightpink": [255, 182, 193],
+	"lightsalmon": [255, 160, 122],
+	"lightseagreen": [32, 178, 170],
+	"lightskyblue": [135, 206, 250],
+	"lightslategray": [119, 136, 153],
+	"lightslategrey": [119, 136, 153],
+	"lightsteelblue": [176, 196, 222],
+	"lightyellow": [255, 255, 224],
+	"lime": [0, 255, 0],
+	"limegreen": [50, 205, 50],
+	"linen": [250, 240, 230],
+	"magenta": [255, 0, 255],
+	"maroon": [128, 0, 0],
+	"mediumaquamarine": [102, 205, 170],
+	"mediumblue": [0, 0, 205],
+	"mediumorchid": [186, 85, 211],
+	"mediumpurple": [147, 112, 219],
+	"mediumseagreen": [60, 179, 113],
+	"mediumslateblue": [123, 104, 238],
+	"mediumspringgreen": [0, 250, 154],
+	"mediumturquoise": [72, 209, 204],
+	"mediumvioletred": [199, 21, 133],
+	"midnightblue": [25, 25, 112],
+	"mintcream": [245, 255, 250],
+	"mistyrose": [255, 228, 225],
+	"moccasin": [255, 228, 181],
+	"navajowhite": [255, 222, 173],
+	"navy": [0, 0, 128],
+	"oldlace": [253, 245, 230],
+	"olive": [128, 128, 0],
+	"olivedrab": [107, 142, 35],
+	"orange": [255, 165, 0],
+	"orangered": [255, 69, 0],
+	"orchid": [218, 112, 214],
+	"palegoldenrod": [238, 232, 170],
+	"palegreen": [152, 251, 152],
+	"paleturquoise": [175, 238, 238],
+	"palevioletred": [219, 112, 147],
+	"papayawhip": [255, 239, 213],
+	"peachpuff": [255, 218, 185],
+	"peru": [205, 133, 63],
+	"pink": [255, 192, 203],
+	"plum": [221, 160, 221],
+	"powderblue": [176, 224, 230],
+	"purple": [128, 0, 128],
+	"rebeccapurple": [102, 51, 153],
+	"red": [255, 0, 0],
+	"rosybrown": [188, 143, 143],
+	"royalblue": [65, 105, 225],
+	"saddlebrown": [139, 69, 19],
+	"salmon": [250, 128, 114],
+	"sandybrown": [244, 164, 96],
+	"seagreen": [46, 139, 87],
+	"seashell": [255, 245, 238],
+	"sienna": [160, 82, 45],
+	"silver": [192, 192, 192],
+	"skyblue": [135, 206, 235],
+	"slateblue": [106, 90, 205],
+	"slategray": [112, 128, 144],
+	"slategrey": [112, 128, 144],
+	"snow": [255, 250, 250],
+	"springgreen": [0, 255, 127],
+	"steelblue": [70, 130, 180],
+	"tan": [210, 180, 140],
+	"teal": [0, 128, 128],
+	"thistle": [216, 191, 216],
+	"tomato": [255, 99, 71],
+	"turquoise": [64, 224, 208],
+	"violet": [238, 130, 238],
+	"wheat": [245, 222, 179],
+	"white": [255, 255, 255],
+	"whitesmoke": [245, 245, 245],
+	"yellow": [255, 255, 0],
+	"yellowgreen": [154, 205, 50]
 };
 
 /***/ }),
-/* 611 */
+/* 579 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /*
@@ -110007,11 +106066,11 @@ module['exports'] = colors;
 colors.themes = {};
 
 var util = __webpack_require__(3);
-var ansiStyles = colors.styles = __webpack_require__(618);
+var ansiStyles = colors.styles = __webpack_require__(586);
 var defineProps = Object.defineProperties;
 var newLineRegex = new RegExp(/[\r\n]+/g);
 
-colors.supportsColor = __webpack_require__(620).supportsColor;
+colors.supportsColor = __webpack_require__(588).supportsColor;
 
 if (typeof colors.enabled === 'undefined') {
   colors.enabled = colors.supportsColor() !== false;
@@ -110153,15 +106212,15 @@ var sequencer = function sequencer(map, str) {
 };
 
 // custom formatter methods
-colors.trap = __webpack_require__(612);
-colors.zalgo = __webpack_require__(613);
+colors.trap = __webpack_require__(580);
+colors.zalgo = __webpack_require__(581);
 
 // maps
 colors.maps = {};
-colors.maps.america = __webpack_require__(614)(colors);
-colors.maps.zebra = __webpack_require__(617)(colors);
-colors.maps.rainbow = __webpack_require__(615)(colors);
-colors.maps.random = __webpack_require__(616)(colors);
+colors.maps.america = __webpack_require__(582)(colors);
+colors.maps.zebra = __webpack_require__(585)(colors);
+colors.maps.rainbow = __webpack_require__(583)(colors);
+colors.maps.random = __webpack_require__(584)(colors);
 
 for (var map in colors.maps) {
   (function(map) {
@@ -110175,7 +106234,7 @@ defineProps(colors, init());
 
 
 /***/ }),
-/* 612 */
+/* 580 */
 /***/ (function(module, exports) {
 
 module['exports'] = function runTheTrap(text, options) {
@@ -110227,7 +106286,7 @@ module['exports'] = function runTheTrap(text, options) {
 
 
 /***/ }),
-/* 613 */
+/* 581 */
 /***/ (function(module, exports) {
 
 // please no
@@ -110343,7 +106402,7 @@ module['exports'] = function zalgo(text, options) {
 
 
 /***/ }),
-/* 614 */
+/* 582 */
 /***/ (function(module, exports) {
 
 module['exports'] = function(colors) {
@@ -110359,7 +106418,7 @@ module['exports'] = function(colors) {
 
 
 /***/ }),
-/* 615 */
+/* 583 */
 /***/ (function(module, exports) {
 
 module['exports'] = function(colors) {
@@ -110377,7 +106436,7 @@ module['exports'] = function(colors) {
 
 
 /***/ }),
-/* 616 */
+/* 584 */
 /***/ (function(module, exports) {
 
 module['exports'] = function(colors) {
@@ -110393,7 +106452,7 @@ module['exports'] = function(colors) {
 
 
 /***/ }),
-/* 617 */
+/* 585 */
 /***/ (function(module, exports) {
 
 module['exports'] = function(colors) {
@@ -110404,7 +106463,7 @@ module['exports'] = function(colors) {
 
 
 /***/ }),
-/* 618 */
+/* 586 */
 /***/ (function(module, exports) {
 
 /*
@@ -110487,7 +106546,7 @@ Object.keys(codes).forEach(function(key) {
 
 
 /***/ }),
-/* 619 */
+/* 587 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -110529,7 +106588,7 @@ module.exports = function(flag, argv) {
 
 
 /***/ }),
-/* 620 */
+/* 588 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -110561,7 +106620,7 @@ THE SOFTWARE.
 
 
 var os = __webpack_require__(46);
-var hasFlag = __webpack_require__(619);
+var hasFlag = __webpack_require__(587);
 
 var env = process.env;
 
@@ -110687,7 +106746,7 @@ module.exports = {
 
 
 /***/ }),
-/* 621 */
+/* 589 */
 /***/ (function(module, exports, __webpack_require__) {
 
 //
@@ -110698,12 +106757,12 @@ module.exports = {
 //   colors.red("foo")
 //
 //
-var colors = __webpack_require__(611);
+var colors = __webpack_require__(579);
 module['exports'] = colors;
 
 
 /***/ }),
-/* 622 */
+/* 590 */
 /***/ (function(module, exports) {
 
 module.exports = defer;
@@ -110735,25 +106794,25 @@ function defer(fn)
 
 
 /***/ }),
-/* 623 */
+/* 591 */
 /***/ (function(module, exports, __webpack_require__) {
 
-__webpack_require__(627);
+__webpack_require__(595);
 module.exports = __webpack_require__(31).Object.assign;
 
 
 /***/ }),
-/* 624 */
+/* 592 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 // 19.1.2.1 Object.assign(target, source, ...)
-var getKeys = __webpack_require__(171);
-var gOPS = __webpack_require__(625);
-var pIE = __webpack_require__(626);
-var toObject = __webpack_require__(172);
-var IObject = __webpack_require__(170);
+var getKeys = __webpack_require__(172);
+var gOPS = __webpack_require__(593);
+var pIE = __webpack_require__(594);
+var toObject = __webpack_require__(173);
+var IObject = __webpack_require__(171);
 var $assign = Object.assign;
 
 // should work with symbols and should have deterministic property order (V8 bug)
@@ -110784,36 +106843,36 @@ module.exports = !$assign || __webpack_require__(112)(function () {
 
 
 /***/ }),
-/* 625 */
+/* 593 */
 /***/ (function(module, exports) {
 
 exports.f = Object.getOwnPropertySymbols;
 
 
 /***/ }),
-/* 626 */
+/* 594 */
 /***/ (function(module, exports) {
 
 exports.f = {}.propertyIsEnumerable;
 
 
 /***/ }),
-/* 627 */
+/* 595 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // 19.1.3.1 Object.assign(target, source)
 var $export = __webpack_require__(60);
 
-$export($export.S + $export.F, 'Object', { assign: __webpack_require__(624) });
+$export($export.S + $export.F, 'Object', { assign: __webpack_require__(592) });
 
 
 /***/ }),
-/* 628 */
+/* 596 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-var arrayFindIndex = __webpack_require__(511);
+var arrayFindIndex = __webpack_require__(479);
 
 module.exports = function () {
 	var unhandledRejections = [];
@@ -110848,12 +106907,12 @@ module.exports = function () {
 
 
 /***/ }),
-/* 629 */
+/* 597 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-var core = __webpack_require__(628);
+var core = __webpack_require__(596);
 
 module.exports = function (p) {
 	p = p || process;
@@ -110867,7 +106926,7 @@ module.exports = function (p) {
 
 
 /***/ }),
-/* 630 */
+/* 598 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -110968,12 +107027,12 @@ module.exports = function (encodedURI) {
 
 
 /***/ }),
-/* 631 */
+/* 599 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var pSlice = Array.prototype.slice;
-var objectKeys = __webpack_require__(633);
-var isArguments = __webpack_require__(632);
+var objectKeys = __webpack_require__(601);
+var isArguments = __webpack_require__(600);
 
 var deepEqual = module.exports = function (actual, expected, opts) {
   if (!opts) opts = {};
@@ -111068,7 +107127,7 @@ function objEquiv(a, b, opts) {
 
 
 /***/ }),
-/* 632 */
+/* 600 */
 /***/ (function(module, exports) {
 
 var supportsArgumentsClass = (function(){
@@ -111094,7 +107153,7 @@ function unsupported(object){
 
 
 /***/ }),
-/* 633 */
+/* 601 */
 /***/ (function(module, exports) {
 
 exports = module.exports = typeof Object.keys === 'function'
@@ -111109,7 +107168,7 @@ function shim (obj) {
 
 
 /***/ }),
-/* 634 */
+/* 602 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var Stream = __webpack_require__(23).Stream;
@@ -111222,7 +107281,7 @@ DelayedStream.prototype._checkIfMaxDataSizeExceeded = function() {
 
 
 /***/ }),
-/* 635 */
+/* 603 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -111351,7 +107410,7 @@ module.exports = str => {
 
 
 /***/ }),
-/* 636 */
+/* 604 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /*
@@ -111370,7 +107429,7 @@ var CacheObject = function (conf) {
 
     this.count = 0;
     this.data = {};
-    var next = __webpack_require__(512);
+    var next = __webpack_require__(480);
 
     this.set = function (key, value, callback) {
         var self = this;
@@ -111478,7 +107537,7 @@ module.exports = CacheObject;
 
 
 /***/ }),
-/* 637 */
+/* 605 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /*
@@ -111487,7 +107546,7 @@ module.exports = CacheObject;
 * See the accompanying LICENSE file for terms.
 */
 
-var CacheObject = __webpack_require__(636),
+var CacheObject = __webpack_require__(604),
     deepCopy = __webpack_require__(749),
     dns = __webpack_require__(964);
 
@@ -111805,7 +107864,7 @@ module.exports = function(conf) {
 
 
 /***/ }),
-/* 638 */
+/* 606 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // Named EC curves
@@ -111981,7 +108040,7 @@ module.exports = {
 
 
 /***/ }),
-/* 639 */
+/* 607 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -112151,7 +108210,7 @@ brackets.match = function(arr, pattern) {
 
 
 /***/ }),
-/* 640 */
+/* 608 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -112164,7 +108223,7 @@ brackets.match = function(arr, pattern) {
 
 
 
-var fill = __webpack_require__(641);
+var fill = __webpack_require__(609);
 
 module.exports = function expandRange(str, options, fn) {
   if (typeof str !== 'string') {
@@ -112201,7 +108260,7 @@ module.exports = function expandRange(str, options, fn) {
 
 
 /***/ }),
-/* 641 */
+/* 609 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -112214,8 +108273,8 @@ module.exports = function expandRange(str, options, fn) {
 
 
 
-var isObject = __webpack_require__(643);
-var isNumber = __webpack_require__(642);
+var isObject = __webpack_require__(611);
+var isNumber = __webpack_require__(610);
 var randomize = __webpack_require__(787);
 var repeatStr = __webpack_require__(797);
 var repeat = __webpack_require__(411);
@@ -112616,7 +108675,7 @@ function length(val) {
 
 
 /***/ }),
-/* 642 */
+/* 610 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -112629,7 +108688,7 @@ function length(val) {
 
 
 
-var typeOf = __webpack_require__(179);
+var typeOf = __webpack_require__(180);
 
 module.exports = function isNumber(num) {
   var type = typeOf(num);
@@ -112642,7 +108701,7 @@ module.exports = function isNumber(num) {
 
 
 /***/ }),
-/* 643 */
+/* 611 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -112663,7 +108722,7 @@ module.exports = function isObject(val) {
 
 
 /***/ }),
-/* 644 */
+/* 612 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -112680,7 +108739,7 @@ module.exports = function isObject(val) {
  * Module dependencies
  */
 
-var isExtglob = __webpack_require__(177);
+var isExtglob = __webpack_require__(178);
 var re, cache = {};
 
 /**
@@ -112848,7 +108907,7 @@ function toRegex(pattern, contains, isNegated) {
 
 
 /***/ }),
-/* 645 */
+/* 613 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /*
@@ -113037,7 +109096,7 @@ function dumpException(ex)
 
 
 /***/ }),
-/* 646 */
+/* 614 */
 /***/ (function(module, exports) {
 
 /*!
@@ -113053,7 +109112,7 @@ module.exports = function filenameRegex() {
 
 
 /***/ }),
-/* 647 */
+/* 615 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -113076,7 +109135,7 @@ module.exports = function forIn(obj, fn, thisArg) {
 
 
 /***/ }),
-/* 648 */
+/* 616 */
 /***/ (function(module, exports, __webpack_require__) {
 
 module.exports = ForeverAgent
@@ -113086,7 +109145,7 @@ var util = __webpack_require__(3)
   , Agent = __webpack_require__(87).Agent
   , net = __webpack_require__(164)
   , tls = __webpack_require__(467)
-  , AgentSSL = __webpack_require__(195).Agent
+  , AgentSSL = __webpack_require__(196).Agent
   
 function getConnectionName(host, port) {  
   var name = ''
@@ -113220,19 +109279,19 @@ function createConnectionSSL (port, host, options) {
 
 
 /***/ }),
-/* 649 */
+/* 617 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var CombinedStream = __webpack_require__(385);
+var CombinedStream = __webpack_require__(379);
 var util = __webpack_require__(3);
 var path = __webpack_require__(0);
 var http = __webpack_require__(87);
-var https = __webpack_require__(195);
+var https = __webpack_require__(196);
 var parseUrl = __webpack_require__(24).parse;
-var fs = __webpack_require__(5);
+var fs = __webpack_require__(4);
 var mime = __webpack_require__(400);
-var asynckit = __webpack_require__(517);
-var populate = __webpack_require__(650);
+var asynckit = __webpack_require__(485);
+var populate = __webpack_require__(618);
 
 // Public API
 module.exports = FormData;
@@ -113683,7 +109742,7 @@ FormData.prototype.toString = function () {
 
 
 /***/ }),
-/* 650 */
+/* 618 */
 /***/ (function(module, exports) {
 
 // populates missing values
@@ -113699,14 +109758,14 @@ module.exports = function(dst, src) {
 
 
 /***/ }),
-/* 651 */
+/* 619 */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = __webpack_require__(5).constants || __webpack_require__(466)
+module.exports = __webpack_require__(4).constants || __webpack_require__(466)
 
 
 /***/ }),
-/* 652 */
+/* 620 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -113720,8 +109779,8 @@ module.exports = __webpack_require__(5).constants || __webpack_require__(466)
 
 
 var path = __webpack_require__(0);
-var parent = __webpack_require__(653);
-var isGlob = __webpack_require__(178);
+var parent = __webpack_require__(621);
+var isGlob = __webpack_require__(179);
 
 module.exports = function globBase(pattern) {
   if (typeof pattern !== 'string') {
@@ -113764,14 +109823,14 @@ function dirname(glob) {
 
 
 /***/ }),
-/* 653 */
+/* 621 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 var path = __webpack_require__(0);
-var isglob = __webpack_require__(178);
+var isglob = __webpack_require__(179);
 
 module.exports = function globParent(str) {
 	str += 'a'; // preserves full path in case of trailing path separator
@@ -113781,7 +109840,7 @@ module.exports = function globParent(str) {
 
 
 /***/ }),
-/* 654 */
+/* 622 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var Stream = __webpack_require__(23).Stream
@@ -113905,10 +109964,10 @@ function legacy (fs) {
 
 
 /***/ }),
-/* 655 */
+/* 623 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var fs = __webpack_require__(390)
+var fs = __webpack_require__(384)
 var constants = __webpack_require__(466)
 
 var origCwd = process.cwd
@@ -114241,10 +110300,10 @@ function chownErOk (er) {
 
 
 /***/ }),
-/* 656 */
+/* 624 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var zlib = __webpack_require__(198)
+var zlib = __webpack_require__(199)
 var peek = __webpack_require__(775)
 var through = __webpack_require__(461)
 var pumpify = __webpack_require__(782)
@@ -114279,144 +110338,144 @@ module.exports = gunzip
 
 
 /***/ }),
-/* 657 */
+/* 625 */
 /***/ (function(module, exports) {
 
 module.exports = {"$id":"afterRequest.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","optional":true,"required":["lastAccess","eTag","hitCount"],"properties":{"expires":{"type":"string","pattern":"^(\\d{4})(-)?(\\d\\d)(-)?(\\d\\d)(T)?(\\d\\d)(:)?(\\d\\d)(:)?(\\d\\d)(\\.\\d+)?(Z|([+-])(\\d\\d)(:)?(\\d\\d))?"},"lastAccess":{"type":"string","pattern":"^(\\d{4})(-)?(\\d\\d)(-)?(\\d\\d)(T)?(\\d\\d)(:)?(\\d\\d)(:)?(\\d\\d)(\\.\\d+)?(Z|([+-])(\\d\\d)(:)?(\\d\\d))?"},"eTag":{"type":"string"},"hitCount":{"type":"integer"},"comment":{"type":"string"}}}
 
 /***/ }),
-/* 658 */
+/* 626 */
 /***/ (function(module, exports) {
 
 module.exports = {"$id":"beforeRequest.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","optional":true,"required":["lastAccess","eTag","hitCount"],"properties":{"expires":{"type":"string","pattern":"^(\\d{4})(-)?(\\d\\d)(-)?(\\d\\d)(T)?(\\d\\d)(:)?(\\d\\d)(:)?(\\d\\d)(\\.\\d+)?(Z|([+-])(\\d\\d)(:)?(\\d\\d))?"},"lastAccess":{"type":"string","pattern":"^(\\d{4})(-)?(\\d\\d)(-)?(\\d\\d)(T)?(\\d\\d)(:)?(\\d\\d)(:)?(\\d\\d)(\\.\\d+)?(Z|([+-])(\\d\\d)(:)?(\\d\\d))?"},"eTag":{"type":"string"},"hitCount":{"type":"integer"},"comment":{"type":"string"}}}
 
 /***/ }),
-/* 659 */
+/* 627 */
 /***/ (function(module, exports) {
 
 module.exports = {"$id":"browser.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["name","version"],"properties":{"name":{"type":"string"},"version":{"type":"string"},"comment":{"type":"string"}}}
 
 /***/ }),
-/* 660 */
+/* 628 */
 /***/ (function(module, exports) {
 
 module.exports = {"$id":"cache.json#","$schema":"http://json-schema.org/draft-06/schema#","properties":{"beforeRequest":{"oneOf":[{"type":"null"},{"$ref":"beforeRequest.json#"}]},"afterRequest":{"oneOf":[{"type":"null"},{"$ref":"afterRequest.json#"}]},"comment":{"type":"string"}}}
 
 /***/ }),
-/* 661 */
+/* 629 */
 /***/ (function(module, exports) {
 
 module.exports = {"$id":"content.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["size","mimeType"],"properties":{"size":{"type":"integer"},"compression":{"type":"integer"},"mimeType":{"type":"string"},"text":{"type":"string"},"encoding":{"type":"string"},"comment":{"type":"string"}}}
 
 /***/ }),
-/* 662 */
+/* 630 */
 /***/ (function(module, exports) {
 
 module.exports = {"$id":"cookie.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["name","value"],"properties":{"name":{"type":"string"},"value":{"type":"string"},"path":{"type":"string"},"domain":{"type":"string"},"expires":{"type":["string","null"],"format":"date-time"},"httpOnly":{"type":"boolean"},"secure":{"type":"boolean"},"comment":{"type":"string"}}}
 
 /***/ }),
-/* 663 */
+/* 631 */
 /***/ (function(module, exports) {
 
 module.exports = {"$id":"creator.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["name","version"],"properties":{"name":{"type":"string"},"version":{"type":"string"},"comment":{"type":"string"}}}
 
 /***/ }),
-/* 664 */
+/* 632 */
 /***/ (function(module, exports) {
 
 module.exports = {"$id":"entry.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","optional":true,"required":["startedDateTime","time","request","response","cache","timings"],"properties":{"pageref":{"type":"string"},"startedDateTime":{"type":"string","format":"date-time","pattern":"^(\\d{4})(-)?(\\d\\d)(-)?(\\d\\d)(T)?(\\d\\d)(:)?(\\d\\d)(:)?(\\d\\d)(\\.\\d+)?(Z|([+-])(\\d\\d)(:)?(\\d\\d))"},"time":{"type":"number","min":0},"request":{"$ref":"request.json#"},"response":{"$ref":"response.json#"},"cache":{"$ref":"cache.json#"},"timings":{"$ref":"timings.json#"},"serverIPAddress":{"type":"string","oneOf":[{"format":"ipv4"},{"format":"ipv6"}]},"connection":{"type":"string"},"comment":{"type":"string"}}}
 
 /***/ }),
-/* 665 */
+/* 633 */
 /***/ (function(module, exports) {
 
 module.exports = {"$id":"har.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["log"],"properties":{"log":{"$ref":"log.json#"}}}
 
 /***/ }),
-/* 666 */
+/* 634 */
 /***/ (function(module, exports) {
 
 module.exports = {"$id":"header.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["name","value"],"properties":{"name":{"type":"string"},"value":{"type":"string"},"comment":{"type":"string"}}}
 
 /***/ }),
-/* 667 */
+/* 635 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 module.exports = {
-  afterRequest: __webpack_require__(657),
-  beforeRequest: __webpack_require__(658),
-  browser: __webpack_require__(659),
-  cache: __webpack_require__(660),
-  content: __webpack_require__(661),
-  cookie: __webpack_require__(662),
-  creator: __webpack_require__(663),
-  entry: __webpack_require__(664),
-  har: __webpack_require__(665),
-  header: __webpack_require__(666),
-  log: __webpack_require__(668),
-  page: __webpack_require__(669),
-  pageTimings: __webpack_require__(670),
-  postData: __webpack_require__(671),
-  query: __webpack_require__(672),
-  request: __webpack_require__(673),
-  response: __webpack_require__(674),
-  timings: __webpack_require__(675)
+  afterRequest: __webpack_require__(625),
+  beforeRequest: __webpack_require__(626),
+  browser: __webpack_require__(627),
+  cache: __webpack_require__(628),
+  content: __webpack_require__(629),
+  cookie: __webpack_require__(630),
+  creator: __webpack_require__(631),
+  entry: __webpack_require__(632),
+  har: __webpack_require__(633),
+  header: __webpack_require__(634),
+  log: __webpack_require__(636),
+  page: __webpack_require__(637),
+  pageTimings: __webpack_require__(638),
+  postData: __webpack_require__(639),
+  query: __webpack_require__(640),
+  request: __webpack_require__(641),
+  response: __webpack_require__(642),
+  timings: __webpack_require__(643)
 }
 
 
 /***/ }),
-/* 668 */
+/* 636 */
 /***/ (function(module, exports) {
 
 module.exports = {"$id":"log.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["version","creator","entries"],"properties":{"version":{"type":"string"},"creator":{"$ref":"creator.json#"},"browser":{"$ref":"browser.json#"},"pages":{"type":"array","items":{"$ref":"page.json#"}},"entries":{"type":"array","items":{"$ref":"entry.json#"}},"comment":{"type":"string"}}}
 
 /***/ }),
-/* 669 */
+/* 637 */
 /***/ (function(module, exports) {
 
 module.exports = {"$id":"page.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","optional":true,"required":["startedDateTime","id","title","pageTimings"],"properties":{"startedDateTime":{"type":"string","format":"date-time","pattern":"^(\\d{4})(-)?(\\d\\d)(-)?(\\d\\d)(T)?(\\d\\d)(:)?(\\d\\d)(:)?(\\d\\d)(\\.\\d+)?(Z|([+-])(\\d\\d)(:)?(\\d\\d))"},"id":{"type":"string","unique":true},"title":{"type":"string"},"pageTimings":{"$ref":"pageTimings.json#"},"comment":{"type":"string"}}}
 
 /***/ }),
-/* 670 */
+/* 638 */
 /***/ (function(module, exports) {
 
 module.exports = {"$id":"pageTimings.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","properties":{"onContentLoad":{"type":"number","min":-1},"onLoad":{"type":"number","min":-1},"comment":{"type":"string"}}}
 
 /***/ }),
-/* 671 */
+/* 639 */
 /***/ (function(module, exports) {
 
 module.exports = {"$id":"postData.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","optional":true,"required":["mimeType"],"properties":{"mimeType":{"type":"string"},"text":{"type":"string"},"params":{"type":"array","required":["name"],"properties":{"name":{"type":"string"},"value":{"type":"string"},"fileName":{"type":"string"},"contentType":{"type":"string"},"comment":{"type":"string"}}},"comment":{"type":"string"}}}
 
 /***/ }),
-/* 672 */
+/* 640 */
 /***/ (function(module, exports) {
 
 module.exports = {"$id":"query.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["name","value"],"properties":{"name":{"type":"string"},"value":{"type":"string"},"comment":{"type":"string"}}}
 
 /***/ }),
-/* 673 */
+/* 641 */
 /***/ (function(module, exports) {
 
 module.exports = {"$id":"request.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["method","url","httpVersion","cookies","headers","queryString","headersSize","bodySize"],"properties":{"method":{"type":"string"},"url":{"type":"string","format":"uri"},"httpVersion":{"type":"string"},"cookies":{"type":"array","items":{"$ref":"cookie.json#"}},"headers":{"type":"array","items":{"$ref":"header.json#"}},"queryString":{"type":"array","items":{"$ref":"query.json#"}},"postData":{"$ref":"postData.json#"},"headersSize":{"type":"integer"},"bodySize":{"type":"integer"},"comment":{"type":"string"}}}
 
 /***/ }),
-/* 674 */
+/* 642 */
 /***/ (function(module, exports) {
 
 module.exports = {"$id":"response.json#","$schema":"http://json-schema.org/draft-06/schema#","type":"object","required":["status","statusText","httpVersion","cookies","headers","content","redirectURL","headersSize","bodySize"],"properties":{"status":{"type":"integer"},"statusText":{"type":"string"},"httpVersion":{"type":"string"},"cookies":{"type":"array","items":{"$ref":"cookie.json#"}},"headers":{"type":"array","items":{"$ref":"header.json#"}},"content":{"$ref":"content.json#"},"redirectURL":{"type":"string"},"headersSize":{"type":"integer"},"bodySize":{"type":"integer"},"comment":{"type":"string"}}}
 
 /***/ }),
-/* 675 */
+/* 643 */
 /***/ (function(module, exports) {
 
 module.exports = {"$id":"timings.json#","$schema":"http://json-schema.org/draft-06/schema#","required":["send","wait","receive"],"properties":{"dns":{"type":"number","min":-1},"connect":{"type":"number","min":-1},"blocked":{"type":"number","min":-1},"send":{"type":"number","min":-1},"wait":{"type":"number","min":-1},"receive":{"type":"number","min":-1},"ssl":{"type":"number","min":-1},"comment":{"type":"string"}}}
 
 /***/ }),
-/* 676 */
+/* 644 */
 /***/ (function(module, exports) {
 
 function HARError (errors) {
@@ -114439,12 +110498,12 @@ module.exports = HARError
 
 
 /***/ }),
-/* 677 */
+/* 645 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var Ajv = __webpack_require__(473)
-var HARError = __webpack_require__(676)
-var schemas = __webpack_require__(667)
+var Ajv = __webpack_require__(647)
+var HARError = __webpack_require__(644)
+var schemas = __webpack_require__(635)
 
 var ajv
 
@@ -114539,6 +110598,4084 @@ exports.timings = function (data) {
 }
 
 
+/***/ }),
+/* 646 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var KEYWORDS = [
+  'multipleOf',
+  'maximum',
+  'exclusiveMaximum',
+  'minimum',
+  'exclusiveMinimum',
+  'maxLength',
+  'minLength',
+  'pattern',
+  'additionalItems',
+  'maxItems',
+  'minItems',
+  'uniqueItems',
+  'maxProperties',
+  'minProperties',
+  'required',
+  'additionalProperties',
+  'enum',
+  'format',
+  'const'
+];
+
+module.exports = function (metaSchema, keywordsJsonPointers) {
+  for (var i=0; i<keywordsJsonPointers.length; i++) {
+    metaSchema = JSON.parse(JSON.stringify(metaSchema));
+    var segments = keywordsJsonPointers[i].split('/');
+    var keywords = metaSchema;
+    var j;
+    for (j=1; j<segments.length; j++)
+      keywords = keywords[segments[j]];
+
+    for (j=0; j<KEYWORDS.length; j++) {
+      var key = KEYWORDS[j];
+      var schema = keywords[key];
+      if (schema) {
+        keywords[key] = {
+          anyOf: [
+            schema,
+            { $ref: 'https://raw.githubusercontent.com/epoberezkin/ajv/master/lib/refs/$data.json#' }
+          ]
+        };
+      }
+    }
+  }
+
+  return metaSchema;
+};
+
+
+/***/ }),
+/* 647 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var compileSchema = __webpack_require__(652)
+  , resolve = __webpack_require__(271)
+  , Cache = __webpack_require__(648)
+  , SchemaObject = __webpack_require__(386)
+  , stableStringify = __webpack_require__(383)
+  , formats = __webpack_require__(651)
+  , rules = __webpack_require__(653)
+  , $dataMetaSchema = __webpack_require__(646)
+  , patternGroups = __webpack_require__(674)
+  , util = __webpack_require__(114)
+  , co = __webpack_require__(377);
+
+module.exports = Ajv;
+
+Ajv.prototype.validate = validate;
+Ajv.prototype.compile = compile;
+Ajv.prototype.addSchema = addSchema;
+Ajv.prototype.addMetaSchema = addMetaSchema;
+Ajv.prototype.validateSchema = validateSchema;
+Ajv.prototype.getSchema = getSchema;
+Ajv.prototype.removeSchema = removeSchema;
+Ajv.prototype.addFormat = addFormat;
+Ajv.prototype.errorsText = errorsText;
+
+Ajv.prototype._addSchema = _addSchema;
+Ajv.prototype._compile = _compile;
+
+Ajv.prototype.compileAsync = __webpack_require__(650);
+var customKeyword = __webpack_require__(673);
+Ajv.prototype.addKeyword = customKeyword.add;
+Ajv.prototype.getKeyword = customKeyword.get;
+Ajv.prototype.removeKeyword = customKeyword.remove;
+
+var errorClasses = __webpack_require__(270);
+Ajv.ValidationError = errorClasses.Validation;
+Ajv.MissingRefError = errorClasses.MissingRef;
+Ajv.$dataMetaSchema = $dataMetaSchema;
+
+var META_SCHEMA_ID = 'http://json-schema.org/draft-06/schema';
+
+var META_IGNORE_OPTIONS = [ 'removeAdditional', 'useDefaults', 'coerceTypes' ];
+var META_SUPPORT_DATA = ['/properties'];
+
+/**
+ * Creates validator instance.
+ * Usage: `Ajv(opts)`
+ * @param {Object} opts optional options
+ * @return {Object} ajv instance
+ */
+function Ajv(opts) {
+  if (!(this instanceof Ajv)) return new Ajv(opts);
+  opts = this._opts = util.copy(opts) || {};
+  setLogger(this);
+  this._schemas = {};
+  this._refs = {};
+  this._fragments = {};
+  this._formats = formats(opts.format);
+  var schemaUriFormat = this._schemaUriFormat = this._formats['uri-reference'];
+  this._schemaUriFormatFunc = function (str) { return schemaUriFormat.test(str); };
+
+  this._cache = opts.cache || new Cache;
+  this._loadingSchemas = {};
+  this._compilations = [];
+  this.RULES = rules();
+  this._getId = chooseGetId(opts);
+
+  opts.loopRequired = opts.loopRequired || Infinity;
+  if (opts.errorDataPath == 'property') opts._errorDataPathProperty = true;
+  if (opts.serialize === undefined) opts.serialize = stableStringify;
+  this._metaOpts = getMetaSchemaOptions(this);
+
+  if (opts.formats) addInitialFormats(this);
+  addDraft6MetaSchema(this);
+  if (typeof opts.meta == 'object') this.addMetaSchema(opts.meta);
+  addInitialSchemas(this);
+  if (opts.patternGroups) patternGroups(this);
+}
+
+
+
+/**
+ * Validate data using schema
+ * Schema will be compiled and cached (using serialized JSON as key. [fast-json-stable-stringify](https://github.com/epoberezkin/fast-json-stable-stringify) is used to serialize.
+ * @this   Ajv
+ * @param  {String|Object} schemaKeyRef key, ref or schema object
+ * @param  {Any} data to be validated
+ * @return {Boolean} validation result. Errors from the last validation will be available in `ajv.errors` (and also in compiled schema: `schema.errors`).
+ */
+function validate(schemaKeyRef, data) {
+  var v;
+  if (typeof schemaKeyRef == 'string') {
+    v = this.getSchema(schemaKeyRef);
+    if (!v) throw new Error('no schema with key or ref "' + schemaKeyRef + '"');
+  } else {
+    var schemaObj = this._addSchema(schemaKeyRef);
+    v = schemaObj.validate || this._compile(schemaObj);
+  }
+
+  var valid = v(data);
+  if (v.$async === true)
+    return this._opts.async == '*' ? co(valid) : valid;
+  this.errors = v.errors;
+  return valid;
+}
+
+
+/**
+ * Create validating function for passed schema.
+ * @this   Ajv
+ * @param  {Object} schema schema object
+ * @param  {Boolean} _meta true if schema is a meta-schema. Used internally to compile meta schemas of custom keywords.
+ * @return {Function} validating function
+ */
+function compile(schema, _meta) {
+  var schemaObj = this._addSchema(schema, undefined, _meta);
+  return schemaObj.validate || this._compile(schemaObj);
+}
+
+
+/**
+ * Adds schema to the instance.
+ * @this   Ajv
+ * @param {Object|Array} schema schema or array of schemas. If array is passed, `key` and other parameters will be ignored.
+ * @param {String} key Optional schema key. Can be passed to `validate` method instead of schema object or id/ref. One schema per instance can have empty `id` and `key`.
+ * @param {Boolean} _skipValidation true to skip schema validation. Used internally, option validateSchema should be used instead.
+ * @param {Boolean} _meta true if schema is a meta-schema. Used internally, addMetaSchema should be used instead.
+ * @return {Ajv} this for method chaining
+ */
+function addSchema(schema, key, _skipValidation, _meta) {
+  if (Array.isArray(schema)){
+    for (var i=0; i<schema.length; i++) this.addSchema(schema[i], undefined, _skipValidation, _meta);
+    return this;
+  }
+  var id = this._getId(schema);
+  if (id !== undefined && typeof id != 'string')
+    throw new Error('schema id must be string');
+  key = resolve.normalizeId(key || id);
+  checkUnique(this, key);
+  this._schemas[key] = this._addSchema(schema, _skipValidation, _meta, true);
+  return this;
+}
+
+
+/**
+ * Add schema that will be used to validate other schemas
+ * options in META_IGNORE_OPTIONS are alway set to false
+ * @this   Ajv
+ * @param {Object} schema schema object
+ * @param {String} key optional schema key
+ * @param {Boolean} skipValidation true to skip schema validation, can be used to override validateSchema option for meta-schema
+ * @return {Ajv} this for method chaining
+ */
+function addMetaSchema(schema, key, skipValidation) {
+  this.addSchema(schema, key, skipValidation, true);
+  return this;
+}
+
+
+/**
+ * Validate schema
+ * @this   Ajv
+ * @param {Object} schema schema to validate
+ * @param {Boolean} throwOrLogError pass true to throw (or log) an error if invalid
+ * @return {Boolean} true if schema is valid
+ */
+function validateSchema(schema, throwOrLogError) {
+  var $schema = schema.$schema;
+  if ($schema !== undefined && typeof $schema != 'string')
+    throw new Error('$schema must be a string');
+  $schema = $schema || this._opts.defaultMeta || defaultMeta(this);
+  if (!$schema) {
+    this.logger.warn('meta-schema not available');
+    this.errors = null;
+    return true;
+  }
+  var currentUriFormat = this._formats.uri;
+  this._formats.uri = typeof currentUriFormat == 'function'
+                      ? this._schemaUriFormatFunc
+                      : this._schemaUriFormat;
+  var valid;
+  try { valid = this.validate($schema, schema); }
+  finally { this._formats.uri = currentUriFormat; }
+  if (!valid && throwOrLogError) {
+    var message = 'schema is invalid: ' + this.errorsText();
+    if (this._opts.validateSchema == 'log') this.logger.error(message);
+    else throw new Error(message);
+  }
+  return valid;
+}
+
+
+function defaultMeta(self) {
+  var meta = self._opts.meta;
+  self._opts.defaultMeta = typeof meta == 'object'
+                            ? self._getId(meta) || meta
+                            : self.getSchema(META_SCHEMA_ID)
+                              ? META_SCHEMA_ID
+                              : undefined;
+  return self._opts.defaultMeta;
+}
+
+
+/**
+ * Get compiled schema from the instance by `key` or `ref`.
+ * @this   Ajv
+ * @param  {String} keyRef `key` that was passed to `addSchema` or full schema reference (`schema.id` or resolved id).
+ * @return {Function} schema validating function (with property `schema`).
+ */
+function getSchema(keyRef) {
+  var schemaObj = _getSchemaObj(this, keyRef);
+  switch (typeof schemaObj) {
+    case 'object': return schemaObj.validate || this._compile(schemaObj);
+    case 'string': return this.getSchema(schemaObj);
+    case 'undefined': return _getSchemaFragment(this, keyRef);
+  }
+}
+
+
+function _getSchemaFragment(self, ref) {
+  var res = resolve.schema.call(self, { schema: {} }, ref);
+  if (res) {
+    var schema = res.schema
+      , root = res.root
+      , baseId = res.baseId;
+    var v = compileSchema.call(self, schema, root, undefined, baseId);
+    self._fragments[ref] = new SchemaObject({
+      ref: ref,
+      fragment: true,
+      schema: schema,
+      root: root,
+      baseId: baseId,
+      validate: v
+    });
+    return v;
+  }
+}
+
+
+function _getSchemaObj(self, keyRef) {
+  keyRef = resolve.normalizeId(keyRef);
+  return self._schemas[keyRef] || self._refs[keyRef] || self._fragments[keyRef];
+}
+
+
+/**
+ * Remove cached schema(s).
+ * If no parameter is passed all schemas but meta-schemas are removed.
+ * If RegExp is passed all schemas with key/id matching pattern but meta-schemas are removed.
+ * Even if schema is referenced by other schemas it still can be removed as other schemas have local references.
+ * @this   Ajv
+ * @param  {String|Object|RegExp} schemaKeyRef key, ref, pattern to match key/ref or schema object
+ * @return {Ajv} this for method chaining
+ */
+function removeSchema(schemaKeyRef) {
+  if (schemaKeyRef instanceof RegExp) {
+    _removeAllSchemas(this, this._schemas, schemaKeyRef);
+    _removeAllSchemas(this, this._refs, schemaKeyRef);
+    return this;
+  }
+  switch (typeof schemaKeyRef) {
+    case 'undefined':
+      _removeAllSchemas(this, this._schemas);
+      _removeAllSchemas(this, this._refs);
+      this._cache.clear();
+      return this;
+    case 'string':
+      var schemaObj = _getSchemaObj(this, schemaKeyRef);
+      if (schemaObj) this._cache.del(schemaObj.cacheKey);
+      delete this._schemas[schemaKeyRef];
+      delete this._refs[schemaKeyRef];
+      return this;
+    case 'object':
+      var serialize = this._opts.serialize;
+      var cacheKey = serialize ? serialize(schemaKeyRef) : schemaKeyRef;
+      this._cache.del(cacheKey);
+      var id = this._getId(schemaKeyRef);
+      if (id) {
+        id = resolve.normalizeId(id);
+        delete this._schemas[id];
+        delete this._refs[id];
+      }
+  }
+  return this;
+}
+
+
+function _removeAllSchemas(self, schemas, regex) {
+  for (var keyRef in schemas) {
+    var schemaObj = schemas[keyRef];
+    if (!schemaObj.meta && (!regex || regex.test(keyRef))) {
+      self._cache.del(schemaObj.cacheKey);
+      delete schemas[keyRef];
+    }
+  }
+}
+
+
+/* @this   Ajv */
+function _addSchema(schema, skipValidation, meta, shouldAddSchema) {
+  if (typeof schema != 'object' && typeof schema != 'boolean')
+    throw new Error('schema should be object or boolean');
+  var serialize = this._opts.serialize;
+  var cacheKey = serialize ? serialize(schema) : schema;
+  var cached = this._cache.get(cacheKey);
+  if (cached) return cached;
+
+  shouldAddSchema = shouldAddSchema || this._opts.addUsedSchema !== false;
+
+  var id = resolve.normalizeId(this._getId(schema));
+  if (id && shouldAddSchema) checkUnique(this, id);
+
+  var willValidate = this._opts.validateSchema !== false && !skipValidation;
+  var recursiveMeta;
+  if (willValidate && !(recursiveMeta = id && id == resolve.normalizeId(schema.$schema)))
+    this.validateSchema(schema, true);
+
+  var localRefs = resolve.ids.call(this, schema);
+
+  var schemaObj = new SchemaObject({
+    id: id,
+    schema: schema,
+    localRefs: localRefs,
+    cacheKey: cacheKey,
+    meta: meta
+  });
+
+  if (id[0] != '#' && shouldAddSchema) this._refs[id] = schemaObj;
+  this._cache.put(cacheKey, schemaObj);
+
+  if (willValidate && recursiveMeta) this.validateSchema(schema, true);
+
+  return schemaObj;
+}
+
+
+/* @this   Ajv */
+function _compile(schemaObj, root) {
+  if (schemaObj.compiling) {
+    schemaObj.validate = callValidate;
+    callValidate.schema = schemaObj.schema;
+    callValidate.errors = null;
+    callValidate.root = root ? root : callValidate;
+    if (schemaObj.schema.$async === true)
+      callValidate.$async = true;
+    return callValidate;
+  }
+  schemaObj.compiling = true;
+
+  var currentOpts;
+  if (schemaObj.meta) {
+    currentOpts = this._opts;
+    this._opts = this._metaOpts;
+  }
+
+  var v;
+  try { v = compileSchema.call(this, schemaObj.schema, root, schemaObj.localRefs); }
+  finally {
+    schemaObj.compiling = false;
+    if (schemaObj.meta) this._opts = currentOpts;
+  }
+
+  schemaObj.validate = v;
+  schemaObj.refs = v.refs;
+  schemaObj.refVal = v.refVal;
+  schemaObj.root = v.root;
+  return v;
+
+
+  function callValidate() {
+    var _validate = schemaObj.validate;
+    var result = _validate.apply(null, arguments);
+    callValidate.errors = _validate.errors;
+    return result;
+  }
+}
+
+
+function chooseGetId(opts) {
+  switch (opts.schemaId) {
+    case '$id': return _get$Id;
+    case 'id': return _getId;
+    default: return _get$IdOrId;
+  }
+}
+
+/* @this   Ajv */
+function _getId(schema) {
+  if (schema.$id) this.logger.warn('schema $id ignored', schema.$id);
+  return schema.id;
+}
+
+/* @this   Ajv */
+function _get$Id(schema) {
+  if (schema.id) this.logger.warn('schema id ignored', schema.id);
+  return schema.$id;
+}
+
+
+function _get$IdOrId(schema) {
+  if (schema.$id && schema.id && schema.$id != schema.id)
+    throw new Error('schema $id is different from id');
+  return schema.$id || schema.id;
+}
+
+
+/**
+ * Convert array of error message objects to string
+ * @this   Ajv
+ * @param  {Array<Object>} errors optional array of validation errors, if not passed errors from the instance are used.
+ * @param  {Object} options optional options with properties `separator` and `dataVar`.
+ * @return {String} human readable string with all errors descriptions
+ */
+function errorsText(errors, options) {
+  errors = errors || this.errors;
+  if (!errors) return 'No errors';
+  options = options || {};
+  var separator = options.separator === undefined ? ', ' : options.separator;
+  var dataVar = options.dataVar === undefined ? 'data' : options.dataVar;
+
+  var text = '';
+  for (var i=0; i<errors.length; i++) {
+    var e = errors[i];
+    if (e) text += dataVar + e.dataPath + ' ' + e.message + separator;
+  }
+  return text.slice(0, -separator.length);
+}
+
+
+/**
+ * Add custom format
+ * @this   Ajv
+ * @param {String} name format name
+ * @param {String|RegExp|Function} format string is converted to RegExp; function should return boolean (true when valid)
+ * @return {Ajv} this for method chaining
+ */
+function addFormat(name, format) {
+  if (typeof format == 'string') format = new RegExp(format);
+  this._formats[name] = format;
+  return this;
+}
+
+
+function addDraft6MetaSchema(self) {
+  var $dataSchema;
+  if (self._opts.$data) {
+    $dataSchema = __webpack_require__(675);
+    self.addMetaSchema($dataSchema, $dataSchema.$id, true);
+  }
+  if (self._opts.meta === false) return;
+  var metaSchema = __webpack_require__(676);
+  if (self._opts.$data) metaSchema = $dataMetaSchema(metaSchema, META_SUPPORT_DATA);
+  self.addMetaSchema(metaSchema, META_SCHEMA_ID, true);
+  self._refs['http://json-schema.org/schema'] = META_SCHEMA_ID;
+}
+
+
+function addInitialSchemas(self) {
+  var optsSchemas = self._opts.schemas;
+  if (!optsSchemas) return;
+  if (Array.isArray(optsSchemas)) self.addSchema(optsSchemas);
+  else for (var key in optsSchemas) self.addSchema(optsSchemas[key], key);
+}
+
+
+function addInitialFormats(self) {
+  for (var name in self._opts.formats) {
+    var format = self._opts.formats[name];
+    self.addFormat(name, format);
+  }
+}
+
+
+function checkUnique(self, id) {
+  if (self._schemas[id] || self._refs[id])
+    throw new Error('schema with key or id "' + id + '" already exists');
+}
+
+
+function getMetaSchemaOptions(self) {
+  var metaOpts = util.copy(self._opts);
+  for (var i=0; i<META_IGNORE_OPTIONS.length; i++)
+    delete metaOpts[META_IGNORE_OPTIONS[i]];
+  return metaOpts;
+}
+
+
+function setLogger(self) {
+  var logger = self._opts.logger;
+  if (logger === false) {
+    self.logger = {log: noop, warn: noop, error: noop};
+  } else {
+    if (logger === undefined) logger = console;
+    if (!(typeof logger == 'object' && logger.log && logger.warn && logger.error))
+      throw new Error('logger must implement log, warn and error methods');
+    self.logger = logger;
+  }
+}
+
+
+function noop() {}
+
+
+/***/ }),
+/* 648 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+
+var Cache = module.exports = function Cache() {
+  this._cache = {};
+};
+
+
+Cache.prototype.put = function Cache_put(key, value) {
+  this._cache[key] = value;
+};
+
+
+Cache.prototype.get = function Cache_get(key) {
+  return this._cache[key];
+};
+
+
+Cache.prototype.del = function Cache_del(key) {
+  delete this._cache[key];
+};
+
+
+Cache.prototype.clear = function Cache_clear() {
+  this._cache = {};
+};
+
+
+/***/ }),
+/* 649 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+//all requires must be explicit because browserify won't work with dynamic requires
+module.exports = {
+  '$ref': __webpack_require__(670),
+  allOf: __webpack_require__(655),
+  anyOf: __webpack_require__(656),
+  const: __webpack_require__(657),
+  contains: __webpack_require__(658),
+  dependencies: __webpack_require__(660),
+  'enum': __webpack_require__(661),
+  format: __webpack_require__(662),
+  items: __webpack_require__(663),
+  maximum: __webpack_require__(387),
+  minimum: __webpack_require__(387),
+  maxItems: __webpack_require__(388),
+  minItems: __webpack_require__(388),
+  maxLength: __webpack_require__(389),
+  minLength: __webpack_require__(389),
+  maxProperties: __webpack_require__(390),
+  minProperties: __webpack_require__(390),
+  multipleOf: __webpack_require__(664),
+  not: __webpack_require__(665),
+  oneOf: __webpack_require__(666),
+  pattern: __webpack_require__(667),
+  properties: __webpack_require__(668),
+  propertyNames: __webpack_require__(669),
+  required: __webpack_require__(671),
+  uniqueItems: __webpack_require__(672),
+  validate: __webpack_require__(391)
+};
+
+
+/***/ }),
+/* 650 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var MissingRefError = __webpack_require__(270).MissingRef;
+
+module.exports = compileAsync;
+
+
+/**
+ * Creates validating function for passed schema with asynchronous loading of missing schemas.
+ * `loadSchema` option should be a function that accepts schema uri and returns promise that resolves with the schema.
+ * @this  Ajv
+ * @param {Object}   schema schema object
+ * @param {Boolean}  meta optional true to compile meta-schema; this parameter can be skipped
+ * @param {Function} callback an optional node-style callback, it is called with 2 parameters: error (or null) and validating function.
+ * @return {Promise} promise that resolves with a validating function.
+ */
+function compileAsync(schema, meta, callback) {
+  /* eslint no-shadow: 0 */
+  /* global Promise */
+  /* jshint validthis: true */
+  var self = this;
+  if (typeof this._opts.loadSchema != 'function')
+    throw new Error('options.loadSchema should be a function');
+
+  if (typeof meta == 'function') {
+    callback = meta;
+    meta = undefined;
+  }
+
+  var p = loadMetaSchemaOf(schema).then(function () {
+    var schemaObj = self._addSchema(schema, undefined, meta);
+    return schemaObj.validate || _compileAsync(schemaObj);
+  });
+
+  if (callback) {
+    p.then(
+      function(v) { callback(null, v); },
+      callback
+    );
+  }
+
+  return p;
+
+
+  function loadMetaSchemaOf(sch) {
+    var $schema = sch.$schema;
+    return $schema && !self.getSchema($schema)
+            ? compileAsync.call(self, { $ref: $schema }, true)
+            : Promise.resolve();
+  }
+
+
+  function _compileAsync(schemaObj) {
+    try { return self._compile(schemaObj); }
+    catch(e) {
+      if (e instanceof MissingRefError) return loadMissingSchema(e);
+      throw e;
+    }
+
+
+    function loadMissingSchema(e) {
+      var ref = e.missingSchema;
+      if (added(ref)) throw new Error('Schema ' + ref + ' is loaded but ' + e.missingRef + ' cannot be resolved');
+
+      var schemaPromise = self._loadingSchemas[ref];
+      if (!schemaPromise) {
+        schemaPromise = self._loadingSchemas[ref] = self._opts.loadSchema(ref);
+        schemaPromise.then(removePromise, removePromise);
+      }
+
+      return schemaPromise.then(function (sch) {
+        if (!added(ref)) {
+          return loadMetaSchemaOf(sch).then(function () {
+            if (!added(ref)) self.addSchema(sch, ref, undefined, meta);
+          });
+        }
+      }).then(function() {
+        return _compileAsync(schemaObj);
+      });
+
+      function removePromise() {
+        delete self._loadingSchemas[ref];
+      }
+
+      function added(ref) {
+        return self._refs[ref] || self._schemas[ref];
+      }
+    }
+  }
+}
+
+
+/***/ }),
+/* 651 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var util = __webpack_require__(114);
+
+var DATE = /^\d\d\d\d-(\d\d)-(\d\d)$/;
+var DAYS = [0,31,29,31,30,31,30,31,31,30,31,30,31];
+var TIME = /^(\d\d):(\d\d):(\d\d)(\.\d+)?(z|[+-]\d\d:\d\d)?$/i;
+var HOSTNAME = /^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?(?:\.[a-z0-9](?:[-0-9a-z]{0,61}[0-9a-z])?)*$/i;
+var URI = /^(?:[a-z][a-z0-9+\-.]*:)(?:\/?\/(?:(?:[a-z0-9\-._~!$&'()*+,;=:]|%[0-9a-f]{2})*@)?(?:\[(?:(?:(?:(?:[0-9a-f]{1,4}:){6}|::(?:[0-9a-f]{1,4}:){5}|(?:[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){4}|(?:(?:[0-9a-f]{1,4}:){0,1}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){3}|(?:(?:[0-9a-f]{1,4}:){0,2}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){2}|(?:(?:[0-9a-f]{1,4}:){0,3}[0-9a-f]{1,4})?::[0-9a-f]{1,4}:|(?:(?:[0-9a-f]{1,4}:){0,4}[0-9a-f]{1,4})?::)(?:[0-9a-f]{1,4}:[0-9a-f]{1,4}|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?))|(?:(?:[0-9a-f]{1,4}:){0,5}[0-9a-f]{1,4})?::[0-9a-f]{1,4}|(?:(?:[0-9a-f]{1,4}:){0,6}[0-9a-f]{1,4})?::)|[Vv][0-9a-f]+\.[a-z0-9\-._~!$&'()*+,;=:]+)\]|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?)|(?:[a-z0-9\-._~!$&'()*+,;=]|%[0-9a-f]{2})*)(?::\d*)?(?:\/(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})*)*|\/(?:(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})*)*)?|(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})*)*)(?:\?(?:[a-z0-9\-._~!$&'()*+,;=:@/?]|%[0-9a-f]{2})*)?(?:#(?:[a-z0-9\-._~!$&'()*+,;=:@/?]|%[0-9a-f]{2})*)?$/i;
+var URIREF = /^(?:[a-z][a-z0-9+\-.]*:)?(?:\/?\/(?:(?:[a-z0-9\-._~!$&'()*+,;=:]|%[0-9a-f]{2})*@)?(?:\[(?:(?:(?:(?:[0-9a-f]{1,4}:){6}|::(?:[0-9a-f]{1,4}:){5}|(?:[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){4}|(?:(?:[0-9a-f]{1,4}:){0,1}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){3}|(?:(?:[0-9a-f]{1,4}:){0,2}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){2}|(?:(?:[0-9a-f]{1,4}:){0,3}[0-9a-f]{1,4})?::[0-9a-f]{1,4}:|(?:(?:[0-9a-f]{1,4}:){0,4}[0-9a-f]{1,4})?::)(?:[0-9a-f]{1,4}:[0-9a-f]{1,4}|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?))|(?:(?:[0-9a-f]{1,4}:){0,5}[0-9a-f]{1,4})?::[0-9a-f]{1,4}|(?:(?:[0-9a-f]{1,4}:){0,6}[0-9a-f]{1,4})?::)|[Vv][0-9a-f]+\.[a-z0-9\-._~!$&'()*+,;=:]+)\]|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?)|(?:[a-z0-9\-._~!$&'"()*+,;=]|%[0-9a-f]{2})*)(?::\d*)?(?:\/(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})*)*|\/(?:(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})*)*)?|(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})*)*)?(?:\?(?:[a-z0-9\-._~!$&'"()*+,;=:@/?]|%[0-9a-f]{2})*)?(?:#(?:[a-z0-9\-._~!$&'"()*+,;=:@/?]|%[0-9a-f]{2})*)?$/i;
+// uri-template: https://tools.ietf.org/html/rfc6570
+var URITEMPLATE = /^(?:(?:[^\x00-\x20"'<>%\\^`{|}]|%[0-9a-f]{2})|\{[+#./;?&=,!@|]?(?:[a-z0-9_]|%[0-9a-f]{2})+(?::[1-9][0-9]{0,3}|\*)?(?:,(?:[a-z0-9_]|%[0-9a-f]{2})+(?::[1-9][0-9]{0,3}|\*)?)*\})*$/i;
+// For the source: https://gist.github.com/dperini/729294
+// For test cases: https://mathiasbynens.be/demo/url-regex
+// @todo Delete current URL in favour of the commented out URL rule when this issue is fixed https://github.com/eslint/eslint/issues/7983.
+// var URL = /^(?:(?:https?|ftp):\/\/)(?:\S+(?::\S*)?@)?(?:(?!10(?:\.\d{1,3}){3})(?!127(?:\.\d{1,3}){3})(?!169\.254(?:\.\d{1,3}){2})(?!192\.168(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u{00a1}-\u{ffff}0-9]+-?)*[a-z\u{00a1}-\u{ffff}0-9]+)(?:\.(?:[a-z\u{00a1}-\u{ffff}0-9]+-?)*[a-z\u{00a1}-\u{ffff}0-9]+)*(?:\.(?:[a-z\u{00a1}-\u{ffff}]{2,})))(?::\d{2,5})?(?:\/[^\s]*)?$/iu;
+var URL = /^(?:(?:http[s\u017F]?|ftp):\/\/)(?:(?:[\0-\x08\x0E-\x1F!-\x9F\xA1-\u167F\u1681-\u1FFF\u200B-\u2027\u202A-\u202E\u2030-\u205E\u2060-\u2FFF\u3001-\uD7FF\uE000-\uFEFE\uFF00-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+(?::(?:[\0-\x08\x0E-\x1F!-\x9F\xA1-\u167F\u1681-\u1FFF\u200B-\u2027\u202A-\u202E\u2030-\u205E\u2060-\u2FFF\u3001-\uD7FF\uE000-\uFEFE\uFF00-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])*)?@)?(?:(?!10(?:\.[0-9]{1,3}){3})(?!127(?:\.[0-9]{1,3}){3})(?!169\.254(?:\.[0-9]{1,3}){2})(?!192\.168(?:\.[0-9]{1,3}){2})(?!172\.(?:1[6-9]|2[0-9]|3[01])(?:\.[0-9]{1,3}){2})(?:[1-9][0-9]?|1[0-9][0-9]|2[01][0-9]|22[0-3])(?:\.(?:1?[0-9]{1,2}|2[0-4][0-9]|25[0-5])){2}(?:\.(?:[1-9][0-9]?|1[0-9][0-9]|2[0-4][0-9]|25[0-4]))|(?:(?:(?:[0-9KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+-?)*(?:[0-9KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+)(?:\.(?:(?:[0-9KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+-?)*(?:[0-9KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+)*(?:\.(?:(?:[KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]){2,})))(?::[0-9]{2,5})?(?:\/(?:[\0-\x08\x0E-\x1F!-\x9F\xA1-\u167F\u1681-\u1FFF\u200B-\u2027\u202A-\u202E\u2030-\u205E\u2060-\u2FFF\u3001-\uD7FF\uE000-\uFEFE\uFF00-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])*)?$/i;
+var UUID = /^(?:urn:uuid:)?[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}$/i;
+var JSON_POINTER = /^(?:\/(?:[^~/]|~0|~1)*)*$|^#(?:\/(?:[a-z0-9_\-.!$&'()*+,;:=@]|%[0-9a-f]{2}|~0|~1)*)*$/i;
+var RELATIVE_JSON_POINTER = /^(?:0|[1-9][0-9]*)(?:#|(?:\/(?:[^~/]|~0|~1)*)*)$/;
+
+
+module.exports = formats;
+
+function formats(mode) {
+  mode = mode == 'full' ? 'full' : 'fast';
+  return util.copy(formats[mode]);
+}
+
+
+formats.fast = {
+  // date: http://tools.ietf.org/html/rfc3339#section-5.6
+  date: /^\d\d\d\d-[0-1]\d-[0-3]\d$/,
+  // date-time: http://tools.ietf.org/html/rfc3339#section-5.6
+  time: /^[0-2]\d:[0-5]\d:[0-5]\d(?:\.\d+)?(?:z|[+-]\d\d:\d\d)?$/i,
+  'date-time': /^\d\d\d\d-[0-1]\d-[0-3]\d[t\s][0-2]\d:[0-5]\d:[0-5]\d(?:\.\d+)?(?:z|[+-]\d\d:\d\d)$/i,
+  // uri: https://github.com/mafintosh/is-my-json-valid/blob/master/formats.js
+  uri: /^(?:[a-z][a-z0-9+-.]*)(?::|\/)\/?[^\s]*$/i,
+  'uri-reference': /^(?:(?:[a-z][a-z0-9+-.]*:)?\/\/)?[^\s]*$/i,
+  'uri-template': URITEMPLATE,
+  url: URL,
+  // email (sources from jsen validator):
+  // http://stackoverflow.com/questions/201323/using-a-regular-expression-to-validate-an-email-address#answer-8829363
+  // http://www.w3.org/TR/html5/forms.html#valid-e-mail-address (search for 'willful violation')
+  email: /^[a-z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?(?:\.[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?)*$/i,
+  hostname: HOSTNAME,
+  // optimized https://www.safaribooksonline.com/library/view/regular-expressions-cookbook/9780596802837/ch07s16.html
+  ipv4: /^(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?)$/,
+  // optimized http://stackoverflow.com/questions/53497/regular-expression-that-matches-valid-ipv6-addresses
+  ipv6: /^\s*(?:(?:(?:[0-9a-f]{1,4}:){7}(?:[0-9a-f]{1,4}|:))|(?:(?:[0-9a-f]{1,4}:){6}(?::[0-9a-f]{1,4}|(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(?:(?:[0-9a-f]{1,4}:){5}(?:(?:(?::[0-9a-f]{1,4}){1,2})|:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(?:(?:[0-9a-f]{1,4}:){4}(?:(?:(?::[0-9a-f]{1,4}){1,3})|(?:(?::[0-9a-f]{1,4})?:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){3}(?:(?:(?::[0-9a-f]{1,4}){1,4})|(?:(?::[0-9a-f]{1,4}){0,2}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){2}(?:(?:(?::[0-9a-f]{1,4}){1,5})|(?:(?::[0-9a-f]{1,4}){0,3}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){1}(?:(?:(?::[0-9a-f]{1,4}){1,6})|(?:(?::[0-9a-f]{1,4}){0,4}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?::(?:(?:(?::[0-9a-f]{1,4}){1,7})|(?:(?::[0-9a-f]{1,4}){0,5}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(?:%.+)?\s*$/i,
+  regex: regex,
+  // uuid: http://tools.ietf.org/html/rfc4122
+  uuid: UUID,
+  // JSON-pointer: https://tools.ietf.org/html/rfc6901
+  // uri fragment: https://tools.ietf.org/html/rfc3986#appendix-A
+  'json-pointer': JSON_POINTER,
+  // relative JSON-pointer: http://tools.ietf.org/html/draft-luff-relative-json-pointer-00
+  'relative-json-pointer': RELATIVE_JSON_POINTER
+};
+
+
+formats.full = {
+  date: date,
+  time: time,
+  'date-time': date_time,
+  uri: uri,
+  'uri-reference': URIREF,
+  'uri-template': URITEMPLATE,
+  url: URL,
+  email: /^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&''*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/i,
+  hostname: hostname,
+  ipv4: /^(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?)$/,
+  ipv6: /^\s*(?:(?:(?:[0-9a-f]{1,4}:){7}(?:[0-9a-f]{1,4}|:))|(?:(?:[0-9a-f]{1,4}:){6}(?::[0-9a-f]{1,4}|(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(?:(?:[0-9a-f]{1,4}:){5}(?:(?:(?::[0-9a-f]{1,4}){1,2})|:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(?:(?:[0-9a-f]{1,4}:){4}(?:(?:(?::[0-9a-f]{1,4}){1,3})|(?:(?::[0-9a-f]{1,4})?:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){3}(?:(?:(?::[0-9a-f]{1,4}){1,4})|(?:(?::[0-9a-f]{1,4}){0,2}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){2}(?:(?:(?::[0-9a-f]{1,4}){1,5})|(?:(?::[0-9a-f]{1,4}){0,3}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){1}(?:(?:(?::[0-9a-f]{1,4}){1,6})|(?:(?::[0-9a-f]{1,4}){0,4}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?::(?:(?:(?::[0-9a-f]{1,4}){1,7})|(?:(?::[0-9a-f]{1,4}){0,5}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(?:%.+)?\s*$/i,
+  regex: regex,
+  uuid: UUID,
+  'json-pointer': JSON_POINTER,
+  'relative-json-pointer': RELATIVE_JSON_POINTER
+};
+
+
+function date(str) {
+  // full-date from http://tools.ietf.org/html/rfc3339#section-5.6
+  var matches = str.match(DATE);
+  if (!matches) return false;
+
+  var month = +matches[1];
+  var day = +matches[2];
+  return month >= 1 && month <= 12 && day >= 1 && day <= DAYS[month];
+}
+
+
+function time(str, full) {
+  var matches = str.match(TIME);
+  if (!matches) return false;
+
+  var hour = matches[1];
+  var minute = matches[2];
+  var second = matches[3];
+  var timeZone = matches[5];
+  return hour <= 23 && minute <= 59 && second <= 59 && (!full || timeZone);
+}
+
+
+var DATE_TIME_SEPARATOR = /t|\s/i;
+function date_time(str) {
+  // http://tools.ietf.org/html/rfc3339#section-5.6
+  var dateTime = str.split(DATE_TIME_SEPARATOR);
+  return dateTime.length == 2 && date(dateTime[0]) && time(dateTime[1], true);
+}
+
+
+function hostname(str) {
+  // https://tools.ietf.org/html/rfc1034#section-3.5
+  // https://tools.ietf.org/html/rfc1123#section-2
+  return str.length <= 255 && HOSTNAME.test(str);
+}
+
+
+var NOT_URI_FRAGMENT = /\/|:/;
+function uri(str) {
+  // http://jmrware.com/articles/2009/uri_regexp/URI_regex.html + optional protocol + required "."
+  return NOT_URI_FRAGMENT.test(str) && URI.test(str);
+}
+
+
+var Z_ANCHOR = /[^\\]\\Z/;
+function regex(str) {
+  if (Z_ANCHOR.test(str)) return false;
+  try {
+    new RegExp(str);
+    return true;
+  } catch(e) {
+    return false;
+  }
+}
+
+
+/***/ }),
+/* 652 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var resolve = __webpack_require__(271)
+  , util = __webpack_require__(114)
+  , errorClasses = __webpack_require__(270)
+  , stableStringify = __webpack_require__(383);
+
+var validateGenerator = __webpack_require__(391);
+
+/**
+ * Functions below are used inside compiled validations function
+ */
+
+var co = __webpack_require__(377);
+var ucs2length = util.ucs2length;
+var equal = __webpack_require__(272);
+
+// this error is thrown by async schemas to return validation errors via exception
+var ValidationError = errorClasses.Validation;
+
+module.exports = compile;
+
+
+/**
+ * Compiles schema to validation function
+ * @this   Ajv
+ * @param  {Object} schema schema object
+ * @param  {Object} root object with information about the root schema for this schema
+ * @param  {Object} localRefs the hash of local references inside the schema (created by resolve.id), used for inline resolution
+ * @param  {String} baseId base ID for IDs in the schema
+ * @return {Function} validation function
+ */
+function compile(schema, root, localRefs, baseId) {
+  /* jshint validthis: true, evil: true */
+  /* eslint no-shadow: 0 */
+  var self = this
+    , opts = this._opts
+    , refVal = [ undefined ]
+    , refs = {}
+    , patterns = []
+    , patternsHash = {}
+    , defaults = []
+    , defaultsHash = {}
+    , customRules = [];
+
+  root = root || { schema: schema, refVal: refVal, refs: refs };
+
+  var c = checkCompiling.call(this, schema, root, baseId);
+  var compilation = this._compilations[c.index];
+  if (c.compiling) return (compilation.callValidate = callValidate);
+
+  var formats = this._formats;
+  var RULES = this.RULES;
+
+  try {
+    var v = localCompile(schema, root, localRefs, baseId);
+    compilation.validate = v;
+    var cv = compilation.callValidate;
+    if (cv) {
+      cv.schema = v.schema;
+      cv.errors = null;
+      cv.refs = v.refs;
+      cv.refVal = v.refVal;
+      cv.root = v.root;
+      cv.$async = v.$async;
+      if (opts.sourceCode) cv.source = v.source;
+    }
+    return v;
+  } finally {
+    endCompiling.call(this, schema, root, baseId);
+  }
+
+  function callValidate() {
+    var validate = compilation.validate;
+    var result = validate.apply(null, arguments);
+    callValidate.errors = validate.errors;
+    return result;
+  }
+
+  function localCompile(_schema, _root, localRefs, baseId) {
+    var isRoot = !_root || (_root && _root.schema == _schema);
+    if (_root.schema != root.schema)
+      return compile.call(self, _schema, _root, localRefs, baseId);
+
+    var $async = _schema.$async === true;
+
+    var sourceCode = validateGenerator({
+      isTop: true,
+      schema: _schema,
+      isRoot: isRoot,
+      baseId: baseId,
+      root: _root,
+      schemaPath: '',
+      errSchemaPath: '#',
+      errorPath: '""',
+      MissingRefError: errorClasses.MissingRef,
+      RULES: RULES,
+      validate: validateGenerator,
+      util: util,
+      resolve: resolve,
+      resolveRef: resolveRef,
+      usePattern: usePattern,
+      useDefault: useDefault,
+      useCustomRule: useCustomRule,
+      opts: opts,
+      formats: formats,
+      logger: self.logger,
+      self: self
+    });
+
+    sourceCode = vars(refVal, refValCode) + vars(patterns, patternCode)
+                   + vars(defaults, defaultCode) + vars(customRules, customRuleCode)
+                   + sourceCode;
+
+    if (opts.processCode) sourceCode = opts.processCode(sourceCode);
+    // console.log('\n\n\n *** \n', JSON.stringify(sourceCode));
+    var validate;
+    try {
+      var makeValidate = new Function(
+        'self',
+        'RULES',
+        'formats',
+        'root',
+        'refVal',
+        'defaults',
+        'customRules',
+        'co',
+        'equal',
+        'ucs2length',
+        'ValidationError',
+        sourceCode
+      );
+
+      validate = makeValidate(
+        self,
+        RULES,
+        formats,
+        root,
+        refVal,
+        defaults,
+        customRules,
+        co,
+        equal,
+        ucs2length,
+        ValidationError
+      );
+
+      refVal[0] = validate;
+    } catch(e) {
+      self.logger.error('Error compiling schema, function code:', sourceCode);
+      throw e;
+    }
+
+    validate.schema = _schema;
+    validate.errors = null;
+    validate.refs = refs;
+    validate.refVal = refVal;
+    validate.root = isRoot ? validate : _root;
+    if ($async) validate.$async = true;
+    if (opts.sourceCode === true) {
+      validate.source = {
+        code: sourceCode,
+        patterns: patterns,
+        defaults: defaults
+      };
+    }
+
+    return validate;
+  }
+
+  function resolveRef(baseId, ref, isRoot) {
+    ref = resolve.url(baseId, ref);
+    var refIndex = refs[ref];
+    var _refVal, refCode;
+    if (refIndex !== undefined) {
+      _refVal = refVal[refIndex];
+      refCode = 'refVal[' + refIndex + ']';
+      return resolvedRef(_refVal, refCode);
+    }
+    if (!isRoot && root.refs) {
+      var rootRefId = root.refs[ref];
+      if (rootRefId !== undefined) {
+        _refVal = root.refVal[rootRefId];
+        refCode = addLocalRef(ref, _refVal);
+        return resolvedRef(_refVal, refCode);
+      }
+    }
+
+    refCode = addLocalRef(ref);
+    var v = resolve.call(self, localCompile, root, ref);
+    if (v === undefined) {
+      var localSchema = localRefs && localRefs[ref];
+      if (localSchema) {
+        v = resolve.inlineRef(localSchema, opts.inlineRefs)
+            ? localSchema
+            : compile.call(self, localSchema, root, localRefs, baseId);
+      }
+    }
+
+    if (v === undefined) {
+      removeLocalRef(ref);
+    } else {
+      replaceLocalRef(ref, v);
+      return resolvedRef(v, refCode);
+    }
+  }
+
+  function addLocalRef(ref, v) {
+    var refId = refVal.length;
+    refVal[refId] = v;
+    refs[ref] = refId;
+    return 'refVal' + refId;
+  }
+
+  function removeLocalRef(ref) {
+    delete refs[ref];
+  }
+
+  function replaceLocalRef(ref, v) {
+    var refId = refs[ref];
+    refVal[refId] = v;
+  }
+
+  function resolvedRef(refVal, code) {
+    return typeof refVal == 'object' || typeof refVal == 'boolean'
+            ? { code: code, schema: refVal, inline: true }
+            : { code: code, $async: refVal && refVal.$async };
+  }
+
+  function usePattern(regexStr) {
+    var index = patternsHash[regexStr];
+    if (index === undefined) {
+      index = patternsHash[regexStr] = patterns.length;
+      patterns[index] = regexStr;
+    }
+    return 'pattern' + index;
+  }
+
+  function useDefault(value) {
+    switch (typeof value) {
+      case 'boolean':
+      case 'number':
+        return '' + value;
+      case 'string':
+        return util.toQuotedString(value);
+      case 'object':
+        if (value === null) return 'null';
+        var valueStr = stableStringify(value);
+        var index = defaultsHash[valueStr];
+        if (index === undefined) {
+          index = defaultsHash[valueStr] = defaults.length;
+          defaults[index] = value;
+        }
+        return 'default' + index;
+    }
+  }
+
+  function useCustomRule(rule, schema, parentSchema, it) {
+    var validateSchema = rule.definition.validateSchema;
+    if (validateSchema && self._opts.validateSchema !== false) {
+      var valid = validateSchema(schema);
+      if (!valid) {
+        var message = 'keyword schema is invalid: ' + self.errorsText(validateSchema.errors);
+        if (self._opts.validateSchema == 'log') self.logger.error(message);
+        else throw new Error(message);
+      }
+    }
+
+    var compile = rule.definition.compile
+      , inline = rule.definition.inline
+      , macro = rule.definition.macro;
+
+    var validate;
+    if (compile) {
+      validate = compile.call(self, schema, parentSchema, it);
+    } else if (macro) {
+      validate = macro.call(self, schema, parentSchema, it);
+      if (opts.validateSchema !== false) self.validateSchema(validate, true);
+    } else if (inline) {
+      validate = inline.call(self, it, rule.keyword, schema, parentSchema);
+    } else {
+      validate = rule.definition.validate;
+      if (!validate) return;
+    }
+
+    if (validate === undefined)
+      throw new Error('custom keyword "' + rule.keyword + '"failed to compile');
+
+    var index = customRules.length;
+    customRules[index] = validate;
+
+    return {
+      code: 'customRule' + index,
+      validate: validate
+    };
+  }
+}
+
+
+/**
+ * Checks if the schema is currently compiled
+ * @this   Ajv
+ * @param  {Object} schema schema to compile
+ * @param  {Object} root root object
+ * @param  {String} baseId base schema ID
+ * @return {Object} object with properties "index" (compilation index) and "compiling" (boolean)
+ */
+function checkCompiling(schema, root, baseId) {
+  /* jshint validthis: true */
+  var index = compIndex.call(this, schema, root, baseId);
+  if (index >= 0) return { index: index, compiling: true };
+  index = this._compilations.length;
+  this._compilations[index] = {
+    schema: schema,
+    root: root,
+    baseId: baseId
+  };
+  return { index: index, compiling: false };
+}
+
+
+/**
+ * Removes the schema from the currently compiled list
+ * @this   Ajv
+ * @param  {Object} schema schema to compile
+ * @param  {Object} root root object
+ * @param  {String} baseId base schema ID
+ */
+function endCompiling(schema, root, baseId) {
+  /* jshint validthis: true */
+  var i = compIndex.call(this, schema, root, baseId);
+  if (i >= 0) this._compilations.splice(i, 1);
+}
+
+
+/**
+ * Index of schema compilation in the currently compiled list
+ * @this   Ajv
+ * @param  {Object} schema schema to compile
+ * @param  {Object} root root object
+ * @param  {String} baseId base schema ID
+ * @return {Integer} compilation index
+ */
+function compIndex(schema, root, baseId) {
+  /* jshint validthis: true */
+  for (var i=0; i<this._compilations.length; i++) {
+    var c = this._compilations[i];
+    if (c.schema == schema && c.root == root && c.baseId == baseId) return i;
+  }
+  return -1;
+}
+
+
+function patternCode(i, patterns) {
+  return 'var pattern' + i + ' = new RegExp(' + util.toQuotedString(patterns[i]) + ');';
+}
+
+
+function defaultCode(i) {
+  return 'var default' + i + ' = defaults[' + i + '];';
+}
+
+
+function refValCode(i, refVal) {
+  return refVal[i] === undefined ? '' : 'var refVal' + i + ' = refVal[' + i + '];';
+}
+
+
+function customRuleCode(i) {
+  return 'var customRule' + i + ' = customRules[' + i + '];';
+}
+
+
+function vars(arr, statement) {
+  if (!arr.length) return '';
+  var code = '';
+  for (var i=0; i<arr.length; i++)
+    code += statement(i, arr);
+  return code;
+}
+
+
+/***/ }),
+/* 653 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var ruleModules = __webpack_require__(649)
+  , toHash = __webpack_require__(114).toHash;
+
+module.exports = function rules() {
+  var RULES = [
+    { type: 'number',
+      rules: [ { 'maximum': ['exclusiveMaximum'] },
+               { 'minimum': ['exclusiveMinimum'] }, 'multipleOf', 'format'] },
+    { type: 'string',
+      rules: [ 'maxLength', 'minLength', 'pattern', 'format' ] },
+    { type: 'array',
+      rules: [ 'maxItems', 'minItems', 'uniqueItems', 'contains', 'items' ] },
+    { type: 'object',
+      rules: [ 'maxProperties', 'minProperties', 'required', 'dependencies', 'propertyNames',
+               { 'properties': ['additionalProperties', 'patternProperties'] } ] },
+    { rules: [ '$ref', 'const', 'enum', 'not', 'anyOf', 'oneOf', 'allOf' ] }
+  ];
+
+  var ALL = [ 'type' ];
+  var KEYWORDS = [
+    'additionalItems', '$schema', '$id', 'id', 'title',
+    'description', 'default', 'definitions'
+  ];
+  var TYPES = [ 'number', 'integer', 'string', 'array', 'object', 'boolean', 'null' ];
+  RULES.all = toHash(ALL);
+  RULES.types = toHash(TYPES);
+
+  RULES.forEach(function (group) {
+    group.rules = group.rules.map(function (keyword) {
+      var implKeywords;
+      if (typeof keyword == 'object') {
+        var key = Object.keys(keyword)[0];
+        implKeywords = keyword[key];
+        keyword = key;
+        implKeywords.forEach(function (k) {
+          ALL.push(k);
+          RULES.all[k] = true;
+        });
+      }
+      ALL.push(keyword);
+      var rule = RULES.all[keyword] = {
+        keyword: keyword,
+        code: ruleModules[keyword],
+        implements: implKeywords
+      };
+      return rule;
+    });
+
+    if (group.type) RULES.types[group.type] = group;
+  });
+
+  RULES.keywords = toHash(ALL.concat(KEYWORDS));
+  RULES.custom = {};
+
+  return RULES;
+};
+
+
+/***/ }),
+/* 654 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+// https://mathiasbynens.be/notes/javascript-encoding
+// https://github.com/bestiejs/punycode.js - punycode.ucs2.decode
+module.exports = function ucs2length(str) {
+  var length = 0
+    , len = str.length
+    , pos = 0
+    , value;
+  while (pos < len) {
+    length++;
+    value = str.charCodeAt(pos++);
+    if (value >= 0xD800 && value <= 0xDBFF && pos < len) {
+      // high surrogate, and there is a next character
+      value = str.charCodeAt(pos);
+      if ((value & 0xFC00) == 0xDC00) pos++; // low surrogate
+    }
+  }
+  return length;
+};
+
+
+/***/ }),
+/* 655 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate_allOf(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $it = it.util.copy(it);
+  var $closingBraces = '';
+  $it.level++;
+  var $nextValid = 'valid' + $it.level;
+  var $currentBaseId = $it.baseId,
+    $allSchemasEmpty = true;
+  var arr1 = $schema;
+  if (arr1) {
+    var $sch, $i = -1,
+      l1 = arr1.length - 1;
+    while ($i < l1) {
+      $sch = arr1[$i += 1];
+      if (it.util.schemaHasRules($sch, it.RULES.all)) {
+        $allSchemasEmpty = false;
+        $it.schema = $sch;
+        $it.schemaPath = $schemaPath + '[' + $i + ']';
+        $it.errSchemaPath = $errSchemaPath + '/' + $i;
+        out += '  ' + (it.validate($it)) + ' ';
+        $it.baseId = $currentBaseId;
+        if ($breakOnError) {
+          out += ' if (' + ($nextValid) + ') { ';
+          $closingBraces += '}';
+        }
+      }
+    }
+  }
+  if ($breakOnError) {
+    if ($allSchemasEmpty) {
+      out += ' if (true) { ';
+    } else {
+      out += ' ' + ($closingBraces.slice(0, -1)) + ' ';
+    }
+  }
+  out = it.util.cleanUpCode(out);
+  return out;
+}
+
+
+/***/ }),
+/* 656 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate_anyOf(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $data = 'data' + ($dataLvl || '');
+  var $valid = 'valid' + $lvl;
+  var $errs = 'errs__' + $lvl;
+  var $it = it.util.copy(it);
+  var $closingBraces = '';
+  $it.level++;
+  var $nextValid = 'valid' + $it.level;
+  var $noEmptySchema = $schema.every(function($sch) {
+    return it.util.schemaHasRules($sch, it.RULES.all);
+  });
+  if ($noEmptySchema) {
+    var $currentBaseId = $it.baseId;
+    out += ' var ' + ($errs) + ' = errors; var ' + ($valid) + ' = false;  ';
+    var $wasComposite = it.compositeRule;
+    it.compositeRule = $it.compositeRule = true;
+    var arr1 = $schema;
+    if (arr1) {
+      var $sch, $i = -1,
+        l1 = arr1.length - 1;
+      while ($i < l1) {
+        $sch = arr1[$i += 1];
+        $it.schema = $sch;
+        $it.schemaPath = $schemaPath + '[' + $i + ']';
+        $it.errSchemaPath = $errSchemaPath + '/' + $i;
+        out += '  ' + (it.validate($it)) + ' ';
+        $it.baseId = $currentBaseId;
+        out += ' ' + ($valid) + ' = ' + ($valid) + ' || ' + ($nextValid) + '; if (!' + ($valid) + ') { ';
+        $closingBraces += '}';
+      }
+    }
+    it.compositeRule = $it.compositeRule = $wasComposite;
+    out += ' ' + ($closingBraces) + ' if (!' + ($valid) + ') {   var err =   '; /* istanbul ignore else */
+    if (it.createErrors !== false) {
+      out += ' { keyword: \'' + ('anyOf') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: {} ';
+      if (it.opts.messages !== false) {
+        out += ' , message: \'should match some schema in anyOf\' ';
+      }
+      if (it.opts.verbose) {
+        out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+      }
+      out += ' } ';
+    } else {
+      out += ' {} ';
+    }
+    out += ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+    if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+      if (it.async) {
+        out += ' throw new ValidationError(vErrors); ';
+      } else {
+        out += ' validate.errors = vErrors; return false; ';
+      }
+    }
+    out += ' } else {  errors = ' + ($errs) + '; if (vErrors !== null) { if (' + ($errs) + ') vErrors.length = ' + ($errs) + '; else vErrors = null; } ';
+    if (it.opts.allErrors) {
+      out += ' } ';
+    }
+    out = it.util.cleanUpCode(out);
+  } else {
+    if ($breakOnError) {
+      out += ' if (true) { ';
+    }
+  }
+  return out;
+}
+
+
+/***/ }),
+/* 657 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate_const(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $data = 'data' + ($dataLvl || '');
+  var $valid = 'valid' + $lvl;
+  var $isData = it.opts.$data && $schema && $schema.$data,
+    $schemaValue;
+  if ($isData) {
+    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
+    $schemaValue = 'schema' + $lvl;
+  } else {
+    $schemaValue = $schema;
+  }
+  if (!$isData) {
+    out += ' var schema' + ($lvl) + ' = validate.schema' + ($schemaPath) + ';';
+  }
+  out += 'var ' + ($valid) + ' = equal(' + ($data) + ', schema' + ($lvl) + '); if (!' + ($valid) + ') {   ';
+  var $$outStack = $$outStack || [];
+  $$outStack.push(out);
+  out = ''; /* istanbul ignore else */
+  if (it.createErrors !== false) {
+    out += ' { keyword: \'' + ('const') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: {} ';
+    if (it.opts.messages !== false) {
+      out += ' , message: \'should be equal to constant\' ';
+    }
+    if (it.opts.verbose) {
+      out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+    }
+    out += ' } ';
+  } else {
+    out += ' {} ';
+  }
+  var __err = out;
+  out = $$outStack.pop();
+  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+    if (it.async) {
+      out += ' throw new ValidationError([' + (__err) + ']); ';
+    } else {
+      out += ' validate.errors = [' + (__err) + ']; return false; ';
+    }
+  } else {
+    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+  }
+  out += ' }';
+  if ($breakOnError) {
+    out += ' else { ';
+  }
+  return out;
+}
+
+
+/***/ }),
+/* 658 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate_contains(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $data = 'data' + ($dataLvl || '');
+  var $valid = 'valid' + $lvl;
+  var $errs = 'errs__' + $lvl;
+  var $it = it.util.copy(it);
+  var $closingBraces = '';
+  $it.level++;
+  var $nextValid = 'valid' + $it.level;
+  var $idx = 'i' + $lvl,
+    $dataNxt = $it.dataLevel = it.dataLevel + 1,
+    $nextData = 'data' + $dataNxt,
+    $currentBaseId = it.baseId,
+    $nonEmptySchema = it.util.schemaHasRules($schema, it.RULES.all);
+  out += 'var ' + ($errs) + ' = errors;var ' + ($valid) + ';';
+  if ($nonEmptySchema) {
+    var $wasComposite = it.compositeRule;
+    it.compositeRule = $it.compositeRule = true;
+    $it.schema = $schema;
+    $it.schemaPath = $schemaPath;
+    $it.errSchemaPath = $errSchemaPath;
+    out += ' var ' + ($nextValid) + ' = false; for (var ' + ($idx) + ' = 0; ' + ($idx) + ' < ' + ($data) + '.length; ' + ($idx) + '++) { ';
+    $it.errorPath = it.util.getPathExpr(it.errorPath, $idx, it.opts.jsonPointers, true);
+    var $passData = $data + '[' + $idx + ']';
+    $it.dataPathArr[$dataNxt] = $idx;
+    var $code = it.validate($it);
+    $it.baseId = $currentBaseId;
+    if (it.util.varOccurences($code, $nextData) < 2) {
+      out += ' ' + (it.util.varReplace($code, $nextData, $passData)) + ' ';
+    } else {
+      out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ' + ($code) + ' ';
+    }
+    out += ' if (' + ($nextValid) + ') break; }  ';
+    it.compositeRule = $it.compositeRule = $wasComposite;
+    out += ' ' + ($closingBraces) + ' if (!' + ($nextValid) + ') {';
+  } else {
+    out += ' if (' + ($data) + '.length == 0) {';
+  }
+  var $$outStack = $$outStack || [];
+  $$outStack.push(out);
+  out = ''; /* istanbul ignore else */
+  if (it.createErrors !== false) {
+    out += ' { keyword: \'' + ('contains') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: {} ';
+    if (it.opts.messages !== false) {
+      out += ' , message: \'should contain a valid item\' ';
+    }
+    if (it.opts.verbose) {
+      out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+    }
+    out += ' } ';
+  } else {
+    out += ' {} ';
+  }
+  var __err = out;
+  out = $$outStack.pop();
+  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+    if (it.async) {
+      out += ' throw new ValidationError([' + (__err) + ']); ';
+    } else {
+      out += ' validate.errors = [' + (__err) + ']; return false; ';
+    }
+  } else {
+    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+  }
+  out += ' } else { ';
+  if ($nonEmptySchema) {
+    out += '  errors = ' + ($errs) + '; if (vErrors !== null) { if (' + ($errs) + ') vErrors.length = ' + ($errs) + '; else vErrors = null; } ';
+  }
+  if (it.opts.allErrors) {
+    out += ' } ';
+  }
+  out = it.util.cleanUpCode(out);
+  return out;
+}
+
+
+/***/ }),
+/* 659 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate_custom(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $errorKeyword;
+  var $data = 'data' + ($dataLvl || '');
+  var $valid = 'valid' + $lvl;
+  var $errs = 'errs__' + $lvl;
+  var $isData = it.opts.$data && $schema && $schema.$data,
+    $schemaValue;
+  if ($isData) {
+    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
+    $schemaValue = 'schema' + $lvl;
+  } else {
+    $schemaValue = $schema;
+  }
+  var $rule = this,
+    $definition = 'definition' + $lvl,
+    $rDef = $rule.definition,
+    $closingBraces = '';
+  var $compile, $inline, $macro, $ruleValidate, $validateCode;
+  if ($isData && $rDef.$data) {
+    $validateCode = 'keywordValidate' + $lvl;
+    var $validateSchema = $rDef.validateSchema;
+    out += ' var ' + ($definition) + ' = RULES.custom[\'' + ($keyword) + '\'].definition; var ' + ($validateCode) + ' = ' + ($definition) + '.validate;';
+  } else {
+    $ruleValidate = it.useCustomRule($rule, $schema, it.schema, it);
+    if (!$ruleValidate) return;
+    $schemaValue = 'validate.schema' + $schemaPath;
+    $validateCode = $ruleValidate.code;
+    $compile = $rDef.compile;
+    $inline = $rDef.inline;
+    $macro = $rDef.macro;
+  }
+  var $ruleErrs = $validateCode + '.errors',
+    $i = 'i' + $lvl,
+    $ruleErr = 'ruleErr' + $lvl,
+    $asyncKeyword = $rDef.async;
+  if ($asyncKeyword && !it.async) throw new Error('async keyword in sync schema');
+  if (!($inline || $macro)) {
+    out += '' + ($ruleErrs) + ' = null;';
+  }
+  out += 'var ' + ($errs) + ' = errors;var ' + ($valid) + ';';
+  if ($isData && $rDef.$data) {
+    $closingBraces += '}';
+    out += ' if (' + ($schemaValue) + ' === undefined) { ' + ($valid) + ' = true; } else { ';
+    if ($validateSchema) {
+      $closingBraces += '}';
+      out += ' ' + ($valid) + ' = ' + ($definition) + '.validateSchema(' + ($schemaValue) + '); if (' + ($valid) + ') { ';
+    }
+  }
+  if ($inline) {
+    if ($rDef.statements) {
+      out += ' ' + ($ruleValidate.validate) + ' ';
+    } else {
+      out += ' ' + ($valid) + ' = ' + ($ruleValidate.validate) + '; ';
+    }
+  } else if ($macro) {
+    var $it = it.util.copy(it);
+    var $closingBraces = '';
+    $it.level++;
+    var $nextValid = 'valid' + $it.level;
+    $it.schema = $ruleValidate.validate;
+    $it.schemaPath = '';
+    var $wasComposite = it.compositeRule;
+    it.compositeRule = $it.compositeRule = true;
+    var $code = it.validate($it).replace(/validate\.schema/g, $validateCode);
+    it.compositeRule = $it.compositeRule = $wasComposite;
+    out += ' ' + ($code);
+  } else {
+    var $$outStack = $$outStack || [];
+    $$outStack.push(out);
+    out = '';
+    out += '  ' + ($validateCode) + '.call( ';
+    if (it.opts.passContext) {
+      out += 'this';
+    } else {
+      out += 'self';
+    }
+    if ($compile || $rDef.schema === false) {
+      out += ' , ' + ($data) + ' ';
+    } else {
+      out += ' , ' + ($schemaValue) + ' , ' + ($data) + ' , validate.schema' + (it.schemaPath) + ' ';
+    }
+    out += ' , (dataPath || \'\')';
+    if (it.errorPath != '""') {
+      out += ' + ' + (it.errorPath);
+    }
+    var $parentData = $dataLvl ? 'data' + (($dataLvl - 1) || '') : 'parentData',
+      $parentDataProperty = $dataLvl ? it.dataPathArr[$dataLvl] : 'parentDataProperty';
+    out += ' , ' + ($parentData) + ' , ' + ($parentDataProperty) + ' , rootData )  ';
+    var def_callRuleValidate = out;
+    out = $$outStack.pop();
+    if ($rDef.errors === false) {
+      out += ' ' + ($valid) + ' = ';
+      if ($asyncKeyword) {
+        out += '' + (it.yieldAwait);
+      }
+      out += '' + (def_callRuleValidate) + '; ';
+    } else {
+      if ($asyncKeyword) {
+        $ruleErrs = 'customErrors' + $lvl;
+        out += ' var ' + ($ruleErrs) + ' = null; try { ' + ($valid) + ' = ' + (it.yieldAwait) + (def_callRuleValidate) + '; } catch (e) { ' + ($valid) + ' = false; if (e instanceof ValidationError) ' + ($ruleErrs) + ' = e.errors; else throw e; } ';
+      } else {
+        out += ' ' + ($ruleErrs) + ' = null; ' + ($valid) + ' = ' + (def_callRuleValidate) + '; ';
+      }
+    }
+  }
+  if ($rDef.modifying) {
+    out += ' if (' + ($parentData) + ') ' + ($data) + ' = ' + ($parentData) + '[' + ($parentDataProperty) + '];';
+  }
+  out += '' + ($closingBraces);
+  if ($rDef.valid) {
+    if ($breakOnError) {
+      out += ' if (true) { ';
+    }
+  } else {
+    out += ' if ( ';
+    if ($rDef.valid === undefined) {
+      out += ' !';
+      if ($macro) {
+        out += '' + ($nextValid);
+      } else {
+        out += '' + ($valid);
+      }
+    } else {
+      out += ' ' + (!$rDef.valid) + ' ';
+    }
+    out += ') { ';
+    $errorKeyword = $rule.keyword;
+    var $$outStack = $$outStack || [];
+    $$outStack.push(out);
+    out = '';
+    var $$outStack = $$outStack || [];
+    $$outStack.push(out);
+    out = ''; /* istanbul ignore else */
+    if (it.createErrors !== false) {
+      out += ' { keyword: \'' + ($errorKeyword || 'custom') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { keyword: \'' + ($rule.keyword) + '\' } ';
+      if (it.opts.messages !== false) {
+        out += ' , message: \'should pass "' + ($rule.keyword) + '" keyword validation\' ';
+      }
+      if (it.opts.verbose) {
+        out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+      }
+      out += ' } ';
+    } else {
+      out += ' {} ';
+    }
+    var __err = out;
+    out = $$outStack.pop();
+    if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+      if (it.async) {
+        out += ' throw new ValidationError([' + (__err) + ']); ';
+      } else {
+        out += ' validate.errors = [' + (__err) + ']; return false; ';
+      }
+    } else {
+      out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+    }
+    var def_customError = out;
+    out = $$outStack.pop();
+    if ($inline) {
+      if ($rDef.errors) {
+        if ($rDef.errors != 'full') {
+          out += '  for (var ' + ($i) + '=' + ($errs) + '; ' + ($i) + '<errors; ' + ($i) + '++) { var ' + ($ruleErr) + ' = vErrors[' + ($i) + ']; if (' + ($ruleErr) + '.dataPath === undefined) ' + ($ruleErr) + '.dataPath = (dataPath || \'\') + ' + (it.errorPath) + '; if (' + ($ruleErr) + '.schemaPath === undefined) { ' + ($ruleErr) + '.schemaPath = "' + ($errSchemaPath) + '"; } ';
+          if (it.opts.verbose) {
+            out += ' ' + ($ruleErr) + '.schema = ' + ($schemaValue) + '; ' + ($ruleErr) + '.data = ' + ($data) + '; ';
+          }
+          out += ' } ';
+        }
+      } else {
+        if ($rDef.errors === false) {
+          out += ' ' + (def_customError) + ' ';
+        } else {
+          out += ' if (' + ($errs) + ' == errors) { ' + (def_customError) + ' } else {  for (var ' + ($i) + '=' + ($errs) + '; ' + ($i) + '<errors; ' + ($i) + '++) { var ' + ($ruleErr) + ' = vErrors[' + ($i) + ']; if (' + ($ruleErr) + '.dataPath === undefined) ' + ($ruleErr) + '.dataPath = (dataPath || \'\') + ' + (it.errorPath) + '; if (' + ($ruleErr) + '.schemaPath === undefined) { ' + ($ruleErr) + '.schemaPath = "' + ($errSchemaPath) + '"; } ';
+          if (it.opts.verbose) {
+            out += ' ' + ($ruleErr) + '.schema = ' + ($schemaValue) + '; ' + ($ruleErr) + '.data = ' + ($data) + '; ';
+          }
+          out += ' } } ';
+        }
+      }
+    } else if ($macro) {
+      out += '   var err =   '; /* istanbul ignore else */
+      if (it.createErrors !== false) {
+        out += ' { keyword: \'' + ($errorKeyword || 'custom') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { keyword: \'' + ($rule.keyword) + '\' } ';
+        if (it.opts.messages !== false) {
+          out += ' , message: \'should pass "' + ($rule.keyword) + '" keyword validation\' ';
+        }
+        if (it.opts.verbose) {
+          out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+        }
+        out += ' } ';
+      } else {
+        out += ' {} ';
+      }
+      out += ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+      if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+        if (it.async) {
+          out += ' throw new ValidationError(vErrors); ';
+        } else {
+          out += ' validate.errors = vErrors; return false; ';
+        }
+      }
+    } else {
+      if ($rDef.errors === false) {
+        out += ' ' + (def_customError) + ' ';
+      } else {
+        out += ' if (Array.isArray(' + ($ruleErrs) + ')) { if (vErrors === null) vErrors = ' + ($ruleErrs) + '; else vErrors = vErrors.concat(' + ($ruleErrs) + '); errors = vErrors.length;  for (var ' + ($i) + '=' + ($errs) + '; ' + ($i) + '<errors; ' + ($i) + '++) { var ' + ($ruleErr) + ' = vErrors[' + ($i) + ']; if (' + ($ruleErr) + '.dataPath === undefined) ' + ($ruleErr) + '.dataPath = (dataPath || \'\') + ' + (it.errorPath) + ';  ' + ($ruleErr) + '.schemaPath = "' + ($errSchemaPath) + '";  ';
+        if (it.opts.verbose) {
+          out += ' ' + ($ruleErr) + '.schema = ' + ($schemaValue) + '; ' + ($ruleErr) + '.data = ' + ($data) + '; ';
+        }
+        out += ' } } else { ' + (def_customError) + ' } ';
+      }
+    }
+    out += ' } ';
+    if ($breakOnError) {
+      out += ' else { ';
+    }
+  }
+  return out;
+}
+
+
+/***/ }),
+/* 660 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate_dependencies(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $data = 'data' + ($dataLvl || '');
+  var $errs = 'errs__' + $lvl;
+  var $it = it.util.copy(it);
+  var $closingBraces = '';
+  $it.level++;
+  var $nextValid = 'valid' + $it.level;
+  var $schemaDeps = {},
+    $propertyDeps = {},
+    $ownProperties = it.opts.ownProperties;
+  for ($property in $schema) {
+    var $sch = $schema[$property];
+    var $deps = Array.isArray($sch) ? $propertyDeps : $schemaDeps;
+    $deps[$property] = $sch;
+  }
+  out += 'var ' + ($errs) + ' = errors;';
+  var $currentErrorPath = it.errorPath;
+  out += 'var missing' + ($lvl) + ';';
+  for (var $property in $propertyDeps) {
+    $deps = $propertyDeps[$property];
+    if ($deps.length) {
+      out += ' if ( ' + ($data) + (it.util.getProperty($property)) + ' !== undefined ';
+      if ($ownProperties) {
+        out += ' && Object.prototype.hasOwnProperty.call(' + ($data) + ', \'' + (it.util.escapeQuotes($property)) + '\') ';
+      }
+      if ($breakOnError) {
+        out += ' && ( ';
+        var arr1 = $deps;
+        if (arr1) {
+          var $propertyKey, $i = -1,
+            l1 = arr1.length - 1;
+          while ($i < l1) {
+            $propertyKey = arr1[$i += 1];
+            if ($i) {
+              out += ' || ';
+            }
+            var $prop = it.util.getProperty($propertyKey),
+              $useData = $data + $prop;
+            out += ' ( ( ' + ($useData) + ' === undefined ';
+            if ($ownProperties) {
+              out += ' || ! Object.prototype.hasOwnProperty.call(' + ($data) + ', \'' + (it.util.escapeQuotes($propertyKey)) + '\') ';
+            }
+            out += ') && (missing' + ($lvl) + ' = ' + (it.util.toQuotedString(it.opts.jsonPointers ? $propertyKey : $prop)) + ') ) ';
+          }
+        }
+        out += ')) {  ';
+        var $propertyPath = 'missing' + $lvl,
+          $missingProperty = '\' + ' + $propertyPath + ' + \'';
+        if (it.opts._errorDataPathProperty) {
+          it.errorPath = it.opts.jsonPointers ? it.util.getPathExpr($currentErrorPath, $propertyPath, true) : $currentErrorPath + ' + ' + $propertyPath;
+        }
+        var $$outStack = $$outStack || [];
+        $$outStack.push(out);
+        out = ''; /* istanbul ignore else */
+        if (it.createErrors !== false) {
+          out += ' { keyword: \'' + ('dependencies') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { property: \'' + (it.util.escapeQuotes($property)) + '\', missingProperty: \'' + ($missingProperty) + '\', depsCount: ' + ($deps.length) + ', deps: \'' + (it.util.escapeQuotes($deps.length == 1 ? $deps[0] : $deps.join(", "))) + '\' } ';
+          if (it.opts.messages !== false) {
+            out += ' , message: \'should have ';
+            if ($deps.length == 1) {
+              out += 'property ' + (it.util.escapeQuotes($deps[0]));
+            } else {
+              out += 'properties ' + (it.util.escapeQuotes($deps.join(", ")));
+            }
+            out += ' when property ' + (it.util.escapeQuotes($property)) + ' is present\' ';
+          }
+          if (it.opts.verbose) {
+            out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+          }
+          out += ' } ';
+        } else {
+          out += ' {} ';
+        }
+        var __err = out;
+        out = $$outStack.pop();
+        if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+          if (it.async) {
+            out += ' throw new ValidationError([' + (__err) + ']); ';
+          } else {
+            out += ' validate.errors = [' + (__err) + ']; return false; ';
+          }
+        } else {
+          out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+        }
+      } else {
+        out += ' ) { ';
+        var arr2 = $deps;
+        if (arr2) {
+          var $propertyKey, i2 = -1,
+            l2 = arr2.length - 1;
+          while (i2 < l2) {
+            $propertyKey = arr2[i2 += 1];
+            var $prop = it.util.getProperty($propertyKey),
+              $missingProperty = it.util.escapeQuotes($propertyKey),
+              $useData = $data + $prop;
+            if (it.opts._errorDataPathProperty) {
+              it.errorPath = it.util.getPath($currentErrorPath, $propertyKey, it.opts.jsonPointers);
+            }
+            out += ' if ( ' + ($useData) + ' === undefined ';
+            if ($ownProperties) {
+              out += ' || ! Object.prototype.hasOwnProperty.call(' + ($data) + ', \'' + (it.util.escapeQuotes($propertyKey)) + '\') ';
+            }
+            out += ') {  var err =   '; /* istanbul ignore else */
+            if (it.createErrors !== false) {
+              out += ' { keyword: \'' + ('dependencies') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { property: \'' + (it.util.escapeQuotes($property)) + '\', missingProperty: \'' + ($missingProperty) + '\', depsCount: ' + ($deps.length) + ', deps: \'' + (it.util.escapeQuotes($deps.length == 1 ? $deps[0] : $deps.join(", "))) + '\' } ';
+              if (it.opts.messages !== false) {
+                out += ' , message: \'should have ';
+                if ($deps.length == 1) {
+                  out += 'property ' + (it.util.escapeQuotes($deps[0]));
+                } else {
+                  out += 'properties ' + (it.util.escapeQuotes($deps.join(", ")));
+                }
+                out += ' when property ' + (it.util.escapeQuotes($property)) + ' is present\' ';
+              }
+              if (it.opts.verbose) {
+                out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+              }
+              out += ' } ';
+            } else {
+              out += ' {} ';
+            }
+            out += ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; } ';
+          }
+        }
+      }
+      out += ' }   ';
+      if ($breakOnError) {
+        $closingBraces += '}';
+        out += ' else { ';
+      }
+    }
+  }
+  it.errorPath = $currentErrorPath;
+  var $currentBaseId = $it.baseId;
+  for (var $property in $schemaDeps) {
+    var $sch = $schemaDeps[$property];
+    if (it.util.schemaHasRules($sch, it.RULES.all)) {
+      out += ' ' + ($nextValid) + ' = true; if ( ' + ($data) + (it.util.getProperty($property)) + ' !== undefined ';
+      if ($ownProperties) {
+        out += ' && Object.prototype.hasOwnProperty.call(' + ($data) + ', \'' + (it.util.escapeQuotes($property)) + '\') ';
+      }
+      out += ') { ';
+      $it.schema = $sch;
+      $it.schemaPath = $schemaPath + it.util.getProperty($property);
+      $it.errSchemaPath = $errSchemaPath + '/' + it.util.escapeFragment($property);
+      out += '  ' + (it.validate($it)) + ' ';
+      $it.baseId = $currentBaseId;
+      out += ' }  ';
+      if ($breakOnError) {
+        out += ' if (' + ($nextValid) + ') { ';
+        $closingBraces += '}';
+      }
+    }
+  }
+  if ($breakOnError) {
+    out += '   ' + ($closingBraces) + ' if (' + ($errs) + ' == errors) {';
+  }
+  out = it.util.cleanUpCode(out);
+  return out;
+}
+
+
+/***/ }),
+/* 661 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate_enum(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $data = 'data' + ($dataLvl || '');
+  var $valid = 'valid' + $lvl;
+  var $isData = it.opts.$data && $schema && $schema.$data,
+    $schemaValue;
+  if ($isData) {
+    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
+    $schemaValue = 'schema' + $lvl;
+  } else {
+    $schemaValue = $schema;
+  }
+  var $i = 'i' + $lvl,
+    $vSchema = 'schema' + $lvl;
+  if (!$isData) {
+    out += ' var ' + ($vSchema) + ' = validate.schema' + ($schemaPath) + ';';
+  }
+  out += 'var ' + ($valid) + ';';
+  if ($isData) {
+    out += ' if (schema' + ($lvl) + ' === undefined) ' + ($valid) + ' = true; else if (!Array.isArray(schema' + ($lvl) + ')) ' + ($valid) + ' = false; else {';
+  }
+  out += '' + ($valid) + ' = false;for (var ' + ($i) + '=0; ' + ($i) + '<' + ($vSchema) + '.length; ' + ($i) + '++) if (equal(' + ($data) + ', ' + ($vSchema) + '[' + ($i) + '])) { ' + ($valid) + ' = true; break; }';
+  if ($isData) {
+    out += '  }  ';
+  }
+  out += ' if (!' + ($valid) + ') {   ';
+  var $$outStack = $$outStack || [];
+  $$outStack.push(out);
+  out = ''; /* istanbul ignore else */
+  if (it.createErrors !== false) {
+    out += ' { keyword: \'' + ('enum') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { allowedValues: schema' + ($lvl) + ' } ';
+    if (it.opts.messages !== false) {
+      out += ' , message: \'should be equal to one of the allowed values\' ';
+    }
+    if (it.opts.verbose) {
+      out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+    }
+    out += ' } ';
+  } else {
+    out += ' {} ';
+  }
+  var __err = out;
+  out = $$outStack.pop();
+  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+    if (it.async) {
+      out += ' throw new ValidationError([' + (__err) + ']); ';
+    } else {
+      out += ' validate.errors = [' + (__err) + ']; return false; ';
+    }
+  } else {
+    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+  }
+  out += ' }';
+  if ($breakOnError) {
+    out += ' else { ';
+  }
+  return out;
+}
+
+
+/***/ }),
+/* 662 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate_format(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $data = 'data' + ($dataLvl || '');
+  if (it.opts.format === false) {
+    if ($breakOnError) {
+      out += ' if (true) { ';
+    }
+    return out;
+  }
+  var $isData = it.opts.$data && $schema && $schema.$data,
+    $schemaValue;
+  if ($isData) {
+    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
+    $schemaValue = 'schema' + $lvl;
+  } else {
+    $schemaValue = $schema;
+  }
+  var $unknownFormats = it.opts.unknownFormats,
+    $allowUnknown = Array.isArray($unknownFormats);
+  if ($isData) {
+    var $format = 'format' + $lvl,
+      $isObject = 'isObject' + $lvl,
+      $formatType = 'formatType' + $lvl;
+    out += ' var ' + ($format) + ' = formats[' + ($schemaValue) + ']; var ' + ($isObject) + ' = typeof ' + ($format) + ' == \'object\' && !(' + ($format) + ' instanceof RegExp) && ' + ($format) + '.validate; var ' + ($formatType) + ' = ' + ($isObject) + ' && ' + ($format) + '.type || \'string\'; if (' + ($isObject) + ') { ';
+    if (it.async) {
+      out += ' var async' + ($lvl) + ' = ' + ($format) + '.async; ';
+    }
+    out += ' ' + ($format) + ' = ' + ($format) + '.validate; } if (  ';
+    if ($isData) {
+      out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'string\') || ';
+    }
+    out += ' (';
+    if ($unknownFormats != 'ignore') {
+      out += ' (' + ($schemaValue) + ' && !' + ($format) + ' ';
+      if ($allowUnknown) {
+        out += ' && self._opts.unknownFormats.indexOf(' + ($schemaValue) + ') == -1 ';
+      }
+      out += ') || ';
+    }
+    out += ' (' + ($format) + ' && ' + ($formatType) + ' == \'' + ($ruleType) + '\' && !(typeof ' + ($format) + ' == \'function\' ? ';
+    if (it.async) {
+      out += ' (async' + ($lvl) + ' ? ' + (it.yieldAwait) + ' ' + ($format) + '(' + ($data) + ') : ' + ($format) + '(' + ($data) + ')) ';
+    } else {
+      out += ' ' + ($format) + '(' + ($data) + ') ';
+    }
+    out += ' : ' + ($format) + '.test(' + ($data) + '))))) {';
+  } else {
+    var $format = it.formats[$schema];
+    if (!$format) {
+      if ($unknownFormats == 'ignore') {
+        it.logger.warn('unknown format "' + $schema + '" ignored in schema at path "' + it.errSchemaPath + '"');
+        if ($breakOnError) {
+          out += ' if (true) { ';
+        }
+        return out;
+      } else if ($allowUnknown && $unknownFormats.indexOf($schema) >= 0) {
+        if ($breakOnError) {
+          out += ' if (true) { ';
+        }
+        return out;
+      } else {
+        throw new Error('unknown format "' + $schema + '" is used in schema at path "' + it.errSchemaPath + '"');
+      }
+    }
+    var $isObject = typeof $format == 'object' && !($format instanceof RegExp) && $format.validate;
+    var $formatType = $isObject && $format.type || 'string';
+    if ($isObject) {
+      var $async = $format.async === true;
+      $format = $format.validate;
+    }
+    if ($formatType != $ruleType) {
+      if ($breakOnError) {
+        out += ' if (true) { ';
+      }
+      return out;
+    }
+    if ($async) {
+      if (!it.async) throw new Error('async format in sync schema');
+      var $formatRef = 'formats' + it.util.getProperty($schema) + '.validate';
+      out += ' if (!(' + (it.yieldAwait) + ' ' + ($formatRef) + '(' + ($data) + '))) { ';
+    } else {
+      out += ' if (! ';
+      var $formatRef = 'formats' + it.util.getProperty($schema);
+      if ($isObject) $formatRef += '.validate';
+      if (typeof $format == 'function') {
+        out += ' ' + ($formatRef) + '(' + ($data) + ') ';
+      } else {
+        out += ' ' + ($formatRef) + '.test(' + ($data) + ') ';
+      }
+      out += ') { ';
+    }
+  }
+  var $$outStack = $$outStack || [];
+  $$outStack.push(out);
+  out = ''; /* istanbul ignore else */
+  if (it.createErrors !== false) {
+    out += ' { keyword: \'' + ('format') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { format:  ';
+    if ($isData) {
+      out += '' + ($schemaValue);
+    } else {
+      out += '' + (it.util.toQuotedString($schema));
+    }
+    out += '  } ';
+    if (it.opts.messages !== false) {
+      out += ' , message: \'should match format "';
+      if ($isData) {
+        out += '\' + ' + ($schemaValue) + ' + \'';
+      } else {
+        out += '' + (it.util.escapeQuotes($schema));
+      }
+      out += '"\' ';
+    }
+    if (it.opts.verbose) {
+      out += ' , schema:  ';
+      if ($isData) {
+        out += 'validate.schema' + ($schemaPath);
+      } else {
+        out += '' + (it.util.toQuotedString($schema));
+      }
+      out += '         , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+    }
+    out += ' } ';
+  } else {
+    out += ' {} ';
+  }
+  var __err = out;
+  out = $$outStack.pop();
+  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+    if (it.async) {
+      out += ' throw new ValidationError([' + (__err) + ']); ';
+    } else {
+      out += ' validate.errors = [' + (__err) + ']; return false; ';
+    }
+  } else {
+    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+  }
+  out += ' } ';
+  if ($breakOnError) {
+    out += ' else { ';
+  }
+  return out;
+}
+
+
+/***/ }),
+/* 663 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate_items(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $data = 'data' + ($dataLvl || '');
+  var $valid = 'valid' + $lvl;
+  var $errs = 'errs__' + $lvl;
+  var $it = it.util.copy(it);
+  var $closingBraces = '';
+  $it.level++;
+  var $nextValid = 'valid' + $it.level;
+  var $idx = 'i' + $lvl,
+    $dataNxt = $it.dataLevel = it.dataLevel + 1,
+    $nextData = 'data' + $dataNxt,
+    $currentBaseId = it.baseId;
+  out += 'var ' + ($errs) + ' = errors;var ' + ($valid) + ';';
+  if (Array.isArray($schema)) {
+    var $additionalItems = it.schema.additionalItems;
+    if ($additionalItems === false) {
+      out += ' ' + ($valid) + ' = ' + ($data) + '.length <= ' + ($schema.length) + '; ';
+      var $currErrSchemaPath = $errSchemaPath;
+      $errSchemaPath = it.errSchemaPath + '/additionalItems';
+      out += '  if (!' + ($valid) + ') {   ';
+      var $$outStack = $$outStack || [];
+      $$outStack.push(out);
+      out = ''; /* istanbul ignore else */
+      if (it.createErrors !== false) {
+        out += ' { keyword: \'' + ('additionalItems') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { limit: ' + ($schema.length) + ' } ';
+        if (it.opts.messages !== false) {
+          out += ' , message: \'should NOT have more than ' + ($schema.length) + ' items\' ';
+        }
+        if (it.opts.verbose) {
+          out += ' , schema: false , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+        }
+        out += ' } ';
+      } else {
+        out += ' {} ';
+      }
+      var __err = out;
+      out = $$outStack.pop();
+      if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+        if (it.async) {
+          out += ' throw new ValidationError([' + (__err) + ']); ';
+        } else {
+          out += ' validate.errors = [' + (__err) + ']; return false; ';
+        }
+      } else {
+        out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+      }
+      out += ' } ';
+      $errSchemaPath = $currErrSchemaPath;
+      if ($breakOnError) {
+        $closingBraces += '}';
+        out += ' else { ';
+      }
+    }
+    var arr1 = $schema;
+    if (arr1) {
+      var $sch, $i = -1,
+        l1 = arr1.length - 1;
+      while ($i < l1) {
+        $sch = arr1[$i += 1];
+        if (it.util.schemaHasRules($sch, it.RULES.all)) {
+          out += ' ' + ($nextValid) + ' = true; if (' + ($data) + '.length > ' + ($i) + ') { ';
+          var $passData = $data + '[' + $i + ']';
+          $it.schema = $sch;
+          $it.schemaPath = $schemaPath + '[' + $i + ']';
+          $it.errSchemaPath = $errSchemaPath + '/' + $i;
+          $it.errorPath = it.util.getPathExpr(it.errorPath, $i, it.opts.jsonPointers, true);
+          $it.dataPathArr[$dataNxt] = $i;
+          var $code = it.validate($it);
+          $it.baseId = $currentBaseId;
+          if (it.util.varOccurences($code, $nextData) < 2) {
+            out += ' ' + (it.util.varReplace($code, $nextData, $passData)) + ' ';
+          } else {
+            out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ' + ($code) + ' ';
+          }
+          out += ' }  ';
+          if ($breakOnError) {
+            out += ' if (' + ($nextValid) + ') { ';
+            $closingBraces += '}';
+          }
+        }
+      }
+    }
+    if (typeof $additionalItems == 'object' && it.util.schemaHasRules($additionalItems, it.RULES.all)) {
+      $it.schema = $additionalItems;
+      $it.schemaPath = it.schemaPath + '.additionalItems';
+      $it.errSchemaPath = it.errSchemaPath + '/additionalItems';
+      out += ' ' + ($nextValid) + ' = true; if (' + ($data) + '.length > ' + ($schema.length) + ') {  for (var ' + ($idx) + ' = ' + ($schema.length) + '; ' + ($idx) + ' < ' + ($data) + '.length; ' + ($idx) + '++) { ';
+      $it.errorPath = it.util.getPathExpr(it.errorPath, $idx, it.opts.jsonPointers, true);
+      var $passData = $data + '[' + $idx + ']';
+      $it.dataPathArr[$dataNxt] = $idx;
+      var $code = it.validate($it);
+      $it.baseId = $currentBaseId;
+      if (it.util.varOccurences($code, $nextData) < 2) {
+        out += ' ' + (it.util.varReplace($code, $nextData, $passData)) + ' ';
+      } else {
+        out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ' + ($code) + ' ';
+      }
+      if ($breakOnError) {
+        out += ' if (!' + ($nextValid) + ') break; ';
+      }
+      out += ' } }  ';
+      if ($breakOnError) {
+        out += ' if (' + ($nextValid) + ') { ';
+        $closingBraces += '}';
+      }
+    }
+  } else if (it.util.schemaHasRules($schema, it.RULES.all)) {
+    $it.schema = $schema;
+    $it.schemaPath = $schemaPath;
+    $it.errSchemaPath = $errSchemaPath;
+    out += '  for (var ' + ($idx) + ' = ' + (0) + '; ' + ($idx) + ' < ' + ($data) + '.length; ' + ($idx) + '++) { ';
+    $it.errorPath = it.util.getPathExpr(it.errorPath, $idx, it.opts.jsonPointers, true);
+    var $passData = $data + '[' + $idx + ']';
+    $it.dataPathArr[$dataNxt] = $idx;
+    var $code = it.validate($it);
+    $it.baseId = $currentBaseId;
+    if (it.util.varOccurences($code, $nextData) < 2) {
+      out += ' ' + (it.util.varReplace($code, $nextData, $passData)) + ' ';
+    } else {
+      out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ' + ($code) + ' ';
+    }
+    if ($breakOnError) {
+      out += ' if (!' + ($nextValid) + ') break; ';
+    }
+    out += ' }';
+  }
+  if ($breakOnError) {
+    out += ' ' + ($closingBraces) + ' if (' + ($errs) + ' == errors) {';
+  }
+  out = it.util.cleanUpCode(out);
+  return out;
+}
+
+
+/***/ }),
+/* 664 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate_multipleOf(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $data = 'data' + ($dataLvl || '');
+  var $isData = it.opts.$data && $schema && $schema.$data,
+    $schemaValue;
+  if ($isData) {
+    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
+    $schemaValue = 'schema' + $lvl;
+  } else {
+    $schemaValue = $schema;
+  }
+  out += 'var division' + ($lvl) + ';if (';
+  if ($isData) {
+    out += ' ' + ($schemaValue) + ' !== undefined && ( typeof ' + ($schemaValue) + ' != \'number\' || ';
+  }
+  out += ' (division' + ($lvl) + ' = ' + ($data) + ' / ' + ($schemaValue) + ', ';
+  if (it.opts.multipleOfPrecision) {
+    out += ' Math.abs(Math.round(division' + ($lvl) + ') - division' + ($lvl) + ') > 1e-' + (it.opts.multipleOfPrecision) + ' ';
+  } else {
+    out += ' division' + ($lvl) + ' !== parseInt(division' + ($lvl) + ') ';
+  }
+  out += ' ) ';
+  if ($isData) {
+    out += '  )  ';
+  }
+  out += ' ) {   ';
+  var $$outStack = $$outStack || [];
+  $$outStack.push(out);
+  out = ''; /* istanbul ignore else */
+  if (it.createErrors !== false) {
+    out += ' { keyword: \'' + ('multipleOf') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { multipleOf: ' + ($schemaValue) + ' } ';
+    if (it.opts.messages !== false) {
+      out += ' , message: \'should be multiple of ';
+      if ($isData) {
+        out += '\' + ' + ($schemaValue);
+      } else {
+        out += '' + ($schemaValue) + '\'';
+      }
+    }
+    if (it.opts.verbose) {
+      out += ' , schema:  ';
+      if ($isData) {
+        out += 'validate.schema' + ($schemaPath);
+      } else {
+        out += '' + ($schema);
+      }
+      out += '         , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+    }
+    out += ' } ';
+  } else {
+    out += ' {} ';
+  }
+  var __err = out;
+  out = $$outStack.pop();
+  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+    if (it.async) {
+      out += ' throw new ValidationError([' + (__err) + ']); ';
+    } else {
+      out += ' validate.errors = [' + (__err) + ']; return false; ';
+    }
+  } else {
+    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+  }
+  out += '} ';
+  if ($breakOnError) {
+    out += ' else { ';
+  }
+  return out;
+}
+
+
+/***/ }),
+/* 665 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate_not(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $data = 'data' + ($dataLvl || '');
+  var $errs = 'errs__' + $lvl;
+  var $it = it.util.copy(it);
+  $it.level++;
+  var $nextValid = 'valid' + $it.level;
+  if (it.util.schemaHasRules($schema, it.RULES.all)) {
+    $it.schema = $schema;
+    $it.schemaPath = $schemaPath;
+    $it.errSchemaPath = $errSchemaPath;
+    out += ' var ' + ($errs) + ' = errors;  ';
+    var $wasComposite = it.compositeRule;
+    it.compositeRule = $it.compositeRule = true;
+    $it.createErrors = false;
+    var $allErrorsOption;
+    if ($it.opts.allErrors) {
+      $allErrorsOption = $it.opts.allErrors;
+      $it.opts.allErrors = false;
+    }
+    out += ' ' + (it.validate($it)) + ' ';
+    $it.createErrors = true;
+    if ($allErrorsOption) $it.opts.allErrors = $allErrorsOption;
+    it.compositeRule = $it.compositeRule = $wasComposite;
+    out += ' if (' + ($nextValid) + ') {   ';
+    var $$outStack = $$outStack || [];
+    $$outStack.push(out);
+    out = ''; /* istanbul ignore else */
+    if (it.createErrors !== false) {
+      out += ' { keyword: \'' + ('not') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: {} ';
+      if (it.opts.messages !== false) {
+        out += ' , message: \'should NOT be valid\' ';
+      }
+      if (it.opts.verbose) {
+        out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+      }
+      out += ' } ';
+    } else {
+      out += ' {} ';
+    }
+    var __err = out;
+    out = $$outStack.pop();
+    if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+      if (it.async) {
+        out += ' throw new ValidationError([' + (__err) + ']); ';
+      } else {
+        out += ' validate.errors = [' + (__err) + ']; return false; ';
+      }
+    } else {
+      out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+    }
+    out += ' } else {  errors = ' + ($errs) + '; if (vErrors !== null) { if (' + ($errs) + ') vErrors.length = ' + ($errs) + '; else vErrors = null; } ';
+    if (it.opts.allErrors) {
+      out += ' } ';
+    }
+  } else {
+    out += '  var err =   '; /* istanbul ignore else */
+    if (it.createErrors !== false) {
+      out += ' { keyword: \'' + ('not') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: {} ';
+      if (it.opts.messages !== false) {
+        out += ' , message: \'should NOT be valid\' ';
+      }
+      if (it.opts.verbose) {
+        out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+      }
+      out += ' } ';
+    } else {
+      out += ' {} ';
+    }
+    out += ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+    if ($breakOnError) {
+      out += ' if (false) { ';
+    }
+  }
+  return out;
+}
+
+
+/***/ }),
+/* 666 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate_oneOf(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $data = 'data' + ($dataLvl || '');
+  var $valid = 'valid' + $lvl;
+  var $errs = 'errs__' + $lvl;
+  var $it = it.util.copy(it);
+  var $closingBraces = '';
+  $it.level++;
+  var $nextValid = 'valid' + $it.level;
+  out += 'var ' + ($errs) + ' = errors;var prevValid' + ($lvl) + ' = false;var ' + ($valid) + ' = false;';
+  var $currentBaseId = $it.baseId;
+  var $wasComposite = it.compositeRule;
+  it.compositeRule = $it.compositeRule = true;
+  var arr1 = $schema;
+  if (arr1) {
+    var $sch, $i = -1,
+      l1 = arr1.length - 1;
+    while ($i < l1) {
+      $sch = arr1[$i += 1];
+      if (it.util.schemaHasRules($sch, it.RULES.all)) {
+        $it.schema = $sch;
+        $it.schemaPath = $schemaPath + '[' + $i + ']';
+        $it.errSchemaPath = $errSchemaPath + '/' + $i;
+        out += '  ' + (it.validate($it)) + ' ';
+        $it.baseId = $currentBaseId;
+      } else {
+        out += ' var ' + ($nextValid) + ' = true; ';
+      }
+      if ($i) {
+        out += ' if (' + ($nextValid) + ' && prevValid' + ($lvl) + ') ' + ($valid) + ' = false; else { ';
+        $closingBraces += '}';
+      }
+      out += ' if (' + ($nextValid) + ') ' + ($valid) + ' = prevValid' + ($lvl) + ' = true;';
+    }
+  }
+  it.compositeRule = $it.compositeRule = $wasComposite;
+  out += '' + ($closingBraces) + 'if (!' + ($valid) + ') {   var err =   '; /* istanbul ignore else */
+  if (it.createErrors !== false) {
+    out += ' { keyword: \'' + ('oneOf') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: {} ';
+    if (it.opts.messages !== false) {
+      out += ' , message: \'should match exactly one schema in oneOf\' ';
+    }
+    if (it.opts.verbose) {
+      out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+    }
+    out += ' } ';
+  } else {
+    out += ' {} ';
+  }
+  out += ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+    if (it.async) {
+      out += ' throw new ValidationError(vErrors); ';
+    } else {
+      out += ' validate.errors = vErrors; return false; ';
+    }
+  }
+  out += '} else {  errors = ' + ($errs) + '; if (vErrors !== null) { if (' + ($errs) + ') vErrors.length = ' + ($errs) + '; else vErrors = null; }';
+  if (it.opts.allErrors) {
+    out += ' } ';
+  }
+  return out;
+}
+
+
+/***/ }),
+/* 667 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate_pattern(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $data = 'data' + ($dataLvl || '');
+  var $isData = it.opts.$data && $schema && $schema.$data,
+    $schemaValue;
+  if ($isData) {
+    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
+    $schemaValue = 'schema' + $lvl;
+  } else {
+    $schemaValue = $schema;
+  }
+  var $regexp = $isData ? '(new RegExp(' + $schemaValue + '))' : it.usePattern($schema);
+  out += 'if ( ';
+  if ($isData) {
+    out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'string\') || ';
+  }
+  out += ' !' + ($regexp) + '.test(' + ($data) + ') ) {   ';
+  var $$outStack = $$outStack || [];
+  $$outStack.push(out);
+  out = ''; /* istanbul ignore else */
+  if (it.createErrors !== false) {
+    out += ' { keyword: \'' + ('pattern') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { pattern:  ';
+    if ($isData) {
+      out += '' + ($schemaValue);
+    } else {
+      out += '' + (it.util.toQuotedString($schema));
+    }
+    out += '  } ';
+    if (it.opts.messages !== false) {
+      out += ' , message: \'should match pattern "';
+      if ($isData) {
+        out += '\' + ' + ($schemaValue) + ' + \'';
+      } else {
+        out += '' + (it.util.escapeQuotes($schema));
+      }
+      out += '"\' ';
+    }
+    if (it.opts.verbose) {
+      out += ' , schema:  ';
+      if ($isData) {
+        out += 'validate.schema' + ($schemaPath);
+      } else {
+        out += '' + (it.util.toQuotedString($schema));
+      }
+      out += '         , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+    }
+    out += ' } ';
+  } else {
+    out += ' {} ';
+  }
+  var __err = out;
+  out = $$outStack.pop();
+  if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+    if (it.async) {
+      out += ' throw new ValidationError([' + (__err) + ']); ';
+    } else {
+      out += ' validate.errors = [' + (__err) + ']; return false; ';
+    }
+  } else {
+    out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+  }
+  out += '} ';
+  if ($breakOnError) {
+    out += ' else { ';
+  }
+  return out;
+}
+
+
+/***/ }),
+/* 668 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate_properties(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $data = 'data' + ($dataLvl || '');
+  var $valid = 'valid' + $lvl;
+  var $errs = 'errs__' + $lvl;
+  var $it = it.util.copy(it);
+  var $closingBraces = '';
+  $it.level++;
+  var $nextValid = 'valid' + $it.level;
+  var $key = 'key' + $lvl,
+    $idx = 'idx' + $lvl,
+    $dataNxt = $it.dataLevel = it.dataLevel + 1,
+    $nextData = 'data' + $dataNxt,
+    $dataProperties = 'dataProperties' + $lvl;
+  var $schemaKeys = Object.keys($schema || {}),
+    $pProperties = it.schema.patternProperties || {},
+    $pPropertyKeys = Object.keys($pProperties),
+    $aProperties = it.schema.additionalProperties,
+    $someProperties = $schemaKeys.length || $pPropertyKeys.length,
+    $noAdditional = $aProperties === false,
+    $additionalIsSchema = typeof $aProperties == 'object' && Object.keys($aProperties).length,
+    $removeAdditional = it.opts.removeAdditional,
+    $checkAdditional = $noAdditional || $additionalIsSchema || $removeAdditional,
+    $ownProperties = it.opts.ownProperties,
+    $currentBaseId = it.baseId;
+  var $required = it.schema.required;
+  if ($required && !(it.opts.v5 && $required.$data) && $required.length < it.opts.loopRequired) var $requiredHash = it.util.toHash($required);
+  if (it.opts.patternGroups) {
+    var $pgProperties = it.schema.patternGroups || {},
+      $pgPropertyKeys = Object.keys($pgProperties);
+  }
+  out += 'var ' + ($errs) + ' = errors;var ' + ($nextValid) + ' = true;';
+  if ($ownProperties) {
+    out += ' var ' + ($dataProperties) + ' = undefined;';
+  }
+  if ($checkAdditional) {
+    if ($ownProperties) {
+      out += ' ' + ($dataProperties) + ' = ' + ($dataProperties) + ' || Object.keys(' + ($data) + '); for (var ' + ($idx) + '=0; ' + ($idx) + '<' + ($dataProperties) + '.length; ' + ($idx) + '++) { var ' + ($key) + ' = ' + ($dataProperties) + '[' + ($idx) + ']; ';
+    } else {
+      out += ' for (var ' + ($key) + ' in ' + ($data) + ') { ';
+    }
+    if ($someProperties) {
+      out += ' var isAdditional' + ($lvl) + ' = !(false ';
+      if ($schemaKeys.length) {
+        if ($schemaKeys.length > 5) {
+          out += ' || validate.schema' + ($schemaPath) + '[' + ($key) + '] ';
+        } else {
+          var arr1 = $schemaKeys;
+          if (arr1) {
+            var $propertyKey, i1 = -1,
+              l1 = arr1.length - 1;
+            while (i1 < l1) {
+              $propertyKey = arr1[i1 += 1];
+              out += ' || ' + ($key) + ' == ' + (it.util.toQuotedString($propertyKey)) + ' ';
+            }
+          }
+        }
+      }
+      if ($pPropertyKeys.length) {
+        var arr2 = $pPropertyKeys;
+        if (arr2) {
+          var $pProperty, $i = -1,
+            l2 = arr2.length - 1;
+          while ($i < l2) {
+            $pProperty = arr2[$i += 1];
+            out += ' || ' + (it.usePattern($pProperty)) + '.test(' + ($key) + ') ';
+          }
+        }
+      }
+      if (it.opts.patternGroups && $pgPropertyKeys.length) {
+        var arr3 = $pgPropertyKeys;
+        if (arr3) {
+          var $pgProperty, $i = -1,
+            l3 = arr3.length - 1;
+          while ($i < l3) {
+            $pgProperty = arr3[$i += 1];
+            out += ' || ' + (it.usePattern($pgProperty)) + '.test(' + ($key) + ') ';
+          }
+        }
+      }
+      out += ' ); if (isAdditional' + ($lvl) + ') { ';
+    }
+    if ($removeAdditional == 'all') {
+      out += ' delete ' + ($data) + '[' + ($key) + ']; ';
+    } else {
+      var $currentErrorPath = it.errorPath;
+      var $additionalProperty = '\' + ' + $key + ' + \'';
+      if (it.opts._errorDataPathProperty) {
+        it.errorPath = it.util.getPathExpr(it.errorPath, $key, it.opts.jsonPointers);
+      }
+      if ($noAdditional) {
+        if ($removeAdditional) {
+          out += ' delete ' + ($data) + '[' + ($key) + ']; ';
+        } else {
+          out += ' ' + ($nextValid) + ' = false; ';
+          var $currErrSchemaPath = $errSchemaPath;
+          $errSchemaPath = it.errSchemaPath + '/additionalProperties';
+          var $$outStack = $$outStack || [];
+          $$outStack.push(out);
+          out = ''; /* istanbul ignore else */
+          if (it.createErrors !== false) {
+            out += ' { keyword: \'' + ('additionalProperties') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { additionalProperty: \'' + ($additionalProperty) + '\' } ';
+            if (it.opts.messages !== false) {
+              out += ' , message: \'should NOT have additional properties\' ';
+            }
+            if (it.opts.verbose) {
+              out += ' , schema: false , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+            }
+            out += ' } ';
+          } else {
+            out += ' {} ';
+          }
+          var __err = out;
+          out = $$outStack.pop();
+          if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+            if (it.async) {
+              out += ' throw new ValidationError([' + (__err) + ']); ';
+            } else {
+              out += ' validate.errors = [' + (__err) + ']; return false; ';
+            }
+          } else {
+            out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+          }
+          $errSchemaPath = $currErrSchemaPath;
+          if ($breakOnError) {
+            out += ' break; ';
+          }
+        }
+      } else if ($additionalIsSchema) {
+        if ($removeAdditional == 'failing') {
+          out += ' var ' + ($errs) + ' = errors;  ';
+          var $wasComposite = it.compositeRule;
+          it.compositeRule = $it.compositeRule = true;
+          $it.schema = $aProperties;
+          $it.schemaPath = it.schemaPath + '.additionalProperties';
+          $it.errSchemaPath = it.errSchemaPath + '/additionalProperties';
+          $it.errorPath = it.opts._errorDataPathProperty ? it.errorPath : it.util.getPathExpr(it.errorPath, $key, it.opts.jsonPointers);
+          var $passData = $data + '[' + $key + ']';
+          $it.dataPathArr[$dataNxt] = $key;
+          var $code = it.validate($it);
+          $it.baseId = $currentBaseId;
+          if (it.util.varOccurences($code, $nextData) < 2) {
+            out += ' ' + (it.util.varReplace($code, $nextData, $passData)) + ' ';
+          } else {
+            out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ' + ($code) + ' ';
+          }
+          out += ' if (!' + ($nextValid) + ') { errors = ' + ($errs) + '; if (validate.errors !== null) { if (errors) validate.errors.length = errors; else validate.errors = null; } delete ' + ($data) + '[' + ($key) + ']; }  ';
+          it.compositeRule = $it.compositeRule = $wasComposite;
+        } else {
+          $it.schema = $aProperties;
+          $it.schemaPath = it.schemaPath + '.additionalProperties';
+          $it.errSchemaPath = it.errSchemaPath + '/additionalProperties';
+          $it.errorPath = it.opts._errorDataPathProperty ? it.errorPath : it.util.getPathExpr(it.errorPath, $key, it.opts.jsonPointers);
+          var $passData = $data + '[' + $key + ']';
+          $it.dataPathArr[$dataNxt] = $key;
+          var $code = it.validate($it);
+          $it.baseId = $currentBaseId;
+          if (it.util.varOccurences($code, $nextData) < 2) {
+            out += ' ' + (it.util.varReplace($code, $nextData, $passData)) + ' ';
+          } else {
+            out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ' + ($code) + ' ';
+          }
+          if ($breakOnError) {
+            out += ' if (!' + ($nextValid) + ') break; ';
+          }
+        }
+      }
+      it.errorPath = $currentErrorPath;
+    }
+    if ($someProperties) {
+      out += ' } ';
+    }
+    out += ' }  ';
+    if ($breakOnError) {
+      out += ' if (' + ($nextValid) + ') { ';
+      $closingBraces += '}';
+    }
+  }
+  var $useDefaults = it.opts.useDefaults && !it.compositeRule;
+  if ($schemaKeys.length) {
+    var arr4 = $schemaKeys;
+    if (arr4) {
+      var $propertyKey, i4 = -1,
+        l4 = arr4.length - 1;
+      while (i4 < l4) {
+        $propertyKey = arr4[i4 += 1];
+        var $sch = $schema[$propertyKey];
+        if (it.util.schemaHasRules($sch, it.RULES.all)) {
+          var $prop = it.util.getProperty($propertyKey),
+            $passData = $data + $prop,
+            $hasDefault = $useDefaults && $sch.default !== undefined;
+          $it.schema = $sch;
+          $it.schemaPath = $schemaPath + $prop;
+          $it.errSchemaPath = $errSchemaPath + '/' + it.util.escapeFragment($propertyKey);
+          $it.errorPath = it.util.getPath(it.errorPath, $propertyKey, it.opts.jsonPointers);
+          $it.dataPathArr[$dataNxt] = it.util.toQuotedString($propertyKey);
+          var $code = it.validate($it);
+          $it.baseId = $currentBaseId;
+          if (it.util.varOccurences($code, $nextData) < 2) {
+            $code = it.util.varReplace($code, $nextData, $passData);
+            var $useData = $passData;
+          } else {
+            var $useData = $nextData;
+            out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ';
+          }
+          if ($hasDefault) {
+            out += ' ' + ($code) + ' ';
+          } else {
+            if ($requiredHash && $requiredHash[$propertyKey]) {
+              out += ' if ( ' + ($useData) + ' === undefined ';
+              if ($ownProperties) {
+                out += ' || ! Object.prototype.hasOwnProperty.call(' + ($data) + ', \'' + (it.util.escapeQuotes($propertyKey)) + '\') ';
+              }
+              out += ') { ' + ($nextValid) + ' = false; ';
+              var $currentErrorPath = it.errorPath,
+                $currErrSchemaPath = $errSchemaPath,
+                $missingProperty = it.util.escapeQuotes($propertyKey);
+              if (it.opts._errorDataPathProperty) {
+                it.errorPath = it.util.getPath($currentErrorPath, $propertyKey, it.opts.jsonPointers);
+              }
+              $errSchemaPath = it.errSchemaPath + '/required';
+              var $$outStack = $$outStack || [];
+              $$outStack.push(out);
+              out = ''; /* istanbul ignore else */
+              if (it.createErrors !== false) {
+                out += ' { keyword: \'' + ('required') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { missingProperty: \'' + ($missingProperty) + '\' } ';
+                if (it.opts.messages !== false) {
+                  out += ' , message: \'';
+                  if (it.opts._errorDataPathProperty) {
+                    out += 'is a required property';
+                  } else {
+                    out += 'should have required property \\\'' + ($missingProperty) + '\\\'';
+                  }
+                  out += '\' ';
+                }
+                if (it.opts.verbose) {
+                  out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+                }
+                out += ' } ';
+              } else {
+                out += ' {} ';
+              }
+              var __err = out;
+              out = $$outStack.pop();
+              if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+                if (it.async) {
+                  out += ' throw new ValidationError([' + (__err) + ']); ';
+                } else {
+                  out += ' validate.errors = [' + (__err) + ']; return false; ';
+                }
+              } else {
+                out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+              }
+              $errSchemaPath = $currErrSchemaPath;
+              it.errorPath = $currentErrorPath;
+              out += ' } else { ';
+            } else {
+              if ($breakOnError) {
+                out += ' if ( ' + ($useData) + ' === undefined ';
+                if ($ownProperties) {
+                  out += ' || ! Object.prototype.hasOwnProperty.call(' + ($data) + ', \'' + (it.util.escapeQuotes($propertyKey)) + '\') ';
+                }
+                out += ') { ' + ($nextValid) + ' = true; } else { ';
+              } else {
+                out += ' if (' + ($useData) + ' !== undefined ';
+                if ($ownProperties) {
+                  out += ' &&   Object.prototype.hasOwnProperty.call(' + ($data) + ', \'' + (it.util.escapeQuotes($propertyKey)) + '\') ';
+                }
+                out += ' ) { ';
+              }
+            }
+            out += ' ' + ($code) + ' } ';
+          }
+        }
+        if ($breakOnError) {
+          out += ' if (' + ($nextValid) + ') { ';
+          $closingBraces += '}';
+        }
+      }
+    }
+  }
+  if ($pPropertyKeys.length) {
+    var arr5 = $pPropertyKeys;
+    if (arr5) {
+      var $pProperty, i5 = -1,
+        l5 = arr5.length - 1;
+      while (i5 < l5) {
+        $pProperty = arr5[i5 += 1];
+        var $sch = $pProperties[$pProperty];
+        if (it.util.schemaHasRules($sch, it.RULES.all)) {
+          $it.schema = $sch;
+          $it.schemaPath = it.schemaPath + '.patternProperties' + it.util.getProperty($pProperty);
+          $it.errSchemaPath = it.errSchemaPath + '/patternProperties/' + it.util.escapeFragment($pProperty);
+          if ($ownProperties) {
+            out += ' ' + ($dataProperties) + ' = ' + ($dataProperties) + ' || Object.keys(' + ($data) + '); for (var ' + ($idx) + '=0; ' + ($idx) + '<' + ($dataProperties) + '.length; ' + ($idx) + '++) { var ' + ($key) + ' = ' + ($dataProperties) + '[' + ($idx) + ']; ';
+          } else {
+            out += ' for (var ' + ($key) + ' in ' + ($data) + ') { ';
+          }
+          out += ' if (' + (it.usePattern($pProperty)) + '.test(' + ($key) + ')) { ';
+          $it.errorPath = it.util.getPathExpr(it.errorPath, $key, it.opts.jsonPointers);
+          var $passData = $data + '[' + $key + ']';
+          $it.dataPathArr[$dataNxt] = $key;
+          var $code = it.validate($it);
+          $it.baseId = $currentBaseId;
+          if (it.util.varOccurences($code, $nextData) < 2) {
+            out += ' ' + (it.util.varReplace($code, $nextData, $passData)) + ' ';
+          } else {
+            out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ' + ($code) + ' ';
+          }
+          if ($breakOnError) {
+            out += ' if (!' + ($nextValid) + ') break; ';
+          }
+          out += ' } ';
+          if ($breakOnError) {
+            out += ' else ' + ($nextValid) + ' = true; ';
+          }
+          out += ' }  ';
+          if ($breakOnError) {
+            out += ' if (' + ($nextValid) + ') { ';
+            $closingBraces += '}';
+          }
+        }
+      }
+    }
+  }
+  if (it.opts.patternGroups && $pgPropertyKeys.length) {
+    var arr6 = $pgPropertyKeys;
+    if (arr6) {
+      var $pgProperty, i6 = -1,
+        l6 = arr6.length - 1;
+      while (i6 < l6) {
+        $pgProperty = arr6[i6 += 1];
+        var $pgSchema = $pgProperties[$pgProperty],
+          $sch = $pgSchema.schema;
+        if (it.util.schemaHasRules($sch, it.RULES.all)) {
+          $it.schema = $sch;
+          $it.schemaPath = it.schemaPath + '.patternGroups' + it.util.getProperty($pgProperty) + '.schema';
+          $it.errSchemaPath = it.errSchemaPath + '/patternGroups/' + it.util.escapeFragment($pgProperty) + '/schema';
+          out += ' var pgPropCount' + ($lvl) + ' = 0;  ';
+          if ($ownProperties) {
+            out += ' ' + ($dataProperties) + ' = ' + ($dataProperties) + ' || Object.keys(' + ($data) + '); for (var ' + ($idx) + '=0; ' + ($idx) + '<' + ($dataProperties) + '.length; ' + ($idx) + '++) { var ' + ($key) + ' = ' + ($dataProperties) + '[' + ($idx) + ']; ';
+          } else {
+            out += ' for (var ' + ($key) + ' in ' + ($data) + ') { ';
+          }
+          out += ' if (' + (it.usePattern($pgProperty)) + '.test(' + ($key) + ')) { pgPropCount' + ($lvl) + '++; ';
+          $it.errorPath = it.util.getPathExpr(it.errorPath, $key, it.opts.jsonPointers);
+          var $passData = $data + '[' + $key + ']';
+          $it.dataPathArr[$dataNxt] = $key;
+          var $code = it.validate($it);
+          $it.baseId = $currentBaseId;
+          if (it.util.varOccurences($code, $nextData) < 2) {
+            out += ' ' + (it.util.varReplace($code, $nextData, $passData)) + ' ';
+          } else {
+            out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ' + ($code) + ' ';
+          }
+          if ($breakOnError) {
+            out += ' if (!' + ($nextValid) + ') break; ';
+          }
+          out += ' } ';
+          if ($breakOnError) {
+            out += ' else ' + ($nextValid) + ' = true; ';
+          }
+          out += ' }  ';
+          if ($breakOnError) {
+            out += ' if (' + ($nextValid) + ') { ';
+            $closingBraces += '}';
+          }
+          var $pgMin = $pgSchema.minimum,
+            $pgMax = $pgSchema.maximum;
+          if ($pgMin !== undefined || $pgMax !== undefined) {
+            out += ' var ' + ($valid) + ' = true; ';
+            var $currErrSchemaPath = $errSchemaPath;
+            if ($pgMin !== undefined) {
+              var $limit = $pgMin,
+                $reason = 'minimum',
+                $moreOrLess = 'less';
+              out += ' ' + ($valid) + ' = pgPropCount' + ($lvl) + ' >= ' + ($pgMin) + '; ';
+              $errSchemaPath = it.errSchemaPath + '/patternGroups/minimum';
+              out += '  if (!' + ($valid) + ') {   ';
+              var $$outStack = $$outStack || [];
+              $$outStack.push(out);
+              out = ''; /* istanbul ignore else */
+              if (it.createErrors !== false) {
+                out += ' { keyword: \'' + ('patternGroups') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { reason: \'' + ($reason) + '\', limit: ' + ($limit) + ', pattern: \'' + (it.util.escapeQuotes($pgProperty)) + '\' } ';
+                if (it.opts.messages !== false) {
+                  out += ' , message: \'should NOT have ' + ($moreOrLess) + ' than ' + ($limit) + ' properties matching pattern "' + (it.util.escapeQuotes($pgProperty)) + '"\' ';
+                }
+                if (it.opts.verbose) {
+                  out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+                }
+                out += ' } ';
+              } else {
+                out += ' {} ';
+              }
+              var __err = out;
+              out = $$outStack.pop();
+              if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+                if (it.async) {
+                  out += ' throw new ValidationError([' + (__err) + ']); ';
+                } else {
+                  out += ' validate.errors = [' + (__err) + ']; return false; ';
+                }
+              } else {
+                out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+              }
+              out += ' } ';
+              if ($pgMax !== undefined) {
+                out += ' else ';
+              }
+            }
+            if ($pgMax !== undefined) {
+              var $limit = $pgMax,
+                $reason = 'maximum',
+                $moreOrLess = 'more';
+              out += ' ' + ($valid) + ' = pgPropCount' + ($lvl) + ' <= ' + ($pgMax) + '; ';
+              $errSchemaPath = it.errSchemaPath + '/patternGroups/maximum';
+              out += '  if (!' + ($valid) + ') {   ';
+              var $$outStack = $$outStack || [];
+              $$outStack.push(out);
+              out = ''; /* istanbul ignore else */
+              if (it.createErrors !== false) {
+                out += ' { keyword: \'' + ('patternGroups') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { reason: \'' + ($reason) + '\', limit: ' + ($limit) + ', pattern: \'' + (it.util.escapeQuotes($pgProperty)) + '\' } ';
+                if (it.opts.messages !== false) {
+                  out += ' , message: \'should NOT have ' + ($moreOrLess) + ' than ' + ($limit) + ' properties matching pattern "' + (it.util.escapeQuotes($pgProperty)) + '"\' ';
+                }
+                if (it.opts.verbose) {
+                  out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+                }
+                out += ' } ';
+              } else {
+                out += ' {} ';
+              }
+              var __err = out;
+              out = $$outStack.pop();
+              if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+                if (it.async) {
+                  out += ' throw new ValidationError([' + (__err) + ']); ';
+                } else {
+                  out += ' validate.errors = [' + (__err) + ']; return false; ';
+                }
+              } else {
+                out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+              }
+              out += ' } ';
+            }
+            $errSchemaPath = $currErrSchemaPath;
+            if ($breakOnError) {
+              out += ' if (' + ($valid) + ') { ';
+              $closingBraces += '}';
+            }
+          }
+        }
+      }
+    }
+  }
+  if ($breakOnError) {
+    out += ' ' + ($closingBraces) + ' if (' + ($errs) + ' == errors) {';
+  }
+  out = it.util.cleanUpCode(out);
+  return out;
+}
+
+
+/***/ }),
+/* 669 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate_propertyNames(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $data = 'data' + ($dataLvl || '');
+  var $errs = 'errs__' + $lvl;
+  var $it = it.util.copy(it);
+  var $closingBraces = '';
+  $it.level++;
+  var $nextValid = 'valid' + $it.level;
+  if (it.util.schemaHasRules($schema, it.RULES.all)) {
+    $it.schema = $schema;
+    $it.schemaPath = $schemaPath;
+    $it.errSchemaPath = $errSchemaPath;
+    var $key = 'key' + $lvl,
+      $idx = 'idx' + $lvl,
+      $i = 'i' + $lvl,
+      $invalidName = '\' + ' + $key + ' + \'',
+      $dataNxt = $it.dataLevel = it.dataLevel + 1,
+      $nextData = 'data' + $dataNxt,
+      $dataProperties = 'dataProperties' + $lvl,
+      $ownProperties = it.opts.ownProperties,
+      $currentBaseId = it.baseId;
+    out += ' var ' + ($errs) + ' = errors; ';
+    if ($ownProperties) {
+      out += ' var ' + ($dataProperties) + ' = undefined; ';
+    }
+    if ($ownProperties) {
+      out += ' ' + ($dataProperties) + ' = ' + ($dataProperties) + ' || Object.keys(' + ($data) + '); for (var ' + ($idx) + '=0; ' + ($idx) + '<' + ($dataProperties) + '.length; ' + ($idx) + '++) { var ' + ($key) + ' = ' + ($dataProperties) + '[' + ($idx) + ']; ';
+    } else {
+      out += ' for (var ' + ($key) + ' in ' + ($data) + ') { ';
+    }
+    out += ' var startErrs' + ($lvl) + ' = errors; ';
+    var $passData = $key;
+    var $wasComposite = it.compositeRule;
+    it.compositeRule = $it.compositeRule = true;
+    var $code = it.validate($it);
+    $it.baseId = $currentBaseId;
+    if (it.util.varOccurences($code, $nextData) < 2) {
+      out += ' ' + (it.util.varReplace($code, $nextData, $passData)) + ' ';
+    } else {
+      out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ' + ($code) + ' ';
+    }
+    it.compositeRule = $it.compositeRule = $wasComposite;
+    out += ' if (!' + ($nextValid) + ') { for (var ' + ($i) + '=startErrs' + ($lvl) + '; ' + ($i) + '<errors; ' + ($i) + '++) { vErrors[' + ($i) + '].propertyName = ' + ($key) + '; }   var err =   '; /* istanbul ignore else */
+    if (it.createErrors !== false) {
+      out += ' { keyword: \'' + ('propertyNames') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { propertyName: \'' + ($invalidName) + '\' } ';
+      if (it.opts.messages !== false) {
+        out += ' , message: \'property name \\\'' + ($invalidName) + '\\\' is invalid\' ';
+      }
+      if (it.opts.verbose) {
+        out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+      }
+      out += ' } ';
+    } else {
+      out += ' {} ';
+    }
+    out += ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+    if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+      if (it.async) {
+        out += ' throw new ValidationError(vErrors); ';
+      } else {
+        out += ' validate.errors = vErrors; return false; ';
+      }
+    }
+    if ($breakOnError) {
+      out += ' break; ';
+    }
+    out += ' } }';
+  }
+  if ($breakOnError) {
+    out += ' ' + ($closingBraces) + ' if (' + ($errs) + ' == errors) {';
+  }
+  out = it.util.cleanUpCode(out);
+  return out;
+}
+
+
+/***/ }),
+/* 670 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate_ref(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $data = 'data' + ($dataLvl || '');
+  var $valid = 'valid' + $lvl;
+  var $async, $refCode;
+  if ($schema == '#' || $schema == '#/') {
+    if (it.isRoot) {
+      $async = it.async;
+      $refCode = 'validate';
+    } else {
+      $async = it.root.schema.$async === true;
+      $refCode = 'root.refVal[0]';
+    }
+  } else {
+    var $refVal = it.resolveRef(it.baseId, $schema, it.isRoot);
+    if ($refVal === undefined) {
+      var $message = it.MissingRefError.message(it.baseId, $schema);
+      if (it.opts.missingRefs == 'fail') {
+        it.logger.error($message);
+        var $$outStack = $$outStack || [];
+        $$outStack.push(out);
+        out = ''; /* istanbul ignore else */
+        if (it.createErrors !== false) {
+          out += ' { keyword: \'' + ('$ref') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { ref: \'' + (it.util.escapeQuotes($schema)) + '\' } ';
+          if (it.opts.messages !== false) {
+            out += ' , message: \'can\\\'t resolve reference ' + (it.util.escapeQuotes($schema)) + '\' ';
+          }
+          if (it.opts.verbose) {
+            out += ' , schema: ' + (it.util.toQuotedString($schema)) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+          }
+          out += ' } ';
+        } else {
+          out += ' {} ';
+        }
+        var __err = out;
+        out = $$outStack.pop();
+        if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+          if (it.async) {
+            out += ' throw new ValidationError([' + (__err) + ']); ';
+          } else {
+            out += ' validate.errors = [' + (__err) + ']; return false; ';
+          }
+        } else {
+          out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+        }
+        if ($breakOnError) {
+          out += ' if (false) { ';
+        }
+      } else if (it.opts.missingRefs == 'ignore') {
+        it.logger.warn($message);
+        if ($breakOnError) {
+          out += ' if (true) { ';
+        }
+      } else {
+        throw new it.MissingRefError(it.baseId, $schema, $message);
+      }
+    } else if ($refVal.inline) {
+      var $it = it.util.copy(it);
+      $it.level++;
+      var $nextValid = 'valid' + $it.level;
+      $it.schema = $refVal.schema;
+      $it.schemaPath = '';
+      $it.errSchemaPath = $schema;
+      var $code = it.validate($it).replace(/validate\.schema/g, $refVal.code);
+      out += ' ' + ($code) + ' ';
+      if ($breakOnError) {
+        out += ' if (' + ($nextValid) + ') { ';
+      }
+    } else {
+      $async = $refVal.$async === true;
+      $refCode = $refVal.code;
+    }
+  }
+  if ($refCode) {
+    var $$outStack = $$outStack || [];
+    $$outStack.push(out);
+    out = '';
+    if (it.opts.passContext) {
+      out += ' ' + ($refCode) + '.call(this, ';
+    } else {
+      out += ' ' + ($refCode) + '( ';
+    }
+    out += ' ' + ($data) + ', (dataPath || \'\')';
+    if (it.errorPath != '""') {
+      out += ' + ' + (it.errorPath);
+    }
+    var $parentData = $dataLvl ? 'data' + (($dataLvl - 1) || '') : 'parentData',
+      $parentDataProperty = $dataLvl ? it.dataPathArr[$dataLvl] : 'parentDataProperty';
+    out += ' , ' + ($parentData) + ' , ' + ($parentDataProperty) + ', rootData)  ';
+    var __callValidate = out;
+    out = $$outStack.pop();
+    if ($async) {
+      if (!it.async) throw new Error('async schema referenced by sync schema');
+      if ($breakOnError) {
+        out += ' var ' + ($valid) + '; ';
+      }
+      out += ' try { ' + (it.yieldAwait) + ' ' + (__callValidate) + '; ';
+      if ($breakOnError) {
+        out += ' ' + ($valid) + ' = true; ';
+      }
+      out += ' } catch (e) { if (!(e instanceof ValidationError)) throw e; if (vErrors === null) vErrors = e.errors; else vErrors = vErrors.concat(e.errors); errors = vErrors.length; ';
+      if ($breakOnError) {
+        out += ' ' + ($valid) + ' = false; ';
+      }
+      out += ' } ';
+      if ($breakOnError) {
+        out += ' if (' + ($valid) + ') { ';
+      }
+    } else {
+      out += ' if (!' + (__callValidate) + ') { if (vErrors === null) vErrors = ' + ($refCode) + '.errors; else vErrors = vErrors.concat(' + ($refCode) + '.errors); errors = vErrors.length; } ';
+      if ($breakOnError) {
+        out += ' else { ';
+      }
+    }
+  }
+  return out;
+}
+
+
+/***/ }),
+/* 671 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate_required(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $data = 'data' + ($dataLvl || '');
+  var $valid = 'valid' + $lvl;
+  var $isData = it.opts.$data && $schema && $schema.$data,
+    $schemaValue;
+  if ($isData) {
+    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
+    $schemaValue = 'schema' + $lvl;
+  } else {
+    $schemaValue = $schema;
+  }
+  var $vSchema = 'schema' + $lvl;
+  if (!$isData) {
+    if ($schema.length < it.opts.loopRequired && it.schema.properties && Object.keys(it.schema.properties).length) {
+      var $required = [];
+      var arr1 = $schema;
+      if (arr1) {
+        var $property, i1 = -1,
+          l1 = arr1.length - 1;
+        while (i1 < l1) {
+          $property = arr1[i1 += 1];
+          var $propertySch = it.schema.properties[$property];
+          if (!($propertySch && it.util.schemaHasRules($propertySch, it.RULES.all))) {
+            $required[$required.length] = $property;
+          }
+        }
+      }
+    } else {
+      var $required = $schema;
+    }
+  }
+  if ($isData || $required.length) {
+    var $currentErrorPath = it.errorPath,
+      $loopRequired = $isData || $required.length >= it.opts.loopRequired,
+      $ownProperties = it.opts.ownProperties;
+    if ($breakOnError) {
+      out += ' var missing' + ($lvl) + '; ';
+      if ($loopRequired) {
+        if (!$isData) {
+          out += ' var ' + ($vSchema) + ' = validate.schema' + ($schemaPath) + '; ';
+        }
+        var $i = 'i' + $lvl,
+          $propertyPath = 'schema' + $lvl + '[' + $i + ']',
+          $missingProperty = '\' + ' + $propertyPath + ' + \'';
+        if (it.opts._errorDataPathProperty) {
+          it.errorPath = it.util.getPathExpr($currentErrorPath, $propertyPath, it.opts.jsonPointers);
+        }
+        out += ' var ' + ($valid) + ' = true; ';
+        if ($isData) {
+          out += ' if (schema' + ($lvl) + ' === undefined) ' + ($valid) + ' = true; else if (!Array.isArray(schema' + ($lvl) + ')) ' + ($valid) + ' = false; else {';
+        }
+        out += ' for (var ' + ($i) + ' = 0; ' + ($i) + ' < ' + ($vSchema) + '.length; ' + ($i) + '++) { ' + ($valid) + ' = ' + ($data) + '[' + ($vSchema) + '[' + ($i) + ']] !== undefined ';
+        if ($ownProperties) {
+          out += ' &&   Object.prototype.hasOwnProperty.call(' + ($data) + ', ' + ($vSchema) + '[' + ($i) + ']) ';
+        }
+        out += '; if (!' + ($valid) + ') break; } ';
+        if ($isData) {
+          out += '  }  ';
+        }
+        out += '  if (!' + ($valid) + ') {   ';
+        var $$outStack = $$outStack || [];
+        $$outStack.push(out);
+        out = ''; /* istanbul ignore else */
+        if (it.createErrors !== false) {
+          out += ' { keyword: \'' + ('required') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { missingProperty: \'' + ($missingProperty) + '\' } ';
+          if (it.opts.messages !== false) {
+            out += ' , message: \'';
+            if (it.opts._errorDataPathProperty) {
+              out += 'is a required property';
+            } else {
+              out += 'should have required property \\\'' + ($missingProperty) + '\\\'';
+            }
+            out += '\' ';
+          }
+          if (it.opts.verbose) {
+            out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+          }
+          out += ' } ';
+        } else {
+          out += ' {} ';
+        }
+        var __err = out;
+        out = $$outStack.pop();
+        if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+          if (it.async) {
+            out += ' throw new ValidationError([' + (__err) + ']); ';
+          } else {
+            out += ' validate.errors = [' + (__err) + ']; return false; ';
+          }
+        } else {
+          out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+        }
+        out += ' } else { ';
+      } else {
+        out += ' if ( ';
+        var arr2 = $required;
+        if (arr2) {
+          var $propertyKey, $i = -1,
+            l2 = arr2.length - 1;
+          while ($i < l2) {
+            $propertyKey = arr2[$i += 1];
+            if ($i) {
+              out += ' || ';
+            }
+            var $prop = it.util.getProperty($propertyKey),
+              $useData = $data + $prop;
+            out += ' ( ( ' + ($useData) + ' === undefined ';
+            if ($ownProperties) {
+              out += ' || ! Object.prototype.hasOwnProperty.call(' + ($data) + ', \'' + (it.util.escapeQuotes($propertyKey)) + '\') ';
+            }
+            out += ') && (missing' + ($lvl) + ' = ' + (it.util.toQuotedString(it.opts.jsonPointers ? $propertyKey : $prop)) + ') ) ';
+          }
+        }
+        out += ') {  ';
+        var $propertyPath = 'missing' + $lvl,
+          $missingProperty = '\' + ' + $propertyPath + ' + \'';
+        if (it.opts._errorDataPathProperty) {
+          it.errorPath = it.opts.jsonPointers ? it.util.getPathExpr($currentErrorPath, $propertyPath, true) : $currentErrorPath + ' + ' + $propertyPath;
+        }
+        var $$outStack = $$outStack || [];
+        $$outStack.push(out);
+        out = ''; /* istanbul ignore else */
+        if (it.createErrors !== false) {
+          out += ' { keyword: \'' + ('required') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { missingProperty: \'' + ($missingProperty) + '\' } ';
+          if (it.opts.messages !== false) {
+            out += ' , message: \'';
+            if (it.opts._errorDataPathProperty) {
+              out += 'is a required property';
+            } else {
+              out += 'should have required property \\\'' + ($missingProperty) + '\\\'';
+            }
+            out += '\' ';
+          }
+          if (it.opts.verbose) {
+            out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+          }
+          out += ' } ';
+        } else {
+          out += ' {} ';
+        }
+        var __err = out;
+        out = $$outStack.pop();
+        if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+          if (it.async) {
+            out += ' throw new ValidationError([' + (__err) + ']); ';
+          } else {
+            out += ' validate.errors = [' + (__err) + ']; return false; ';
+          }
+        } else {
+          out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+        }
+        out += ' } else { ';
+      }
+    } else {
+      if ($loopRequired) {
+        if (!$isData) {
+          out += ' var ' + ($vSchema) + ' = validate.schema' + ($schemaPath) + '; ';
+        }
+        var $i = 'i' + $lvl,
+          $propertyPath = 'schema' + $lvl + '[' + $i + ']',
+          $missingProperty = '\' + ' + $propertyPath + ' + \'';
+        if (it.opts._errorDataPathProperty) {
+          it.errorPath = it.util.getPathExpr($currentErrorPath, $propertyPath, it.opts.jsonPointers);
+        }
+        if ($isData) {
+          out += ' if (' + ($vSchema) + ' && !Array.isArray(' + ($vSchema) + ')) {  var err =   '; /* istanbul ignore else */
+          if (it.createErrors !== false) {
+            out += ' { keyword: \'' + ('required') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { missingProperty: \'' + ($missingProperty) + '\' } ';
+            if (it.opts.messages !== false) {
+              out += ' , message: \'';
+              if (it.opts._errorDataPathProperty) {
+                out += 'is a required property';
+              } else {
+                out += 'should have required property \\\'' + ($missingProperty) + '\\\'';
+              }
+              out += '\' ';
+            }
+            if (it.opts.verbose) {
+              out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+            }
+            out += ' } ';
+          } else {
+            out += ' {} ';
+          }
+          out += ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; } else if (' + ($vSchema) + ' !== undefined) { ';
+        }
+        out += ' for (var ' + ($i) + ' = 0; ' + ($i) + ' < ' + ($vSchema) + '.length; ' + ($i) + '++) { if (' + ($data) + '[' + ($vSchema) + '[' + ($i) + ']] === undefined ';
+        if ($ownProperties) {
+          out += ' || ! Object.prototype.hasOwnProperty.call(' + ($data) + ', ' + ($vSchema) + '[' + ($i) + ']) ';
+        }
+        out += ') {  var err =   '; /* istanbul ignore else */
+        if (it.createErrors !== false) {
+          out += ' { keyword: \'' + ('required') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { missingProperty: \'' + ($missingProperty) + '\' } ';
+          if (it.opts.messages !== false) {
+            out += ' , message: \'';
+            if (it.opts._errorDataPathProperty) {
+              out += 'is a required property';
+            } else {
+              out += 'should have required property \\\'' + ($missingProperty) + '\\\'';
+            }
+            out += '\' ';
+          }
+          if (it.opts.verbose) {
+            out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+          }
+          out += ' } ';
+        } else {
+          out += ' {} ';
+        }
+        out += ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; } } ';
+        if ($isData) {
+          out += '  }  ';
+        }
+      } else {
+        var arr3 = $required;
+        if (arr3) {
+          var $propertyKey, i3 = -1,
+            l3 = arr3.length - 1;
+          while (i3 < l3) {
+            $propertyKey = arr3[i3 += 1];
+            var $prop = it.util.getProperty($propertyKey),
+              $missingProperty = it.util.escapeQuotes($propertyKey),
+              $useData = $data + $prop;
+            if (it.opts._errorDataPathProperty) {
+              it.errorPath = it.util.getPath($currentErrorPath, $propertyKey, it.opts.jsonPointers);
+            }
+            out += ' if ( ' + ($useData) + ' === undefined ';
+            if ($ownProperties) {
+              out += ' || ! Object.prototype.hasOwnProperty.call(' + ($data) + ', \'' + (it.util.escapeQuotes($propertyKey)) + '\') ';
+            }
+            out += ') {  var err =   '; /* istanbul ignore else */
+            if (it.createErrors !== false) {
+              out += ' { keyword: \'' + ('required') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { missingProperty: \'' + ($missingProperty) + '\' } ';
+              if (it.opts.messages !== false) {
+                out += ' , message: \'';
+                if (it.opts._errorDataPathProperty) {
+                  out += 'is a required property';
+                } else {
+                  out += 'should have required property \\\'' + ($missingProperty) + '\\\'';
+                }
+                out += '\' ';
+              }
+              if (it.opts.verbose) {
+                out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+              }
+              out += ' } ';
+            } else {
+              out += ' {} ';
+            }
+            out += ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; } ';
+          }
+        }
+      }
+    }
+    it.errorPath = $currentErrorPath;
+  } else if ($breakOnError) {
+    out += ' if (true) {';
+  }
+  return out;
+}
+
+
+/***/ }),
+/* 672 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = function generate_uniqueItems(it, $keyword, $ruleType) {
+  var out = ' ';
+  var $lvl = it.level;
+  var $dataLvl = it.dataLevel;
+  var $schema = it.schema[$keyword];
+  var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
+  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
+  var $breakOnError = !it.opts.allErrors;
+  var $data = 'data' + ($dataLvl || '');
+  var $valid = 'valid' + $lvl;
+  var $isData = it.opts.$data && $schema && $schema.$data,
+    $schemaValue;
+  if ($isData) {
+    out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
+    $schemaValue = 'schema' + $lvl;
+  } else {
+    $schemaValue = $schema;
+  }
+  if (($schema || $isData) && it.opts.uniqueItems !== false) {
+    if ($isData) {
+      out += ' var ' + ($valid) + '; if (' + ($schemaValue) + ' === false || ' + ($schemaValue) + ' === undefined) ' + ($valid) + ' = true; else if (typeof ' + ($schemaValue) + ' != \'boolean\') ' + ($valid) + ' = false; else { ';
+    }
+    out += ' var ' + ($valid) + ' = true; if (' + ($data) + '.length > 1) { var i = ' + ($data) + '.length, j; outer: for (;i--;) { for (j = i; j--;) { if (equal(' + ($data) + '[i], ' + ($data) + '[j])) { ' + ($valid) + ' = false; break outer; } } } } ';
+    if ($isData) {
+      out += '  }  ';
+    }
+    out += ' if (!' + ($valid) + ') {   ';
+    var $$outStack = $$outStack || [];
+    $$outStack.push(out);
+    out = ''; /* istanbul ignore else */
+    if (it.createErrors !== false) {
+      out += ' { keyword: \'' + ('uniqueItems') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { i: i, j: j } ';
+      if (it.opts.messages !== false) {
+        out += ' , message: \'should NOT have duplicate items (items ## \' + j + \' and \' + i + \' are identical)\' ';
+      }
+      if (it.opts.verbose) {
+        out += ' , schema:  ';
+        if ($isData) {
+          out += 'validate.schema' + ($schemaPath);
+        } else {
+          out += '' + ($schema);
+        }
+        out += '         , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
+      }
+      out += ' } ';
+    } else {
+      out += ' {} ';
+    }
+    var __err = out;
+    out = $$outStack.pop();
+    if (!it.compositeRule && $breakOnError) { /* istanbul ignore if */
+      if (it.async) {
+        out += ' throw new ValidationError([' + (__err) + ']); ';
+      } else {
+        out += ' validate.errors = [' + (__err) + ']; return false; ';
+      }
+    } else {
+      out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
+    }
+    out += ' } ';
+    if ($breakOnError) {
+      out += ' else { ';
+    }
+  } else {
+    if ($breakOnError) {
+      out += ' if (true) { ';
+    }
+  }
+  return out;
+}
+
+
+/***/ }),
+/* 673 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var IDENTIFIER = /^[a-z_$][a-z0-9_$-]*$/i;
+var customRuleCode = __webpack_require__(659);
+
+module.exports = {
+  add: addKeyword,
+  get: getKeyword,
+  remove: removeKeyword
+};
+
+/**
+ * Define custom keyword
+ * @this  Ajv
+ * @param {String} keyword custom keyword, should be unique (including different from all standard, custom and macro keywords).
+ * @param {Object} definition keyword definition object with properties `type` (type(s) which the keyword applies to), `validate` or `compile`.
+ * @return {Ajv} this for method chaining
+ */
+function addKeyword(keyword, definition) {
+  /* jshint validthis: true */
+  /* eslint no-shadow: 0 */
+  var RULES = this.RULES;
+
+  if (RULES.keywords[keyword])
+    throw new Error('Keyword ' + keyword + ' is already defined');
+
+  if (!IDENTIFIER.test(keyword))
+    throw new Error('Keyword ' + keyword + ' is not a valid identifier');
+
+  if (definition) {
+    if (definition.macro && definition.valid !== undefined)
+      throw new Error('"valid" option cannot be used with macro keywords');
+
+    var dataType = definition.type;
+    if (Array.isArray(dataType)) {
+      var i, len = dataType.length;
+      for (i=0; i<len; i++) checkDataType(dataType[i]);
+      for (i=0; i<len; i++) _addRule(keyword, dataType[i], definition);
+    } else {
+      if (dataType) checkDataType(dataType);
+      _addRule(keyword, dataType, definition);
+    }
+
+    var $data = definition.$data === true && this._opts.$data;
+    if ($data && !definition.validate)
+      throw new Error('$data support: "validate" function is not defined');
+
+    var metaSchema = definition.metaSchema;
+    if (metaSchema) {
+      if ($data) {
+        metaSchema = {
+          anyOf: [
+            metaSchema,
+            { '$ref': 'https://raw.githubusercontent.com/epoberezkin/ajv/master/lib/refs/$data.json#' }
+          ]
+        };
+      }
+      definition.validateSchema = this.compile(metaSchema, true);
+    }
+  }
+
+  RULES.keywords[keyword] = RULES.all[keyword] = true;
+
+
+  function _addRule(keyword, dataType, definition) {
+    var ruleGroup;
+    for (var i=0; i<RULES.length; i++) {
+      var rg = RULES[i];
+      if (rg.type == dataType) {
+        ruleGroup = rg;
+        break;
+      }
+    }
+
+    if (!ruleGroup) {
+      ruleGroup = { type: dataType, rules: [] };
+      RULES.push(ruleGroup);
+    }
+
+    var rule = {
+      keyword: keyword,
+      definition: definition,
+      custom: true,
+      code: customRuleCode,
+      implements: definition.implements
+    };
+    ruleGroup.rules.push(rule);
+    RULES.custom[keyword] = rule;
+  }
+
+
+  function checkDataType(dataType) {
+    if (!RULES.types[dataType]) throw new Error('Unknown type ' + dataType);
+  }
+
+  return this;
+}
+
+
+/**
+ * Get keyword
+ * @this  Ajv
+ * @param {String} keyword pre-defined or custom keyword.
+ * @return {Object|Boolean} custom keyword definition, `true` if it is a predefined keyword, `false` otherwise.
+ */
+function getKeyword(keyword) {
+  /* jshint validthis: true */
+  var rule = this.RULES.custom[keyword];
+  return rule ? rule.definition : this.RULES.keywords[keyword] || false;
+}
+
+
+/**
+ * Remove keyword
+ * @this  Ajv
+ * @param {String} keyword pre-defined or custom keyword.
+ * @return {Ajv} this for method chaining
+ */
+function removeKeyword(keyword) {
+  /* jshint validthis: true */
+  var RULES = this.RULES;
+  delete RULES.keywords[keyword];
+  delete RULES.all[keyword];
+  delete RULES.custom[keyword];
+  for (var i=0; i<RULES.length; i++) {
+    var rules = RULES[i].rules;
+    for (var j=0; j<rules.length; j++) {
+      if (rules[j].keyword == keyword) {
+        rules.splice(j, 1);
+        break;
+      }
+    }
+  }
+  return this;
+}
+
+
+/***/ }),
+/* 674 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var META_SCHEMA_ID = 'http://json-schema.org/draft-06/schema';
+
+module.exports = function (ajv) {
+  var defaultMeta = ajv._opts.defaultMeta;
+  var metaSchemaRef = typeof defaultMeta == 'string'
+                      ? { $ref: defaultMeta }
+                      : ajv.getSchema(META_SCHEMA_ID)
+                        ? { $ref: META_SCHEMA_ID }
+                        : {};
+
+  ajv.addKeyword('patternGroups', {
+    // implemented in properties.jst
+    metaSchema: {
+      type: 'object',
+      additionalProperties: {
+        type: 'object',
+        required: [ 'schema' ],
+        properties: {
+          maximum: {
+            type: 'integer',
+            minimum: 0
+          },
+          minimum: {
+            type: 'integer',
+            minimum: 0
+          },
+          schema: metaSchemaRef
+        },
+        additionalProperties: false
+      }
+    }
+  });
+  ajv.RULES.all.properties.implements.push('patternGroups');
+};
+
+
+/***/ }),
+/* 675 */
+/***/ (function(module, exports) {
+
+module.exports = {"$schema":"http://json-schema.org/draft-06/schema#","$id":"https://raw.githubusercontent.com/epoberezkin/ajv/master/lib/refs/$data.json#","description":"Meta-schema for $data reference (JSON-schema extension proposal)","type":"object","required":["$data"],"properties":{"$data":{"type":"string","anyOf":[{"format":"relative-json-pointer"},{"format":"json-pointer"}]}},"additionalProperties":false}
+
+/***/ }),
+/* 676 */
+/***/ (function(module, exports) {
+
+module.exports = {"$schema":"http://json-schema.org/draft-06/schema#","$id":"http://json-schema.org/draft-06/schema#","title":"Core schema meta-schema","definitions":{"schemaArray":{"type":"array","minItems":1,"items":{"$ref":"#"}},"nonNegativeInteger":{"type":"integer","minimum":0},"nonNegativeIntegerDefault0":{"allOf":[{"$ref":"#/definitions/nonNegativeInteger"},{"default":0}]},"simpleTypes":{"enum":["array","boolean","integer","null","number","object","string"]},"stringArray":{"type":"array","items":{"type":"string"},"uniqueItems":true,"default":[]}},"type":["object","boolean"],"properties":{"$id":{"type":"string","format":"uri-reference"},"$schema":{"type":"string","format":"uri"},"$ref":{"type":"string","format":"uri-reference"},"title":{"type":"string"},"description":{"type":"string"},"default":{},"examples":{"type":"array","items":{}},"multipleOf":{"type":"number","exclusiveMinimum":0},"maximum":{"type":"number"},"exclusiveMaximum":{"type":"number"},"minimum":{"type":"number"},"exclusiveMinimum":{"type":"number"},"maxLength":{"$ref":"#/definitions/nonNegativeInteger"},"minLength":{"$ref":"#/definitions/nonNegativeIntegerDefault0"},"pattern":{"type":"string","format":"regex"},"additionalItems":{"$ref":"#"},"items":{"anyOf":[{"$ref":"#"},{"$ref":"#/definitions/schemaArray"}],"default":{}},"maxItems":{"$ref":"#/definitions/nonNegativeInteger"},"minItems":{"$ref":"#/definitions/nonNegativeIntegerDefault0"},"uniqueItems":{"type":"boolean","default":false},"contains":{"$ref":"#"},"maxProperties":{"$ref":"#/definitions/nonNegativeInteger"},"minProperties":{"$ref":"#/definitions/nonNegativeIntegerDefault0"},"required":{"$ref":"#/definitions/stringArray"},"additionalProperties":{"$ref":"#"},"definitions":{"type":"object","additionalProperties":{"$ref":"#"},"default":{}},"properties":{"type":"object","additionalProperties":{"$ref":"#"},"default":{}},"patternProperties":{"type":"object","additionalProperties":{"$ref":"#"},"default":{}},"dependencies":{"type":"object","additionalProperties":{"anyOf":[{"$ref":"#"},{"$ref":"#/definitions/stringArray"}]}},"propertyNames":{"$ref":"#"},"const":{},"enum":{"type":"array","minItems":1,"uniqueItems":true},"type":{"anyOf":[{"$ref":"#/definitions/simpleTypes"},{"type":"array","items":{"$ref":"#/definitions/simpleTypes"},"minItems":1,"uniqueItems":true}]},"format":{"type":"string"},"allOf":{"$ref":"#/definitions/schemaArray"},"anyOf":{"$ref":"#/definitions/schemaArray"},"oneOf":{"$ref":"#/definitions/schemaArray"},"not":{"$ref":"#"}},"default":{}}
+
+/***/ }),
+/* 677 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var traverse = module.exports = function (schema, opts, cb) {
+  if (typeof opts == 'function') {
+    cb = opts;
+    opts = {};
+  }
+  _traverse(opts, cb, schema, '', schema);
+};
+
+
+traverse.keywords = {
+  additionalItems: true,
+  items: true,
+  contains: true,
+  additionalProperties: true,
+  propertyNames: true,
+  not: true
+};
+
+traverse.arrayKeywords = {
+  items: true,
+  allOf: true,
+  anyOf: true,
+  oneOf: true
+};
+
+traverse.propsKeywords = {
+  definitions: true,
+  properties: true,
+  patternProperties: true,
+  dependencies: true
+};
+
+traverse.skipKeywords = {
+  enum: true,
+  const: true,
+  required: true,
+  maximum: true,
+  minimum: true,
+  exclusiveMaximum: true,
+  exclusiveMinimum: true,
+  multipleOf: true,
+  maxLength: true,
+  minLength: true,
+  pattern: true,
+  format: true,
+  maxItems: true,
+  minItems: true,
+  uniqueItems: true,
+  maxProperties: true,
+  minProperties: true
+};
+
+
+function _traverse(opts, cb, schema, jsonPtr, rootSchema, parentJsonPtr, parentKeyword, parentSchema, keyIndex) {
+  if (schema && typeof schema == 'object' && !Array.isArray(schema)) {
+    cb(schema, jsonPtr, rootSchema, parentJsonPtr, parentKeyword, parentSchema, keyIndex);
+    for (var key in schema) {
+      var sch = schema[key];
+      if (Array.isArray(sch)) {
+        if (key in traverse.arrayKeywords) {
+          for (var i=0; i<sch.length; i++)
+            _traverse(opts, cb, sch[i], jsonPtr + '/' + key + '/' + i, rootSchema, jsonPtr, key, schema, i);
+        }
+      } else if (key in traverse.propsKeywords) {
+        if (sch && typeof sch == 'object') {
+          for (var prop in sch)
+            _traverse(opts, cb, sch[prop], jsonPtr + '/' + key + '/' + escapeJsonPtr(prop), rootSchema, jsonPtr, key, schema, prop);
+        }
+      } else if (key in traverse.keywords || (opts.allKeys && !(key in traverse.skipKeywords))) {
+        _traverse(opts, cb, sch, jsonPtr + '/' + key, rootSchema, jsonPtr, key, schema);
+      }
+    }
+  }
+}
+
+
+function escapeJsonPtr(str) {
+  return str.replace(/~/g, '~0').replace(/\//g, '~1');
+}
+
+
 /***/ }),
 /* 678 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -114635,7 +114772,7 @@ module.exports = function resolvePkg(name, dir) {
 var parser = __webpack_require__(681);
 var signer = __webpack_require__(682);
 var verify = __webpack_require__(683);
-var utils = __webpack_require__(174);
+var utils = __webpack_require__(175);
 
 
 
@@ -114669,7 +114806,7 @@ module.exports = {
 
 var assert = __webpack_require__(16);
 var util = __webpack_require__(3);
-var utils = __webpack_require__(174);
+var utils = __webpack_require__(175);
 
 
 
@@ -114994,7 +115131,7 @@ var http = __webpack_require__(87);
 var util = __webpack_require__(3);
 var sshpk = __webpack_require__(328);
 var jsprim = __webpack_require__(746);
-var utils = __webpack_require__(174);
+var utils = __webpack_require__(175);
 
 var sprintf = __webpack_require__(3).format;
 
@@ -115398,7 +115535,7 @@ module.exports = {
 var assert = __webpack_require__(16);
 var crypto = __webpack_require__(11);
 var sshpk = __webpack_require__(328);
-var utils = __webpack_require__(174);
+var utils = __webpack_require__(175);
 
 var HASH_ALGOS = utils.HASH_ALGOS;
 var PK_ALGOS = utils.PK_ALGOS;
@@ -115735,7 +115872,7 @@ module.exports = class Choice {
 
 var assert = __webpack_require__(28);
 var _ = __webpack_require__(38);
-var Separator = __webpack_require__(175);
+var Separator = __webpack_require__(176);
 var Choice = __webpack_require__(685);
 
 /**
@@ -115860,12 +115997,12 @@ module.exports = class Choices {
 
 var _ = __webpack_require__(38);
 var chalk = __webpack_require__(30);
-var cliCursor = __webpack_require__(381);
-var figures = __webpack_require__(270);
+var cliCursor = __webpack_require__(375);
+var figures = __webpack_require__(267);
 var { map, takeUntil } = __webpack_require__(63);
 var Base = __webpack_require__(79);
 var observe = __webpack_require__(80);
-var Paginator = __webpack_require__(176);
+var Paginator = __webpack_require__(177);
 
 class CheckboxPrompt extends Base {
   constructor(questions, rl, answers) {
@@ -116229,7 +116366,7 @@ var chalk = __webpack_require__(30);
 var editAsync = __webpack_require__(709).editAsync;
 var Base = __webpack_require__(79);
 var observe = __webpack_require__(80);
-var { Subject } = __webpack_require__(182);
+var { Subject } = __webpack_require__(183);
 
 class EditorPrompt extends Base {
   /**
@@ -116336,9 +116473,9 @@ var _ = __webpack_require__(38);
 var chalk = __webpack_require__(30);
 var { map, takeUntil } = __webpack_require__(63);
 var Base = __webpack_require__(79);
-var Separator = __webpack_require__(175);
+var Separator = __webpack_require__(176);
 var observe = __webpack_require__(80);
-var Paginator = __webpack_require__(176);
+var Paginator = __webpack_require__(177);
 
 class ExpandPrompt extends Base {
   constructor(questions, rl, answers) {
@@ -116608,13 +116745,13 @@ module.exports = ExpandPrompt;
 
 var _ = __webpack_require__(38);
 var chalk = __webpack_require__(30);
-var figures = __webpack_require__(270);
-var cliCursor = __webpack_require__(381);
-var runAsync = __webpack_require__(181);
+var figures = __webpack_require__(267);
+var cliCursor = __webpack_require__(375);
+var runAsync = __webpack_require__(182);
 var { flatMap, map, take, takeUntil } = __webpack_require__(63);
 var Base = __webpack_require__(79);
 var observe = __webpack_require__(80);
-var Paginator = __webpack_require__(176);
+var Paginator = __webpack_require__(177);
 
 class ListPrompt extends Base {
   constructor(questions, rl, answers) {
@@ -116950,9 +117087,9 @@ var _ = __webpack_require__(38);
 var chalk = __webpack_require__(30);
 var { map, takeUntil } = __webpack_require__(63);
 var Base = __webpack_require__(79);
-var Separator = __webpack_require__(175);
+var Separator = __webpack_require__(176);
 var observe = __webpack_require__(80);
-var Paginator = __webpack_require__(176);
+var Paginator = __webpack_require__(177);
 
 class RawListPrompt extends Base {
   constructor(questions, rl, answers) {
@@ -117237,9 +117374,9 @@ module.exports = BottomBar;
 "use strict";
 
 var _ = __webpack_require__(38);
-var { defer, empty, from, of } = __webpack_require__(182);
+var { defer, empty, from, of } = __webpack_require__(183);
 var { concatMap, filter, publish, reduce } = __webpack_require__(63);
-var runAsync = __webpack_require__(181);
+var runAsync = __webpack_require__(182);
 var utils = __webpack_require__(698);
 var Base = __webpack_require__(393);
 
@@ -117347,8 +117484,8 @@ class PromptUI extends Base {
     var answers = this.answers;
     return defer(() =>
       from(
-        runAsync(question.when)(answers).then(conditions => {
-          if (conditions) {
+        runAsync(question.when)(answers).then(shouldRun => {
+          if (shouldRun) {
             return question;
           }
         })
@@ -117368,7 +117505,7 @@ module.exports = PromptUI;
 
 var _ = __webpack_require__(38);
 var util = __webpack_require__(394);
-var cliWidth = __webpack_require__(606);
+var cliWidth = __webpack_require__(574);
 var stripAnsi = __webpack_require__(329);
 var stringWidth = __webpack_require__(728);
 
@@ -117512,8 +117649,8 @@ module.exports = ScreenManager;
 "use strict";
 
 var _ = __webpack_require__(38);
-var { from, of } = __webpack_require__(182);
-var runAsync = __webpack_require__(181);
+var { from, of } = __webpack_require__(183);
+var runAsync = __webpack_require__(182);
 
 /**
  * Resolve a question property value if it is passed as a function.
@@ -119320,7 +119457,7 @@ module.exports = function() {
 /***/ (function(module, exports, __webpack_require__) {
 
 
-var fs = __webpack_require__(5);
+var fs = __webpack_require__(4);
 
 var utf8  = __webpack_require__(703),
   unicode = __webpack_require__(702),
@@ -119671,7 +119808,7 @@ exports.RemoveFileError = RemoveFileError;
 Object.defineProperty(exports, "__esModule", { value: true });
 var chardet_1 = __webpack_require__(704);
 var child_process_1 = __webpack_require__(331);
-var fs_1 = __webpack_require__(5);
+var fs_1 = __webpack_require__(4);
 var iconv_lite_1 = __webpack_require__(726);
 var tmp_1 = __webpack_require__(954);
 var CreateFileError_1 = __webpack_require__(705);
@@ -123033,280 +123170,280 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 /* 744 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/**
- * JSONSchema Validator - Validates JavaScript objects using JSON Schemas
- *	(http://www.json.com/json-schema-proposal/)
- *
- * Copyright (c) 2007 Kris Zyp SitePen (www.sitepen.com)
- * Licensed under the MIT (MIT-LICENSE.txt) license.
-To use the validator call the validate function with an instance object and an optional schema object.
-If a schema is provided, it will be used to validate. If the instance object refers to a schema (self-validating),
-that schema will be used to validate and the schema parameter is not necessary (if both exist,
-both validations will occur).
-The validate method will return an array of validation errors. If there are no errors, then an
-empty list will be returned. A validation error will have two properties:
-"property" which indicates which property had the error
-"message" which indicates what the error was
- */
-(function (root, factory) {
-    if (true) {
-        // AMD. Register as an anonymous module.
-        !(__WEBPACK_AMD_DEFINE_ARRAY__ = [], __WEBPACK_AMD_DEFINE_RESULT__ = function () {
-            return factory();
+var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/**
+ * JSONSchema Validator - Validates JavaScript objects using JSON Schemas
+ *	(http://www.json.com/json-schema-proposal/)
+ *
+ * Copyright (c) 2007 Kris Zyp SitePen (www.sitepen.com)
+ * Licensed under the MIT (MIT-LICENSE.txt) license.
+To use the validator call the validate function with an instance object and an optional schema object.
+If a schema is provided, it will be used to validate. If the instance object refers to a schema (self-validating),
+that schema will be used to validate and the schema parameter is not necessary (if both exist,
+both validations will occur).
+The validate method will return an array of validation errors. If there are no errors, then an
+empty list will be returned. A validation error will have two properties:
+"property" which indicates which property had the error
+"message" which indicates what the error was
+ */
+(function (root, factory) {
+    if (true) {
+        // AMD. Register as an anonymous module.
+        !(__WEBPACK_AMD_DEFINE_ARRAY__ = [], __WEBPACK_AMD_DEFINE_RESULT__ = function () {
+            return factory();
         }.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__),
-				__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
-    } else if (typeof module === 'object' && module.exports) {
-        // Node. Does not work with strict CommonJS, but
-        // only CommonJS-like environments that support module.exports,
-        // like Node.
-        module.exports = factory();
-    } else {
-        // Browser globals
-        root.jsonSchema = factory();
-    }
-}(this, function () {// setup primitive classes to be JSON Schema types
-var exports = validate
-exports.Integer = {type:"integer"};
-var primitiveConstructors = {
-	String: String,
-	Boolean: Boolean,
-	Number: Number,
-	Object: Object,
-	Array: Array,
-	Date: Date
-}
-exports.validate = validate;
-function validate(/*Any*/instance,/*Object*/schema) {
-		// Summary:
-		//  	To use the validator call JSONSchema.validate with an instance object and an optional schema object.
-		// 		If a schema is provided, it will be used to validate. If the instance object refers to a schema (self-validating),
-		// 		that schema will be used to validate and the schema parameter is not necessary (if both exist,
-		// 		both validations will occur).
-		// 		The validate method will return an object with two properties:
-		// 			valid: A boolean indicating if the instance is valid by the schema
-		// 			errors: An array of validation errors. If there are no errors, then an
-		// 					empty list will be returned. A validation error will have two properties:
-		// 						property: which indicates which property had the error
-		// 						message: which indicates what the error was
-		//
-		return validate(instance, schema, {changing: false});//, coerce: false, existingOnly: false});
-	};
-exports.checkPropertyChange = function(/*Any*/value,/*Object*/schema, /*String*/property) {
-		// Summary:
-		// 		The checkPropertyChange method will check to see if an value can legally be in property with the given schema
-		// 		This is slightly different than the validate method in that it will fail if the schema is readonly and it will
-		// 		not check for self-validation, it is assumed that the passed in value is already internally valid.
-		// 		The checkPropertyChange method will return the same object type as validate, see JSONSchema.validate for
-		// 		information.
-		//
-		return validate(value, schema, {changing: property || "property"});
-	};
-var validate = exports._validate = function(/*Any*/instance,/*Object*/schema,/*Object*/options) {
-
-	if (!options) options = {};
-	var _changing = options.changing;
-
-	function getType(schema){
-		return schema.type || (primitiveConstructors[schema.name] == schema && schema.name.toLowerCase());
-	}
-	var errors = [];
-	// validate a value against a property definition
-	function checkProp(value, schema, path,i){
-
-		var l;
-		path += path ? typeof i == 'number' ? '[' + i + ']' : typeof i == 'undefined' ? '' : '.' + i : i;
-		function addError(message){
-			errors.push({property:path,message:message});
-		}
-
-		if((typeof schema != 'object' || schema instanceof Array) && (path || typeof schema != 'function') && !(schema && getType(schema))){
-			if(typeof schema == 'function'){
-				if(!(value instanceof schema)){
-					addError("is not an instance of the class/constructor " + schema.name);
-				}
-			}else if(schema){
-				addError("Invalid schema/property definition " + schema);
-			}
-			return null;
-		}
-		if(_changing && schema.readonly){
-			addError("is a readonly field, it can not be changed");
-		}
-		if(schema['extends']){ // if it extends another schema, it must pass that schema as well
-			checkProp(value,schema['extends'],path,i);
-		}
-		// validate a value against a type definition
-		function checkType(type,value){
-			if(type){
-				if(typeof type == 'string' && type != 'any' &&
-						(type == 'null' ? value !== null : typeof value != type) &&
-						!(value instanceof Array && type == 'array') &&
-						!(value instanceof Date && type == 'date') &&
-						!(type == 'integer' && value%1===0)){
-					return [{property:path,message:(typeof value) + " value found, but a " + type + " is required"}];
-				}
-				if(type instanceof Array){
-					var unionErrors=[];
-					for(var j = 0; j < type.length; j++){ // a union type
-						if(!(unionErrors=checkType(type[j],value)).length){
-							break;
-						}
-					}
-					if(unionErrors.length){
-						return unionErrors;
-					}
-				}else if(typeof type == 'object'){
-					var priorErrors = errors;
-					errors = [];
-					checkProp(value,type,path);
-					var theseErrors = errors;
-					errors = priorErrors;
-					return theseErrors;
-				}
-			}
-			return [];
-		}
-		if(value === undefined){
-			if(schema.required){
-				addError("is missing and it is required");
-			}
-		}else{
-			errors = errors.concat(checkType(getType(schema),value));
-			if(schema.disallow && !checkType(schema.disallow,value).length){
-				addError(" disallowed value was matched");
-			}
-			if(value !== null){
-				if(value instanceof Array){
-					if(schema.items){
-						var itemsIsArray = schema.items instanceof Array;
-						var propDef = schema.items;
-						for (i = 0, l = value.length; i < l; i += 1) {
-							if (itemsIsArray)
-								propDef = schema.items[i];
-							if (options.coerce)
-								value[i] = options.coerce(value[i], propDef);
-							errors.concat(checkProp(value[i],propDef,path,i));
-						}
-					}
-					if(schema.minItems && value.length < schema.minItems){
-						addError("There must be a minimum of " + schema.minItems + " in the array");
-					}
-					if(schema.maxItems && value.length > schema.maxItems){
-						addError("There must be a maximum of " + schema.maxItems + " in the array");
-					}
-				}else if(schema.properties || schema.additionalProperties){
-					errors.concat(checkObj(value, schema.properties, path, schema.additionalProperties));
-				}
-				if(schema.pattern && typeof value == 'string' && !value.match(schema.pattern)){
-					addError("does not match the regex pattern " + schema.pattern);
-				}
-				if(schema.maxLength && typeof value == 'string' && value.length > schema.maxLength){
-					addError("may only be " + schema.maxLength + " characters long");
-				}
-				if(schema.minLength && typeof value == 'string' && value.length < schema.minLength){
-					addError("must be at least " + schema.minLength + " characters long");
-				}
-				if(typeof schema.minimum !== undefined && typeof value == typeof schema.minimum &&
-						schema.minimum > value){
-					addError("must have a minimum value of " + schema.minimum);
-				}
-				if(typeof schema.maximum !== undefined && typeof value == typeof schema.maximum &&
-						schema.maximum < value){
-					addError("must have a maximum value of " + schema.maximum);
-				}
-				if(schema['enum']){
-					var enumer = schema['enum'];
-					l = enumer.length;
-					var found;
-					for(var j = 0; j < l; j++){
-						if(enumer[j]===value){
-							found=1;
-							break;
-						}
-					}
-					if(!found){
-						addError("does not have a value in the enumeration " + enumer.join(", "));
-					}
-				}
-				if(typeof schema.maxDecimal == 'number' &&
-					(value.toString().match(new RegExp("\\.[0-9]{" + (schema.maxDecimal + 1) + ",}")))){
-					addError("may only have " + schema.maxDecimal + " digits of decimal places");
-				}
-			}
-		}
-		return null;
-	}
-	// validate an object against a schema
-	function checkObj(instance,objTypeDef,path,additionalProp){
-
-		if(typeof objTypeDef =='object'){
-			if(typeof instance != 'object' || instance instanceof Array){
-				errors.push({property:path,message:"an object is required"});
-			}
-			
-			for(var i in objTypeDef){ 
-				if(objTypeDef.hasOwnProperty(i)){
-					var value = instance[i];
-					// skip _not_ specified properties
-					if (value === undefined && options.existingOnly) continue;
-					var propDef = objTypeDef[i];
-					// set default
-					if(value === undefined && propDef["default"]){
-						value = instance[i] = propDef["default"];
-					}
-					if(options.coerce && i in instance){
-						value = instance[i] = options.coerce(value, propDef);
-					}
-					checkProp(value,propDef,path,i);
-				}
-			}
-		}
-		for(i in instance){
-			if(instance.hasOwnProperty(i) && !(i.charAt(0) == '_' && i.charAt(1) == '_') && objTypeDef && !objTypeDef[i] && additionalProp===false){
-				if (options.filter) {
-					delete instance[i];
-					continue;
-				} else {
-					errors.push({property:path,message:(typeof value) + "The property " + i +
-						" is not defined in the schema and the schema does not allow additional properties"});
-				}
-			}
-			var requires = objTypeDef && objTypeDef[i] && objTypeDef[i].requires;
-			if(requires && !(requires in instance)){
-				errors.push({property:path,message:"the presence of the property " + i + " requires that " + requires + " also be present"});
-			}
-			value = instance[i];
-			if(additionalProp && (!(objTypeDef && typeof objTypeDef == 'object') || !(i in objTypeDef))){
-				if(options.coerce){
-					value = instance[i] = options.coerce(value, additionalProp);
-				}
-				checkProp(value,additionalProp,path,i);
-			}
-			if(!_changing && value && value.$schema){
-				errors = errors.concat(checkProp(value,value.$schema,path,i));
-			}
-		}
-		return errors;
-	}
-	if(schema){
-		checkProp(instance,schema,'',_changing || '');
-	}
-	if(!_changing && instance && instance.$schema){
-		checkProp(instance,instance.$schema,'','');
-	}
-	return {valid:!errors.length,errors:errors};
-};
-exports.mustBeValid = function(result){
-	//	summary:
-	//		This checks to ensure that the result is valid and will throw an appropriate error message if it is not
-	// result: the result returned from checkPropertyChange or validate
-	if(!result.valid){
-		throw new TypeError(result.errors.map(function(error){return "for property " + error.property + ': ' + error.message;}).join(", \n"));
-	}
-}
-
-return exports;
-}));
+				__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
+    } else if (typeof module === 'object' && module.exports) {
+        // Node. Does not work with strict CommonJS, but
+        // only CommonJS-like environments that support module.exports,
+        // like Node.
+        module.exports = factory();
+    } else {
+        // Browser globals
+        root.jsonSchema = factory();
+    }
+}(this, function () {// setup primitive classes to be JSON Schema types
+var exports = validate
+exports.Integer = {type:"integer"};
+var primitiveConstructors = {
+	String: String,
+	Boolean: Boolean,
+	Number: Number,
+	Object: Object,
+	Array: Array,
+	Date: Date
+}
+exports.validate = validate;
+function validate(/*Any*/instance,/*Object*/schema) {
+		// Summary:
+		//  	To use the validator call JSONSchema.validate with an instance object and an optional schema object.
+		// 		If a schema is provided, it will be used to validate. If the instance object refers to a schema (self-validating),
+		// 		that schema will be used to validate and the schema parameter is not necessary (if both exist,
+		// 		both validations will occur).
+		// 		The validate method will return an object with two properties:
+		// 			valid: A boolean indicating if the instance is valid by the schema
+		// 			errors: An array of validation errors. If there are no errors, then an
+		// 					empty list will be returned. A validation error will have two properties:
+		// 						property: which indicates which property had the error
+		// 						message: which indicates what the error was
+		//
+		return validate(instance, schema, {changing: false});//, coerce: false, existingOnly: false});
+	};
+exports.checkPropertyChange = function(/*Any*/value,/*Object*/schema, /*String*/property) {
+		// Summary:
+		// 		The checkPropertyChange method will check to see if an value can legally be in property with the given schema
+		// 		This is slightly different than the validate method in that it will fail if the schema is readonly and it will
+		// 		not check for self-validation, it is assumed that the passed in value is already internally valid.
+		// 		The checkPropertyChange method will return the same object type as validate, see JSONSchema.validate for
+		// 		information.
+		//
+		return validate(value, schema, {changing: property || "property"});
+	};
+var validate = exports._validate = function(/*Any*/instance,/*Object*/schema,/*Object*/options) {
+
+	if (!options) options = {};
+	var _changing = options.changing;
+
+	function getType(schema){
+		return schema.type || (primitiveConstructors[schema.name] == schema && schema.name.toLowerCase());
+	}
+	var errors = [];
+	// validate a value against a property definition
+	function checkProp(value, schema, path,i){
+
+		var l;
+		path += path ? typeof i == 'number' ? '[' + i + ']' : typeof i == 'undefined' ? '' : '.' + i : i;
+		function addError(message){
+			errors.push({property:path,message:message});
+		}
+
+		if((typeof schema != 'object' || schema instanceof Array) && (path || typeof schema != 'function') && !(schema && getType(schema))){
+			if(typeof schema == 'function'){
+				if(!(value instanceof schema)){
+					addError("is not an instance of the class/constructor " + schema.name);
+				}
+			}else if(schema){
+				addError("Invalid schema/property definition " + schema);
+			}
+			return null;
+		}
+		if(_changing && schema.readonly){
+			addError("is a readonly field, it can not be changed");
+		}
+		if(schema['extends']){ // if it extends another schema, it must pass that schema as well
+			checkProp(value,schema['extends'],path,i);
+		}
+		// validate a value against a type definition
+		function checkType(type,value){
+			if(type){
+				if(typeof type == 'string' && type != 'any' &&
+						(type == 'null' ? value !== null : typeof value != type) &&
+						!(value instanceof Array && type == 'array') &&
+						!(value instanceof Date && type == 'date') &&
+						!(type == 'integer' && value%1===0)){
+					return [{property:path,message:(typeof value) + " value found, but a " + type + " is required"}];
+				}
+				if(type instanceof Array){
+					var unionErrors=[];
+					for(var j = 0; j < type.length; j++){ // a union type
+						if(!(unionErrors=checkType(type[j],value)).length){
+							break;
+						}
+					}
+					if(unionErrors.length){
+						return unionErrors;
+					}
+				}else if(typeof type == 'object'){
+					var priorErrors = errors;
+					errors = [];
+					checkProp(value,type,path);
+					var theseErrors = errors;
+					errors = priorErrors;
+					return theseErrors;
+				}
+			}
+			return [];
+		}
+		if(value === undefined){
+			if(schema.required){
+				addError("is missing and it is required");
+			}
+		}else{
+			errors = errors.concat(checkType(getType(schema),value));
+			if(schema.disallow && !checkType(schema.disallow,value).length){
+				addError(" disallowed value was matched");
+			}
+			if(value !== null){
+				if(value instanceof Array){
+					if(schema.items){
+						var itemsIsArray = schema.items instanceof Array;
+						var propDef = schema.items;
+						for (i = 0, l = value.length; i < l; i += 1) {
+							if (itemsIsArray)
+								propDef = schema.items[i];
+							if (options.coerce)
+								value[i] = options.coerce(value[i], propDef);
+							errors.concat(checkProp(value[i],propDef,path,i));
+						}
+					}
+					if(schema.minItems && value.length < schema.minItems){
+						addError("There must be a minimum of " + schema.minItems + " in the array");
+					}
+					if(schema.maxItems && value.length > schema.maxItems){
+						addError("There must be a maximum of " + schema.maxItems + " in the array");
+					}
+				}else if(schema.properties || schema.additionalProperties){
+					errors.concat(checkObj(value, schema.properties, path, schema.additionalProperties));
+				}
+				if(schema.pattern && typeof value == 'string' && !value.match(schema.pattern)){
+					addError("does not match the regex pattern " + schema.pattern);
+				}
+				if(schema.maxLength && typeof value == 'string' && value.length > schema.maxLength){
+					addError("may only be " + schema.maxLength + " characters long");
+				}
+				if(schema.minLength && typeof value == 'string' && value.length < schema.minLength){
+					addError("must be at least " + schema.minLength + " characters long");
+				}
+				if(typeof schema.minimum !== undefined && typeof value == typeof schema.minimum &&
+						schema.minimum > value){
+					addError("must have a minimum value of " + schema.minimum);
+				}
+				if(typeof schema.maximum !== undefined && typeof value == typeof schema.maximum &&
+						schema.maximum < value){
+					addError("must have a maximum value of " + schema.maximum);
+				}
+				if(schema['enum']){
+					var enumer = schema['enum'];
+					l = enumer.length;
+					var found;
+					for(var j = 0; j < l; j++){
+						if(enumer[j]===value){
+							found=1;
+							break;
+						}
+					}
+					if(!found){
+						addError("does not have a value in the enumeration " + enumer.join(", "));
+					}
+				}
+				if(typeof schema.maxDecimal == 'number' &&
+					(value.toString().match(new RegExp("\\.[0-9]{" + (schema.maxDecimal + 1) + ",}")))){
+					addError("may only have " + schema.maxDecimal + " digits of decimal places");
+				}
+			}
+		}
+		return null;
+	}
+	// validate an object against a schema
+	function checkObj(instance,objTypeDef,path,additionalProp){
+
+		if(typeof objTypeDef =='object'){
+			if(typeof instance != 'object' || instance instanceof Array){
+				errors.push({property:path,message:"an object is required"});
+			}
+			
+			for(var i in objTypeDef){ 
+				if(objTypeDef.hasOwnProperty(i)){
+					var value = instance[i];
+					// skip _not_ specified properties
+					if (value === undefined && options.existingOnly) continue;
+					var propDef = objTypeDef[i];
+					// set default
+					if(value === undefined && propDef["default"]){
+						value = instance[i] = propDef["default"];
+					}
+					if(options.coerce && i in instance){
+						value = instance[i] = options.coerce(value, propDef);
+					}
+					checkProp(value,propDef,path,i);
+				}
+			}
+		}
+		for(i in instance){
+			if(instance.hasOwnProperty(i) && !(i.charAt(0) == '_' && i.charAt(1) == '_') && objTypeDef && !objTypeDef[i] && additionalProp===false){
+				if (options.filter) {
+					delete instance[i];
+					continue;
+				} else {
+					errors.push({property:path,message:(typeof value) + "The property " + i +
+						" is not defined in the schema and the schema does not allow additional properties"});
+				}
+			}
+			var requires = objTypeDef && objTypeDef[i] && objTypeDef[i].requires;
+			if(requires && !(requires in instance)){
+				errors.push({property:path,message:"the presence of the property " + i + " requires that " + requires + " also be present"});
+			}
+			value = instance[i];
+			if(additionalProp && (!(objTypeDef && typeof objTypeDef == 'object') || !(i in objTypeDef))){
+				if(options.coerce){
+					value = instance[i] = options.coerce(value, additionalProp);
+				}
+				checkProp(value,additionalProp,path,i);
+			}
+			if(!_changing && value && value.$schema){
+				errors = errors.concat(checkProp(value,value.$schema,path,i));
+			}
+		}
+		return errors;
+	}
+	if(schema){
+		checkProp(instance,schema,'',_changing || '');
+	}
+	if(!_changing && instance && instance.$schema){
+		checkProp(instance,instance.$schema,'','');
+	}
+	return {valid:!errors.length,errors:errors};
+};
+exports.mustBeValid = function(result){
+	//	summary:
+	//		This checks to ensure that the result is valid and will throw an appropriate error message if it is not
+	// result: the result returned from checkPropertyChange or validate
+	if(!result.valid){
+		throw new TypeError(result.errors.map(function(error){return "for property " + error.property + ': ' + error.message;}).join(", \n"));
+	}
+}
+
+return exports;
+}));
 
 
 /***/ }),
@@ -123353,7 +123490,7 @@ function serializer(replacer, cycleReplacer) {
 var mod_assert = __webpack_require__(16);
 var mod_util = __webpack_require__(3);
 
-var mod_extsprintf = __webpack_require__(645);
+var mod_extsprintf = __webpack_require__(613);
 var mod_verror = __webpack_require__(960);
 var mod_jsonschema = __webpack_require__(744);
 
@@ -127505,7 +127642,7 @@ function unesc(str) {
 
 
 
-var flatten = __webpack_require__(510);
+var flatten = __webpack_require__(478);
 var slice = [].slice;
 
 /**
@@ -127609,7 +127746,7 @@ module.exports = function unique(arr) {
  * Module dependencies
  */
 
-var expand = __webpack_require__(640);
+var expand = __webpack_require__(608);
 var repeat = __webpack_require__(411);
 var tokens = __webpack_require__(778);
 
@@ -128057,12 +128194,12 @@ module.exports = function (dir, opts) {
 /***/ (function(module, exports, __webpack_require__) {
 
 
-var Promise = __webpack_require__(345)
+var Promise = __webpack_require__(339)
 var fs
 try {
-  fs = __webpack_require__(391)
+  fs = __webpack_require__(385)
 } catch(err) {
-  fs = __webpack_require__(5)
+  fs = __webpack_require__(4)
 }
 
 var api = [
@@ -128673,7 +128810,7 @@ module.exports = Number.isNaN || function (x) {
 /***/ (function(module, exports, __webpack_require__) {
 
 var crypto = __webpack_require__(11)
-  , qs = __webpack_require__(196)
+  , qs = __webpack_require__(197)
   ;
 
 function sha1 (key, body) {
@@ -128871,7 +129008,7 @@ module.exports = function omit(obj, keys) {
 
 
 
-var forIn = __webpack_require__(647);
+var forIn = __webpack_require__(615);
 var hasOwn = Object.prototype.hasOwnProperty;
 
 module.exports = function forOwn(obj, fn, thisArg) {
@@ -128975,9 +129112,9 @@ module.exports = function () {
 
 
 
-var isGlob = __webpack_require__(178);
-var findBase = __webpack_require__(652);
-var extglob = __webpack_require__(177);
+var isGlob = __webpack_require__(179);
+var findBase = __webpack_require__(620);
+var extglob = __webpack_require__(178);
 var dotfile = __webpack_require__(733);
 
 /**
@@ -129228,9 +129365,9 @@ module.exports.win32 = win32.parse;
 /* 775 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var duplexify = __webpack_require__(386)
+var duplexify = __webpack_require__(380)
 var through = __webpack_require__(461)
-var bufferFrom = __webpack_require__(595)
+var bufferFrom = __webpack_require__(563)
 
 var noop = function() {}
 
@@ -130228,8 +130365,8 @@ exports.unquoted = unquoted;
 /***/ (function(module, exports, __webpack_require__) {
 
 var once = __webpack_require__(83)
-var eos = __webpack_require__(173)
-var fs = __webpack_require__(5) // we only need fs to get the ReadStream and WriteStream prototypes
+var eos = __webpack_require__(174)
+var fs = __webpack_require__(4) // we only need fs to get the ReadStream and WriteStream prototypes
 
 var noop = function () {}
 
@@ -130315,7 +130452,7 @@ module.exports = pump
 
 var pump = __webpack_require__(783)
 var inherits = __webpack_require__(61)
-var Duplexify = __webpack_require__(386)
+var Duplexify = __webpack_require__(380)
 
 var toArray = function(args) {
   if (!args.length) return []
@@ -130380,8 +130517,8 @@ module.exports.ctor = define
 /***/ (function(module, exports, __webpack_require__) {
 
 var once = __webpack_require__(83)
-var eos = __webpack_require__(173)
-var fs = __webpack_require__(5) // we only need fs to get the ReadStream and WriteStream prototypes
+var eos = __webpack_require__(174)
+var fs = __webpack_require__(4) // we only need fs to get the ReadStream and WriteStream prototypes
 
 var noop = function () {}
 var ancient = /^v?\.0/.test(process.version)
@@ -130869,7 +131006,7 @@ module.exports = function (object, opts) {
 
 var strictUriEncode = __webpack_require__(943);
 var objectAssign = __webpack_require__(303);
-var decodeComponent = __webpack_require__(630);
+var decodeComponent = __webpack_require__(598);
 
 function encoderForArrayFormat(opts) {
 	switch (opts.arrayFormat) {
@@ -131355,7 +131492,7 @@ function isBuffer(val) {
 
 module.exports = read
 
-var readline = __webpack_require__(197)
+var readline = __webpack_require__(198)
 var Mute = __webpack_require__(401)
 
 function read (opts, cb) {
@@ -131804,7 +131941,7 @@ module.exports = {"name":"request-capture-har","version":"1.2.2","description":"
 /* 799 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var fs = __webpack_require__(5);
+var fs = __webpack_require__(4);
 var pkg = __webpack_require__(798);
 
 function buildHarHeaders (headers) {
@@ -131969,7 +132106,7 @@ module.exports = HarWrapper;
 
 
 
-var extend = __webpack_require__(269)
+var extend = __webpack_require__(266)
 var cookies = __webpack_require__(412)
 var helpers = __webpack_require__(305)
 
@@ -132117,8 +132254,8 @@ Object.defineProperty(request, 'debug', {
 "use strict";
 
 
-var caseless = __webpack_require__(231)
-var uuid = __webpack_require__(119)
+var caseless = __webpack_require__(228)
+var uuid = __webpack_require__(120)
 var helpers = __webpack_require__(305)
 
 var md5 = helpers.md5
@@ -132377,10 +132514,10 @@ module.exports = getProxyFromURI
 "use strict";
 
 
-var fs = __webpack_require__(5)
-var qs = __webpack_require__(196)
-var validate = __webpack_require__(677)
-var extend = __webpack_require__(269)
+var fs = __webpack_require__(4)
+var qs = __webpack_require__(197)
+var validate = __webpack_require__(645)
+var extend = __webpack_require__(266)
 
 function Har (request) {
   this.request = request
@@ -132685,8 +132822,8 @@ exports.header = function (uri, method, opts) {
 "use strict";
 
 
-var uuid = __webpack_require__(119)
-var CombinedStream = __webpack_require__(385)
+var uuid = __webpack_require__(120)
+var CombinedStream = __webpack_require__(379)
 var isstream = __webpack_require__(399)
 var Buffer = __webpack_require__(45).Buffer
 
@@ -132806,8 +132943,8 @@ exports.Multipart = Multipart
 
 var url = __webpack_require__(24)
 var qs = __webpack_require__(404)
-var caseless = __webpack_require__(231)
-var uuid = __webpack_require__(119)
+var caseless = __webpack_require__(228)
+var uuid = __webpack_require__(120)
 var oauth = __webpack_require__(768)
 var crypto = __webpack_require__(11)
 var Buffer = __webpack_require__(45).Buffer
@@ -132960,7 +133097,7 @@ exports.OAuth = OAuth
 
 
 var qs = __webpack_require__(404)
-var querystring = __webpack_require__(196)
+var querystring = __webpack_require__(197)
 
 function Querystring (request) {
   this.request = request
@@ -134976,19 +135113,19 @@ module.exports = {"author":{"name":"Jeremy Stashewsky","email":"jstashewsky@sale
 
 
 var http = __webpack_require__(87)
-var https = __webpack_require__(195)
+var https = __webpack_require__(196)
 var url = __webpack_require__(24)
 var util = __webpack_require__(3)
 var stream = __webpack_require__(23)
-var zlib = __webpack_require__(198)
-var aws2 = __webpack_require__(521)
-var aws4 = __webpack_require__(522)
+var zlib = __webpack_require__(199)
+var aws2 = __webpack_require__(489)
+var aws4 = __webpack_require__(490)
 var httpSignature = __webpack_require__(680)
 var mime = __webpack_require__(400)
-var caseless = __webpack_require__(231)
-var ForeverAgent = __webpack_require__(648)
-var FormData = __webpack_require__(649)
-var extend = __webpack_require__(269)
+var caseless = __webpack_require__(228)
+var ForeverAgent = __webpack_require__(616)
+var FormData = __webpack_require__(617)
+var extend = __webpack_require__(266)
 var isstream = __webpack_require__(399)
 var isTypedArray = __webpack_require__(742).strict
 var helpers = __webpack_require__(305)
@@ -136540,7 +136677,7 @@ module.exports = async;
 /***/ (function(module, exports, __webpack_require__) {
 
 var core = __webpack_require__(306);
-var fs = __webpack_require__(5);
+var fs = __webpack_require__(4);
 var path = __webpack_require__(0);
 var caller = __webpack_require__(417);
 var nodeModulesPaths = __webpack_require__(418);
@@ -136758,7 +136895,7 @@ module.exports = {"assert":true,"async_hooks":">= 8","buffer_ieee754":"< 0.9.7",
 /***/ (function(module, exports, __webpack_require__) {
 
 var core = __webpack_require__(306);
-var fs = __webpack_require__(5);
+var fs = __webpack_require__(4);
 var path = __webpack_require__(0);
 var caller = __webpack_require__(417);
 var nodeModulesPaths = __webpack_require__(418);
@@ -137176,7 +137313,7 @@ RetryOperation.prototype.mainError = function() {
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Observable__ = __webpack_require__(12);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__scheduler_asap__ = __webpack_require__(438);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_isNumeric__ = __webpack_require__(190);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_isNumeric__ = __webpack_require__(191);
 /** PURE_IMPORTS_START tslib,_Observable,_scheduler_asap,_util_isNumeric PURE_IMPORTS_END */
 
 
@@ -137237,7 +137374,7 @@ var SubscribeOnObservable = /*@__PURE__*/ (function (_super) {
 "use strict";
 /* harmony export (immutable) */ __webpack_exports__["a"] = bindCallback;
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncSubject__ = __webpack_require__(183);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncSubject__ = __webpack_require__(184);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__operators_map__ = __webpack_require__(47);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_canReportError__ = __webpack_require__(322);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isArray__ = __webpack_require__(41);
@@ -137356,7 +137493,7 @@ function dispatchError(state) {
 "use strict";
 /* harmony export (immutable) */ __webpack_exports__["a"] = bindNodeCallback;
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncSubject__ = __webpack_require__(183);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncSubject__ = __webpack_require__(184);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__operators_map__ = __webpack_require__(47);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_canReportError__ = __webpack_require__(322);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isScheduler__ = __webpack_require__(49);
@@ -137756,7 +137893,7 @@ function fromIterable(input, scheduler) {
 /* harmony export (immutable) */ __webpack_exports__["a"] = fromObservable;
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(25);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__symbol_observable__ = __webpack_require__(117);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__symbol_observable__ = __webpack_require__(118);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_subscribeToObservable__ = __webpack_require__(449);
 /** PURE_IMPORTS_START _Observable,_Subscription,_symbol_observable,_util_subscribeToObservable PURE_IMPORTS_END */
 
@@ -137829,7 +137966,7 @@ function fromPromise(input, scheduler) {
 "use strict";
 /* harmony export (immutable) */ __webpack_exports__["a"] = generate;
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_identity__ = __webpack_require__(118);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_identity__ = __webpack_require__(119);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isScheduler__ = __webpack_require__(49);
 /** PURE_IMPORTS_START _Observable,_util_identity,_util_isScheduler PURE_IMPORTS_END */
 
@@ -137989,7 +138126,7 @@ function iif(condition, trueResult, falseResult) {
 /* harmony export (immutable) */ __webpack_exports__["a"] = interval;
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(12);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__scheduler_async__ = __webpack_require__(40);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isNumeric__ = __webpack_require__(190);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isNumeric__ = __webpack_require__(191);
 /** PURE_IMPORTS_START _Observable,_scheduler_async,_util_isNumeric PURE_IMPORTS_END */
 
 
@@ -138667,7 +138804,7 @@ var BufferToggleSubscriber = /*@__PURE__*/ (function (_super) {
 /* harmony export (immutable) */ __webpack_exports__["a"] = bufferWhen;
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(25);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(56);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(57);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(48);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__ = __webpack_require__(13);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__ = __webpack_require__(14);
@@ -138867,7 +139004,7 @@ function combineLatest() {
 
 "use strict";
 /* harmony export (immutable) */ __webpack_exports__["a"] = concat;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_concat__ = __webpack_require__(186);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_concat__ = __webpack_require__(187);
 /** PURE_IMPORTS_START _observable_concat PURE_IMPORTS_END */
 
 function concat() {
@@ -139131,7 +139268,7 @@ function dispatchNext(subscriber) {
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__scheduler_async__ = __webpack_require__(40);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isDate__ = __webpack_require__(443);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__Subscriber__ = __webpack_require__(7);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__Notification__ = __webpack_require__(184);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__Notification__ = __webpack_require__(185);
 /** PURE_IMPORTS_START tslib,_scheduler_async,_util_isDate,_Subscriber,_Notification PURE_IMPORTS_END */
 
 
@@ -139509,7 +139646,7 @@ function distinctUntilKeyChanged(key, compare) {
 /* harmony export (immutable) */ __webpack_exports__["a"] = elementAt;
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_ArgumentOutOfRangeError__ = __webpack_require__(152);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__filter__ = __webpack_require__(147);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__throwIfEmpty__ = __webpack_require__(188);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__throwIfEmpty__ = __webpack_require__(189);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__defaultIfEmpty__ = __webpack_require__(146);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__take__ = __webpack_require__(319);
 /** PURE_IMPORTS_START _util_ArgumentOutOfRangeError,_filter,_throwIfEmpty,_defaultIfEmpty,_take PURE_IMPORTS_END */
@@ -139541,7 +139678,7 @@ function elementAt(index, defaultValue) {
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_fromArray__ = __webpack_require__(85);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__observable_scalar__ = __webpack_require__(312);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__observable_empty__ = __webpack_require__(39);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__observable_concat__ = __webpack_require__(186);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__observable_concat__ = __webpack_require__(187);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isScheduler__ = __webpack_require__(49);
 /** PURE_IMPORTS_START _observable_fromArray,_observable_scalar,_observable_empty,_observable_concat,_util_isScheduler PURE_IMPORTS_END */
 
@@ -139799,7 +139936,7 @@ var ExhaustMapSubscriber = /*@__PURE__*/ (function (_super) {
 /* unused harmony export ExpandOperator */
 /* unused harmony export ExpandSubscriber */
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_tryCatch__ = __webpack_require__(56);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_tryCatch__ = __webpack_require__(57);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_errorObject__ = __webpack_require__(48);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(13);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(14);
@@ -139971,8 +140108,8 @@ function findIndex(predicate, thisArg) {
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__filter__ = __webpack_require__(147);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__take__ = __webpack_require__(319);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__defaultIfEmpty__ = __webpack_require__(146);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__throwIfEmpty__ = __webpack_require__(188);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_identity__ = __webpack_require__(118);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__throwIfEmpty__ = __webpack_require__(189);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_identity__ = __webpack_require__(119);
 /** PURE_IMPORTS_START _util_EmptyError,_filter,_take,_defaultIfEmpty,_throwIfEmpty,_util_identity PURE_IMPORTS_END */
 
 
@@ -140075,9 +140212,9 @@ var IsEmptySubscriber = /*@__PURE__*/ (function (_super) {
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_EmptyError__ = __webpack_require__(153);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__filter__ = __webpack_require__(147);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__takeLast__ = __webpack_require__(320);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__throwIfEmpty__ = __webpack_require__(188);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__throwIfEmpty__ = __webpack_require__(189);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__defaultIfEmpty__ = __webpack_require__(146);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_identity__ = __webpack_require__(118);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_identity__ = __webpack_require__(119);
 /** PURE_IMPORTS_START _util_EmptyError,_filter,_takeLast,_throwIfEmpty,_defaultIfEmpty,_util_identity PURE_IMPORTS_END */
 
 
@@ -140138,7 +140275,7 @@ var MapToSubscriber = /*@__PURE__*/ (function (_super) {
 /* harmony export (immutable) */ __webpack_exports__["a"] = materialize;
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Notification__ = __webpack_require__(184);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Notification__ = __webpack_require__(185);
 /** PURE_IMPORTS_START tslib,_Subscriber,_Notification PURE_IMPORTS_END */
 
 
@@ -140185,7 +140322,7 @@ var MaterializeSubscriber = /*@__PURE__*/ (function (_super) {
 
 "use strict";
 /* harmony export (immutable) */ __webpack_exports__["a"] = max;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__reduce__ = __webpack_require__(187);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__reduce__ = __webpack_require__(188);
 /** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */
 
 function max(comparer) {
@@ -140249,7 +140386,7 @@ function mergeMapTo(innerObservable, resultSelector, concurrent) {
 /* unused harmony export MergeScanOperator */
 /* unused harmony export MergeScanSubscriber */
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_tryCatch__ = __webpack_require__(56);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_tryCatch__ = __webpack_require__(57);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_errorObject__ = __webpack_require__(48);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_subscribeToResult__ = __webpack_require__(14);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__ = __webpack_require__(13);
@@ -140359,7 +140496,7 @@ var MergeScanSubscriber = /*@__PURE__*/ (function (_super) {
 
 "use strict";
 /* harmony export (immutable) */ __webpack_exports__["a"] = min;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__reduce__ = __webpack_require__(187);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__reduce__ = __webpack_require__(188);
 /** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */
 
 function min(comparer) {
@@ -140572,7 +140709,7 @@ function plucker(props, length) {
 "use strict";
 /* harmony export (immutable) */ __webpack_exports__["a"] = publish;
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Subject__ = __webpack_require__(36);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__multicast__ = __webpack_require__(116);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__multicast__ = __webpack_require__(117);
 /** PURE_IMPORTS_START _Subject,_multicast PURE_IMPORTS_END */
 
 
@@ -140591,7 +140728,7 @@ function publish(selector) {
 "use strict";
 /* harmony export (immutable) */ __webpack_exports__["a"] = publishBehavior;
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__BehaviorSubject__ = __webpack_require__(419);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__multicast__ = __webpack_require__(116);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__multicast__ = __webpack_require__(117);
 /** PURE_IMPORTS_START _BehaviorSubject,_multicast PURE_IMPORTS_END */
 
 
@@ -140607,8 +140744,8 @@ function publishBehavior(value) {
 
 "use strict";
 /* harmony export (immutable) */ __webpack_exports__["a"] = publishLast;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__AsyncSubject__ = __webpack_require__(183);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__multicast__ = __webpack_require__(116);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__AsyncSubject__ = __webpack_require__(184);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__multicast__ = __webpack_require__(117);
 /** PURE_IMPORTS_START _AsyncSubject,_multicast PURE_IMPORTS_END */
 
 
@@ -140625,7 +140762,7 @@ function publishLast() {
 "use strict";
 /* harmony export (immutable) */ __webpack_exports__["a"] = publishReplay;
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__ReplaySubject__ = __webpack_require__(308);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__multicast__ = __webpack_require__(116);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__multicast__ = __webpack_require__(117);
 /** PURE_IMPORTS_START _ReplaySubject,_multicast PURE_IMPORTS_END */
 
 
@@ -140738,7 +140875,7 @@ var RepeatSubscriber = /*@__PURE__*/ (function (_super) {
 /* harmony export (immutable) */ __webpack_exports__["a"] = repeatWhen;
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(36);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(56);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(57);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(48);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__ = __webpack_require__(13);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__ = __webpack_require__(14);
@@ -140885,7 +141022,7 @@ var RetrySubscriber = /*@__PURE__*/ (function (_super) {
 /* harmony export (immutable) */ __webpack_exports__["a"] = retryWhen;
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(36);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(56);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(57);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(48);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__ = __webpack_require__(13);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__ = __webpack_require__(14);
@@ -141090,7 +141227,7 @@ function dispatchNotification(state) {
 /* unused harmony export SequenceEqualSubscriber */
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(7);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(56);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(57);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(48);
 /** PURE_IMPORTS_START tslib,_Subscriber,_util_tryCatch,_util_errorObject PURE_IMPORTS_END */
 
@@ -141215,7 +141352,7 @@ var SequenceEqualCompareToSubscriber = /*@__PURE__*/ (function (_super) {
 
 "use strict";
 /* harmony export (immutable) */ __webpack_exports__["a"] = share;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__multicast__ = __webpack_require__(116);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__multicast__ = __webpack_require__(117);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__refCount__ = __webpack_require__(316);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Subject__ = __webpack_require__(36);
 /** PURE_IMPORTS_START _multicast,_refCount,_Subject PURE_IMPORTS_END */
@@ -141586,7 +141723,7 @@ var SkipWhileSubscriber = /*@__PURE__*/ (function (_super) {
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_fromArray__ = __webpack_require__(85);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__observable_scalar__ = __webpack_require__(312);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__observable_empty__ = __webpack_require__(39);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__observable_concat__ = __webpack_require__(186);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__observable_concat__ = __webpack_require__(187);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isScheduler__ = __webpack_require__(49);
 /** PURE_IMPORTS_START _observable_fromArray,_observable_scalar,_observable_empty,_observable_concat,_util_isScheduler PURE_IMPORTS_END */
 
@@ -141659,7 +141796,7 @@ var SubscribeOnOperator = /*@__PURE__*/ (function () {
 "use strict";
 /* harmony export (immutable) */ __webpack_exports__["a"] = switchAll;
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__switchMap__ = __webpack_require__(318);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_identity__ = __webpack_require__(118);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_identity__ = __webpack_require__(119);
 /** PURE_IMPORTS_START _switchMap,_util_identity PURE_IMPORTS_END */
 
 
@@ -141985,7 +142122,7 @@ var Timestamp = /*@__PURE__*/ (function () {
 
 "use strict";
 /* harmony export (immutable) */ __webpack_exports__["a"] = toArray;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__reduce__ = __webpack_require__(187);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__reduce__ = __webpack_require__(188);
 /** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */
 
 function toArrayReducer(arr, item, index) {
@@ -142179,7 +142316,7 @@ var WindowCountSubscriber = /*@__PURE__*/ (function (_super) {
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(36);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__scheduler_async__ = __webpack_require__(40);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__Subscriber__ = __webpack_require__(7);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isNumeric__ = __webpack_require__(190);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isNumeric__ = __webpack_require__(191);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_isScheduler__ = __webpack_require__(49);
 /** PURE_IMPORTS_START tslib,_Subject,_scheduler_async,_Subscriber,_util_isNumeric,_util_isScheduler PURE_IMPORTS_END */
 
@@ -142347,7 +142484,7 @@ function dispatchWindowClose(state) {
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(36);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Subscription__ = __webpack_require__(25);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_tryCatch__ = __webpack_require__(56);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_tryCatch__ = __webpack_require__(57);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_errorObject__ = __webpack_require__(48);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__OuterSubscriber__ = __webpack_require__(13);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__util_subscribeToResult__ = __webpack_require__(14);
@@ -142491,7 +142628,7 @@ var WindowToggleSubscriber = /*@__PURE__*/ (function (_super) {
 /* harmony export (immutable) */ __webpack_exports__["a"] = windowWhen;
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(36);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(56);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(57);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(48);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__ = __webpack_require__(13);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__ = __webpack_require__(14);
@@ -143166,7 +143303,7 @@ var Immediate = {
 
 "use strict";
 /* harmony export (immutable) */ __webpack_exports__["a"] = isInteropObservable;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__symbol_observable__ = __webpack_require__(117);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__symbol_observable__ = __webpack_require__(118);
 /** PURE_IMPORTS_START _symbol_observable PURE_IMPORTS_END */
 
 function isInteropObservable(input) {
@@ -144492,7 +144629,7 @@ module.exports = function pkg(name, dir) {
 "use strict";
 
 var stripAnsi = __webpack_require__(947);
-var codePointAt = __webpack_require__(607);
+var codePointAt = __webpack_require__(575);
 var isFullwidthCodePoint = __webpack_require__(946);
 
 // https://github.com/nodejs/io.js/blob/cff7300a578be1b10001f2d967aaedc88aee6402/lib/readline.js#L1345
@@ -144588,7 +144725,7 @@ module.exports = function (x) {
 
 "use strict";
 
-var ansiRegex = __webpack_require__(505)();
+var ansiRegex = __webpack_require__(473)();
 
 module.exports = function (str) {
 	return typeof str === 'string' ? str.replace(ansiRegex, '') : str;
@@ -144617,7 +144754,7 @@ module.exports = () => {
 /***/ (function(module, exports, __webpack_require__) {
 
 var util = __webpack_require__(3)
-var bl = __webpack_require__(592)
+var bl = __webpack_require__(560)
 var xtend = __webpack_require__(465)
 var headers = __webpack_require__(459)
 
@@ -144880,10 +145017,10 @@ module.exports = Extract
 /* 950 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var constants = __webpack_require__(651)
-var eos = __webpack_require__(173)
+var constants = __webpack_require__(619)
+var eos = __webpack_require__(174)
 var util = __webpack_require__(3)
-var alloc = __webpack_require__(380)
+var alloc = __webpack_require__(374)
 var toBuffer = __webpack_require__(462)
 
 var Readable = __webpack_require__(102).Readable
@@ -145221,7 +145358,7 @@ function deprecated(source, name) {
 /***/ (function(module, exports, __webpack_require__) {
 
 
-var Promise = __webpack_require__(345)
+var Promise = __webpack_require__(339)
 var assert = __webpack_require__(28)
 
 module.exports = thenify
@@ -145431,7 +145568,7 @@ function through (write, end, opts) {
 /*
  * Module dependencies.
  */
-const fs = __webpack_require__(5);
+const fs = __webpack_require__(4);
 const path = __webpack_require__(0);
 const crypto = __webpack_require__(11);
 const osTmpDir = __webpack_require__(772);
@@ -146043,7 +146180,7 @@ module.exports.setGracefulCleanup = setGracefulCleanup;
 var net = __webpack_require__(164)
   , tls = __webpack_require__(467)
   , http = __webpack_require__(87)
-  , https = __webpack_require__(195)
+  , https = __webpack_require__(196)
   , events = __webpack_require__(77)
   , assert = __webpack_require__(28)
   , util = __webpack_require__(3)
diff --git a/.yarnrc.yml b/.yarnrc.yml
new file mode 100644
index 00000000..82069dd8
--- /dev/null
+++ b/.yarnrc.yml
@@ -0,0 +1 @@
+yarnPath: .yarn/releases/yarn-1.22.19.cjs
diff --git a/package.json b/package.json
index 4dc1c584..67e11563 100644
--- a/package.json
+++ b/package.json
@@ -8,15 +8,15 @@
   },
   "private": true,
   "dependencies": {
-    "@emotion/react": "^11.9.0",
-    "@emotion/styled": "^11.8.1",
+    "@emotion/react": "^11.10.5",
+    "@emotion/styled": "^11.10.5",
     "@mdi/js": "^6.6.96",
     "@monaco-editor/react": "^4.4.4",
-    "@mui/icons-material": "5.6.0",
+    "@mui/icons-material": "^5.10.16",
     "@mui/lab": "^5.0.0-alpha.76",
-    "@mui/material": "5.6.0",
+    "@mui/material": "^5.10.16",
     "@mui/x-date-pickers": "^5.0.0-alpha.4",
-    "@rowy/form-builder": "^0.7.0",
+    "@rowy/form-builder": "^0.8.0",
     "@rowy/multiselect": "^0.4.1",
     "@tanstack/react-table": "^8.5.15",
     "@tinymce/tinymce-react": "^3",
@@ -44,14 +44,14 @@
     "path-browserify": "^1.0.1",
     "pb-util": "^1.0.3",
     "quicktype-core": "^6.0.71",
-    "react": "^18.0.0",
+    "react": "^18.2.0",
     "react-beautiful-dnd": "^13.1.0",
     "react-color-palette": "^6.2.0",
     "react-detect-offline": "^2.4.5",
     "react-div-100vh": "^0.7.0",
     "react-dnd": "^16.0.1",
     "react-dnd-html5-backend": "^16.0.1",
-    "react-dom": "^18.0.0",
+    "react-dom": "^18.2.0",
     "react-dropzone": "^10",
     "react-element-scroll-hook": "^1.1.0",
     "react-error-boundary": "^3.1.4",
@@ -62,7 +62,7 @@
     "react-markdown": "^8.0.3",
     "react-router-dom": "^6.3.0",
     "react-router-hash-link": "^2.4.3",
-    "react-scripts": "^5.0.0",
+    "react-scripts": "^5.0.1",
     "react-usestateref": "^1.0.8",
     "react-virtual": "^2.10.4",
     "remark-gfm": "^3.0.1",
@@ -70,13 +70,14 @@
     "stream-browserify": "^3.0.0",
     "swr": "^1.3.0",
     "tinymce": "^5",
-    "tss-react": "^3.6.2",
-    "typescript": "^4.6.3",
+    "tss-react": "^4.4.4",
+    "typescript": "^4.9.3",
     "use-algolia": "^1.5.3",
     "use-async-memo": "^1.2.4",
     "use-debounce": "^8.0.0",
     "use-memo-value": "^1.0.1",
-    "web-vitals": "^2.1.4"
+    "web-vitals": "^2.1.4",
+    "workbox-webpack-plugin": "^6.5.4"
   },
   "scripts": {
     "start": "cross-env PORT=7699 craco start",
@@ -92,7 +93,7 @@
     "typedoc": "typedoc --options typedoc.json"
   },
   "engines": {
-    "node": "^16"
+    "node": ">=16"
   },
   "eslintConfig": {
     "plugins": [
@@ -156,21 +157,22 @@
     "@types/json2csv": "^5.0.3",
     "@types/lodash-es": "^4.17.6",
     "@types/node": "^17.0.23",
-    "@types/react": "^18.0.5",
+    "@types/react": "^18.0.25",
     "@types/react-beautiful-dnd": "^13.1.2",
     "@types/react-detect-offline": "^2.4.1",
     "@types/react-div-100vh": "^0.4.0",
-    "@types/react-dom": "^18.0.0",
+    "@types/react-dom": "^18.0.9",
     "@types/react-router-dom": "^5.3.3",
     "@types/react-router-hash-link": "^2.4.5",
     "@types/seedrandom": "^3.0.2",
-    "@typescript-eslint/parser": "^5.18.0",
+    "@typescript-eslint/eslint-plugin": "^5.45.0",
+    "@typescript-eslint/parser": "^5.45.0",
     "craco-alias": "^3.0.1",
     "craco-swc": "^0.5.1",
     "cross-env": "^7.0.3",
-    "eslint": "^8.12.0",
+    "eslint": "^8.28.0",
     "eslint-config-prettier": "^8.5.0",
-    "eslint-config-react-app": "^7.0.0",
+    "eslint-config-react-app": "^7.0.1",
     "eslint-plugin-local-rules": "^1.1.0",
     "eslint-plugin-no-relative-import-paths": "^1.2.0",
     "eslint-plugin-tsdoc": "^0.2.16",
@@ -189,5 +191,6 @@
   "lint-staged": {
     "*.{js,ts,tsx}": "eslint --cache --fix",
     "**/*": "prettier --write --ignore-unknown"
-  }
+  },
+  "packageManager": "yarn@1.22.19"
 }
diff --git a/src/Providers.tsx b/src/Providers.tsx
index 4bb24f48..3162ef91 100644
--- a/src/Providers.tsx
+++ b/src/Providers.tsx
@@ -6,8 +6,8 @@ import { HelmetProvider } from "react-helmet-async";
 import { Provider as JotaiProvider, Atom } from "jotai";
 import { projectScope } from "@src/atoms/projectScope";
 import { DebugAtoms } from "@src/atoms/utils";
-import LocalizationProvider from "@mui/lab/LocalizationProvider";
-import AdapterDateFns from "@mui/lab/AdapterDateFns";
+import { LocalizationProvider } from "@mui/x-date-pickers/LocalizationProvider";
+import { AdapterDateFns } from "@mui/x-date-pickers/AdapterDateFns";
 import createCache from "@emotion/cache";
 import { CacheProvider } from "@emotion/react";
 import RowyThemeProvider from "@src/theme/RowyThemeProvider";
diff --git a/src/components/TableSettingsDialog/TableSettingsDialog.tsx b/src/components/TableSettingsDialog/TableSettingsDialog.tsx
index d045739c..8424ce1a 100644
--- a/src/components/TableSettingsDialog/TableSettingsDialog.tsx
+++ b/src/components/TableSettingsDialog/TableSettingsDialog.tsx
@@ -184,18 +184,20 @@ export default function TableSettingsDialog() {
           handleCancel: async () => {
             let _schema: Record<string, any> = {};
             if (hasExtensions) {
-              _schema.extensionObjects = get(
-                data,
-                "_schema.extensionObjects"
-                // TODO: types
-              )!.map((x: any) => ({
+              _schema.extensionObjects = (
+                get(
+                  data,
+                  "_schema.extensionObjects"
+                  // TODO: types
+                ) ?? []
+              ).map((x: any) => ({
                 ...x,
                 active: false,
               }));
             }
             if (hasWebhooks) {
               // TODO: types
-              _schema.webhooks = get(data, "_schema.webhooks")!.map(
+              _schema.webhooks = (get(data, "_schema.webhooks") ?? []).map(
                 (x: any) => ({
                   ...x,
                   active: false,
@@ -272,7 +274,7 @@ export default function TableSettingsDialog() {
         ).reduce((acc, [name, err]) => {
           const match = find(fields, ["name", name])?.step;
           if (!match) return acc;
-          acc[match] = err.message;
+          acc[match] = (err?.message as string) ?? "";
           return acc;
         }, {} as Record<string, string>);
 
diff --git a/src/components/fields/Date/EditorCell.tsx b/src/components/fields/Date/EditorCell.tsx
index 56de95c1..bae76c2d 100644
--- a/src/components/fields/Date/EditorCell.tsx
+++ b/src/components/fields/Date/EditorCell.tsx
@@ -1,7 +1,7 @@
 import { useDebouncedCallback } from "use-debounce";
 import { IEditorCellProps } from "@src/components/fields/types";
 
-import DatePicker from "@mui/lab/DatePicker";
+import { DatePicker } from "@mui/x-date-pickers";
 import { TextField } from "@mui/material";
 import { ChevronDown } from "@src/assets/icons";
 
@@ -63,6 +63,8 @@ export default function Date_({
             },
             "& .MuiInputAdornment-root": { m: 0 },
           }}
+          autoFocus
+          onKeyDown={(e) => e.stopPropagation()}
           onClick={(e) => e.stopPropagation()}
           inputProps={{ ...props.inputProps, tabIndex }}
         />
@@ -72,7 +74,6 @@ export default function Date_({
       onChange={handleDateChange}
       inputFormat={format}
       mask={format.replace(/[A-Za-z]/g, "_")}
-      clearable
       OpenPickerButtonProps={{
         size: "small",
         className: "row-hover-iconButton end",
diff --git a/src/components/fields/Date/SideDrawerField.tsx b/src/components/fields/Date/SideDrawerField.tsx
index 2fa85327..b20c5aa2 100644
--- a/src/components/fields/Date/SideDrawerField.tsx
+++ b/src/components/fields/Date/SideDrawerField.tsx
@@ -1,6 +1,6 @@
 import { ISideDrawerFieldProps } from "@src/components/fields/types";
 
-import DatePicker from "@mui/lab/DatePicker";
+import { DatePicker } from "@mui/x-date-pickers";
 import { TextField } from "@mui/material";
 import { ChevronDown } from "@src/assets/icons";
 
@@ -52,7 +52,6 @@ export default function Date_({
       onAccept={onSubmit}
       inputFormat={format}
       mask={format.replace(/[A-Za-z]/g, "_")}
-      clearable
       OpenPickerButtonProps={{
         size: "small",
         sx: { width: 32, height: 32 },
diff --git a/src/components/fields/DateTime/EditorCell.tsx b/src/components/fields/DateTime/EditorCell.tsx
index 5a8cf2f1..03d5dc03 100644
--- a/src/components/fields/DateTime/EditorCell.tsx
+++ b/src/components/fields/DateTime/EditorCell.tsx
@@ -2,7 +2,7 @@ import { useDebouncedCallback } from "use-debounce";
 import { IEditorCellProps } from "@src/components/fields/types";
 import { setSeconds } from "date-fns";
 
-import DateTimePicker from "@mui/lab/DateTimePicker";
+import { DateTimePicker } from "@mui/x-date-pickers";
 import { TextField } from "@mui/material";
 import { ChevronDown } from "@src/assets/icons";
 
@@ -68,6 +68,7 @@ export default function DateTime({
             },
             "& .MuiInputAdornment-root": { m: 0 },
           }}
+          autoFocus
           onKeyDown={(e) => e.stopPropagation()}
           onClick={(e) => e.stopPropagation()}
           inputProps={{ ...props.inputProps, tabIndex }}
@@ -77,7 +78,6 @@ export default function DateTime({
       value={transformedValue}
       onChange={(date) => handleDateChange(date ? setSeconds(date, 0) : null)}
       inputFormat={format}
-      clearable
       OpenPickerButtonProps={{
         size: "small",
         className: "row-hover-iconButton end",
@@ -88,6 +88,7 @@ export default function DateTime({
       disableOpenPicker={false}
       disabled={disabled}
       PopperProps={{ onClick: (e) => e.stopPropagation() }}
+      hideTabs={false}
     />
   );
 }
diff --git a/src/components/fields/DateTime/SideDrawerField.tsx b/src/components/fields/DateTime/SideDrawerField.tsx
index 55a892ba..d240814e 100644
--- a/src/components/fields/DateTime/SideDrawerField.tsx
+++ b/src/components/fields/DateTime/SideDrawerField.tsx
@@ -1,7 +1,7 @@
 import { ISideDrawerFieldProps } from "@src/components/fields/types";
 import { setSeconds } from "date-fns";
 
-import DateTimePicker from "@mui/lab/DateTimePicker";
+import { DateTimePicker } from "@mui/x-date-pickers";
 import { TextField } from "@mui/material";
 import { ChevronDown } from "@src/assets/icons";
 
@@ -52,11 +52,10 @@ export default function DateTime({
       )}
       label={column.name}
       value={transformedValue}
-      onChange={(date) => handleChange(date ? setSeconds(date, 0) : null)}
+      onChange={(date: any) => handleChange(date ? setSeconds(date, 0) : null)}
       onAccept={onSubmit}
       inputFormat={format}
       mask={format.replace(/[A-Za-z]/g, "_")}
-      clearable
       OpenPickerButtonProps={{
         size: "small",
         sx: { width: 32, height: 32 },
@@ -64,6 +63,7 @@ export default function DateTime({
       components={{ OpenPickerIcon: ChevronDown }}
       disableOpenPicker={false}
       disabled={disabled}
+      hideTabs={false}
     />
   );
 }
diff --git a/src/components/fields/Duration/SideDrawerField.tsx b/src/components/fields/Duration/SideDrawerField.tsx
index 9cdc6be4..2fd11e72 100644
--- a/src/components/fields/Duration/SideDrawerField.tsx
+++ b/src/components/fields/Duration/SideDrawerField.tsx
@@ -1,8 +1,8 @@
 import { ISideDrawerFieldProps } from "@src/components/fields/types";
 
 import { Box, Stack, TextField } from "@mui/material";
-import DatePicker from "@mui/lab/DatePicker";
-import DateTimeIcon from "@mui/icons-material/AccessTime";
+import { DateTimePicker } from "@mui/x-date-pickers";
+import { ChevronDown } from "@src/assets/icons";
 
 import { fieldSx, getFieldId } from "@src/components/SideDrawer/utils";
 import { getDurationString } from "./utils";
@@ -42,7 +42,7 @@ export default function Duration({
       </Box>
 
       <Stack direction="row" spacing={1} sx={{ mt: 0.5 }}>
-        <DatePicker
+        <DateTimePicker
           renderInput={(props) => (
             <TextField
               {...props}
@@ -50,12 +50,6 @@ export default function Duration({
               fullWidth
               hiddenLabel
               aria-label={column.name as string}
-              InputProps={{
-                ...props.InputProps,
-                endAdornment: props.InputProps?.endAdornment || (
-                  <DateTimeIcon color="action" />
-                ),
-              }}
               sx={{
                 "& .MuiInputBase-input": { fontVariantNumeric: "tabular-nums" },
                 "& .MuiInputAdornment-root": { m: 0 },
@@ -71,15 +65,14 @@ export default function Duration({
           onAccept={onSubmit}
           inputFormat={format}
           mask={format.replace(/[A-Za-z]/g, "_")}
-          clearable
           OpenPickerButtonProps={{ size: "small" }}
-          components={{ OpenPickerIcon: DateTimeIcon }}
+          components={{ OpenPickerIcon: ChevronDown }}
           disableOpenPicker={false}
-          showToolbar
           disabled={disabled}
+          hideTabs={false}
         />
 
-        <DatePicker
+        <DateTimePicker
           renderInput={(props) => (
             <TextField
               {...props}
@@ -87,12 +80,6 @@ export default function Duration({
               label="End"
               hiddenLabel
               aria-label={column.name as string}
-              InputProps={{
-                ...props.InputProps,
-                endAdornment: props.InputProps?.endAdornment || (
-                  <DateTimeIcon color="action" />
-                ),
-              }}
               sx={{
                 "& .MuiInputBase-input": { fontVariantNumeric: "tabular-nums" },
                 "& .MuiInputAdornment-root": { m: 0 },
@@ -108,12 +95,11 @@ export default function Duration({
           onAccept={onSubmit}
           inputFormat={format}
           mask={format.replace(/[A-Za-z]/g, "_")}
-          clearable
           OpenPickerButtonProps={{ size: "small" }}
-          components={{ OpenPickerIcon: DateTimeIcon }}
+          components={{ OpenPickerIcon: ChevronDown }}
           disableOpenPicker={false}
-          showToolbar
           disabled={disabled}
+          hideTabs={false}
         />
       </Stack>
     </>
diff --git a/src/hooks/useFirestoreCollectionWithAtom.ts b/src/hooks/useFirestoreCollectionWithAtom.ts
index a49ec98a..16a7fb92 100644
--- a/src/hooks/useFirestoreCollectionWithAtom.ts
+++ b/src/hooks/useFirestoreCollectionWithAtom.ts
@@ -23,6 +23,7 @@ import {
   WhereFilterOp,
   documentId,
   getCountFromServer,
+  DocumentData,
 } from "firebase/firestore";
 import { useErrorHandler } from "react-error-boundary";
 
@@ -77,7 +78,9 @@ interface IUseFirestoreCollectionWithAtomOptions<T> {
  * @param path - Collection path. If falsy, the listener isn’t created at all.
  * @param options - {@link IUseFirestoreCollectionWithAtomOptions}
  */
-export function useFirestoreCollectionWithAtom<T = TableRow>(
+export function useFirestoreCollectionWithAtom<
+  T extends DocumentData = TableRow
+>(
   dataAtom: PrimitiveAtom<T[]>,
   dataScope: Parameters<typeof useAtom>[1] | undefined,
   path: string | undefined,
diff --git a/src/theme/components.tsx b/src/theme/components.tsx
index 374dc25b..02282bfc 100644
--- a/src/theme/components.tsx
+++ b/src/theme/components.tsx
@@ -1402,23 +1402,23 @@ export const components = (theme: Theme): ThemeOptions => {
         },
       },
 
-      MuiYearPicker: {
-        styleOverrides: {
-          root: {
-            "& .PrivatePickersYear-yearButton": {
-              ...(theme.typography.button as any),
-              fontSize: "1rem",
-            },
-          },
-        },
-      },
-      MuiPickersDay: {
-        styleOverrides: {
-          root: {
-            background: "none",
-          },
-        },
-      },
+      // MuiYearPicker: {
+      //   styleOverrides: {
+      //     root: {
+      //       "& .PrivatePickersYear-yearButton": {
+      //         ...(theme.typography.button as any),
+      //         fontSize: "1rem",
+      //       },
+      //     },
+      //   },
+      // },
+      // MuiPickersDay: {
+      //   styleOverrides: {
+      //     root: {
+      //       background: "none",
+      //     },
+      //   },
+      // },
 
       RowyMultiSelect: {
         defaultProps: {
diff --git a/yarn.lock b/yarn.lock
index 00c14283..3f159757 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,153 +2,159 @@
 # yarn lockfile v1
 
 
-"@algolia/cache-browser-local-storage@4.13.1":
-  version "4.13.1"
-  resolved "https://registry.yarnpkg.com/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.13.1.tgz#ffacb9230119f77de1a6f163b83680be999110e4"
-  integrity sha512-UAUVG2PEfwd/FfudsZtYnidJ9eSCpS+LW9cQiesePQLz41NAcddKxBak6eP2GErqyFagSlnVXe/w2E9h2m2ttg==
+"@adobe/css-tools@^4.0.1":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.0.1.tgz#b38b444ad3aa5fedbb15f2f746dcd934226a12dd"
+  integrity sha512-+u76oB43nOHrF4DDWRLWDCtci7f3QJoEBigemIdIeTi1ODqjx6Tad9NCVnPRwewWlKkVab5PlK8DCtPTyX7S8g==
+
+"@algolia/cache-browser-local-storage@4.14.2":
+  version "4.14.2"
+  resolved "https://registry.yarnpkg.com/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.14.2.tgz#d5b1b90130ca87c6321de876e167df9ec6524936"
+  integrity sha512-FRweBkK/ywO+GKYfAWbrepewQsPTIEirhi1BdykX9mxvBPtGNKccYAxvGdDCumU1jL4r3cayio4psfzKMejBlA==
   dependencies:
-    "@algolia/cache-common" "4.13.1"
+    "@algolia/cache-common" "4.14.2"
 
-"@algolia/cache-common@4.13.1":
-  version "4.13.1"
-  resolved "https://registry.yarnpkg.com/@algolia/cache-common/-/cache-common-4.13.1.tgz#c933fdec9f73b4f7c69d5751edc92eee4a63d76b"
-  integrity sha512-7Vaf6IM4L0Jkl3sYXbwK+2beQOgVJ0mKFbz/4qSxKd1iy2Sp77uTAazcX+Dlexekg1fqGUOSO7HS4Sx47ZJmjA==
+"@algolia/cache-common@4.14.2":
+  version "4.14.2"
+  resolved "https://registry.yarnpkg.com/@algolia/cache-common/-/cache-common-4.14.2.tgz#b946b6103c922f0c06006fb6929163ed2c67d598"
+  integrity sha512-SbvAlG9VqNanCErr44q6lEKD2qoK4XtFNx9Qn8FK26ePCI8I9yU7pYB+eM/cZdS9SzQCRJBbHUumVr4bsQ4uxg==
 
-"@algolia/cache-in-memory@4.13.1":
-  version "4.13.1"
-  resolved "https://registry.yarnpkg.com/@algolia/cache-in-memory/-/cache-in-memory-4.13.1.tgz#c19baa67b4597e1a93e987350613ab3b88768832"
-  integrity sha512-pZzybCDGApfA/nutsFK1P0Sbsq6fYJU3DwIvyKg4pURerlJM4qZbB9bfLRef0FkzfQu7W11E4cVLCIOWmyZeuQ==
+"@algolia/cache-in-memory@4.14.2":
+  version "4.14.2"
+  resolved "https://registry.yarnpkg.com/@algolia/cache-in-memory/-/cache-in-memory-4.14.2.tgz#88e4a21474f9ac05331c2fa3ceb929684a395a24"
+  integrity sha512-HrOukWoop9XB/VFojPv1R5SVXowgI56T9pmezd/djh2JnVN/vXswhXV51RKy4nCpqxyHt/aGFSq2qkDvj6KiuQ==
   dependencies:
-    "@algolia/cache-common" "4.13.1"
+    "@algolia/cache-common" "4.14.2"
 
-"@algolia/client-account@4.13.1":
-  version "4.13.1"
-  resolved "https://registry.yarnpkg.com/@algolia/client-account/-/client-account-4.13.1.tgz#fea591943665477a23922ab31863ad0732e26c66"
-  integrity sha512-TFLiZ1KqMiir3FNHU+h3b0MArmyaHG+eT8Iojio6TdpeFcAQ1Aiy+2gb3SZk3+pgRJa/BxGmDkRUwE5E/lv3QQ==
+"@algolia/client-account@4.14.2":
+  version "4.14.2"
+  resolved "https://registry.yarnpkg.com/@algolia/client-account/-/client-account-4.14.2.tgz#b76ac1ba9ea71e8c3f77a1805b48350dc0728a16"
+  integrity sha512-WHtriQqGyibbb/Rx71YY43T0cXqyelEU0lB2QMBRXvD2X0iyeGl4qMxocgEIcbHyK7uqE7hKgjT8aBrHqhgc1w==
   dependencies:
-    "@algolia/client-common" "4.13.1"
-    "@algolia/client-search" "4.13.1"
-    "@algolia/transporter" "4.13.1"
+    "@algolia/client-common" "4.14.2"
+    "@algolia/client-search" "4.14.2"
+    "@algolia/transporter" "4.14.2"
 
-"@algolia/client-analytics@4.13.1":
-  version "4.13.1"
-  resolved "https://registry.yarnpkg.com/@algolia/client-analytics/-/client-analytics-4.13.1.tgz#5275956b2d0d16997148f2085f1701b6c39ecc32"
-  integrity sha512-iOS1JBqh7xaL5x00M5zyluZ9+9Uy9GqtYHv/2SMuzNW1qP7/0doz1lbcsP3S7KBbZANJTFHUOfuqyRLPk91iFA==
+"@algolia/client-analytics@4.14.2":
+  version "4.14.2"
+  resolved "https://registry.yarnpkg.com/@algolia/client-analytics/-/client-analytics-4.14.2.tgz#ca04dcaf9a78ee5c92c5cb5e9c74cf031eb2f1fb"
+  integrity sha512-yBvBv2mw+HX5a+aeR0dkvUbFZsiC4FKSnfqk9rrfX+QrlNOKEhCG0tJzjiOggRW4EcNqRmaTULIYvIzQVL2KYQ==
   dependencies:
-    "@algolia/client-common" "4.13.1"
-    "@algolia/client-search" "4.13.1"
-    "@algolia/requester-common" "4.13.1"
-    "@algolia/transporter" "4.13.1"
+    "@algolia/client-common" "4.14.2"
+    "@algolia/client-search" "4.14.2"
+    "@algolia/requester-common" "4.14.2"
+    "@algolia/transporter" "4.14.2"
 
-"@algolia/client-common@4.13.1":
-  version "4.13.1"
-  resolved "https://registry.yarnpkg.com/@algolia/client-common/-/client-common-4.13.1.tgz#3bf9e3586f20ef85bbb56ccca390f7dbe57c8f4f"
-  integrity sha512-LcDoUE0Zz3YwfXJL6lJ2OMY2soClbjrrAKB6auYVMNJcoKZZ2cbhQoFR24AYoxnGUYBER/8B+9sTBj5bj/Gqbg==
+"@algolia/client-common@4.14.2":
+  version "4.14.2"
+  resolved "https://registry.yarnpkg.com/@algolia/client-common/-/client-common-4.14.2.tgz#e1324e167ffa8af60f3e8bcd122110fd0bfd1300"
+  integrity sha512-43o4fslNLcktgtDMVaT5XwlzsDPzlqvqesRi4MjQz2x4/Sxm7zYg5LRYFol1BIhG6EwxKvSUq8HcC/KxJu3J0Q==
   dependencies:
-    "@algolia/requester-common" "4.13.1"
-    "@algolia/transporter" "4.13.1"
+    "@algolia/requester-common" "4.14.2"
+    "@algolia/transporter" "4.14.2"
 
-"@algolia/client-personalization@4.13.1":
-  version "4.13.1"
-  resolved "https://registry.yarnpkg.com/@algolia/client-personalization/-/client-personalization-4.13.1.tgz#438a1f58576ef19c4ad4addb8417bdacfe2fce2e"
-  integrity sha512-1CqrOW1ypVrB4Lssh02hP//YxluoIYXAQCpg03L+/RiXJlCs+uIqlzC0ctpQPmxSlTK6h07kr50JQoYH/TIM9w==
+"@algolia/client-personalization@4.14.2":
+  version "4.14.2"
+  resolved "https://registry.yarnpkg.com/@algolia/client-personalization/-/client-personalization-4.14.2.tgz#656bbb6157a3dd1a4be7de65e457fda136c404ec"
+  integrity sha512-ACCoLi0cL8CBZ1W/2juehSltrw2iqsQBnfiu/Rbl9W2yE6o2ZUb97+sqN/jBqYNQBS+o0ekTMKNkQjHHAcEXNw==
   dependencies:
-    "@algolia/client-common" "4.13.1"
-    "@algolia/requester-common" "4.13.1"
-    "@algolia/transporter" "4.13.1"
+    "@algolia/client-common" "4.14.2"
+    "@algolia/requester-common" "4.14.2"
+    "@algolia/transporter" "4.14.2"
 
-"@algolia/client-search@4.13.1":
-  version "4.13.1"
-  resolved "https://registry.yarnpkg.com/@algolia/client-search/-/client-search-4.13.1.tgz#5501deed01e23c33d4aaa9f9eb96a849f0fce313"
-  integrity sha512-YQKYA83MNRz3FgTNM+4eRYbSmHi0WWpo019s5SeYcL3HUan/i5R09VO9dk3evELDFJYciiydSjbsmhBzbpPP2A==
+"@algolia/client-search@4.14.2":
+  version "4.14.2"
+  resolved "https://registry.yarnpkg.com/@algolia/client-search/-/client-search-4.14.2.tgz#357bdb7e640163f0e33bad231dfcc21f67dc2e92"
+  integrity sha512-L5zScdOmcZ6NGiVbLKTvP02UbxZ0njd5Vq9nJAmPFtjffUSOGEp11BmD2oMJ5QvARgx2XbX4KzTTNS5ECYIMWw==
   dependencies:
-    "@algolia/client-common" "4.13.1"
-    "@algolia/requester-common" "4.13.1"
-    "@algolia/transporter" "4.13.1"
+    "@algolia/client-common" "4.14.2"
+    "@algolia/requester-common" "4.14.2"
+    "@algolia/transporter" "4.14.2"
 
-"@algolia/logger-common@4.13.1":
-  version "4.13.1"
-  resolved "https://registry.yarnpkg.com/@algolia/logger-common/-/logger-common-4.13.1.tgz#4221378e701e3f1eacaa051bcd4ba1f25ddfaf4d"
-  integrity sha512-L6slbL/OyZaAXNtS/1A8SAbOJeEXD5JcZeDCPYDqSTYScfHu+2ePRTDMgUTY4gQ7HsYZ39N1LujOd8WBTmM2Aw==
+"@algolia/logger-common@4.14.2":
+  version "4.14.2"
+  resolved "https://registry.yarnpkg.com/@algolia/logger-common/-/logger-common-4.14.2.tgz#b74b3a92431f92665519d95942c246793ec390ee"
+  integrity sha512-/JGlYvdV++IcMHBnVFsqEisTiOeEr6cUJtpjz8zc0A9c31JrtLm318Njc72p14Pnkw3A/5lHHh+QxpJ6WFTmsA==
 
-"@algolia/logger-console@4.13.1":
-  version "4.13.1"
-  resolved "https://registry.yarnpkg.com/@algolia/logger-console/-/logger-console-4.13.1.tgz#423d358e4992dd4bceab0d9a4e99d1fd68107043"
-  integrity sha512-7jQOTftfeeLlnb3YqF8bNgA2GZht7rdKkJ31OCeSH2/61haO0tWPoNRjZq9XLlgMQZH276pPo0NdiArcYPHjCA==
+"@algolia/logger-console@4.14.2":
+  version "4.14.2"
+  resolved "https://registry.yarnpkg.com/@algolia/logger-console/-/logger-console-4.14.2.tgz#ec49cb47408f5811d4792598683923a800abce7b"
+  integrity sha512-8S2PlpdshbkwlLCSAB5f8c91xyc84VM9Ar9EdfE9UmX+NrKNYnWR1maXXVDQQoto07G1Ol/tYFnFVhUZq0xV/g==
   dependencies:
-    "@algolia/logger-common" "4.13.1"
+    "@algolia/logger-common" "4.14.2"
 
-"@algolia/requester-browser-xhr@4.13.1":
-  version "4.13.1"
-  resolved "https://registry.yarnpkg.com/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.13.1.tgz#f8ea79233cf6f0392feaf31e35a6b40d68c5bc9e"
-  integrity sha512-oa0CKr1iH6Nc7CmU6RE7TnXMjHnlyp7S80pP/LvZVABeJHX3p/BcSCKovNYWWltgTxUg0U1o+2uuy8BpMKljwA==
+"@algolia/requester-browser-xhr@4.14.2":
+  version "4.14.2"
+  resolved "https://registry.yarnpkg.com/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.14.2.tgz#a2cd4d9d8d90d53109cc7f3682dc6ebf20f798f2"
+  integrity sha512-CEh//xYz/WfxHFh7pcMjQNWgpl4wFB85lUMRyVwaDPibNzQRVcV33YS+63fShFWc2+42YEipFGH2iPzlpszmDw==
   dependencies:
-    "@algolia/requester-common" "4.13.1"
+    "@algolia/requester-common" "4.14.2"
 
-"@algolia/requester-common@4.13.1":
-  version "4.13.1"
-  resolved "https://registry.yarnpkg.com/@algolia/requester-common/-/requester-common-4.13.1.tgz#daea143d15ab6ed3909c4c45877f1b6c36a16179"
-  integrity sha512-eGVf0ID84apfFEuXsaoSgIxbU3oFsIbz4XiotU3VS8qGCJAaLVUC5BUJEkiFENZIhon7hIB4d0RI13HY4RSA+w==
+"@algolia/requester-common@4.14.2":
+  version "4.14.2"
+  resolved "https://registry.yarnpkg.com/@algolia/requester-common/-/requester-common-4.14.2.tgz#bc4e9e5ee16c953c0ecacbfb334a33c30c28b1a1"
+  integrity sha512-73YQsBOKa5fvVV3My7iZHu1sUqmjjfs9TteFWwPwDmnad7T0VTCopttcsM3OjLxZFtBnX61Xxl2T2gmG2O4ehg==
 
-"@algolia/requester-node-http@4.13.1":
-  version "4.13.1"
-  resolved "https://registry.yarnpkg.com/@algolia/requester-node-http/-/requester-node-http-4.13.1.tgz#32c63d4c009f22d97e396406de7af9b66fb8e89d"
-  integrity sha512-7C0skwtLdCz5heKTVe/vjvrqgL/eJxmiEjHqXdtypcE5GCQCYI15cb+wC4ytYioZDMiuDGeVYmCYImPoEgUGPw==
+"@algolia/requester-node-http@4.14.2":
+  version "4.14.2"
+  resolved "https://registry.yarnpkg.com/@algolia/requester-node-http/-/requester-node-http-4.14.2.tgz#7c1223a1785decaab1def64c83dade6bea45e115"
+  integrity sha512-oDbb02kd1o5GTEld4pETlPZLY0e+gOSWjWMJHWTgDXbv9rm/o2cF7japO6Vj1ENnrqWvLBmW1OzV9g6FUFhFXg==
   dependencies:
-    "@algolia/requester-common" "4.13.1"
+    "@algolia/requester-common" "4.14.2"
 
-"@algolia/transporter@4.13.1":
-  version "4.13.1"
-  resolved "https://registry.yarnpkg.com/@algolia/transporter/-/transporter-4.13.1.tgz#509e03e9145102843d5be4a031c521f692d4e8d6"
-  integrity sha512-pICnNQN7TtrcYJqqPEXByV8rJ8ZRU2hCiIKLTLRyNpghtQG3VAFk6fVtdzlNfdUGZcehSKGarPIZEHlQXnKjgw==
+"@algolia/transporter@4.14.2":
+  version "4.14.2"
+  resolved "https://registry.yarnpkg.com/@algolia/transporter/-/transporter-4.14.2.tgz#77c069047fb1a4359ee6a51f51829508e44a1e3d"
+  integrity sha512-t89dfQb2T9MFQHidjHcfhh6iGMNwvuKUvojAj+JsrHAGbuSy7yE4BylhLX6R0Q1xYRoC4Vvv+O5qIw/LdnQfsQ==
   dependencies:
-    "@algolia/cache-common" "4.13.1"
-    "@algolia/logger-common" "4.13.1"
-    "@algolia/requester-common" "4.13.1"
+    "@algolia/cache-common" "4.14.2"
+    "@algolia/logger-common" "4.14.2"
+    "@algolia/requester-common" "4.14.2"
 
 "@ampproject/remapping@^2.1.0":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.1.2.tgz#4edca94973ded9630d20101cd8559cedb8d8bd34"
-  integrity sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d"
+  integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==
   dependencies:
-    "@jridgewell/trace-mapping" "^0.3.0"
+    "@jridgewell/gen-mapping" "^0.1.0"
+    "@jridgewell/trace-mapping" "^0.3.9"
 
 "@apideck/better-ajv-errors@^0.3.1":
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.3.tgz#ab0b1e981e1749bf59736cf7ebe25cfc9f949c15"
-  integrity sha512-9o+HO2MbJhJHjDYZaDxJmSDckvDpiuItEsrIShV0DXeCshXWRHhqYyU/PKHMkuClOmFnZhRd6wzv4vpDu/dRKg==
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.6.tgz#957d4c28e886a64a8141f7522783be65733ff097"
+  integrity sha512-P+ZygBLZtkp0qqOAJJVX4oX/sFo5JR3eBWwwuqHHhK0GIgQOKWrAfiAaWX0aArHkRWHMuggFEgAZNxVPwPZYaA==
   dependencies:
     json-schema "^0.4.0"
     jsonpointer "^5.0.0"
     leven "^3.1.0"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.8.3":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
-  integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.8.3":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
+  integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
   dependencies:
-    "@babel/highlight" "^7.16.7"
+    "@babel/highlight" "^7.18.6"
 
-"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.8", "@babel/compat-data@^7.17.0", "@babel/compat-data@^7.17.7":
-  version "7.17.7"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.7.tgz#078d8b833fbbcc95286613be8c716cef2b519fa2"
-  integrity sha512-p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ==
+"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.0", "@babel/compat-data@^7.20.1":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.5.tgz#86f172690b093373a933223b4745deeb6049e733"
+  integrity sha512-KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g==
 
 "@babel/core@^7.1.0", "@babel/core@^7.11.1", "@babel/core@^7.12.3", "@babel/core@^7.16.0", "@babel/core@^7.7.2", "@babel/core@^7.8.0":
-  version "7.17.9"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.9.tgz#6bae81a06d95f4d0dec5bb9d74bbc1f58babdcfe"
-  integrity sha512-5ug+SfZCpDAkVp9SFIZAzlW18rlzsOcJGaetCjkySnrXXDUw9AR8cDUm1iByTmdWM6yxX6/zycaV76w3YTF2gw==
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.5.tgz#45e2114dc6cd4ab167f81daf7820e8fa1250d113"
+  integrity sha512-UdOWmk4pNWTm/4DlPUl/Pt4Gz4rcEMb7CY0Y3eJl5Yz1vI8ZJGmHWaVE55LoxRjdpx0z259GE9U5STA9atUinQ==
   dependencies:
     "@ampproject/remapping" "^2.1.0"
-    "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.17.9"
-    "@babel/helper-compilation-targets" "^7.17.7"
-    "@babel/helper-module-transforms" "^7.17.7"
-    "@babel/helpers" "^7.17.9"
-    "@babel/parser" "^7.17.9"
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.17.9"
-    "@babel/types" "^7.17.0"
+    "@babel/code-frame" "^7.18.6"
+    "@babel/generator" "^7.20.5"
+    "@babel/helper-compilation-targets" "^7.20.0"
+    "@babel/helper-module-transforms" "^7.20.2"
+    "@babel/helpers" "^7.20.5"
+    "@babel/parser" "^7.20.5"
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.20.5"
+    "@babel/types" "^7.20.5"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
@@ -156,391 +162,393 @@
     semver "^6.3.0"
 
 "@babel/eslint-parser@^7.16.3":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz#eabb24ad9f0afa80e5849f8240d0e5facc2d90d6"
-  integrity sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.19.1.tgz#4f68f6b0825489e00a24b41b6a1ae35414ecd2f4"
+  integrity sha512-AqNf2QWt1rtu2/1rLswy6CDP7H9Oh3mMhk177Y67Rg8d7RD9WfOLLv8CGn6tisFvS2htm86yIe1yLF6I1UDaGQ==
   dependencies:
-    eslint-scope "^5.1.1"
+    "@nicolo-ribaudo/eslint-scope-5-internals" "5.1.1-v1"
     eslint-visitor-keys "^2.1.0"
     semver "^6.3.0"
 
-"@babel/generator@^7.17.9", "@babel/generator@^7.7.2":
-  version "7.17.9"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.9.tgz#f4af9fd38fa8de143c29fce3f71852406fc1e2fc"
-  integrity sha512-rAdDousTwxbIxbz5I7GEQ3lUip+xVCXooZNbsydCWs3xA7ZsYOv+CFRdzGxRX78BmQHu9B1Eso59AOZQOJDEdQ==
+"@babel/generator@^7.20.5", "@babel/generator@^7.7.2":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.5.tgz#cb25abee3178adf58d6814b68517c62bdbfdda95"
+  integrity sha512-jl7JY2Ykn9S0yj4DQP82sYvPU+T3g0HFcWTqDLqiuA9tGRNIj9VfbtXGAYTTkyNEnQk1jkMGOdYka8aG/lulCA==
   dependencies:
-    "@babel/types" "^7.17.0"
+    "@babel/types" "^7.20.5"
+    "@jridgewell/gen-mapping" "^0.3.2"
     jsesc "^2.5.1"
-    source-map "^0.5.0"
 
-"@babel/helper-annotate-as-pure@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862"
-  integrity sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==
+"@babel/helper-annotate-as-pure@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb"
+  integrity sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==
   dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/types" "^7.18.6"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz#38d138561ea207f0f69eb1626a418e4f7e6a580b"
-  integrity sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.18.6":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz#acd4edfd7a566d1d51ea975dff38fd52906981bb"
+  integrity sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==
   dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.16.7"
-    "@babel/types" "^7.16.7"
+    "@babel/helper-explode-assignable-expression" "^7.18.6"
+    "@babel/types" "^7.18.9"
 
-"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7", "@babel/helper-compilation-targets@^7.17.7":
-  version "7.17.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz#a3c2924f5e5f0379b356d4cfb313d1414dc30e46"
-  integrity sha512-UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w==
+"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.0":
+  version "7.20.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz#6bf5374d424e1b3922822f1d9bdaa43b1a139d0a"
+  integrity sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==
   dependencies:
-    "@babel/compat-data" "^7.17.7"
-    "@babel/helper-validator-option" "^7.16.7"
-    browserslist "^4.17.5"
+    "@babel/compat-data" "^7.20.0"
+    "@babel/helper-validator-option" "^7.18.6"
+    browserslist "^4.21.3"
     semver "^6.3.0"
 
-"@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.6", "@babel/helper-create-class-features-plugin@^7.17.9":
-  version "7.17.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.9.tgz#71835d7fb9f38bd9f1378e40a4c0902fdc2ea49d"
-  integrity sha512-kUjip3gruz6AJKOq5i3nC6CoCEEF/oHH3cp6tOZhB+IyyyPyW0g1Gfsxn3mkk6S08pIA2y8GQh609v9G/5sHVQ==
+"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.20.2", "@babel/helper-create-class-features-plugin@^7.20.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.5.tgz#327154eedfb12e977baa4ecc72e5806720a85a06"
+  integrity sha512-3RCdA/EmEaikrhayahwToF0fpweU/8o2p8vhc1c/1kftHOdTKuC65kik/TLc+qfbS8JKw4qqJbne4ovICDhmww==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.17.9"
-    "@babel/helper-member-expression-to-functions" "^7.17.7"
-    "@babel/helper-optimise-call-expression" "^7.16.7"
-    "@babel/helper-replace-supers" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-function-name" "^7.19.0"
+    "@babel/helper-member-expression-to-functions" "^7.18.9"
+    "@babel/helper-optimise-call-expression" "^7.18.6"
+    "@babel/helper-replace-supers" "^7.19.1"
+    "@babel/helper-split-export-declaration" "^7.18.6"
 
-"@babel/helper-create-regexp-features-plugin@^7.16.7":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz#1dcc7d40ba0c6b6b25618997c5dbfd310f186fe1"
-  integrity sha512-awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA==
+"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.20.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.20.5.tgz#5ea79b59962a09ec2acf20a963a01ab4d076ccca"
+  integrity sha512-m68B1lkg3XDGX5yCvGO0kPx3v9WIYLnzjKfPcQiwntEQa5ZeRkPmo2X/ISJc8qxWGfwUr+kvZAeEzAwLec2r2w==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    regexpu-core "^5.0.1"
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    regexpu-core "^5.2.1"
 
-"@babel/helper-define-polyfill-provider@^0.3.1":
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz#52411b445bdb2e676869e5a74960d2d3826d2665"
-  integrity sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==
+"@babel/helper-define-polyfill-provider@^0.3.3":
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz#8612e55be5d51f0cd1f36b4a5a83924e89884b7a"
+  integrity sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.13.0"
-    "@babel/helper-module-imports" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/traverse" "^7.13.0"
+    "@babel/helper-compilation-targets" "^7.17.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
     debug "^4.1.1"
     lodash.debounce "^4.0.8"
     resolve "^1.14.2"
     semver "^6.1.2"
 
-"@babel/helper-environment-visitor@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz#ff484094a839bde9d89cd63cba017d7aae80ecd7"
-  integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==
+"@babel/helper-environment-visitor@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be"
+  integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==
+
+"@babel/helper-explode-assignable-expression@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz#41f8228ef0a6f1a036b8dfdfec7ce94f9a6bc096"
+  integrity sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==
   dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/types" "^7.18.6"
 
-"@babel/helper-explode-assignable-expression@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz#12a6d8522fdd834f194e868af6354e8650242b7a"
-  integrity sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==
+"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c"
+  integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==
   dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/template" "^7.18.10"
+    "@babel/types" "^7.19.0"
 
-"@babel/helper-function-name@^7.16.7", "@babel/helper-function-name@^7.17.9":
-  version "7.17.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz#136fcd54bc1da82fcb47565cf16fd8e444b1ff12"
-  integrity sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==
+"@babel/helper-hoist-variables@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678"
+  integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==
   dependencies:
-    "@babel/template" "^7.16.7"
-    "@babel/types" "^7.17.0"
+    "@babel/types" "^7.18.6"
 
-"@babel/helper-hoist-variables@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246"
-  integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==
+"@babel/helper-member-expression-to-functions@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz#1531661e8375af843ad37ac692c132841e2fd815"
+  integrity sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==
   dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/types" "^7.18.9"
 
-"@babel/helper-member-expression-to-functions@^7.16.7", "@babel/helper-member-expression-to-functions@^7.17.7":
-  version "7.17.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz#a34013b57d8542a8c4ff8ba3f747c02452a4d8c4"
-  integrity sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==
+"@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e"
+  integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==
   dependencies:
-    "@babel/types" "^7.17.0"
+    "@babel/types" "^7.18.6"
 
-"@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437"
-  integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==
+"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.6", "@babel/helper-module-transforms@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz#ac53da669501edd37e658602a21ba14c08748712"
+  integrity sha512-zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA==
   dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-module-imports" "^7.18.6"
+    "@babel/helper-simple-access" "^7.20.2"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/helper-validator-identifier" "^7.19.1"
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.20.1"
+    "@babel/types" "^7.20.2"
 
-"@babel/helper-module-transforms@^7.16.7", "@babel/helper-module-transforms@^7.17.7":
-  version "7.17.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz#3943c7f777139e7954a5355c815263741a9c1cbd"
-  integrity sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw==
+"@babel/helper-optimise-call-expression@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe"
+  integrity sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-module-imports" "^7.16.7"
-    "@babel/helper-simple-access" "^7.17.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
-    "@babel/helper-validator-identifier" "^7.16.7"
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.17.3"
-    "@babel/types" "^7.17.0"
+    "@babel/types" "^7.18.6"
 
-"@babel/helper-optimise-call-expression@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz#a34e3560605abbd31a18546bd2aad3e6d9a174f2"
-  integrity sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629"
+  integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==
+
+"@babel/helper-remap-async-to-generator@^7.18.6", "@babel/helper-remap-async-to-generator@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz#997458a0e3357080e54e1d79ec347f8a8cd28519"
+  integrity sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==
   dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-wrap-function" "^7.18.9"
+    "@babel/types" "^7.18.9"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5"
-  integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==
-
-"@babel/helper-remap-async-to-generator@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz#29ffaade68a367e2ed09c90901986918d25e57e3"
-  integrity sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==
+"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.19.1":
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz#e1592a9b4b368aa6bdb8784a711e0bcbf0612b78"
+  integrity sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-wrap-function" "^7.16.8"
-    "@babel/types" "^7.16.8"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-member-expression-to-functions" "^7.18.9"
+    "@babel/helper-optimise-call-expression" "^7.18.6"
+    "@babel/traverse" "^7.19.1"
+    "@babel/types" "^7.19.0"
 
-"@babel/helper-replace-supers@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz#e9f5f5f32ac90429c1a4bdec0f231ef0c2838ab1"
-  integrity sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==
+"@babel/helper-simple-access@^7.19.4", "@babel/helper-simple-access@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9"
+  integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-member-expression-to-functions" "^7.16.7"
-    "@babel/helper-optimise-call-expression" "^7.16.7"
-    "@babel/traverse" "^7.16.7"
-    "@babel/types" "^7.16.7"
+    "@babel/types" "^7.20.2"
 
-"@babel/helper-simple-access@^7.17.7":
-  version "7.17.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz#aaa473de92b7987c6dfa7ce9a7d9674724823367"
-  integrity sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==
+"@babel/helper-skip-transparent-expression-wrappers@^7.18.9":
+  version "7.20.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz#fbe4c52f60518cab8140d77101f0e63a8a230684"
+  integrity sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==
   dependencies:
-    "@babel/types" "^7.17.0"
+    "@babel/types" "^7.20.0"
 
-"@babel/helper-skip-transparent-expression-wrappers@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09"
-  integrity sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==
+"@babel/helper-split-export-declaration@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075"
+  integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==
   dependencies:
-    "@babel/types" "^7.16.0"
+    "@babel/types" "^7.18.6"
 
-"@babel/helper-split-export-declaration@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b"
-  integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==
+"@babel/helper-string-parser@^7.19.4":
+  version "7.19.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63"
+  integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==
+
+"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1":
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
+  integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
+
+"@babel/helper-validator-option@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8"
+  integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==
+
+"@babel/helper-wrap-function@^7.18.9":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz#75e2d84d499a0ab3b31c33bcfe59d6b8a45f62e3"
+  integrity sha512-bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q==
   dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/helper-function-name" "^7.19.0"
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.20.5"
+    "@babel/types" "^7.20.5"
 
-"@babel/helper-validator-identifier@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad"
-  integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==
-
-"@babel/helper-validator-option@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23"
-  integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==
-
-"@babel/helper-wrap-function@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz#58afda087c4cd235de92f7ceedebca2c41274200"
-  integrity sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==
+"@babel/helpers@^7.20.5":
+  version "7.20.6"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.6.tgz#e64778046b70e04779dfbdf924e7ebb45992c763"
+  integrity sha512-Pf/OjgfgFRW5bApskEz5pvidpim7tEDPlFtKcNRXWmfHGn9IEI2W2flqRQXTFb7gIPTyK++N6rVHuwKut4XK6w==
   dependencies:
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.16.8"
-    "@babel/types" "^7.16.8"
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.20.5"
+    "@babel/types" "^7.20.5"
 
-"@babel/helpers@^7.17.9":
-  version "7.17.9"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.9.tgz#b2af120821bfbe44f9907b1826e168e819375a1a"
-  integrity sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q==
+"@babel/highlight@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
+  integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==
   dependencies:
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.17.9"
-    "@babel/types" "^7.17.0"
-
-"@babel/highlight@^7.16.7":
-  version "7.17.9"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.17.9.tgz#61b2ee7f32ea0454612def4fccdae0de232b73e3"
-  integrity sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.16.7"
+    "@babel/helper-validator-identifier" "^7.18.6"
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.17.9":
-  version "7.17.9"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.9.tgz#9c94189a6062f0291418ca021077983058e171ef"
-  integrity sha512-vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg==
+"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.10", "@babel/parser@^7.20.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.5.tgz#7f3c7335fe417665d929f34ae5dceae4c04015e8"
+  integrity sha512-r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA==
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050"
-  integrity sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg==
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2"
+  integrity sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz#cc001234dfc139ac45f6bcf801866198c8c72ff9"
-  integrity sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw==
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz#a11af19aa373d68d561f08e0a57242350ed0ec50"
+  integrity sha512-AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
-    "@babel/plugin-proposal-optional-chaining" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
+    "@babel/plugin-proposal-optional-chaining" "^7.18.9"
 
-"@babel/plugin-proposal-async-generator-functions@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz#3bdd1ebbe620804ea9416706cd67d60787504bc8"
-  integrity sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==
+"@babel/plugin-proposal-async-generator-functions@^7.20.1":
+  version "7.20.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.1.tgz#352f02baa5d69f4e7529bdac39aaa02d41146af9"
+  integrity sha512-Gh5rchzSwE4kC+o/6T8waD0WHEQIsDmjltY8WnWRXHUdH8axZhuH86Ov9M72YhJfDrZseQwuuWaaIT/TmePp3g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-remap-async-to-generator" "^7.16.8"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/helper-remap-async-to-generator" "^7.18.9"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
-"@babel/plugin-proposal-class-properties@^7.16.0", "@babel/plugin-proposal-class-properties@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0"
-  integrity sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==
+"@babel/plugin-proposal-class-properties@^7.16.0", "@babel/plugin-proposal-class-properties@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3"
+  integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-proposal-class-static-block@^7.16.7":
-  version "7.17.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.17.6.tgz#164e8fd25f0d80fa48c5a4d1438a6629325ad83c"
-  integrity sha512-X/tididvL2zbs7jZCeeRJ8167U/+Ac135AM6jCAx6gYXDUviZV5Ku9UDvWS2NCuWlFjIRXklYhwo6HhAC7ETnA==
+"@babel/plugin-proposal-class-static-block@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz#8aa81d403ab72d3962fc06c26e222dacfc9b9020"
+  integrity sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.17.6"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
 "@babel/plugin-proposal-decorators@^7.16.4":
-  version "7.17.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.17.9.tgz#67a1653be9c77ce5b6c318aa90c8287b87831619"
-  integrity sha512-EfH2LZ/vPa2wuPwJ26j+kYRkaubf89UlwxKXtxqEm57HrgSEYDB8t4swFP+p8LcI9yiP9ZRJJjo/58hS6BnaDA==
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.20.5.tgz#28ba1a0e5044664a512967a19407d7fc26925394"
+  integrity sha512-Lac7PpRJXcC3s9cKsBfl+uc+DYXU5FD06BrTFunQO6QIQT+DwyzDPURAowI3bcvD1dZF/ank1Z5rstUJn3Hn4Q==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.17.9"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-replace-supers" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
-    "@babel/plugin-syntax-decorators" "^7.17.0"
-    charcodes "^0.2.0"
+    "@babel/helper-create-class-features-plugin" "^7.20.5"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-replace-supers" "^7.19.1"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/plugin-syntax-decorators" "^7.19.0"
 
-"@babel/plugin-proposal-dynamic-import@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz#c19c897eaa46b27634a00fee9fb7d829158704b2"
-  integrity sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==
+"@babel/plugin-proposal-dynamic-import@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz#72bcf8d408799f547d759298c3c27c7e7faa4d94"
+  integrity sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
-"@babel/plugin-proposal-export-namespace-from@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz#09de09df18445a5786a305681423ae63507a6163"
-  integrity sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==
+"@babel/plugin-proposal-export-namespace-from@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz#5f7313ab348cdb19d590145f9247540e94761203"
+  integrity sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.9"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
-"@babel/plugin-proposal-json-strings@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz#9732cb1d17d9a2626a08c5be25186c195b6fa6e8"
-  integrity sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ==
+"@babel/plugin-proposal-json-strings@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz#7e8788c1811c393aff762817e7dbf1ebd0c05f0b"
+  integrity sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
 
-"@babel/plugin-proposal-logical-assignment-operators@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz#be23c0ba74deec1922e639832904be0bea73cdea"
-  integrity sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==
+"@babel/plugin-proposal-logical-assignment-operators@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz#8148cbb350483bf6220af06fa6db3690e14b2e23"
+  integrity sha512-128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.9"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.16.0", "@babel/plugin-proposal-nullish-coalescing-operator@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz#141fc20b6857e59459d430c850a0011e36561d99"
-  integrity sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.16.0", "@babel/plugin-proposal-nullish-coalescing-operator@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1"
+  integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
-"@babel/plugin-proposal-numeric-separator@^7.16.0", "@babel/plugin-proposal-numeric-separator@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz#d6b69f4af63fb38b6ca2558442a7fb191236eba9"
-  integrity sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==
+"@babel/plugin-proposal-numeric-separator@^7.16.0", "@babel/plugin-proposal-numeric-separator@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz#899b14fbafe87f053d2c5ff05b36029c62e13c75"
+  integrity sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.16.7":
-  version "7.17.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.17.3.tgz#d9eb649a54628a51701aef7e0ea3d17e2b9dd390"
-  integrity sha512-yuL5iQA/TbZn+RGAfxQXfi7CNLmKi1f8zInn4IgobuCWcAb7i+zj4TYzQ9l8cEzVyJ89PDGuqxK1xZpUDISesw==
+"@babel/plugin-proposal-object-rest-spread@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.2.tgz#a556f59d555f06961df1e572bb5eca864c84022d"
+  integrity sha512-Ks6uej9WFK+fvIMesSqbAto5dD8Dz4VuuFvGJFKgIGSkJuRGcrwGECPA1fDgQK3/DbExBJpEkTeYeB8geIFCSQ==
   dependencies:
-    "@babel/compat-data" "^7.17.0"
-    "@babel/helper-compilation-targets" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/compat-data" "^7.20.1"
+    "@babel/helper-compilation-targets" "^7.20.0"
+    "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.16.7"
+    "@babel/plugin-transform-parameters" "^7.20.1"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz#c623a430674ffc4ab732fd0a0ae7722b67cb74cf"
-  integrity sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==
+"@babel/plugin-proposal-optional-catch-binding@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz#f9400d0e6a3ea93ba9ef70b09e72dd6da638a2cb"
+  integrity sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-proposal-optional-chaining@^7.16.0", "@babel/plugin-proposal-optional-chaining@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz#7cd629564724816c0e8a969535551f943c64c39a"
-  integrity sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==
+"@babel/plugin-proposal-optional-chaining@^7.16.0", "@babel/plugin-proposal-optional-chaining@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz#e8e8fe0723f2563960e4bf5e9690933691915993"
+  integrity sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-proposal-private-methods@^7.16.0", "@babel/plugin-proposal-private-methods@^7.16.11":
-  version "7.16.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz#e8df108288555ff259f4527dbe84813aac3a1c50"
-  integrity sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==
+"@babel/plugin-proposal-private-methods@^7.16.0", "@babel/plugin-proposal-private-methods@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz#5209de7d213457548a98436fa2882f52f4be6bea"
+  integrity sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.16.10"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-proposal-private-property-in-object@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz#b0b8cef543c2c3d57e59e2c611994861d46a3fce"
-  integrity sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==
+"@babel/plugin-proposal-private-property-in-object@^7.18.6":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.20.5.tgz#309c7668f2263f1c711aa399b5a9a6291eef6135"
+  integrity sha512-Vq7b9dUA12ByzB4EjQTPo25sFhY+08pQDBSZRtUAkj7lb7jahaHR5igera16QZ+3my1nYR4dKsNdYj5IjPHilQ==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-create-class-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-create-class-features-plugin" "^7.20.5"
+    "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.16.7", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz#635d18eb10c6214210ffc5ff4932552de08188a2"
-  integrity sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg==
+"@babel/plugin-proposal-unicode-property-regex@^7.18.6", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz#af613d2cd5e643643b65cded64207b15c85cb78e"
+  integrity sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
@@ -570,12 +578,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-decorators@^7.17.0":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.17.0.tgz#a2be3b2c9fe7d78bd4994e790896bc411e2f166d"
-  integrity sha512-qWe85yCXsvDEluNP0OyeQjH63DlhAR3W7K9BxxU1MvbDb48tgBG+Ao6IJJ6smPDrrVzSQZrbF6donpkFBMcs3A==
+"@babel/plugin-syntax-decorators@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.19.0.tgz#5f13d1d8fce96951bea01a10424463c9a5b3a599"
+  integrity sha512-xaBZUEDntt4faL1yN8oIFlhfXeQAWJW7CLKYsHTUqriCUbj8xOra8bfxxKGi/UwExPFBuPdH4XfHc9rGQhrVkQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.19.0"
 
 "@babel/plugin-syntax-dynamic-import@^7.8.3":
   version "7.8.3"
@@ -591,12 +599,19 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-syntax-flow@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.16.7.tgz#202b147e5892b8452bbb0bb269c7ed2539ab8832"
-  integrity sha512-UDo3YGQO0jH6ytzVwgSLv9i/CzMcUjbKenL67dTrAZPPv6GFAtDhe6jqnvmoKzC/7htNTohhos+onPtDMqJwaQ==
+"@babel/plugin-syntax-flow@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.18.6.tgz#774d825256f2379d06139be0c723c4dd444f3ca1"
+  integrity sha512-LUbR+KNTBWCUAqRG9ex5Gnzu2IOkt8jRJbHHXFT9q+L9zm7M/QQbEqXyw1n1pohYvOyWC8CjeyjrSaIwiYjK7A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
+
+"@babel/plugin-syntax-import-assertions@^7.20.0":
+  version "7.20.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz#bb50e0d4bea0957235390641209394e87bdb9cc4"
+  integrity sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.19.0"
 
 "@babel/plugin-syntax-import-meta@^7.8.3":
   version "7.10.4"
@@ -612,12 +627,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-jsx@^7.12.13", "@babel/plugin-syntax-jsx@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.7.tgz#50b6571d13f764266a113d77c82b4a6508bbe665"
-  integrity sha512-Esxmk7YjA8QysKeT3VhTXvF6y77f/a91SIs4pWb4H2eWGQkCKFgQaG6hdoEVZtGsrAcb2K5BW66XsOErD4WU3Q==
+"@babel/plugin-syntax-jsx@^7.17.12", "@babel/plugin-syntax-jsx@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz#a8feef63b010150abd97f1649ec296e849943ca0"
+  integrity sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
   version "7.10.4"
@@ -675,363 +690,364 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-typescript@^7.16.7", "@babel/plugin-syntax-typescript@^7.7.2":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.7.tgz#39c9b55ee153151990fb038651d58d3fd03f98f8"
-  integrity sha512-YhUIJHHGkqPgEcMYkPCKTyGUdoGKWtopIycQyjJH8OjvRgOYsXsaKehLVPScKJWAULPxMa4N1vCe6szREFlZ7A==
+"@babel/plugin-syntax-typescript@^7.20.0", "@babel/plugin-syntax-typescript@^7.7.2":
+  version "7.20.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz#4e9a0cfc769c85689b77a2e642d24e9f697fc8c7"
+  integrity sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.19.0"
 
-"@babel/plugin-transform-arrow-functions@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz#44125e653d94b98db76369de9c396dc14bef4154"
-  integrity sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==
+"@babel/plugin-transform-arrow-functions@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz#19063fcf8771ec7b31d742339dac62433d0611fe"
+  integrity sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-async-to-generator@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz#b83dff4b970cf41f1b819f8b49cc0cfbaa53a808"
-  integrity sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg==
+"@babel/plugin-transform-async-to-generator@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz#ccda3d1ab9d5ced5265fdb13f1882d5476c71615"
+  integrity sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==
   dependencies:
-    "@babel/helper-module-imports" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-remap-async-to-generator" "^7.16.8"
+    "@babel/helper-module-imports" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-remap-async-to-generator" "^7.18.6"
 
-"@babel/plugin-transform-block-scoped-functions@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz#4d0d57d9632ef6062cdf354bb717102ee042a620"
-  integrity sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==
+"@babel/plugin-transform-block-scoped-functions@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz#9187bf4ba302635b9d70d986ad70f038726216a8"
+  integrity sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-block-scoping@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz#f50664ab99ddeaee5bc681b8f3a6ea9d72ab4f87"
-  integrity sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==
+"@babel/plugin-transform-block-scoping@^7.20.2":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.5.tgz#401215f9dc13dc5262940e2e527c9536b3d7f237"
+  integrity sha512-WvpEIW9Cbj9ApF3yJCjIEEf1EiNJLtXagOrL5LNWEZOo3jv8pmPoYTSNJQvqej8OavVlgOoOPw6/htGZro6IkA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-classes@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz#8f4b9562850cd973de3b498f1218796eb181ce00"
-  integrity sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ==
+"@babel/plugin-transform-classes@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.2.tgz#c0033cf1916ccf78202d04be4281d161f6709bb2"
+  integrity sha512-9rbPp0lCVVoagvtEyQKSo5L8oo0nQS/iif+lwlAz29MccX2642vWDlSZK+2T2buxbopotId2ld7zZAzRfz9j1g==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/helper-optimise-call-expression" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-replace-supers" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-compilation-targets" "^7.20.0"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-function-name" "^7.19.0"
+    "@babel/helper-optimise-call-expression" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-replace-supers" "^7.19.1"
+    "@babel/helper-split-export-declaration" "^7.18.6"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz#66dee12e46f61d2aae7a73710f591eb3df616470"
-  integrity sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw==
+"@babel/plugin-transform-computed-properties@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz#2357a8224d402dad623caf6259b611e56aec746e"
+  integrity sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-destructuring@^7.16.7":
-  version "7.17.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.7.tgz#49dc2675a7afa9a5e4c6bdee636061136c3408d1"
-  integrity sha512-XVh0r5yq9sLR4vZ6eVZe8FKfIcSgaTBxVBRSYokRj2qksf6QerYnTxz9/GTuKTH/n/HwLP7t6gtlybHetJ/6hQ==
+"@babel/plugin-transform-destructuring@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.2.tgz#c23741cfa44ddd35f5e53896e88c75331b8b2792"
+  integrity sha512-mENM+ZHrvEgxLTBXUiQ621rRXZes3KWUv6NdQlrnr1TkWVw+hUjQBZuP2X32qKlrlG2BzgR95gkuCRSkJl8vIw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-dotall-regex@^7.16.7", "@babel/plugin-transform-dotall-regex@^7.4.4":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz#6b2d67686fab15fb6a7fd4bd895d5982cfc81241"
-  integrity sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==
+"@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.4.4":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz#b286b3e7aae6c7b861e45bed0a2fafd6b1a4fef8"
+  integrity sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-duplicate-keys@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz#2207e9ca8f82a0d36a5a67b6536e7ef8b08823c9"
-  integrity sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw==
+"@babel/plugin-transform-duplicate-keys@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz#687f15ee3cdad6d85191eb2a372c4528eaa0ae0e"
+  integrity sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-exponentiation-operator@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz#efa9862ef97e9e9e5f653f6ddc7b665e8536fe9b"
-  integrity sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==
+"@babel/plugin-transform-exponentiation-operator@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz#421c705f4521888c65e91fdd1af951bfefd4dacd"
+  integrity sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-transform-flow-strip-types@^7.16.0":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.16.7.tgz#291fb140c78dabbf87f2427e7c7c332b126964b8"
-  integrity sha512-mzmCq3cNsDpZZu9FADYYyfZJIOrSONmHcop2XEKPdBNMa4PDC4eEvcOvzZaCNcjKu72v0XQlA5y1g58aLRXdYg==
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.19.0.tgz#e9e8606633287488216028719638cbbb2f2dde8f"
+  integrity sha512-sgeMlNaQVbCSpgLSKP4ZZKfsJVnFnNQlUSk6gPYzR/q7tzCgQF2t8RBKAP6cKJeZdveei7Q7Jm527xepI8lNLg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/plugin-syntax-flow" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/plugin-syntax-flow" "^7.18.6"
 
-"@babel/plugin-transform-for-of@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz#649d639d4617dff502a9a158c479b3b556728d8c"
-  integrity sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg==
+"@babel/plugin-transform-for-of@^7.18.8":
+  version "7.18.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz#6ef8a50b244eb6a0bdbad0c7c61877e4e30097c1"
+  integrity sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-function-name@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz#5ab34375c64d61d083d7d2f05c38d90b97ec65cf"
-  integrity sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==
+"@babel/plugin-transform-function-name@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz#cc354f8234e62968946c61a46d6365440fc764e0"
+  integrity sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.16.7"
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-compilation-targets" "^7.18.9"
+    "@babel/helper-function-name" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-literals@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz#254c9618c5ff749e87cb0c0cef1a0a050c0bdab1"
-  integrity sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ==
+"@babel/plugin-transform-literals@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz#72796fdbef80e56fba3c6a699d54f0de557444bc"
+  integrity sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-member-expression-literals@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz#6e5dcf906ef8a098e630149d14c867dd28f92384"
-  integrity sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==
+"@babel/plugin-transform-member-expression-literals@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz#ac9fdc1a118620ac49b7e7a5d2dc177a1bfee88e"
+  integrity sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-modules-amd@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz#b28d323016a7daaae8609781d1f8c9da42b13186"
-  integrity sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==
+"@babel/plugin-transform-modules-amd@^7.19.6":
+  version "7.19.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.19.6.tgz#aca391801ae55d19c4d8d2ebfeaa33df5f2a2cbd"
+  integrity sha512-uG3od2mXvAtIFQIh0xrpLH6r5fpSQN04gIVovl+ODLdUMANokxQLZnPBHcjmv3GxRjnqwLuHvppjjcelqUFZvg==
   dependencies:
-    "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-module-transforms" "^7.19.6"
+    "@babel/helper-plugin-utils" "^7.19.0"
 
-"@babel/plugin-transform-modules-commonjs@^7.16.8":
-  version "7.17.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.9.tgz#274be1a2087beec0254d4abd4d86e52442e1e5b6"
-  integrity sha512-2TBFd/r2I6VlYn0YRTz2JdazS+FoUuQ2rIFHoAxtyP/0G3D82SBLaRq9rnUkpqlLg03Byfl/+M32mpxjO6KaPw==
+"@babel/plugin-transform-modules-commonjs@^7.19.6":
+  version "7.19.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.19.6.tgz#25b32feef24df8038fc1ec56038917eacb0b730c"
+  integrity sha512-8PIa1ym4XRTKuSsOUXqDG0YaOlEuTVvHMe5JCfgBMOtHvJKw/4NGovEGN33viISshG/rZNVrACiBmPQLvWN8xQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.17.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-simple-access" "^7.17.7"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-module-transforms" "^7.19.6"
+    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/helper-simple-access" "^7.19.4"
 
-"@babel/plugin-transform-modules-systemjs@^7.16.7":
-  version "7.17.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.17.8.tgz#81fd834024fae14ea78fbe34168b042f38703859"
-  integrity sha512-39reIkMTUVagzgA5x88zDYXPCMT6lcaRKs1+S9K6NKBPErbgO/w/kP8GlNQTC87b412ZTlmNgr3k2JrWgHH+Bw==
+"@babel/plugin-transform-modules-systemjs@^7.19.6":
+  version "7.19.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz#59e2a84064b5736a4471b1aa7b13d4431d327e0d"
+  integrity sha512-fqGLBepcc3kErfR9R3DnVpURmckXP7gj7bAlrTQyBxrigFqszZCkFkcoxzCp2v32XmwXLvbw+8Yq9/b+QqksjQ==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.16.7"
-    "@babel/helper-module-transforms" "^7.17.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-validator-identifier" "^7.16.7"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-hoist-variables" "^7.18.6"
+    "@babel/helper-module-transforms" "^7.19.6"
+    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/helper-validator-identifier" "^7.19.1"
 
-"@babel/plugin-transform-modules-umd@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz#23dad479fa585283dbd22215bff12719171e7618"
-  integrity sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ==
+"@babel/plugin-transform-modules-umd@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz#81d3832d6034b75b54e62821ba58f28ed0aab4b9"
+  integrity sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-module-transforms" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz#7f860e0e40d844a02c9dcf9d84965e7dfd666252"
-  integrity sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.19.1":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz#626298dd62ea51d452c3be58b285d23195ba69a8"
+  integrity sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
+    "@babel/helper-create-regexp-features-plugin" "^7.20.5"
+    "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-new-target@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz#9967d89a5c243818e0800fdad89db22c5f514244"
-  integrity sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg==
+"@babel/plugin-transform-new-target@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz#d128f376ae200477f37c4ddfcc722a8a1b3246a8"
+  integrity sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-object-super@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz#ac359cf8d32cf4354d27a46867999490b6c32a94"
-  integrity sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==
+"@babel/plugin-transform-object-super@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz#fb3c6ccdd15939b6ff7939944b51971ddc35912c"
+  integrity sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-replace-supers" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-replace-supers" "^7.18.6"
 
-"@babel/plugin-transform-parameters@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz#a1721f55b99b736511cb7e0152f61f17688f331f"
-  integrity sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw==
+"@babel/plugin-transform-parameters@^7.20.1":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.5.tgz#f8f9186c681d10c3de7620c916156d893c8a019e"
+  integrity sha512-h7plkOmcndIUWXZFLgpbrh2+fXAi47zcUX7IrOQuZdLD0I0KvjJ6cvo3BEcAOsDOcZhVKGJqv07mkSqK0y2isQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-property-literals@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz#2dadac85155436f22c696c4827730e0fe1057a55"
-  integrity sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==
+"@babel/plugin-transform-property-literals@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz#e22498903a483448e94e032e9bbb9c5ccbfc93a3"
+  integrity sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-transform-react-constant-elements@^7.12.1":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.12.13.tgz#f8ee56888545d53d80f766b3cc1563ab2c241f92"
-  integrity sha512-qmzKVTn46Upvtxv8LQoQ8mTCdUC83AOVQIQm57e9oekLT5cmK9GOMOfcWhe8jMNx4UJXn/UDhVZ/7lGofVNeDQ==
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.20.2.tgz#3f02c784e0b711970d7d8ccc96c4359d64e27ac7"
+  integrity sha512-KS/G8YI8uwMGKErLFOHS/ekhqdHhpEloxs43NecQHVgo2QuQSyJhGIY1fL8UGl9wy5ItVwwoUL4YxVqsplGq2g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-react-display-name@^7.16.0", "@babel/plugin-transform-react-display-name@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.7.tgz#7b6d40d232f4c0f550ea348593db3b21e2404340"
-  integrity sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg==
+"@babel/plugin-transform-react-display-name@^7.16.0", "@babel/plugin-transform-react-display-name@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.18.6.tgz#8b1125f919ef36ebdfff061d664e266c666b9415"
+  integrity sha512-TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-react-jsx-development@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.7.tgz#43a00724a3ed2557ed3f276a01a929e6686ac7b8"
-  integrity sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A==
+"@babel/plugin-transform-react-jsx-development@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.18.6.tgz#dbe5c972811e49c7405b630e4d0d2e1380c0ddc5"
+  integrity sha512-SA6HEjwYFKF7WDjWcMcMGUimmw/nhNRDWxr+KaLSCrkD/LMDBvWRmHAYgE1HDeF8KUuI8OAu+RT6EOtKxSW2qA==
   dependencies:
-    "@babel/plugin-transform-react-jsx" "^7.16.7"
+    "@babel/plugin-transform-react-jsx" "^7.18.6"
 
-"@babel/plugin-transform-react-jsx@^7.16.7":
-  version "7.17.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.17.3.tgz#eac1565da176ccb1a715dae0b4609858808008c1"
-  integrity sha512-9tjBm4O07f7mzKSIlEmPdiE6ub7kfIe6Cd+w+oQebpATfTQMAgW+YOuWxogbKVTulA+MEO7byMeIUtQ1z+z+ZQ==
+"@babel/plugin-transform-react-jsx@^7.18.6":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.19.0.tgz#b3cbb7c3a00b92ec8ae1027910e331ba5c500eb9"
+  integrity sha512-UVEvX3tXie3Szm3emi1+G63jyw1w5IcMY0FSKM+CRnKRI5Mr1YbCNgsSTwoTwKphQEG9P+QqmuRFneJPZuHNhg==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-module-imports" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/plugin-syntax-jsx" "^7.16.7"
-    "@babel/types" "^7.17.0"
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-module-imports" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/plugin-syntax-jsx" "^7.18.6"
+    "@babel/types" "^7.19.0"
 
-"@babel/plugin-transform-react-pure-annotations@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.7.tgz#232bfd2f12eb551d6d7d01d13fe3f86b45eb9c67"
-  integrity sha512-hs71ToC97k3QWxswh2ElzMFABXHvGiJ01IB1TbYQDGeWRKWz/MPUTh5jGExdHvosYKpnJW5Pm3S4+TA3FyX+GA==
+"@babel/plugin-transform-react-pure-annotations@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.18.6.tgz#561af267f19f3e5d59291f9950fd7b9663d0d844"
+  integrity sha512-I8VfEPg9r2TRDdvnHgPepTKvuRomzA8+u+nhY7qSI1fR2hRNebasZEETLyM5mAUr0Ku56OkXJ0I7NHJnO6cJiQ==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-regenerator@^7.16.7":
-  version "7.17.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.17.9.tgz#0a33c3a61cf47f45ed3232903683a0afd2d3460c"
-  integrity sha512-Lc2TfbxR1HOyn/c6b4Y/b6NHoTb67n/IoWLxTu4kC7h4KQnWlhCq2S8Tx0t2SVvv5Uu87Hs+6JEJ5kt2tYGylQ==
+"@babel/plugin-transform-regenerator@^7.18.6":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.20.5.tgz#57cda588c7ffb7f4f8483cc83bdcea02a907f04d"
+  integrity sha512-kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ==
   dependencies:
-    regenerator-transform "^0.15.0"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    regenerator-transform "^0.15.1"
 
-"@babel/plugin-transform-reserved-words@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz#1d798e078f7c5958eec952059c460b220a63f586"
-  integrity sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg==
+"@babel/plugin-transform-reserved-words@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz#b1abd8ebf8edaa5f7fe6bbb8d2133d23b6a6f76a"
+  integrity sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-transform-runtime@^7.16.4":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.17.0.tgz#0a2e08b5e2b2d95c4b1d3b3371a2180617455b70"
-  integrity sha512-fr7zPWnKXNc1xoHfrIU9mN/4XKX4VLZ45Q+oMhfsYIaHvg7mHgmhfOy/ckRWqDK7XF3QDigRpkh5DKq6+clE8A==
+  version "7.19.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.6.tgz#9d2a9dbf4e12644d6f46e5e75bfbf02b5d6e9194"
+  integrity sha512-PRH37lz4JU156lYFW1p8OxE5i7d6Sl/zV58ooyr+q1J1lnQPyg5tIiXlIwNVhJaY4W3TmOtdc8jqdXQcB1v5Yw==
   dependencies:
-    "@babel/helper-module-imports" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    babel-plugin-polyfill-corejs2 "^0.3.0"
-    babel-plugin-polyfill-corejs3 "^0.5.0"
-    babel-plugin-polyfill-regenerator "^0.3.0"
+    "@babel/helper-module-imports" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.19.0"
+    babel-plugin-polyfill-corejs2 "^0.3.3"
+    babel-plugin-polyfill-corejs3 "^0.6.0"
+    babel-plugin-polyfill-regenerator "^0.4.1"
     semver "^6.3.0"
 
-"@babel/plugin-transform-shorthand-properties@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz#e8549ae4afcf8382f711794c0c7b6b934c5fbd2a"
-  integrity sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==
+"@babel/plugin-transform-shorthand-properties@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz#6d6df7983d67b195289be24909e3f12a8f664dc9"
+  integrity sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-spread@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz#a303e2122f9f12e0105daeedd0f30fb197d8ff44"
-  integrity sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg==
+"@babel/plugin-transform-spread@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz#dd60b4620c2fec806d60cfaae364ec2188d593b6"
+  integrity sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
 
-"@babel/plugin-transform-sticky-regex@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz#c84741d4f4a38072b9a1e2e3fd56d359552e8660"
-  integrity sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==
+"@babel/plugin-transform-sticky-regex@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz#c6706eb2b1524028e317720339583ad0f444adcc"
+  integrity sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-template-literals@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz#f3d1c45d28967c8e80f53666fc9c3e50618217ab"
-  integrity sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA==
+"@babel/plugin-transform-template-literals@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz#04ec6f10acdaa81846689d63fae117dd9c243a5e"
+  integrity sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-typeof-symbol@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz#9cdbe622582c21368bd482b660ba87d5545d4f7e"
-  integrity sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ==
+"@babel/plugin-transform-typeof-symbol@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz#c8cea68263e45addcd6afc9091429f80925762c0"
+  integrity sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-typescript@^7.16.7":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.16.8.tgz#591ce9b6b83504903fa9dd3652c357c2ba7a1ee0"
-  integrity sha512-bHdQ9k7YpBDO2d0NVfkj51DpQcvwIzIusJ7mEUaMlbZq3Kt/U47j24inXZHQ5MDiYpCs+oZiwnXyKedE8+q7AQ==
+"@babel/plugin-transform-typescript@^7.18.6":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.20.2.tgz#91515527b376fc122ba83b13d70b01af8fe98f3f"
+  integrity sha512-jvS+ngBfrnTUBfOQq8NfGnSbF9BrqlR6hjJ2yVxMkmO5nL/cdifNbI30EfjRlN4g5wYWNnMPyj5Sa6R1pbLeag==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/plugin-syntax-typescript" "^7.16.7"
+    "@babel/helper-create-class-features-plugin" "^7.20.2"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/plugin-syntax-typescript" "^7.20.0"
 
-"@babel/plugin-transform-unicode-escapes@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz#da8717de7b3287a2c6d659750c964f302b31ece3"
-  integrity sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==
+"@babel/plugin-transform-unicode-escapes@^7.18.10":
+  version "7.18.10"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz#1ecfb0eda83d09bbcb77c09970c2dd55832aa246"
+  integrity sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-unicode-regex@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz#0f7aa4a501198976e25e82702574c34cfebe9ef2"
-  integrity sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==
+"@babel/plugin-transform-unicode-regex@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz#194317225d8c201bbae103364ffe9e2cea36cdca"
+  integrity sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/preset-env@^7.11.0", "@babel/preset-env@^7.12.1", "@babel/preset-env@^7.16.4":
-  version "7.16.11"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.11.tgz#5dd88fd885fae36f88fd7c8342475c9f0abe2982"
-  integrity sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.20.2.tgz#9b1642aa47bb9f43a86f9630011780dab7f86506"
+  integrity sha512-1G0efQEWR1EHkKvKHqbG+IN/QdgwfByUpM5V5QroDzGV2t3S/WXNQd693cHiHTlCFMpr9B6FkPFXDA2lQcKoDg==
   dependencies:
-    "@babel/compat-data" "^7.16.8"
-    "@babel/helper-compilation-targets" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-validator-option" "^7.16.7"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.16.7"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.16.7"
-    "@babel/plugin-proposal-async-generator-functions" "^7.16.8"
-    "@babel/plugin-proposal-class-properties" "^7.16.7"
-    "@babel/plugin-proposal-class-static-block" "^7.16.7"
-    "@babel/plugin-proposal-dynamic-import" "^7.16.7"
-    "@babel/plugin-proposal-export-namespace-from" "^7.16.7"
-    "@babel/plugin-proposal-json-strings" "^7.16.7"
-    "@babel/plugin-proposal-logical-assignment-operators" "^7.16.7"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.16.7"
-    "@babel/plugin-proposal-numeric-separator" "^7.16.7"
-    "@babel/plugin-proposal-object-rest-spread" "^7.16.7"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.16.7"
-    "@babel/plugin-proposal-optional-chaining" "^7.16.7"
-    "@babel/plugin-proposal-private-methods" "^7.16.11"
-    "@babel/plugin-proposal-private-property-in-object" "^7.16.7"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.16.7"
+    "@babel/compat-data" "^7.20.1"
+    "@babel/helper-compilation-targets" "^7.20.0"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-validator-option" "^7.18.6"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.18.9"
+    "@babel/plugin-proposal-async-generator-functions" "^7.20.1"
+    "@babel/plugin-proposal-class-properties" "^7.18.6"
+    "@babel/plugin-proposal-class-static-block" "^7.18.6"
+    "@babel/plugin-proposal-dynamic-import" "^7.18.6"
+    "@babel/plugin-proposal-export-namespace-from" "^7.18.9"
+    "@babel/plugin-proposal-json-strings" "^7.18.6"
+    "@babel/plugin-proposal-logical-assignment-operators" "^7.18.9"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6"
+    "@babel/plugin-proposal-numeric-separator" "^7.18.6"
+    "@babel/plugin-proposal-object-rest-spread" "^7.20.2"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.18.6"
+    "@babel/plugin-proposal-optional-chaining" "^7.18.9"
+    "@babel/plugin-proposal-private-methods" "^7.18.6"
+    "@babel/plugin-proposal-private-property-in-object" "^7.18.6"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.18.6"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
     "@babel/plugin-syntax-class-properties" "^7.12.13"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+    "@babel/plugin-syntax-import-assertions" "^7.20.0"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
@@ -1041,44 +1057,44 @@
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
     "@babel/plugin-syntax-top-level-await" "^7.14.5"
-    "@babel/plugin-transform-arrow-functions" "^7.16.7"
-    "@babel/plugin-transform-async-to-generator" "^7.16.8"
-    "@babel/plugin-transform-block-scoped-functions" "^7.16.7"
-    "@babel/plugin-transform-block-scoping" "^7.16.7"
-    "@babel/plugin-transform-classes" "^7.16.7"
-    "@babel/plugin-transform-computed-properties" "^7.16.7"
-    "@babel/plugin-transform-destructuring" "^7.16.7"
-    "@babel/plugin-transform-dotall-regex" "^7.16.7"
-    "@babel/plugin-transform-duplicate-keys" "^7.16.7"
-    "@babel/plugin-transform-exponentiation-operator" "^7.16.7"
-    "@babel/plugin-transform-for-of" "^7.16.7"
-    "@babel/plugin-transform-function-name" "^7.16.7"
-    "@babel/plugin-transform-literals" "^7.16.7"
-    "@babel/plugin-transform-member-expression-literals" "^7.16.7"
-    "@babel/plugin-transform-modules-amd" "^7.16.7"
-    "@babel/plugin-transform-modules-commonjs" "^7.16.8"
-    "@babel/plugin-transform-modules-systemjs" "^7.16.7"
-    "@babel/plugin-transform-modules-umd" "^7.16.7"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.16.8"
-    "@babel/plugin-transform-new-target" "^7.16.7"
-    "@babel/plugin-transform-object-super" "^7.16.7"
-    "@babel/plugin-transform-parameters" "^7.16.7"
-    "@babel/plugin-transform-property-literals" "^7.16.7"
-    "@babel/plugin-transform-regenerator" "^7.16.7"
-    "@babel/plugin-transform-reserved-words" "^7.16.7"
-    "@babel/plugin-transform-shorthand-properties" "^7.16.7"
-    "@babel/plugin-transform-spread" "^7.16.7"
-    "@babel/plugin-transform-sticky-regex" "^7.16.7"
-    "@babel/plugin-transform-template-literals" "^7.16.7"
-    "@babel/plugin-transform-typeof-symbol" "^7.16.7"
-    "@babel/plugin-transform-unicode-escapes" "^7.16.7"
-    "@babel/plugin-transform-unicode-regex" "^7.16.7"
+    "@babel/plugin-transform-arrow-functions" "^7.18.6"
+    "@babel/plugin-transform-async-to-generator" "^7.18.6"
+    "@babel/plugin-transform-block-scoped-functions" "^7.18.6"
+    "@babel/plugin-transform-block-scoping" "^7.20.2"
+    "@babel/plugin-transform-classes" "^7.20.2"
+    "@babel/plugin-transform-computed-properties" "^7.18.9"
+    "@babel/plugin-transform-destructuring" "^7.20.2"
+    "@babel/plugin-transform-dotall-regex" "^7.18.6"
+    "@babel/plugin-transform-duplicate-keys" "^7.18.9"
+    "@babel/plugin-transform-exponentiation-operator" "^7.18.6"
+    "@babel/plugin-transform-for-of" "^7.18.8"
+    "@babel/plugin-transform-function-name" "^7.18.9"
+    "@babel/plugin-transform-literals" "^7.18.9"
+    "@babel/plugin-transform-member-expression-literals" "^7.18.6"
+    "@babel/plugin-transform-modules-amd" "^7.19.6"
+    "@babel/plugin-transform-modules-commonjs" "^7.19.6"
+    "@babel/plugin-transform-modules-systemjs" "^7.19.6"
+    "@babel/plugin-transform-modules-umd" "^7.18.6"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.19.1"
+    "@babel/plugin-transform-new-target" "^7.18.6"
+    "@babel/plugin-transform-object-super" "^7.18.6"
+    "@babel/plugin-transform-parameters" "^7.20.1"
+    "@babel/plugin-transform-property-literals" "^7.18.6"
+    "@babel/plugin-transform-regenerator" "^7.18.6"
+    "@babel/plugin-transform-reserved-words" "^7.18.6"
+    "@babel/plugin-transform-shorthand-properties" "^7.18.6"
+    "@babel/plugin-transform-spread" "^7.19.0"
+    "@babel/plugin-transform-sticky-regex" "^7.18.6"
+    "@babel/plugin-transform-template-literals" "^7.18.9"
+    "@babel/plugin-transform-typeof-symbol" "^7.18.9"
+    "@babel/plugin-transform-unicode-escapes" "^7.18.10"
+    "@babel/plugin-transform-unicode-regex" "^7.18.6"
     "@babel/preset-modules" "^0.1.5"
-    "@babel/types" "^7.16.8"
-    babel-plugin-polyfill-corejs2 "^0.3.0"
-    babel-plugin-polyfill-corejs3 "^0.5.0"
-    babel-plugin-polyfill-regenerator "^0.3.0"
-    core-js-compat "^3.20.2"
+    "@babel/types" "^7.20.2"
+    babel-plugin-polyfill-corejs2 "^0.3.3"
+    babel-plugin-polyfill-corejs3 "^0.6.0"
+    babel-plugin-polyfill-regenerator "^0.4.1"
+    core-js-compat "^3.25.1"
     semver "^6.3.0"
 
 "@babel/preset-modules@^0.1.5":
@@ -1093,72 +1109,73 @@
     esutils "^2.0.2"
 
 "@babel/preset-react@^7.12.5", "@babel/preset-react@^7.16.0":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.16.7.tgz#4c18150491edc69c183ff818f9f2aecbe5d93852"
-  integrity sha512-fWpyI8UM/HE6DfPBzD8LnhQ/OcH8AgTaqcqP2nGOXEUV+VKBR5JRN9hCk9ai+zQQ57vtm9oWeXguBCPNUjytgA==
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.18.6.tgz#979f76d6277048dc19094c217b507f3ad517dd2d"
+  integrity sha512-zXr6atUmyYdiWRVLOZahakYmOBHtWc2WGCkP8PYTgZi0iJXDY2CN180TdrIW4OGOAdLc7TifzDIvtx6izaRIzg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-validator-option" "^7.16.7"
-    "@babel/plugin-transform-react-display-name" "^7.16.7"
-    "@babel/plugin-transform-react-jsx" "^7.16.7"
-    "@babel/plugin-transform-react-jsx-development" "^7.16.7"
-    "@babel/plugin-transform-react-pure-annotations" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-validator-option" "^7.18.6"
+    "@babel/plugin-transform-react-display-name" "^7.18.6"
+    "@babel/plugin-transform-react-jsx" "^7.18.6"
+    "@babel/plugin-transform-react-jsx-development" "^7.18.6"
+    "@babel/plugin-transform-react-pure-annotations" "^7.18.6"
 
 "@babel/preset-typescript@^7.16.0":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.16.7.tgz#ab114d68bb2020afc069cd51b37ff98a046a70b9"
-  integrity sha512-WbVEmgXdIyvzB77AQjGBEyYPZx+8tTsO50XtfozQrkW8QB2rLJpH2lgx0TRw5EJrBxOZQ+wCcyPVQvS8tjEHpQ==
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.18.6.tgz#ce64be3e63eddc44240c6358daefac17b3186399"
+  integrity sha512-s9ik86kXBAnD760aybBucdpnLsAt0jK1xqJn2juOn9lkOvSHV60os5hxoVJsPzMQxvnUJFAlkont2DvvaYEBtQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-validator-option" "^7.16.7"
-    "@babel/plugin-transform-typescript" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-validator-option" "^7.18.6"
+    "@babel/plugin-transform-typescript" "^7.18.6"
 
 "@babel/runtime-corejs3@^7.10.2":
-  version "7.17.9"
-  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.17.9.tgz#3d02d0161f0fbf3ada8e88159375af97690f4055"
-  integrity sha512-WxYHHUWF2uZ7Hp1K+D1xQgbgkGUfA+5UPOegEXGt2Y5SMog/rYCVaifLZDbw8UkNXozEqqrZTy6bglL7xTaCOw==
+  version "7.20.6"
+  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.20.6.tgz#63dae945963539ab0ad578efbf3eff271e7067ae"
+  integrity sha512-tqeujPiuEfcH067mx+7otTQWROVMKHXEaOQcAeNV5dDdbPWvPcFA8/W9LXw2NfjNmOetqLl03dfnG2WALPlsRQ==
   dependencies:
-    core-js-pure "^3.20.2"
-    regenerator-runtime "^0.13.4"
+    core-js-pure "^3.25.1"
+    regenerator-runtime "^0.13.11"
 
-"@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.14.6", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
-  version "7.18.3"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.3.tgz#c7b654b57f6f63cf7f8b418ac9ca04408c4579f4"
-  integrity sha512-38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug==
+"@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.6", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.2", "@babel/runtime@^7.18.3", "@babel/runtime@^7.18.9", "@babel/runtime@^7.20.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+  version "7.20.6"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.6.tgz#facf4879bfed9b5326326273a64220f099b0fce3"
+  integrity sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==
   dependencies:
-    regenerator-runtime "^0.13.4"
+    regenerator-runtime "^0.13.11"
 
-"@babel/template@^7.16.7", "@babel/template@^7.3.3":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155"
-  integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==
+"@babel/template@^7.18.10", "@babel/template@^7.3.3":
+  version "7.18.10"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71"
+  integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==
   dependencies:
-    "@babel/code-frame" "^7.16.7"
-    "@babel/parser" "^7.16.7"
-    "@babel/types" "^7.16.7"
+    "@babel/code-frame" "^7.18.6"
+    "@babel/parser" "^7.18.10"
+    "@babel/types" "^7.18.10"
 
-"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.3", "@babel/traverse@^7.17.9", "@babel/traverse@^7.7.2":
-  version "7.17.9"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.9.tgz#1f9b207435d9ae4a8ed6998b2b82300d83c37a0d"
-  integrity sha512-PQO8sDIJ8SIwipTPiR71kJQCKQYB5NGImbOviK8K+kg5xkNSYXLBupuX9QhatFowrsvo9Hj8WgArg3W7ijNAQw==
+"@babel/traverse@^7.19.1", "@babel/traverse@^7.20.1", "@babel/traverse@^7.20.5", "@babel/traverse@^7.7.2":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.5.tgz#78eb244bea8270fdda1ef9af22a5d5e5b7e57133"
+  integrity sha512-WM5ZNN3JITQIq9tFZaw1ojLU3WgWdtkxnhM1AegMS+PvHjkM5IXjmYEGY7yukz5XS4sJyEf2VzWjI8uAavhxBQ==
   dependencies:
-    "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.17.9"
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.17.9"
-    "@babel/helper-hoist-variables" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
-    "@babel/parser" "^7.17.9"
-    "@babel/types" "^7.17.0"
+    "@babel/code-frame" "^7.18.6"
+    "@babel/generator" "^7.20.5"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-function-name" "^7.19.0"
+    "@babel/helper-hoist-variables" "^7.18.6"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/parser" "^7.20.5"
+    "@babel/types" "^7.20.5"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.12.6", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b"
-  integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==
+"@babel/types@^7.0.0", "@babel/types@^7.12.6", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.5.tgz#e206ae370b5393d94dfd1d04cd687cace53efa84"
+  integrity sha512-c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.16.7"
+    "@babel/helper-string-parser" "^7.19.4"
+    "@babel/helper-validator-identifier" "^7.19.1"
     to-fast-properties "^2.0.0"
 
 "@bcoe/v8-coverage@^0.2.3":
@@ -1167,9 +1184,9 @@
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
 "@craco/craco@^6.4.3":
-  version "6.4.3"
-  resolved "https://registry.yarnpkg.com/@craco/craco/-/craco-6.4.3.tgz#784395b6ebab764056550a2860494d24c3abd44e"
-  integrity sha512-RzkXYmNzRCGUyG7mM+IUMM+nvrpSfA34352sPSGQN76UivAmCAht3sI4v5JKgzO05oUK9Zwi6abCKD7iKXI8hQ==
+  version "6.4.5"
+  resolved "https://registry.yarnpkg.com/@craco/craco/-/craco-6.4.5.tgz#471e67082a2ffd3edf73759b215bdc16250d27b3"
+  integrity sha512-8F2rIAao8sEh0FPP52ViEvDM9GjJ7acq0knu1c8UgI+EuZMD5/ZB270ol6jV4iNY7it9Umg/RoGBvNRUNr8U8w==
   dependencies:
     cosmiconfig "^7.0.1"
     cosmiconfig-typescript-loader "^1.0.0"
@@ -1178,71 +1195,82 @@
     semver "^7.3.2"
     webpack-merge "^4.2.2"
 
-"@cspotcode/source-map-consumer@0.8.0":
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz#33bf4b7b39c178821606f669bbc447a6a629786b"
-  integrity sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==
-
-"@cspotcode/source-map-support@0.7.0":
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.7.0.tgz#4789840aa859e46d2f3173727ab707c66bf344f5"
-  integrity sha512-X4xqRHqN8ACt2aHVe51OxeA2HjbcL4MqFqXkrmQszJ1NOUuUu5u6Vqx/0lZSVNku7velL5FC/s5uEAj1lsBMhA==
+"@cspotcode/source-map-support@^0.8.0":
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
+  integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==
   dependencies:
-    "@cspotcode/source-map-consumer" "0.8.0"
+    "@jridgewell/trace-mapping" "0.3.9"
 
 "@csstools/normalize.css@*":
   version "12.0.0"
   resolved "https://registry.yarnpkg.com/@csstools/normalize.css/-/normalize.css-12.0.0.tgz#a9583a75c3f150667771f30b60d9f059473e62c4"
   integrity sha512-M0qqxAcwCsIVfpFQSlGN5XjXWu8l5JDZN+fPt1LeW5SZexQTgnaEvgXAY+CeygRw0EeppWHi12JxESWiWrB0Sg==
 
-"@csstools/postcss-color-function@^1.0.3":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-color-function/-/postcss-color-function-1.1.0.tgz#229966327747f58fbe586de35daa139db3ce1e5d"
-  integrity sha512-5D5ND/mZWcQoSfYnSPsXtuiFxhzmhxt6pcjrFLJyldj+p0ZN2vvRpYNX+lahFTtMhAYOa2WmkdGINr0yP0CvGA==
-  dependencies:
-    "@csstools/postcss-progressive-custom-properties" "^1.1.0"
-    postcss-value-parser "^4.2.0"
-
-"@csstools/postcss-font-format-keywords@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-1.0.0.tgz#7e7df948a83a0dfb7eb150a96e2390ac642356a1"
-  integrity sha512-oO0cZt8do8FdVBX8INftvIA4lUrKUSCcWUf9IwH9IPWOgKT22oAZFXeHLoDK7nhB2SmkNycp5brxfNMRLIhd6Q==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-"@csstools/postcss-hwb-function@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.0.tgz#d6785c1c5ba8152d1d392c66f3a6a446c6034f6d"
-  integrity sha512-VSTd7hGjmde4rTj1rR30sokY3ONJph1reCBTUXqeW1fKwETPy1x4t/XIeaaqbMbC5Xg4SM/lyXZ2S8NELT2TaA==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-"@csstools/postcss-ic-unit@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-ic-unit/-/postcss-ic-unit-1.0.0.tgz#f484db59fc94f35a21b6d680d23b0ec69b286b7f"
-  integrity sha512-i4yps1mBp2ijrx7E96RXrQXQQHm6F4ym1TOD0D69/sjDjZvQ22tqiEvaNw7pFZTUO5b9vWRHzbHzP9+UKuw+bA==
-  dependencies:
-    "@csstools/postcss-progressive-custom-properties" "^1.1.0"
-    postcss-value-parser "^4.2.0"
-
-"@csstools/postcss-is-pseudo-class@^2.0.1":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.2.tgz#a834ca11a43d6ed9bc9e3ff53c80d490a4b1aaad"
-  integrity sha512-L9h1yxXMj7KpgNzlMrw3isvHJYkikZgZE4ASwssTnGEH8tm50L6QsM9QQT5wR4/eO5mU0rN5axH7UzNxEYg5CA==
+"@csstools/postcss-cascade-layers@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.1.1.tgz#8a997edf97d34071dd2e37ea6022447dd9e795ad"
+  integrity sha512-+KdYrpKC5TgomQr2DlZF4lDEpHcoxnj5IGddYYfBWJAKfj1JtuHUIqMa+E1pJJ+z3kvDViWMqyqPlG4Ja7amQA==
   dependencies:
+    "@csstools/selector-specificity" "^2.0.2"
     postcss-selector-parser "^6.0.10"
 
-"@csstools/postcss-normalize-display-values@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-1.0.0.tgz#ce698f688c28517447aedf15a9037987e3d2dc97"
-  integrity sha512-bX+nx5V8XTJEmGtpWTO6kywdS725t71YSLlxWt78XoHUbELWgoCXeOFymRJmL3SU1TLlKSIi7v52EWqe60vJTQ==
+"@csstools/postcss-color-function@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-color-function/-/postcss-color-function-1.1.1.tgz#2bd36ab34f82d0497cfacdc9b18d34b5e6f64b6b"
+  integrity sha512-Bc0f62WmHdtRDjf5f3e2STwRAl89N2CLb+9iAwzrv4L2hncrbDwnQD9PCq0gtAt7pOI2leIV08HIBUd4jxD8cw==
+  dependencies:
+    "@csstools/postcss-progressive-custom-properties" "^1.1.0"
+    postcss-value-parser "^4.2.0"
+
+"@csstools/postcss-font-format-keywords@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-1.0.1.tgz#677b34e9e88ae997a67283311657973150e8b16a"
+  integrity sha512-ZgrlzuUAjXIOc2JueK0X5sZDjCtgimVp/O5CEqTcs5ShWBa6smhWYbS0x5cVc/+rycTDbjjzoP0KTDnUneZGOg==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-"@csstools/postcss-oklab-function@^1.0.2":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.1.0.tgz#e9a269487a292e0930760948e923e1d46b638ee6"
-  integrity sha512-e/Q5HopQzmnQgqimG9v3w2IG4VRABsBq3itOcn4bnm+j4enTgQZ0nWsaH/m9GV2otWGQ0nwccYL5vmLKyvP1ww==
+"@csstools/postcss-hwb-function@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.2.tgz#ab54a9fce0ac102c754854769962f2422ae8aa8b"
+  integrity sha512-YHdEru4o3Rsbjmu6vHy4UKOXZD+Rn2zmkAmLRfPet6+Jz4Ojw8cbWxe1n42VaXQhD3CQUXXTooIy8OkVbUcL+w==
+  dependencies:
+    postcss-value-parser "^4.2.0"
+
+"@csstools/postcss-ic-unit@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-ic-unit/-/postcss-ic-unit-1.0.1.tgz#28237d812a124d1a16a5acc5c3832b040b303e58"
+  integrity sha512-Ot1rcwRAaRHNKC9tAqoqNZhjdYBzKk1POgWfhN4uCOE47ebGcLRqXjKkApVDpjifL6u2/55ekkpnFcp+s/OZUw==
+  dependencies:
+    "@csstools/postcss-progressive-custom-properties" "^1.1.0"
+    postcss-value-parser "^4.2.0"
+
+"@csstools/postcss-is-pseudo-class@^2.0.7":
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.7.tgz#846ae6c0d5a1eaa878fce352c544f9c295509cd1"
+  integrity sha512-7JPeVVZHd+jxYdULl87lvjgvWldYu+Bc62s9vD/ED6/QTGjy0jy0US/f6BG53sVMTBJ1lzKZFpYmofBN9eaRiA==
+  dependencies:
+    "@csstools/selector-specificity" "^2.0.0"
+    postcss-selector-parser "^6.0.10"
+
+"@csstools/postcss-nested-calc@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-nested-calc/-/postcss-nested-calc-1.0.0.tgz#d7e9d1d0d3d15cf5ac891b16028af2a1044d0c26"
+  integrity sha512-JCsQsw1wjYwv1bJmgjKSoZNvf7R6+wuHDAbi5f/7MbFhl2d/+v+TvBTU4BJH3G1X1H87dHl0mh6TfYogbT/dJQ==
+  dependencies:
+    postcss-value-parser "^4.2.0"
+
+"@csstools/postcss-normalize-display-values@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-1.0.1.tgz#15da54a36e867b3ac5163ee12c1d7f82d4d612c3"
+  integrity sha512-jcOanIbv55OFKQ3sYeFD/T0Ti7AMXc9nM1hZWu8m/2722gOTxFg7xYu4RDLJLeZmPUVQlGzo4jhzvTUq3x4ZUw==
+  dependencies:
+    postcss-value-parser "^4.2.0"
+
+"@csstools/postcss-oklab-function@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.1.1.tgz#88cee0fbc8d6df27079ebd2fa016ee261eecf844"
+  integrity sha512-nJpJgsdA3dA9y5pgyb/UfEzE7W5Ka7u0CX0/HIMVBNWzWemdcTH3XwANECU6anWv/ao4vVNLTMxhiPNZsTK6iA==
   dependencies:
     "@csstools/postcss-progressive-custom-properties" "^1.1.0"
     postcss-value-parser "^4.2.0"
@@ -1254,534 +1282,573 @@
   dependencies:
     postcss-value-parser "^4.2.0"
 
-"@date-io/core@^2.14.0":
-  version "2.14.0"
-  resolved "https://registry.yarnpkg.com/@date-io/core/-/core-2.14.0.tgz#03e9b9b9fc8e4d561c32dd324df0f3ccd967ef14"
-  integrity sha512-qFN64hiFjmlDHJhu+9xMkdfDG2jLsggNxKXglnekUpXSq8faiqZgtHm2lsHCUuaPDTV6wuXHcCl8J1GQ5wLmPw==
-
-"@date-io/date-fns@^2.11.0", "@date-io/date-fns@^2.14.0":
-  version "2.14.0"
-  resolved "https://registry.yarnpkg.com/@date-io/date-fns/-/date-fns-2.14.0.tgz#92ab150f488f294c135c873350d154803cebdbea"
-  integrity sha512-4fJctdVyOd5cKIKGaWUM+s3MUXMuzkZaHuTY15PH70kU1YTMrCoauA7hgQVx9qj0ZEbGrH9VSPYJYnYro7nKiA==
+"@csstools/postcss-stepped-value-functions@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-1.0.1.tgz#f8772c3681cc2befed695e2b0b1d68e22f08c4f4"
+  integrity sha512-dz0LNoo3ijpTOQqEJLY8nyaapl6umbmDcgj4AD0lgVQ572b2eqA1iGZYTTWhrcrHztWDDRAX2DGYyw2VBjvCvQ==
   dependencies:
-    "@date-io/core" "^2.14.0"
+    postcss-value-parser "^4.2.0"
 
-"@date-io/dayjs@^2.11.0", "@date-io/dayjs@^2.14.0":
-  version "2.14.0"
-  resolved "https://registry.yarnpkg.com/@date-io/dayjs/-/dayjs-2.14.0.tgz#8d4e93e1d473bb5f25210866204dc33384ca4c20"
-  integrity sha512-4fRvNWaOh7AjvOyJ4h6FYMS7VHLQnIEeAV5ahv6sKYWx+1g1UwYup8h7+gPuoF+sW2hTScxi7PVaba2Jk/U8Og==
+"@csstools/postcss-text-decoration-shorthand@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-1.0.0.tgz#ea96cfbc87d921eca914d3ad29340d9bcc4c953f"
+  integrity sha512-c1XwKJ2eMIWrzQenN0XbcfzckOLLJiczqy+YvfGmzoVXd7pT9FfObiSEfzs84bpE/VqfpEuAZ9tCRbZkZxxbdw==
   dependencies:
-    "@date-io/core" "^2.14.0"
+    postcss-value-parser "^4.2.0"
 
-"@date-io/luxon@^2.11.1", "@date-io/luxon@^2.14.0":
-  version "2.14.0"
-  resolved "https://registry.yarnpkg.com/@date-io/luxon/-/luxon-2.14.0.tgz#cd1641229e00a899625895de3a31e3aaaf66629f"
-  integrity sha512-KmpBKkQFJ/YwZgVd0T3h+br/O0uL9ZdE7mn903VPAG2ZZncEmaUfUdYKFT7v7GyIKJ4KzCp379CRthEbxevEVg==
+"@csstools/postcss-trigonometric-functions@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-1.0.2.tgz#94d3e4774c36d35dcdc88ce091336cb770d32756"
+  integrity sha512-woKaLO///4bb+zZC2s80l+7cm07M7268MsyG3M0ActXXEFi6SuhvriQYcb58iiKGbjwwIU7n45iRLEHypB47Og==
   dependencies:
-    "@date-io/core" "^2.14.0"
+    postcss-value-parser "^4.2.0"
 
-"@date-io/moment@^2.11.0", "@date-io/moment@^2.14.0":
-  version "2.14.0"
-  resolved "https://registry.yarnpkg.com/@date-io/moment/-/moment-2.14.0.tgz#8300abd6ae8c55d8edee90d118db3cef0b1d4f58"
-  integrity sha512-VsoLXs94GsZ49ecWuvFbsa081zEv2xxG7d+izJsqGa2L8RPZLlwk27ANh87+SNnOUpp+qy2AoCAf0mx4XXhioA==
-  dependencies:
-    "@date-io/core" "^2.14.0"
+"@csstools/postcss-unset-value@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.2.tgz#c99bb70e2cdc7312948d1eb41df2412330b81f77"
+  integrity sha512-c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g==
 
-"@emotion/babel-plugin@^11.7.1":
-  version "11.7.2"
-  resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.7.2.tgz#fec75f38a6ab5b304b0601c74e2a5e77c95e5fa0"
-  integrity sha512-6mGSCWi9UzXut/ZAN6lGFu33wGR3SJisNl3c0tvlmb8XChH1b2SUvxvnOh7hvLpqyRdHHU9AiazV3Cwbk5SXKQ==
+"@csstools/selector-specificity@^2.0.0", "@csstools/selector-specificity@^2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz#1bfafe4b7ed0f3e4105837e056e0a89b108ebe36"
+  integrity sha512-IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg==
+
+"@date-io/core@^2.15.0", "@date-io/core@^2.16.0":
+  version "2.16.0"
+  resolved "https://registry.yarnpkg.com/@date-io/core/-/core-2.16.0.tgz#7871bfc1d9bca9aa35ad444a239505589d0f22f6"
+  integrity sha512-DYmSzkr+jToahwWrsiRA2/pzMEtz9Bq1euJwoOuYwuwIYXnZFtHajY2E6a1VNVDc9jP8YUXK1BvnZH9mmT19Zg==
+
+"@date-io/date-fns@^2.15.0":
+  version "2.16.0"
+  resolved "https://registry.yarnpkg.com/@date-io/date-fns/-/date-fns-2.16.0.tgz#bd5e09b6ecb47ee55e593fc3a87e7b2caaa3da40"
+  integrity sha512-bfm5FJjucqlrnQcXDVU5RD+nlGmL3iWgkHTq3uAZWVIuBu6dDmGa3m8a6zo2VQQpu8ambq9H22UyUpn7590joA==
   dependencies:
-    "@babel/helper-module-imports" "^7.12.13"
-    "@babel/plugin-syntax-jsx" "^7.12.13"
-    "@babel/runtime" "^7.13.10"
-    "@emotion/hash" "^0.8.0"
-    "@emotion/memoize" "^0.7.5"
-    "@emotion/serialize" "^1.0.2"
-    babel-plugin-macros "^2.6.1"
+    "@date-io/core" "^2.16.0"
+
+"@date-io/dayjs@^2.15.0":
+  version "2.16.0"
+  resolved "https://registry.yarnpkg.com/@date-io/dayjs/-/dayjs-2.16.0.tgz#0d2c254ad8db1306fdc4b8eda197cb53c9af89dc"
+  integrity sha512-y5qKyX2j/HG3zMvIxTobYZRGnd1FUW2olZLS0vTj7bEkBQkjd2RO7/FEwDY03Z1geVGlXKnzIATEVBVaGzV4Iw==
+  dependencies:
+    "@date-io/core" "^2.16.0"
+
+"@date-io/luxon@^2.15.0":
+  version "2.16.1"
+  resolved "https://registry.yarnpkg.com/@date-io/luxon/-/luxon-2.16.1.tgz#b08786614cb58831c729a15807753011e4acb966"
+  integrity sha512-aeYp5K9PSHV28946pC+9UKUi/xMMYoaGelrpDibZSgHu2VWHXrr7zWLEr+pMPThSs5vt8Ei365PO+84pCm37WQ==
+  dependencies:
+    "@date-io/core" "^2.16.0"
+
+"@date-io/moment@^2.15.0":
+  version "2.16.1"
+  resolved "https://registry.yarnpkg.com/@date-io/moment/-/moment-2.16.1.tgz#ec6e0daa486871e0e6412036c6f806842a0eeed4"
+  integrity sha512-JkxldQxUqZBfZtsaCcCMkm/dmytdyq5pS1RxshCQ4fHhsvP5A7gSqPD22QbVXMcJydi3d3v1Y8BQdUKEuGACZQ==
+  dependencies:
+    "@date-io/core" "^2.16.0"
+
+"@emotion/babel-plugin@^11.10.5":
+  version "11.10.5"
+  resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.10.5.tgz#65fa6e1790ddc9e23cc22658a4c5dea423c55c3c"
+  integrity sha512-xE7/hyLHJac7D2Ve9dKroBBZqBT7WuPQmWcq7HSGb84sUuP4mlOWoB8dvVfD9yk5DHkU1m6RW7xSoDtnQHNQeA==
+  dependencies:
+    "@babel/helper-module-imports" "^7.16.7"
+    "@babel/plugin-syntax-jsx" "^7.17.12"
+    "@babel/runtime" "^7.18.3"
+    "@emotion/hash" "^0.9.0"
+    "@emotion/memoize" "^0.8.0"
+    "@emotion/serialize" "^1.1.1"
+    babel-plugin-macros "^3.1.0"
     convert-source-map "^1.5.0"
     escape-string-regexp "^4.0.0"
     find-root "^1.1.0"
     source-map "^0.5.7"
-    stylis "4.0.13"
+    stylis "4.1.3"
 
-"@emotion/cache@*", "@emotion/cache@^11.7.1", "@emotion/cache@^11.9.3":
-  version "11.9.3"
-  resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.9.3.tgz#96638449f6929fd18062cfe04d79b29b44c0d6cb"
-  integrity sha512-0dgkI/JKlCXa+lEXviaMtGBL0ynpx4osh7rjOXE71q9bIF8G+XhJgvi+wDu0B0IdCVx37BffiwXlN9I3UuzFvg==
+"@emotion/cache@*", "@emotion/cache@^11.10.5":
+  version "11.10.5"
+  resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.10.5.tgz#c142da9351f94e47527ed458f7bbbbe40bb13c12"
+  integrity sha512-dGYHWyzTdmK+f2+EnIGBpkz1lKc4Zbj2KHd4cX3Wi8/OWr5pKslNjc3yABKH4adRGCvSX4VDC0i04mrrq0aiRA==
   dependencies:
-    "@emotion/memoize" "^0.7.4"
-    "@emotion/sheet" "^1.1.1"
-    "@emotion/utils" "^1.0.0"
-    "@emotion/weak-memoize" "^0.2.5"
-    stylis "4.0.13"
+    "@emotion/memoize" "^0.8.0"
+    "@emotion/sheet" "^1.2.1"
+    "@emotion/utils" "^1.2.0"
+    "@emotion/weak-memoize" "^0.3.0"
+    stylis "4.1.3"
 
-"@emotion/hash@^0.8.0":
+"@emotion/hash@^0.9.0":
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.9.0.tgz#c5153d50401ee3c027a57a177bc269b16d889cb7"
+  integrity sha512-14FtKiHhy2QoPIzdTcvh//8OyBlknNs2nXRwIhG904opCby3l+9Xaf/wuPvICBF0rc1ZCNBd3nKe9cd2mecVkQ==
+
+"@emotion/is-prop-valid@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.2.0.tgz#7f2d35c97891669f7e276eb71c83376a5dc44c83"
+  integrity sha512-3aDpDprjM0AwaxGE09bOPkNxHpBd+kA6jty3RnaEXdweX1DF1U3VQpPYb0g1IStAuK7SVQ1cy+bNBBKp4W3Fjg==
+  dependencies:
+    "@emotion/memoize" "^0.8.0"
+
+"@emotion/memoize@^0.8.0":
   version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413"
-  integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==
+  resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.8.0.tgz#f580f9beb67176fa57aae70b08ed510e1b18980f"
+  integrity sha512-G/YwXTkv7Den9mXDO7AhLWkE3q+I92B+VqAE+dYG4NGPaHZGvt3G8Q0p9vmE+sq7rTGphUbAvmQ9YpbfMQGGlA==
 
-"@emotion/is-prop-valid@^1.1.2", "@emotion/is-prop-valid@^1.1.3":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.1.3.tgz#f0907a416368cf8df9e410117068e20fe87c0a3a"
-  integrity sha512-RFg04p6C+1uO19uG8N+vqanzKqiM9eeV1LDOG3bmkYmuOj7NbKNlFC/4EZq5gnwAIlcC/jOT24f8Td0iax2SXA==
+"@emotion/react@^11.10.5":
+  version "11.10.5"
+  resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.10.5.tgz#95fff612a5de1efa9c0d535384d3cfa115fe175d"
+  integrity sha512-TZs6235tCJ/7iF6/rvTaOH4oxQg2gMAcdHemjwLKIjKz4rRuYe1HJ2TQJKnAcRAfOUDdU8XoDadCe1rl72iv8A==
   dependencies:
-    "@emotion/memoize" "^0.7.4"
-
-"@emotion/memoize@^0.7.4", "@emotion/memoize@^0.7.5":
-  version "0.7.5"
-  resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.5.tgz#2c40f81449a4e554e9fc6396910ed4843ec2be50"
-  integrity sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ==
-
-"@emotion/react@^11.9.0":
-  version "11.9.0"
-  resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.9.0.tgz#b6d42b1db3bd7511e7a7c4151dc8bc82e14593b8"
-  integrity sha512-lBVSF5d0ceKtfKCDQJveNAtkC7ayxpVlgOohLgXqRwqWr9bOf4TZAFFyIcNngnV6xK6X4x2ZeXq7vliHkoVkxQ==
-  dependencies:
-    "@babel/runtime" "^7.13.10"
-    "@emotion/babel-plugin" "^11.7.1"
-    "@emotion/cache" "^11.7.1"
-    "@emotion/serialize" "^1.0.3"
-    "@emotion/utils" "^1.1.0"
-    "@emotion/weak-memoize" "^0.2.5"
+    "@babel/runtime" "^7.18.3"
+    "@emotion/babel-plugin" "^11.10.5"
+    "@emotion/cache" "^11.10.5"
+    "@emotion/serialize" "^1.1.1"
+    "@emotion/use-insertion-effect-with-fallbacks" "^1.0.0"
+    "@emotion/utils" "^1.2.0"
+    "@emotion/weak-memoize" "^0.3.0"
     hoist-non-react-statics "^3.3.1"
 
-"@emotion/serialize@*", "@emotion/serialize@^1.0.2", "@emotion/serialize@^1.0.3":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.0.3.tgz#99e2060c26c6292469fb30db41f4690e1c8fea63"
-  integrity sha512-2mSSvgLfyV3q+iVh3YWgNlUc2a9ZlDU7DjuP5MjK3AXRR0dYigCrP99aeFtaB2L/hjfEZdSThn5dsZ0ufqbvsA==
+"@emotion/serialize@*", "@emotion/serialize@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.1.1.tgz#0595701b1902feded8a96d293b26be3f5c1a5cf0"
+  integrity sha512-Zl/0LFggN7+L1liljxXdsVSVlg6E/Z/olVWpfxUTxOAmi8NU7YoeWeLfi1RmnB2TATHoaWwIBRoL+FvAJiTUQA==
   dependencies:
-    "@emotion/hash" "^0.8.0"
-    "@emotion/memoize" "^0.7.4"
-    "@emotion/unitless" "^0.7.5"
-    "@emotion/utils" "^1.0.0"
+    "@emotion/hash" "^0.9.0"
+    "@emotion/memoize" "^0.8.0"
+    "@emotion/unitless" "^0.8.0"
+    "@emotion/utils" "^1.2.0"
     csstype "^3.0.2"
 
-"@emotion/sheet@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.1.1.tgz#015756e2a9a3c7c5f11d8ec22966a8dbfbfac787"
-  integrity sha512-J3YPccVRMiTZxYAY0IOq3kd+hUP8idY8Kz6B/Cyo+JuXq52Ek+zbPbSQUrVQp95aJ+lsAW7DPL1P2Z+U1jGkKA==
-
-"@emotion/styled@^11.8.1":
-  version "11.8.1"
-  resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-11.8.1.tgz#856f6f63aceef0eb783985fa2322e2bf66d04e17"
-  integrity sha512-OghEVAYBZMpEquHZwuelXcRjRJQOVayvbmNR0zr174NHdmMgrNkLC6TljKC5h9lZLkN5WGrdUcrKlOJ4phhoTQ==
-  dependencies:
-    "@babel/runtime" "^7.13.10"
-    "@emotion/babel-plugin" "^11.7.1"
-    "@emotion/is-prop-valid" "^1.1.2"
-    "@emotion/serialize" "^1.0.2"
-    "@emotion/utils" "^1.1.0"
-
-"@emotion/unitless@^0.7.5":
-  version "0.7.5"
-  resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed"
-  integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==
-
-"@emotion/utils@*", "@emotion/utils@^1.0.0", "@emotion/utils@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.1.0.tgz#86b0b297f3f1a0f2bdb08eeac9a2f49afd40d0cf"
-  integrity sha512-iRLa/Y4Rs5H/f2nimczYmS5kFJEbpiVvgN3XVfZ022IYhuNA1IRSHEizcof88LtCTXtl9S2Cxt32KgaXEu72JQ==
-
-"@emotion/weak-memoize@^0.2.5":
-  version "0.2.5"
-  resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46"
-  integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==
-
-"@eslint/eslintrc@^1.2.1":
+"@emotion/sheet@^1.2.1":
   version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.2.1.tgz#8b5e1c49f4077235516bc9ec7d41378c0f69b8c6"
-  integrity sha512-bxvbYnBPN1Gibwyp6NrpnFzA3YtRL3BBAyEAFVIpNTm2Rn4Vy87GA5M4aSn3InRrlsbX5N0GW7XIx+U4SAEKdQ==
+  resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.2.1.tgz#0767e0305230e894897cadb6c8df2c51e61a6c2c"
+  integrity sha512-zxRBwl93sHMsOj4zs+OslQKg/uhF38MB+OMKoCrVuS0nyTkqnau+BM3WGEoOptg9Oz45T/aIGs1qbVAsEFo3nA==
+
+"@emotion/styled@^11.10.5":
+  version "11.10.5"
+  resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-11.10.5.tgz#1fe7bf941b0909802cb826457e362444e7e96a79"
+  integrity sha512-8EP6dD7dMkdku2foLoruPCNkRevzdcBaY6q0l0OsbyJK+x8D9HWjX27ARiSIKNF634hY9Zdoedh8bJCiva8yZw==
+  dependencies:
+    "@babel/runtime" "^7.18.3"
+    "@emotion/babel-plugin" "^11.10.5"
+    "@emotion/is-prop-valid" "^1.2.0"
+    "@emotion/serialize" "^1.1.1"
+    "@emotion/use-insertion-effect-with-fallbacks" "^1.0.0"
+    "@emotion/utils" "^1.2.0"
+
+"@emotion/unitless@^0.8.0":
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.8.0.tgz#a4a36e9cbdc6903737cd20d38033241e1b8833db"
+  integrity sha512-VINS5vEYAscRl2ZUDiT3uMPlrFQupiKgHz5AA4bCH1miKBg4qtwkim1qPmJj/4WG6TreYMY111rEFsjupcOKHw==
+
+"@emotion/use-insertion-effect-with-fallbacks@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.0.tgz#ffadaec35dbb7885bd54de3fa267ab2f860294df"
+  integrity sha512-1eEgUGmkaljiBnRMTdksDV1W4kUnmwgp7X9G8B++9GYwl1lUdqSndSriIrTJ0N7LQaoauY9JJ2yhiOYK5+NI4A==
+
+"@emotion/utils@*", "@emotion/utils@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.2.0.tgz#9716eaccbc6b5ded2ea5a90d65562609aab0f561"
+  integrity sha512-sn3WH53Kzpw8oQ5mgMmIzzyAaH2ZqFEbozVVBSYp538E06OSE6ytOp7pRAjNQR+Q/orwqdQYJSe2m3hCOeznkw==
+
+"@emotion/weak-memoize@^0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.3.0.tgz#ea89004119dc42db2e1dba0f97d553f7372f6fcb"
+  integrity sha512-AHPmaAx+RYfZz0eYu6Gviiagpmiyw98ySSlQvCUhVGDRtDFe4DBS0x1bSjdF3gqUDYOczB+yYvBTtEylYSdRhg==
+
+"@eslint/eslintrc@^1.3.3":
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.3.tgz#2b044ab39fdfa75b4688184f9e573ce3c5b0ff95"
+  integrity sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
-    espree "^9.3.1"
-    globals "^13.9.0"
+    espree "^9.4.0"
+    globals "^13.15.0"
     ignore "^5.2.0"
     import-fresh "^3.2.1"
     js-yaml "^4.1.0"
-    minimatch "^3.0.4"
+    minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@firebase/analytics-compat@0.1.16":
-  version "0.1.16"
-  resolved "https://registry.yarnpkg.com/@firebase/analytics-compat/-/analytics-compat-0.1.16.tgz#7a2c57c37a39efe52c476fa8878dd5a6b93b2155"
-  integrity sha512-mDAhE33WiyCrqSQZvzyZtQCCdf4ipn5tsEpTbIUruk7MbThQ1EbNAbPBiEk9NDLD3sUyLABZGFctvym/hc8H+w==
+"@firebase/analytics-compat@0.1.17":
+  version "0.1.17"
+  resolved "https://registry.yarnpkg.com/@firebase/analytics-compat/-/analytics-compat-0.1.17.tgz#7be65327b3fe8a4dceab636562fc10032064280f"
+  integrity sha512-36ByEDsH6/3YNuD6yig30s2A/+E1pt333r8SJirUE8+aHYl/DGX0PXplKvJWDGamYYjMwet3Kt4XRrB1NY8mLg==
   dependencies:
-    "@firebase/analytics" "0.8.3"
-    "@firebase/analytics-types" "0.7.0"
-    "@firebase/component" "0.5.20"
-    "@firebase/util" "1.7.2"
+    "@firebase/analytics" "0.8.4"
+    "@firebase/analytics-types" "0.7.1"
+    "@firebase/component" "0.5.21"
+    "@firebase/util" "1.7.3"
     tslib "^2.1.0"
 
-"@firebase/analytics-types@0.7.0":
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/@firebase/analytics-types/-/analytics-types-0.7.0.tgz#91960e7c87ce8bf18cf8dd9e55ccbf5dc3989b5d"
-  integrity sha512-DNE2Waiwy5+zZnCfintkDtBfaW6MjIG883474v6Z0K1XZIvl76cLND4iv0YUb48leyF+PJK1KO2XrgHb/KpmhQ==
+"@firebase/analytics-types@0.7.1":
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/@firebase/analytics-types/-/analytics-types-0.7.1.tgz#21556098e83aa14f192ce84051c81d794b2eb150"
+  integrity sha512-a1INLjelc1Mqrt2CbGmGdlNBj0zsvwBv0K5q5C6Fje8GSXBMc3+iQQQjzYe/4KkK6nL54UP7ZMeI/Q3VEW72FA==
 
-"@firebase/analytics@0.8.3":
-  version "0.8.3"
-  resolved "https://registry.yarnpkg.com/@firebase/analytics/-/analytics-0.8.3.tgz#d8c6d71c3aa09d2ae5041db5b3778e4f66a832cb"
-  integrity sha512-viGhc57JW9zHp/0JKpLBUthdpOrEjbPETQFz8oNfaNma+cHA6FtIrtg4Sla52DgqatbATcE9aIDBiPCGrCtNjw==
+"@firebase/analytics@0.8.4":
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/@firebase/analytics/-/analytics-0.8.4.tgz#596e79258605c8322ef25f47cd4e1ff94579dd90"
+  integrity sha512-Bgr2tMexv0YrL6kjrOF1xVRts8PM6WWmROpfRQjh0xFU4QSoofBJhkVn2NXDXkHWrr5slFfqB5yOnmgAIsHiMw==
   dependencies:
-    "@firebase/component" "0.5.20"
-    "@firebase/installations" "0.5.15"
-    "@firebase/logger" "0.3.3"
-    "@firebase/util" "1.7.2"
+    "@firebase/component" "0.5.21"
+    "@firebase/installations" "0.5.16"
+    "@firebase/logger" "0.3.4"
+    "@firebase/util" "1.7.3"
     tslib "^2.1.0"
 
-"@firebase/app-check-compat@0.2.15":
-  version "0.2.15"
-  resolved "https://registry.yarnpkg.com/@firebase/app-check-compat/-/app-check-compat-0.2.15.tgz#d61255996b23f3e91ffd8eab7391877a3a993dca"
-  integrity sha512-EgD1WEFwwq7aP7DxPSYuUpMt8eAhClA57976D3BaHDbH/IXEuw0DfaeT0LtBb+xJD7J8uxy+YKpudCC8gzUu8g==
+"@firebase/app-check-compat@0.2.17":
+  version "0.2.17"
+  resolved "https://registry.yarnpkg.com/@firebase/app-check-compat/-/app-check-compat-0.2.17.tgz#c949976e8353156d521a52664d3735d4aa3c4417"
+  integrity sha512-yhiAy6U4MuhbY+DCgvG5FcrXkAL+7YohRzqywycQKr31k/ftelbR5l9Zmo2WJMxdLxfubnnqeG/BYCRHlSvk7A==
   dependencies:
-    "@firebase/app-check" "0.5.15"
-    "@firebase/app-check-types" "0.4.0"
-    "@firebase/component" "0.5.20"
-    "@firebase/logger" "0.3.3"
-    "@firebase/util" "1.7.2"
+    "@firebase/app-check" "0.5.17"
+    "@firebase/app-check-types" "0.4.1"
+    "@firebase/component" "0.5.21"
+    "@firebase/logger" "0.3.4"
+    "@firebase/util" "1.7.3"
     tslib "^2.1.0"
 
-"@firebase/app-check-interop-types@0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@firebase/app-check-interop-types/-/app-check-interop-types-0.1.0.tgz#83afd9d41f99166c2bdb2d824e5032e9edd8fe53"
-  integrity sha512-uZfn9s4uuRsaX5Lwx+gFP3B6YsyOKUE+Rqa6z9ojT4VSRAsZFko9FRn6OxQUA1z5t5d08fY4pf+/+Dkd5wbdbA==
+"@firebase/app-check-interop-types@0.1.1":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@firebase/app-check-interop-types/-/app-check-interop-types-0.1.1.tgz#7a6e01f4bc37195e58e62d7e4a2995e54b1957b8"
+  integrity sha512-QpYh5GmiLA9ob8NWAZpHbNNl9TzxxZI4NLevT6MYPRDXKG9BSmBI7FATRfm5uv2QQUVSQrESKog5CCmU16v+7Q==
 
-"@firebase/app-check-types@0.4.0":
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/@firebase/app-check-types/-/app-check-types-0.4.0.tgz#7007a9d1d720db20bcf466fe6785c96feaa0a82d"
-  integrity sha512-SsWafqMABIOu7zLgWbmwvHGOeQQVQlwm42kwwubsmfLmL4Sf5uGpBfDhQ0CAkpi7bkJ/NwNFKafNDL9prRNP0Q==
+"@firebase/app-check-types@0.4.1":
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/@firebase/app-check-types/-/app-check-types-0.4.1.tgz#7807e761b119d71562611a14c307ac8ca2981103"
+  integrity sha512-4X79w2X0H5i5qvaho3qkjZg5qdERnKR4gCfy/fxDmdMMP4QgNJHJ9IBk1E+c4cm5HlaZVcLq9K6z8xaRqjZhyw==
 
-"@firebase/app-check@0.5.15":
-  version "0.5.15"
-  resolved "https://registry.yarnpkg.com/@firebase/app-check/-/app-check-0.5.15.tgz#a57830b00864f792eddf45d581d256b1513643ab"
-  integrity sha512-ifQalGXkXMwGR3F8Glmo1XtDg0UjkwCmI/ff05mxnKGMfs5ZDyw8DikQfna//a/KdYuOBqxlBwS2BhHiobqUUg==
+"@firebase/app-check@0.5.17":
+  version "0.5.17"
+  resolved "https://registry.yarnpkg.com/@firebase/app-check/-/app-check-0.5.17.tgz#d24aa73f9ac887711c79986c90f18b0f15cb2c14"
+  integrity sha512-P4bm0lbs+VgS7pns322GC0hyKuTDCqYk2X4FGBf133LZaw1NXJpzOteqPdCT0hBCaR0QSHk49gxx+bdnSdd5Fg==
   dependencies:
-    "@firebase/component" "0.5.20"
-    "@firebase/logger" "0.3.3"
-    "@firebase/util" "1.7.2"
+    "@firebase/component" "0.5.21"
+    "@firebase/logger" "0.3.4"
+    "@firebase/util" "1.7.3"
     tslib "^2.1.0"
 
-"@firebase/app-compat@0.1.37":
-  version "0.1.37"
-  resolved "https://registry.yarnpkg.com/@firebase/app-compat/-/app-compat-0.1.37.tgz#338fead261344529ad7fcedd5ca014d463d6679b"
-  integrity sha512-doTKYGlVc8ZiQNOl66rpkU/YItRyOxCgMp4YWThXkPM4T/pTi4a9IMCe8K88gVNeYWd8sKW4vSnxjcOG5hQXEA==
+"@firebase/app-compat@0.1.39":
+  version "0.1.39"
+  resolved "https://registry.yarnpkg.com/@firebase/app-compat/-/app-compat-0.1.39.tgz#3ea5465d07855fdb8357a0f63fd113da81468e50"
+  integrity sha512-F5O/N38dVGFzpe6zM//MslYT80rpX0V+MQNMvONPUlXhvDqS5T+8NMSCWOcZ++Z4Hkj8EvgTJk59AMnD8SdyFw==
   dependencies:
-    "@firebase/app" "0.8.2"
-    "@firebase/component" "0.5.20"
-    "@firebase/logger" "0.3.3"
-    "@firebase/util" "1.7.2"
+    "@firebase/app" "0.8.4"
+    "@firebase/component" "0.5.21"
+    "@firebase/logger" "0.3.4"
+    "@firebase/util" "1.7.3"
     tslib "^2.1.0"
 
-"@firebase/app-types@0.8.0":
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@firebase/app-types/-/app-types-0.8.0.tgz#50a539a0a20bef8c50494d0615592fe2a384851f"
-  integrity sha512-Lec3VVquUwXPn2UReGSsfTxuMBVRmzGIwA/CJnF0LQuPgv9kOmXk9mVqsDMfHxHtqjai0n6wWHR2TqjdVV/bYA==
+"@firebase/app-types@0.8.1":
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/@firebase/app-types/-/app-types-0.8.1.tgz#4c7f916281aed570581fc667e3eb6cc730119a95"
+  integrity sha512-p75Ow3QhB82kpMzmOntv866wH9eZ3b4+QbUY+8/DA5Zzdf1c8Nsk8B7kbFpzJt4wwHMdy5LTF5YUnoTc1JiWkw==
 
-"@firebase/app@0.8.2":
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/@firebase/app/-/app-0.8.2.tgz#705fcbdd82d4720038a2eb9af7277c73ebd9e9d5"
-  integrity sha512-ByNDCe8h9O/szO3XVTrS484MtqBOKriVaNCQC7Y7KgZSaiA0OOWmIY5vwi63mBTYetqMNN5VGiG/6ZSmGIZyoQ==
+"@firebase/app@0.8.4":
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/@firebase/app/-/app-0.8.4.tgz#e62b47f909e10627f7f377ecfb7b90b921303d21"
+  integrity sha512-gQntijd+sLaGWjcBQpk33giCEXNzGLB6489NMpypVgEXJwQXYQPSrtb9vUHXot1w1iy/j6xlNl4K8wwwNdRgDg==
   dependencies:
-    "@firebase/component" "0.5.20"
-    "@firebase/logger" "0.3.3"
-    "@firebase/util" "1.7.2"
+    "@firebase/component" "0.5.21"
+    "@firebase/logger" "0.3.4"
+    "@firebase/util" "1.7.3"
     idb "7.0.1"
     tslib "^2.1.0"
 
-"@firebase/auth-compat@0.2.23":
-  version "0.2.23"
-  resolved "https://registry.yarnpkg.com/@firebase/auth-compat/-/auth-compat-0.2.23.tgz#72a2d5163f4688bd85b0db58ded13db68f34b0a2"
-  integrity sha512-r9YEXaL7YKoFOWHRvVoQ6d5klP+hkSsAtt21UIvP3/BxDDU+yLXN5vVvFHr38apuUeMGN34M7zkY6SihnLutIQ==
+"@firebase/auth-compat@0.2.24":
+  version "0.2.24"
+  resolved "https://registry.yarnpkg.com/@firebase/auth-compat/-/auth-compat-0.2.24.tgz#7ad914d412d467f181016c88b5a2b398b6e7fba3"
+  integrity sha512-IuZQScjtoOLkUHtmIUJ2F3E2OpDOyap6L/9HL/DX3nzEA1LrX7wlpeU6OF2jS9E0KLueWKIrSkIQOOsKoQj/sA==
   dependencies:
-    "@firebase/auth" "0.20.10"
-    "@firebase/auth-types" "0.11.0"
-    "@firebase/component" "0.5.20"
-    "@firebase/util" "1.7.2"
+    "@firebase/auth" "0.20.11"
+    "@firebase/auth-types" "0.11.1"
+    "@firebase/component" "0.5.21"
+    "@firebase/util" "1.7.3"
     node-fetch "2.6.7"
-    selenium-webdriver "4.1.2"
+    selenium-webdriver "4.5.0"
     tslib "^2.1.0"
 
-"@firebase/auth-interop-types@0.1.6":
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/@firebase/auth-interop-types/-/auth-interop-types-0.1.6.tgz#5ce13fc1c527ad36f1bb1322c4492680a6cf4964"
-  integrity sha512-etIi92fW3CctsmR9e3sYM3Uqnoq861M0Id9mdOPF6PWIg38BXL5k4upCNBggGUpLIS0H1grMOvy/wn1xymwe2g==
+"@firebase/auth-interop-types@0.1.7":
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/@firebase/auth-interop-types/-/auth-interop-types-0.1.7.tgz#82c8d431779916224d2af5cef6cec2042d830f28"
+  integrity sha512-yA/dTveGGPcc85JP8ZE/KZqfGQyQTBCV10THdI8HTlP1GDvNrhr//J5jAt58MlsCOaO3XmC4DqScPBbtIsR/EA==
 
-"@firebase/auth-types@0.11.0":
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/@firebase/auth-types/-/auth-types-0.11.0.tgz#b9c73c60ca07945b3bbd7a097633e5f78fa9e886"
-  integrity sha512-q7Bt6cx+ySj9elQHTsKulwk3+qDezhzRBFC9zlQ1BjgMueUOnGMcvqmU0zuKlQ4RhLSH7MNAdBV2znVaoN3Vxw==
+"@firebase/auth-types@0.11.1":
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/@firebase/auth-types/-/auth-types-0.11.1.tgz#f5524891653dbe4e22fba7586ef00605f33ce61d"
+  integrity sha512-ud7T39VG9ptTrC2fOy/XlU+ubC+BVuBJPteuzsPZSa9l7gkntvWgVb3Z/3FxqqRPlkVUYiyvmsbRN3DE1He2ow==
 
-"@firebase/auth@0.20.10":
-  version "0.20.10"
-  resolved "https://registry.yarnpkg.com/@firebase/auth/-/auth-0.20.10.tgz#4dbd6cb24906e11f78bf65100a71b45b028b607b"
-  integrity sha512-uAZypmVv/4nijaPVtR/ipjKBmSDPLQ7sNScLHs2DVhdvCklgUUF5+zsEdPlMfKDIfmVQHFwHbUgeKyXDYSRMwQ==
+"@firebase/auth@0.20.11":
+  version "0.20.11"
+  resolved "https://registry.yarnpkg.com/@firebase/auth/-/auth-0.20.11.tgz#acf40fcf9c64af9d5f29ad9a8cfc2e99aed50237"
+  integrity sha512-cKy91l4URDG3yWfPK7tjUySh2wCLxtTilsR59jiqQJLReBrQsKP79eFDJ6jqWwbEh3+f1lmoH1nKswwbo9XdmA==
   dependencies:
-    "@firebase/component" "0.5.20"
-    "@firebase/logger" "0.3.3"
-    "@firebase/util" "1.7.2"
+    "@firebase/component" "0.5.21"
+    "@firebase/logger" "0.3.4"
+    "@firebase/util" "1.7.3"
     node-fetch "2.6.7"
-    selenium-webdriver "4.1.2"
+    selenium-webdriver "4.5.0"
     tslib "^2.1.0"
 
-"@firebase/component@0.5.20":
-  version "0.5.20"
-  resolved "https://registry.yarnpkg.com/@firebase/component/-/component-0.5.20.tgz#52165b5f7d25c4ac9c679e4e48d6f7fa7bf722cf"
-  integrity sha512-wP51tQBlPFprfAWxWjzC/56hG4APhl43jFsgwuqCl3bhVbiKcr278QbrbGNmIXDeGKo4sGZLAnH9whl2apeCmA==
+"@firebase/component@0.5.21":
+  version "0.5.21"
+  resolved "https://registry.yarnpkg.com/@firebase/component/-/component-0.5.21.tgz#bb10add24fe2ee59a61163a469d4711d8da4002d"
+  integrity sha512-12MMQ/ulfygKpEJpseYMR0HunJdlsLrwx2XcEs40M18jocy2+spyzHHEwegN3x/2/BLFBjR5247Etmz0G97Qpg==
   dependencies:
-    "@firebase/util" "1.7.2"
+    "@firebase/util" "1.7.3"
     tslib "^2.1.0"
 
-"@firebase/database-compat@0.2.9":
-  version "0.2.9"
-  resolved "https://registry.yarnpkg.com/@firebase/database-compat/-/database-compat-0.2.9.tgz#a1b4ecf94e11eadfc21aa48121b3ba7ea18a57ae"
-  integrity sha512-zzyFM3+jW/qYtHojiQirHXGXYyElbqVngEEn/i2gXoSzcK0Y2AL5oHAqGYXLaaW0+t4Zwnssh3HnQJM8C1D0fw==
+"@firebase/database-compat@0.2.10":
+  version "0.2.10"
+  resolved "https://registry.yarnpkg.com/@firebase/database-compat/-/database-compat-0.2.10.tgz#fa4440db9f41a9a05112642504c1e6557a75b8be"
+  integrity sha512-fK+IgUUqVKcWK/gltzDU+B1xauCOfY6vulO8lxoNTkcCGlSxuTtwsdqjGkFmgFRMYjXFWWJ6iFcJ/vXahzwCtA==
   dependencies:
-    "@firebase/component" "0.5.20"
-    "@firebase/database" "0.13.9"
-    "@firebase/database-types" "0.9.16"
-    "@firebase/logger" "0.3.3"
-    "@firebase/util" "1.7.2"
+    "@firebase/component" "0.5.21"
+    "@firebase/database" "0.13.10"
+    "@firebase/database-types" "0.9.17"
+    "@firebase/logger" "0.3.4"
+    "@firebase/util" "1.7.3"
     tslib "^2.1.0"
 
-"@firebase/database-types@0.9.16":
-  version "0.9.16"
-  resolved "https://registry.yarnpkg.com/@firebase/database-types/-/database-types-0.9.16.tgz#4f7f612c00346641a641ac689005857190e91ebc"
-  integrity sha512-dK/uFgHisrVijSoHf9RLJ7NwvlOul2rO/z9ufOSbGd8/TqFVASXz+19mynhDIoSEnyQtJC/NTyBzSPfjz0w61w==
+"@firebase/database-types@0.9.17":
+  version "0.9.17"
+  resolved "https://registry.yarnpkg.com/@firebase/database-types/-/database-types-0.9.17.tgz#4c248052b0a9ae052ba940e4996a0bfab25dc257"
+  integrity sha512-YQm2tCZyxNtEnlS5qo5gd2PAYgKCy69tUKwioGhApCFThW+mIgZs7IeYeJo2M51i4LCixYUl+CvnOyAnb/c3XA==
   dependencies:
-    "@firebase/app-types" "0.8.0"
-    "@firebase/util" "1.7.2"
+    "@firebase/app-types" "0.8.1"
+    "@firebase/util" "1.7.3"
 
-"@firebase/database@0.13.9":
-  version "0.13.9"
-  resolved "https://registry.yarnpkg.com/@firebase/database/-/database-0.13.9.tgz#8cf8c77fb837ed1a6fa85565ac8c28864b0957fb"
-  integrity sha512-raQEBgQQybaEoMloJL8wWHQywGQ9mF2VbitvHydsbSNn+KL/xRDjXeQZPuuSbRjkYV6mR8jvQB7gpnzQQNE8Qg==
+"@firebase/database@0.13.10":
+  version "0.13.10"
+  resolved "https://registry.yarnpkg.com/@firebase/database/-/database-0.13.10.tgz#c24e0219490b9c1fabfb7b42cb45850e145fe56d"
+  integrity sha512-KRucuzZ7ZHQsRdGEmhxId5jyM2yKsjsQWF9yv0dIhlxYg0D8rCVDZc/waoPKA5oV3/SEIoptF8F7R1Vfe7BCQA==
   dependencies:
-    "@firebase/auth-interop-types" "0.1.6"
-    "@firebase/component" "0.5.20"
-    "@firebase/logger" "0.3.3"
-    "@firebase/util" "1.7.2"
+    "@firebase/auth-interop-types" "0.1.7"
+    "@firebase/component" "0.5.21"
+    "@firebase/logger" "0.3.4"
+    "@firebase/util" "1.7.3"
     faye-websocket "0.11.4"
     tslib "^2.1.0"
 
-"@firebase/firestore-compat@0.2.1":
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/@firebase/firestore-compat/-/firestore-compat-0.2.1.tgz#15fac47547e2c2fe2c4d3ddd8af63591009436af"
-  integrity sha512-XiiTpmUfyZ6QU3Dw9BCT4T+KPvqzada1GsUNX49HmriWHpIn3jTAjsagkigRAnmNDlxS3ki6Yzg9Cs60tpD0tw==
+"@firebase/firestore-compat@0.2.3":
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/@firebase/firestore-compat/-/firestore-compat-0.2.3.tgz#da2f4f9a1da8cdf0a83769ec771f64ad7866363c"
+  integrity sha512-FgJwGCA2K+lsGk6gbJo57qn4iocQSGfOlNi2s4QsEO/WOVIU00yYGm408fN7iAGpr9d5VKyulO4sYcic7cS51g==
   dependencies:
-    "@firebase/component" "0.5.20"
-    "@firebase/firestore" "3.7.1"
-    "@firebase/firestore-types" "2.5.0"
-    "@firebase/util" "1.7.2"
+    "@firebase/component" "0.5.21"
+    "@firebase/firestore" "3.7.3"
+    "@firebase/firestore-types" "2.5.1"
+    "@firebase/util" "1.7.3"
     tslib "^2.1.0"
 
-"@firebase/firestore-types@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@firebase/firestore-types/-/firestore-types-2.5.0.tgz#16fca40b6980fdb000de86042d7a96635f2bcdd7"
-  integrity sha512-I6c2m1zUhZ5SH0cWPmINabDyH5w0PPFHk2UHsjBpKdZllzJZ2TwTkXbDtpHUZNmnc/zAa0WNMNMvcvbb/xJLKA==
+"@firebase/firestore-types@2.5.1":
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/@firebase/firestore-types/-/firestore-types-2.5.1.tgz#464b2ee057956599ca34de50eae957c30fdbabb7"
+  integrity sha512-xG0CA6EMfYo8YeUxC8FeDzf6W3FX1cLlcAGBYV6Cku12sZRI81oWcu61RSKM66K6kUENP+78Qm8mvroBcm1whw==
 
-"@firebase/firestore@3.7.1":
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/@firebase/firestore/-/firestore-3.7.1.tgz#68d6c35ba16702942577afe4607a5acf6d62d912"
-  integrity sha512-sDZ79cUf4cwCyRzN74zODgaeUvyt0lGA8YwaasVVqojgznwMG/bIz+/Tny4ZEnLZFrlniCqt2tStWsiC6s3u7g==
+"@firebase/firestore@3.7.3":
+  version "3.7.3"
+  resolved "https://registry.yarnpkg.com/@firebase/firestore/-/firestore-3.7.3.tgz#c839d6983f81d2853daeac42fba316a86102e5e4"
+  integrity sha512-hnA8hljwJBpejv0SPlt0yiej1wz3VRcLzoNAZujTCI1wLoADkRNsqic5uN/Ge0M0vbmHliLXtet/PDqvEbB9Ww==
   dependencies:
-    "@firebase/component" "0.5.20"
-    "@firebase/logger" "0.3.3"
-    "@firebase/util" "1.7.2"
-    "@firebase/webchannel-wrapper" "0.8.0"
+    "@firebase/component" "0.5.21"
+    "@firebase/logger" "0.3.4"
+    "@firebase/util" "1.7.3"
+    "@firebase/webchannel-wrapper" "0.8.1"
     "@grpc/grpc-js" "^1.3.2"
     "@grpc/proto-loader" "^0.6.13"
     node-fetch "2.6.7"
     tslib "^2.1.0"
 
-"@firebase/functions-compat@0.2.7":
-  version "0.2.7"
-  resolved "https://registry.yarnpkg.com/@firebase/functions-compat/-/functions-compat-0.2.7.tgz#fc43b1ab79f2c63209ea69db87b121f18b63a973"
-  integrity sha512-bcUst8ZDJHeVy2Wox4KEM5EizsrrqLzbwFIwJD7KkuSYP8XrlV2gaqJnCvIXXc0Nc4JRGvbXcvFFMXDjhsEp4Q==
+"@firebase/functions-compat@0.2.8":
+  version "0.2.8"
+  resolved "https://registry.yarnpkg.com/@firebase/functions-compat/-/functions-compat-0.2.8.tgz#e6f1c476cdd6c3657d3b6328aebe8a62ace0a7bb"
+  integrity sha512-5w668whT+bm6oVcFqIxfFbn9N77WycpNCfZNg1l0iC+5RLSt53RTVu43pqi43vh23Vp4ad+SRBgZiQGAMen5wA==
   dependencies:
-    "@firebase/component" "0.5.20"
-    "@firebase/functions" "0.8.7"
-    "@firebase/functions-types" "0.5.0"
-    "@firebase/util" "1.7.2"
+    "@firebase/component" "0.5.21"
+    "@firebase/functions" "0.8.8"
+    "@firebase/functions-types" "0.5.1"
+    "@firebase/util" "1.7.3"
     tslib "^2.1.0"
 
-"@firebase/functions-types@0.5.0":
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/@firebase/functions-types/-/functions-types-0.5.0.tgz#b50ba95ccce9e96f7cda453228ffe1684645625b"
-  integrity sha512-qza0M5EwX+Ocrl1cYI14zoipUX4gI/Shwqv0C1nB864INAD42Dgv4v94BCyxGHBg2kzlWy8PNafdP7zPO8aJQA==
+"@firebase/functions-types@0.5.1":
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/@firebase/functions-types/-/functions-types-0.5.1.tgz#7633fd2ade99c1b8c0c5037fa369fc91849e3b15"
+  integrity sha512-olEJnTuULM/ws0pwhHA0Ze5oIdpFbZsdBGCaBhyL4pm1NUR4Moh0cyAsqr+VtqHCNMGquHU1GJ77qITkoonp0w==
 
-"@firebase/functions@0.8.7":
-  version "0.8.7"
-  resolved "https://registry.yarnpkg.com/@firebase/functions/-/functions-0.8.7.tgz#b5571c50b849a31f8825a08f535419b2c2f3e9d8"
-  integrity sha512-JHSKdAOzlFJ9NdKoOaq4x6S1q6B3GmYZDg13KIDsE6BC0E9o/eWxOWOjSFJRCP/lpfFwa0rYBRayfUvZxW3BLw==
+"@firebase/functions@0.8.8":
+  version "0.8.8"
+  resolved "https://registry.yarnpkg.com/@firebase/functions/-/functions-0.8.8.tgz#a193d5565670bfa9b0e64b00556fae7d183fc895"
+  integrity sha512-weNcDQJcH3/2YFaXd5dF5pUk3IQdZY60QNuWpq7yS+uaPlCRHjT0K989Q3ZcmYwXz7mHTfhlQamXdA4Yobgt+Q==
   dependencies:
-    "@firebase/app-check-interop-types" "0.1.0"
-    "@firebase/auth-interop-types" "0.1.6"
-    "@firebase/component" "0.5.20"
-    "@firebase/messaging-interop-types" "0.1.0"
-    "@firebase/util" "1.7.2"
+    "@firebase/app-check-interop-types" "0.1.1"
+    "@firebase/auth-interop-types" "0.1.7"
+    "@firebase/component" "0.5.21"
+    "@firebase/messaging-interop-types" "0.1.1"
+    "@firebase/util" "1.7.3"
     node-fetch "2.6.7"
     tslib "^2.1.0"
 
-"@firebase/installations-compat@0.1.15":
-  version "0.1.15"
-  resolved "https://registry.yarnpkg.com/@firebase/installations-compat/-/installations-compat-0.1.15.tgz#95b13a2fa55ba1aa05094b8b54ccd09fc046cc11"
-  integrity sha512-m0atyudsVj6ekmM+djhhzzInMC3Y233YJky9vXUVt5MHQY0mHhqDds9+UIrCa6cpbl+ntI2fOuoYV7y01s3sfw==
+"@firebase/installations-compat@0.1.16":
+  version "0.1.16"
+  resolved "https://registry.yarnpkg.com/@firebase/installations-compat/-/installations-compat-0.1.16.tgz#b54c2fefaffd49a9f16e84ab5260348197ea9e4e"
+  integrity sha512-Xp7s3iUMZ6/TN0a+g1kpHNEn7h59kSxi44/2I7bd3X6xwHnxMu0TqYB7U9WfqEhqiI9iKulL3g06wIZqaklElw==
   dependencies:
-    "@firebase/component" "0.5.20"
-    "@firebase/installations" "0.5.15"
-    "@firebase/installations-types" "0.4.0"
-    "@firebase/util" "1.7.2"
+    "@firebase/component" "0.5.21"
+    "@firebase/installations" "0.5.16"
+    "@firebase/installations-types" "0.4.1"
+    "@firebase/util" "1.7.3"
     tslib "^2.1.0"
 
-"@firebase/installations-types@0.4.0":
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/@firebase/installations-types/-/installations-types-0.4.0.tgz#256782ff9adfb390ac658c25bc32f89635ddce7c"
-  integrity sha512-nXxWKQDvBGctuvsizbUEJKfxXU9WAaDhon+j0jpjIfOJkvkj3YHqlLB/HeYjpUn85Pb22BjplpTnDn4Gm9pc3A==
+"@firebase/installations-types@0.4.1":
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/@firebase/installations-types/-/installations-types-0.4.1.tgz#3aa99213e39a81a3bbac25b1627169082da289ad"
+  integrity sha512-ac906QcmipomZjSasGDYNS1LDy4JNGzQ4VXHpFtoOrI6U2QGFkRezZpI+5bzfU062JOD+doO6irYC6Uwnv/GnA==
 
-"@firebase/installations@0.5.15":
-  version "0.5.15"
-  resolved "https://registry.yarnpkg.com/@firebase/installations/-/installations-0.5.15.tgz#c037152c1b6a21e8ed54ecf7439ec50820962aa4"
-  integrity sha512-RVm2nc2d+bEDFzFzQDTTU1Z13fjAD0v88yDLjtRZuT2R7JwvAegQ4F7CupBvnnf7nftkd3kBwdOi8MhMthb3jQ==
+"@firebase/installations@0.5.16":
+  version "0.5.16"
+  resolved "https://registry.yarnpkg.com/@firebase/installations/-/installations-0.5.16.tgz#ee83f771d36e991335d625dc861ac7d5574044e4"
+  integrity sha512-k3iyjr+yZnDOcJbP+CCZW3/zQJf9gYL2CNBJs9QbmFJoLz7cgIcnAT/XNDMudxcggF1goLfq4+MygpzHD0NzLA==
   dependencies:
-    "@firebase/component" "0.5.20"
-    "@firebase/util" "1.7.2"
+    "@firebase/component" "0.5.21"
+    "@firebase/util" "1.7.3"
     idb "7.0.1"
     tslib "^2.1.0"
 
-"@firebase/logger@0.3.3":
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/@firebase/logger/-/logger-0.3.3.tgz#0f724b1e0b166d17ac285aac5c8ec14d136beed4"
-  integrity sha512-POTJl07jOKTOevLXrTvJD/VZ0M6PnJXflbAh5J9VGkmtXPXNG6MdZ9fmRgqYhXKTaDId6AQenQ262uwgpdtO0Q==
+"@firebase/logger@0.3.4":
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/@firebase/logger/-/logger-0.3.4.tgz#8822dd3e9168be93c1bce0b4ac235e3b165a6a68"
+  integrity sha512-hlFglGRgZEwoyClZcGLx/Wd+zoLfGmbDkFx56mQt/jJ0XMbfPqwId1kiPl0zgdWZX+D8iH+gT6GuLPFsJWgiGw==
   dependencies:
     tslib "^2.1.0"
 
-"@firebase/messaging-compat@0.1.19":
-  version "0.1.19"
-  resolved "https://registry.yarnpkg.com/@firebase/messaging-compat/-/messaging-compat-0.1.19.tgz#4de2dcb0768846cd889e5ba89742dd5232afb8a5"
-  integrity sha512-h5tx4nxfSILeRquk5mKE8Onu7WtL6b7rfB6GKNJKecvkPs3nnq5Z4cp2Av4JUR2Wtt9UxCTfO0iRbbmtrt2bZQ==
+"@firebase/messaging-compat@0.1.21":
+  version "0.1.21"
+  resolved "https://registry.yarnpkg.com/@firebase/messaging-compat/-/messaging-compat-0.1.21.tgz#1e221cdd186fd48d41a8b9c42fdb912476717939"
+  integrity sha512-oxQCQ8EXqpSaTybryokbEM/LAqkG0L7OJuucllCg5roqRGIHE437Abus0Bn67P8TKJaYjyKxomg8wCvfmInjlg==
   dependencies:
-    "@firebase/component" "0.5.20"
-    "@firebase/messaging" "0.9.19"
-    "@firebase/util" "1.7.2"
+    "@firebase/component" "0.5.21"
+    "@firebase/messaging" "0.11.0"
+    "@firebase/util" "1.7.3"
     tslib "^2.1.0"
 
-"@firebase/messaging-interop-types@0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@firebase/messaging-interop-types/-/messaging-interop-types-0.1.0.tgz#bdac02dd31edd5cb9eec37b1db698ea5e2c1a631"
-  integrity sha512-DbvUl/rXAZpQeKBnwz0NYY5OCqr2nFA0Bj28Fmr3NXGqR4PAkfTOHuQlVtLO1Nudo3q0HxAYLa68ZDAcuv2uKQ==
+"@firebase/messaging-interop-types@0.1.1":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@firebase/messaging-interop-types/-/messaging-interop-types-0.1.1.tgz#03733115df2688786be5f96baa64869fb3914d0c"
+  integrity sha512-7XuY87zPh01EBaeS3s6co31Il5oGbPl5MxAg6Uj3fPv7PqJQlbwQ+B5k7CKSF/Y26tRxp+u+usxIvIWCSEA8CQ==
 
-"@firebase/messaging@0.9.19":
-  version "0.9.19"
-  resolved "https://registry.yarnpkg.com/@firebase/messaging/-/messaging-0.9.19.tgz#868916ed20e2bd3ecb58d13e1adb186714cfcbfa"
-  integrity sha512-xu99y/7/P+y3txGtgjsVJZyvx7T5/KdvFgDWS7oZwhKYG0o+DXFvvw3SBMK82LFGFOoyHlJUPqv45EyCPnOPCA==
+"@firebase/messaging@0.11.0":
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/@firebase/messaging/-/messaging-0.11.0.tgz#ab6dbcd8b95f2b65f2290eb44110979261f84399"
+  integrity sha512-V7+Xw4QlB8PgINY7Wml+Uj8A3S2nR0ooVoaqfRJ8ZN3W7A4aO/DCkjPsf6DXehwfqRLA7PGB9Boe8l9Idy7icA==
   dependencies:
-    "@firebase/component" "0.5.20"
-    "@firebase/installations" "0.5.15"
-    "@firebase/messaging-interop-types" "0.1.0"
-    "@firebase/util" "1.7.2"
+    "@firebase/component" "0.5.21"
+    "@firebase/installations" "0.5.16"
+    "@firebase/messaging-interop-types" "0.1.1"
+    "@firebase/util" "1.7.3"
     idb "7.0.1"
     tslib "^2.1.0"
 
-"@firebase/performance-compat@0.1.15":
-  version "0.1.15"
-  resolved "https://registry.yarnpkg.com/@firebase/performance-compat/-/performance-compat-0.1.15.tgz#9ba68c6696a5ccd9ea5022ead43c1246017015bf"
-  integrity sha512-mryHr5eBEpWxBo8b3KM/53SwwVjMVahwdEnhfx1r+zAvmEPEzXUOGBzAC1l5WQ4DrwtDR87uMZ5soiQ/0jl9QQ==
+"@firebase/performance-compat@0.1.17":
+  version "0.1.17"
+  resolved "https://registry.yarnpkg.com/@firebase/performance-compat/-/performance-compat-0.1.17.tgz#23774adda07f6af83299517a202f8d98ebc9a70d"
+  integrity sha512-Hci5MrDlRuqwVozq7LaSAufXXElz+AtmEQArix64kLRJqHhOu5K/8TpuZXM/klR6gnLyIrk+01CrAemH3zHpDw==
   dependencies:
-    "@firebase/component" "0.5.20"
-    "@firebase/logger" "0.3.3"
-    "@firebase/performance" "0.5.15"
-    "@firebase/performance-types" "0.1.0"
-    "@firebase/util" "1.7.2"
+    "@firebase/component" "0.5.21"
+    "@firebase/logger" "0.3.4"
+    "@firebase/performance" "0.5.17"
+    "@firebase/performance-types" "0.1.1"
+    "@firebase/util" "1.7.3"
     tslib "^2.1.0"
 
-"@firebase/performance-types@0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@firebase/performance-types/-/performance-types-0.1.0.tgz#5e6efa9dc81860aee2cb7121b39ae8fa137e69fc"
-  integrity sha512-6p1HxrH0mpx+622Ql6fcxFxfkYSBpE3LSuwM7iTtYU2nw91Hj6THC8Bc8z4nboIq7WvgsT/kOTYVVZzCSlXl8w==
+"@firebase/performance-types@0.1.1":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@firebase/performance-types/-/performance-types-0.1.1.tgz#ac37fff87f2e716c18fb78c138dc398d9b9aecd7"
+  integrity sha512-wiJRLBg8EPaYSGJqx7aqkZ3L5fULfZa9zOTs4C06K020g0zzJh9kUUO/0U3wvHz7zRQjJxTO8Jw4SDjxs3EZrA==
 
-"@firebase/performance@0.5.15":
-  version "0.5.15"
-  resolved "https://registry.yarnpkg.com/@firebase/performance/-/performance-0.5.15.tgz#094856ab0b5799a81d57c4998cda6d363d315a07"
-  integrity sha512-YnnkUehXXzqQefNE5PlPEsXeJYSeY7cMWEdHYTj6u0/F5ntLSAhVZC8jl3Y0fTU1W8a9USQhml6NaXyWiVGmjQ==
+"@firebase/performance@0.5.17":
+  version "0.5.17"
+  resolved "https://registry.yarnpkg.com/@firebase/performance/-/performance-0.5.17.tgz#f0aa9724df9e2ef095f176c2ef1accfa75e3bac6"
+  integrity sha512-NDgzI5JYo6Itnj1FWhMkK3LtwKhtOnhC+WBkxezjzFVuCOornQjvu7ucAU1o2dHXh7MFruhHGFPsHyfkkMCljA==
   dependencies:
-    "@firebase/component" "0.5.20"
-    "@firebase/installations" "0.5.15"
-    "@firebase/logger" "0.3.3"
-    "@firebase/util" "1.7.2"
+    "@firebase/component" "0.5.21"
+    "@firebase/installations" "0.5.16"
+    "@firebase/logger" "0.3.4"
+    "@firebase/util" "1.7.3"
     tslib "^2.1.0"
 
-"@firebase/remote-config-compat@0.1.15":
-  version "0.1.15"
-  resolved "https://registry.yarnpkg.com/@firebase/remote-config-compat/-/remote-config-compat-0.1.15.tgz#91343411085468a6c65b77acbbabc8791ea984f5"
-  integrity sha512-jGUrZXIxQRMeSrqEaCi3MtMF33NN12TNTQDZlbex2+T2+yTMI/sn3Mq52T/OccCo86DK17WVlXSWQCH1zCD13g==
+"@firebase/remote-config-compat@0.1.16":
+  version "0.1.16"
+  resolved "https://registry.yarnpkg.com/@firebase/remote-config-compat/-/remote-config-compat-0.1.16.tgz#2953f8d556145eb57cb4244eb3e2c4a2c6f19804"
+  integrity sha512-BWonzeqODnGki/fZ17zOnjJFR5CWbIOU0PmYGjWBnbkWxpFDdE3zNsz8JTVd/Mkt7y2PHFMYpLsyZ473E/62FQ==
   dependencies:
-    "@firebase/component" "0.5.20"
-    "@firebase/logger" "0.3.3"
-    "@firebase/remote-config" "0.3.14"
-    "@firebase/remote-config-types" "0.2.0"
-    "@firebase/util" "1.7.2"
+    "@firebase/component" "0.5.21"
+    "@firebase/logger" "0.3.4"
+    "@firebase/remote-config" "0.3.15"
+    "@firebase/remote-config-types" "0.2.1"
+    "@firebase/util" "1.7.3"
     tslib "^2.1.0"
 
-"@firebase/remote-config-types@0.2.0":
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/@firebase/remote-config-types/-/remote-config-types-0.2.0.tgz#1e2759fc01f20b58c564db42196f075844c3d1fd"
-  integrity sha512-hqK5sCPeZvcHQ1D6VjJZdW6EexLTXNMJfPdTwbD8NrXUw6UjWC4KWhLK/TSlL0QPsQtcKRkaaoP+9QCgKfMFPw==
+"@firebase/remote-config-types@0.2.1":
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/@firebase/remote-config-types/-/remote-config-types-0.2.1.tgz#9f7dfb6b0066443592b055dddc57b0c954b0e83c"
+  integrity sha512-1PGx4vKtMMd5uB6G1Nj2b8fOnJx7mIJGzkdyfhIM1oQx9k3dJ+pVu4StrNm46vHaD8ZlOQLr91YfUE43xSXwSg==
 
-"@firebase/remote-config@0.3.14":
-  version "0.3.14"
-  resolved "https://registry.yarnpkg.com/@firebase/remote-config/-/remote-config-0.3.14.tgz#44b2e6174b82b9729ab0893ab80eadcc7b3c830c"
-  integrity sha512-wEOz3Tasxhr5lCGioe0WNZwDOoQhNZK2qGAm5+AlHAPaAhWIWvqUTkKsk3nFRztyRZzj3r9k5Gc2OSpEcQKP1A==
+"@firebase/remote-config@0.3.15":
+  version "0.3.15"
+  resolved "https://registry.yarnpkg.com/@firebase/remote-config/-/remote-config-0.3.15.tgz#97e14d08a1065ce1ccd63b13a6eaa0927164556d"
+  integrity sha512-ZCyqoCaftoNvc2r4zPaqNV4OgC4sRHjcQI+agzXESnhDLnTY8DpCaQ0m9j6deHuxxDOgu8QPDb8psLbjR+9CgQ==
   dependencies:
-    "@firebase/component" "0.5.20"
-    "@firebase/installations" "0.5.15"
-    "@firebase/logger" "0.3.3"
-    "@firebase/util" "1.7.2"
+    "@firebase/component" "0.5.21"
+    "@firebase/installations" "0.5.16"
+    "@firebase/logger" "0.3.4"
+    "@firebase/util" "1.7.3"
     tslib "^2.1.0"
 
-"@firebase/storage-compat@0.1.20":
-  version "0.1.20"
-  resolved "https://registry.yarnpkg.com/@firebase/storage-compat/-/storage-compat-0.1.20.tgz#ec24fd62332d39460db6e7d62770de57e72fe690"
-  integrity sha512-8vruwltKdvEPhYbPXA/otb5fAD7MGsBHpCzktJWvF7eIALa4sUlYt+jJxG5Nwk2FoT1NrwLQ7TtI7zvm6/NinA==
+"@firebase/storage-compat@0.1.22":
+  version "0.1.22"
+  resolved "https://registry.yarnpkg.com/@firebase/storage-compat/-/storage-compat-0.1.22.tgz#0eba37444a525fce3854c68eacc1d2b5d87f8b5a"
+  integrity sha512-uv33WnAEcxf2983Z03uhJmKc91LKSsRijFwut8xeoJamJoGAVj1Tc9Mio491aI1KZ+RMkNFghHL2FpxjuvxpPg==
   dependencies:
-    "@firebase/component" "0.5.20"
-    "@firebase/storage" "0.9.12"
-    "@firebase/storage-types" "0.6.0"
-    "@firebase/util" "1.7.2"
+    "@firebase/component" "0.5.21"
+    "@firebase/storage" "0.9.14"
+    "@firebase/storage-types" "0.6.1"
+    "@firebase/util" "1.7.3"
     tslib "^2.1.0"
 
-"@firebase/storage-types@0.6.0":
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/@firebase/storage-types/-/storage-types-0.6.0.tgz#0b1af64a2965af46fca138e5b70700e9b7e6312a"
-  integrity sha512-1LpWhcCb1ftpkP/akhzjzeFxgVefs6eMD2QeKiJJUGH1qOiows2w5o0sKCUSQrvrRQS1lz3SFGvNR1Ck/gqxeA==
+"@firebase/storage-types@0.6.1":
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/@firebase/storage-types/-/storage-types-0.6.1.tgz#76b71b6f6ef5df4cf286e63f58e92638b9dcd62d"
+  integrity sha512-/pkNzKiGCSjdBBZHPvWL1kkPZfM3pFJ38HPJE1xTHwLBwdrFb4JrmY+5/E4ma5ePsbejecIOD1SZhEKDB/JwUQ==
 
-"@firebase/storage@0.9.12":
-  version "0.9.12"
-  resolved "https://registry.yarnpkg.com/@firebase/storage/-/storage-0.9.12.tgz#5631893a1ae9f7b0426948ab9910cd58782f9183"
-  integrity sha512-XIAmje0ufvRrxrUU/9tvGCuUIy7WSJf3XM8Y8OV9EW2Dg1w4f8IpraLiUdlirdtFM0UAnO2kDQHoiVQYhRrADQ==
+"@firebase/storage@0.9.14":
+  version "0.9.14"
+  resolved "https://registry.yarnpkg.com/@firebase/storage/-/storage-0.9.14.tgz#e70a0e6a706df8401acfa9991306b77eb1e32d7d"
+  integrity sha512-he8VAJ4BLkQdebnna15TI1/ymkwQTeKnjA/psKMAJ2+/UswD/68bCMKOlTrMvw6Flv3zc5YZk1xdL9DHR0i6wg==
   dependencies:
-    "@firebase/component" "0.5.20"
-    "@firebase/util" "1.7.2"
+    "@firebase/component" "0.5.21"
+    "@firebase/util" "1.7.3"
     node-fetch "2.6.7"
     tslib "^2.1.0"
 
-"@firebase/util@1.7.2":
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/@firebase/util/-/util-1.7.2.tgz#dbdb259f141b5025a7faaaa38e2ea5df0be36ff5"
-  integrity sha512-P3aTihYEMoz2QQlcn0T7av7HLEK9gsTc1ZiN9VA8wnUtEJscUNemCmTmP3RRysqEb3Z+tVVoycztY8f6R36rRw==
+"@firebase/util@1.7.3":
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/@firebase/util/-/util-1.7.3.tgz#e71640b6b2970b754f947235ceb10cba3f70e62c"
+  integrity sha512-wxNqWbqokF551WrJ9BIFouU/V5SL1oYCGx1oudcirdhadnQRFH5v1sjgGL7cUV/UsekSycygphdrF2lxBxOYKg==
   dependencies:
     tslib "^2.1.0"
 
-"@firebase/webchannel-wrapper@0.8.0":
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.8.0.tgz#88dfc717fb950276fd0fdee879fad2c041e33475"
-  integrity sha512-Q8erQds5LuAUgNuFOt/tu/abffYUHYxN+Ogp2V5EOssfFG7Ja4ce324Sqyq41u/vB5CSr+tfYS3JzTDrDxCvdw==
+"@firebase/webchannel-wrapper@0.8.1":
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.8.1.tgz#5fbb3808677aa6b88bf79968237d3bb14595b1ba"
+  integrity sha512-CJW8vxt6bJaBeco2VnlJjmCmAkrrtIdf0GGKvpAB4J5gw8Gi0rHb+qsgKp6LsyS5W6ALPLawLs7phZmw02dvLw==
 
 "@grpc/grpc-js@^1.3.2":
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.3.6.tgz#6e2d17610c2c8df0f6ceab0e1968f563df74b173"
-  integrity sha512-v7+LQFbqZKmd/Tvf5/j1Xlbq6jXL/4d+gUtm2TNX4QiEC3ELWADmGr2dGlUyLl6aKTuYfsN72vAsO5zmavYkEg==
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.7.3.tgz#f2ea79f65e31622d7f86d4b4c9ae38f13ccab99a"
+  integrity sha512-H9l79u4kJ2PVSxUNA08HMYAnUBLj9v6KjYQ7SQ71hOZcEXhShE/y5iQCesP8+6/Ik/7i2O0a10bPquIcYfufog==
   dependencies:
+    "@grpc/proto-loader" "^0.7.0"
     "@types/node" ">=12.12.47"
 
 "@grpc/proto-loader@^0.6.13":
@@ -1795,19 +1862,35 @@
     protobufjs "^6.11.3"
     yargs "^16.2.0"
 
-"@hookform/resolvers@^2.6.0":
-  version "2.8.8"
-  resolved "https://registry.yarnpkg.com/@hookform/resolvers/-/resolvers-2.8.8.tgz#17cf806485435877fdafce9f3bee6ff68f7f87b6"
-  integrity sha512-meAEDur1IJBfKyTo9yPYAuzjIfrxA7m9Ov+1nxaW/YupsqMeseWifoUjWK03+hz/RJizsVQAaUjVxFEkyu0GWg==
+"@grpc/proto-loader@^0.7.0":
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.7.3.tgz#75a6f95b51b85c5078ac7394da93850c32d36bb8"
+  integrity sha512-5dAvoZwna2Py3Ef96Ux9jIkp3iZ62TUsV00p3wVBPNX5K178UbNi8Q7gQVqwXT1Yq9RejIGG9G2IPEo93T6RcA==
+  dependencies:
+    "@types/long" "^4.0.1"
+    lodash.camelcase "^4.3.0"
+    long "^4.0.0"
+    protobufjs "^7.0.0"
+    yargs "^16.2.0"
 
-"@humanwhocodes/config-array@^0.9.2":
-  version "0.9.5"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.9.5.tgz#2cbaf9a89460da24b5ca6531b8bbfc23e1df50c7"
-  integrity sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==
+"@hookform/resolvers@^2.6.0":
+  version "2.9.10"
+  resolved "https://registry.yarnpkg.com/@hookform/resolvers/-/resolvers-2.9.10.tgz#e7e88942ee34e97b7bc937b0be4694194c9cd420"
+  integrity sha512-JIL1DgJIlH9yuxcNGtyhsWX/PgNltz+5Gr6+8SX9fhXc/hPbEIk6wPI82nhgvp3uUb6ZfAM5mqg/x7KR7NAb+A==
+
+"@humanwhocodes/config-array@^0.11.6":
+  version "0.11.7"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.7.tgz#38aec044c6c828f6ed51d5d7ae3d9b9faf6dbb0f"
+  integrity sha512-kBbPWzN8oVMLb0hOUYXhmxggL/1cJE6ydvjDIGi9EnAGUyA7cLVKQg+d/Dsm+KZwx2czGHrCmMVLiyg8s5JPKw==
   dependencies:
     "@humanwhocodes/object-schema" "^1.2.1"
     debug "^4.1.1"
-    minimatch "^3.0.4"
+    minimatch "^3.0.5"
+
+"@humanwhocodes/module-importer@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
+  integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
 
 "@humanwhocodes/object-schema@^1.2.1":
   version "1.2.1"
@@ -1842,6 +1925,18 @@
     jest-util "^27.5.1"
     slash "^3.0.0"
 
+"@jest/console@^28.1.3":
+  version "28.1.3"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-28.1.3.tgz#2030606ec03a18c31803b8a36382762e447655df"
+  integrity sha512-QPAkP5EwKdK/bxIr6C1I4Vs0rm2nHiANzj/Z5X2JQkrZo6IqvC4ldZ9K95tF0HdidhA8Bo6egxSzUFPYKcEXLw==
+  dependencies:
+    "@jest/types" "^28.1.3"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    jest-message-util "^28.1.3"
+    jest-util "^28.1.3"
+    slash "^3.0.0"
+
 "@jest/core@^27.5.1":
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.5.1.tgz#267ac5f704e09dc52de2922cbf3af9edcd64b626"
@@ -1893,6 +1988,13 @@
     "@types/node" "*"
     jest-mock "^27.5.1"
 
+"@jest/expect-utils@^29.3.1":
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.3.1.tgz#531f737039e9b9e27c42449798acb5bba01935b6"
+  integrity sha512-wlrznINZI5sMjwvUoLVk617ll/UYfGIZNxmbU+Pa7wmkL4vYzhV9R2pwVqUh4NWWuLQWkI8+8mOkxs//prKQ3g==
+  dependencies:
+    jest-get-type "^29.2.0"
+
 "@jest/fake-timers@^27.5.1":
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.5.1.tgz#76979745ce0579c8a94a4678af7a748eda8ada74"
@@ -1945,12 +2047,19 @@
     terminal-link "^2.0.0"
     v8-to-istanbul "^8.1.0"
 
-"@jest/schemas@^28.0.2":
-  version "28.0.2"
-  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-28.0.2.tgz#08c30df6a8d07eafea0aef9fb222c5e26d72e613"
-  integrity sha512-YVDJZjd4izeTDkij00vHHAymNXQ6WWsdChFRK86qck6Jpr3DCL5W3Is3vslviRlP+bLuMYRLbdp98amMvqudhA==
+"@jest/schemas@^28.1.3":
+  version "28.1.3"
+  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-28.1.3.tgz#ad8b86a66f11f33619e3d7e1dcddd7f2d40ff905"
+  integrity sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==
   dependencies:
-    "@sinclair/typebox" "^0.23.3"
+    "@sinclair/typebox" "^0.24.1"
+
+"@jest/schemas@^29.0.0":
+  version "29.0.0"
+  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.0.0.tgz#5f47f5994dd4ef067fb7b4188ceac45f77fe952a"
+  integrity sha512-3Ab5HgYIIAnS0HjqJHQYZS+zXc4tUmTmBH3z83ajI6afXp8X3ZtdLX+nXx+I7LNkJD7uN9LAVhgnjDgZa2z0kA==
+  dependencies:
+    "@sinclair/typebox" "^0.24.1"
 
 "@jest/source-map@^27.5.1":
   version "27.5.1"
@@ -1971,6 +2080,16 @@
     "@types/istanbul-lib-coverage" "^2.0.0"
     collect-v8-coverage "^1.0.0"
 
+"@jest/test-result@^28.1.3":
+  version "28.1.3"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-28.1.3.tgz#5eae945fd9f4b8fcfce74d239e6f725b6bf076c5"
+  integrity sha512-kZAkxnSE+FqE8YjW8gNuoVkkC9I7S1qmenl8sGcDOLropASP+BkcGKwhXoyqQuGOGeYY0y/ixjrd/iERpEXHNg==
+  dependencies:
+    "@jest/console" "^28.1.3"
+    "@jest/types" "^28.1.3"
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    collect-v8-coverage "^1.0.0"
+
 "@jest/test-sequencer@^27.5.1":
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.5.1.tgz#4057e0e9cea4439e544c6353c6affe58d095745b"
@@ -2013,19 +2132,39 @@
     "@types/yargs" "^16.0.0"
     chalk "^4.0.0"
 
-"@jest/types@^28.1.0":
-  version "28.1.0"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-28.1.0.tgz#508327a89976cbf9bd3e1cc74641a29fd7dfd519"
-  integrity sha512-xmEggMPr317MIOjjDoZ4ejCSr9Lpbt/u34+dvc99t7DS8YirW5rwZEhzKPC2BMUFkUhI48qs6qLUSGw5FuL0GA==
+"@jest/types@^28.1.3":
+  version "28.1.3"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-28.1.3.tgz#b05de80996ff12512bc5ceb1d208285a7d11748b"
+  integrity sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==
   dependencies:
-    "@jest/schemas" "^28.0.2"
+    "@jest/schemas" "^28.1.3"
     "@types/istanbul-lib-coverage" "^2.0.0"
     "@types/istanbul-reports" "^3.0.0"
     "@types/node" "*"
     "@types/yargs" "^17.0.8"
     chalk "^4.0.0"
 
-"@jridgewell/gen-mapping@^0.3.0":
+"@jest/types@^29.3.1":
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.3.1.tgz#7c5a80777cb13e703aeec6788d044150341147e3"
+  integrity sha512-d0S0jmmTpjnhCmNpApgX3jrUZgZ22ivKJRvL2lli5hpCRoNnp1f85r2/wpKfXuYu8E7Jjh1hGfhPyup1NM5AmA==
+  dependencies:
+    "@jest/schemas" "^29.0.0"
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/istanbul-reports" "^3.0.0"
+    "@types/node" "*"
+    "@types/yargs" "^17.0.8"
+    chalk "^4.0.0"
+
+"@jridgewell/gen-mapping@^0.1.0":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996"
+  integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==
+  dependencies:
+    "@jridgewell/set-array" "^1.0.0"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+
+"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2":
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"
   integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==
@@ -2034,12 +2173,12 @@
     "@jridgewell/sourcemap-codec" "^1.4.10"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@jridgewell/resolve-uri@^3.0.3":
+"@jridgewell/resolve-uri@3.1.0", "@jridgewell/resolve-uri@^3.0.3":
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
   integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
 
-"@jridgewell/set-array@^1.0.1":
+"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
   integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
@@ -2052,23 +2191,31 @@
     "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@jridgewell/sourcemap-codec@^1.4.10":
+"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10":
   version "1.4.14"
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
   integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
 
-"@jridgewell/trace-mapping@^0.3.0", "@jridgewell/trace-mapping@^0.3.9":
-  version "0.3.14"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz#b231a081d8f66796e475ad588a1ef473112701ed"
-  integrity sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==
+"@jridgewell/trace-mapping@0.3.9":
+  version "0.3.9"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
+  integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==
   dependencies:
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
+"@jridgewell/trace-mapping@^0.3.14", "@jridgewell/trace-mapping@^0.3.9":
+  version "0.3.17"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985"
+  integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==
+  dependencies:
+    "@jridgewell/resolve-uri" "3.1.0"
+    "@jridgewell/sourcemap-codec" "1.4.14"
+
 "@leichtgewicht/ip-codec@^2.0.1":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.3.tgz#0300943770e04231041a51bd39f0439b5c7ab4f0"
-  integrity sha512-nkalE/f1RvRGChwBnEIoBfSEYOXnCRdleKuv6+lePbMDrMZXeDQnqak5XDOeBgrPPyPfAdcCu/B5z+v3VhplGg==
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b"
+  integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==
 
 "@mark.probst/unicode-properties@~1.1.0":
   version "1.1.0"
@@ -2079,205 +2226,171 @@
     unicode-trie "^0.3.0"
 
 "@mdi/js@^6.6.96":
-  version "6.6.96"
-  resolved "https://registry.yarnpkg.com/@mdi/js/-/js-6.6.96.tgz#119f79fa9327359421167a7d4b8bde26e84702ce"
-  integrity sha512-ke9PN5DjPCOlMfhioxeZYADz8Yiz6v47W0IYRza01SSJD7y1EwESVpwFnnFUso+eCoWtE1CO9cTIvQF6sEreuA==
+  version "6.9.96"
+  resolved "https://registry.yarnpkg.com/@mdi/js/-/js-6.9.96.tgz#90e8fadef05a975df384f0505b2100a795881873"
+  integrity sha512-rK0/vLFaiItYS2W7uVmaKPKnhNQE4XVkylpk5njtVwENnp8elwY5uRL6qvdj2esuvUHG7DwygE4Qu3eKxxuJiQ==
 
-"@microsoft/tsdoc-config@0.16.1":
-  version "0.16.1"
-  resolved "https://registry.yarnpkg.com/@microsoft/tsdoc-config/-/tsdoc-config-0.16.1.tgz#4de11976c1202854c4618f364bf499b4be33e657"
-  integrity sha512-2RqkwiD4uN6MLnHFljqBlZIXlt/SaUT6cuogU1w2ARw4nKuuppSmR0+s+NC+7kXBQykd9zzu0P4HtBpZT5zBpQ==
+"@microsoft/tsdoc-config@0.16.2":
+  version "0.16.2"
+  resolved "https://registry.yarnpkg.com/@microsoft/tsdoc-config/-/tsdoc-config-0.16.2.tgz#b786bb4ead00d54f53839a458ce626c8548d3adf"
+  integrity sha512-OGiIzzoBLgWWR0UdRJX98oYO+XKGf7tiK4Zk6tQ/E4IJqGCe7dvkTvgDZV5cFJUzLGDOjeAXrnZoA6QkVySuxw==
   dependencies:
-    "@microsoft/tsdoc" "0.14.1"
+    "@microsoft/tsdoc" "0.14.2"
     ajv "~6.12.6"
     jju "~1.4.0"
     resolve "~1.19.0"
 
-"@microsoft/tsdoc@0.14.1":
-  version "0.14.1"
-  resolved "https://registry.yarnpkg.com/@microsoft/tsdoc/-/tsdoc-0.14.1.tgz#155ef21065427901994e765da8a0ba0eaae8b8bd"
-  integrity sha512-6Wci+Tp3CgPt/B9B0a3J4s3yMgLNSku6w5TV6mN+61C71UqsRBv2FUibBf3tPGlNxebgPHMEUzKpb1ggE8KCKw==
+"@microsoft/tsdoc@0.14.2":
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/@microsoft/tsdoc/-/tsdoc-0.14.2.tgz#c3ec604a0b54b9a9b87e9735dfc59e1a5da6a5fb"
+  integrity sha512-9b8mPpKrfeGRuhFH5iO1iwCLeIIsV6+H1sRfxbkoGXIyQE2BTsPd9zqSqQJ+pv5sJ/hT5M1zvOFL02MnEezFug==
 
-"@monaco-editor/loader@^1.3.1":
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/@monaco-editor/loader/-/loader-1.3.1.tgz#35d198fb13a983dd49e9e448a172b6a9da309411"
-  integrity sha512-LfpAO6e54SZQW0nnI1sWKO4XtAlNx3WHXYZixeVy0HhZ4txGPOok4rs2u4dSi2+iRWeL198cZ2FlFQKr8mH+cw==
+"@monaco-editor/loader@^1.3.2":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@monaco-editor/loader/-/loader-1.3.2.tgz#04effbb87052d19cd7d3c9d81c0635490f9bb6d8"
+  integrity sha512-BTDbpHl3e47r3AAtpfVFTlAi7WXv4UQ/xZmz8atKl4q7epQV5e7+JbigFDViWF71VBi4IIBdcWP57Hj+OWuc9g==
   dependencies:
     state-local "^1.0.6"
 
 "@monaco-editor/react@^4.4.4":
-  version "4.4.4"
-  resolved "https://registry.yarnpkg.com/@monaco-editor/react/-/react-4.4.4.tgz#8d6b0ac144e2b673f85408e30f1facafff9b7aab"
-  integrity sha512-yQsYnVkgP5RC5ZMoRVCXSBn4D4hLUOgoQK+AZJpVY57NDXmEb57OVaaYKh8/RTzxkpuLV278hKNw5DnuzlgQwg==
+  version "4.4.6"
+  resolved "https://registry.yarnpkg.com/@monaco-editor/react/-/react-4.4.6.tgz#8ae500b0edf85276d860ed702e7056c316548218"
+  integrity sha512-Gr3uz3LYf33wlFE3eRnta4RxP5FSNxiIV9ENn2D2/rN8KgGAD8ecvcITRtsbbyuOuNkwbuHYxfeaz2Vr+CtyFA==
   dependencies:
-    "@monaco-editor/loader" "^1.3.1"
+    "@monaco-editor/loader" "^1.3.2"
     prop-types "^15.7.2"
 
-"@mui/base@5.0.0-alpha.75":
-  version "5.0.0-alpha.75"
-  resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.75.tgz#0b352ff951765dfa83723fd1faf46a128dfe63ca"
-  integrity sha512-eQ8SP2ML5nJyOdSqmk26ezg/eEP1k42Z+k6uMfNbgHZc8iZwgw9iVe+6g5j/qZPKS88AtxVG8YsLLZkXT82/Bw==
+"@mui/base@5.0.0-alpha.108":
+  version "5.0.0-alpha.108"
+  resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.108.tgz#4e4639ba6769dd178ef475dba4cc36bf8a3f1dc6"
+  integrity sha512-KjzRUts2i/ODlMfywhFTqTzQl+Cr9nlDSZxJcnYjrbOV/iRyQNBTDoiFJt+XEdRi0fZBHnk74AFbnP56ehybsA==
   dependencies:
-    "@babel/runtime" "^7.17.2"
-    "@emotion/is-prop-valid" "^1.1.2"
-    "@mui/types" "^7.1.3"
-    "@mui/utils" "^5.6.0"
-    "@popperjs/core" "^2.11.4"
-    clsx "^1.1.1"
-    prop-types "^15.7.2"
-    react-is "^17.0.2"
-
-"@mui/base@5.0.0-alpha.90":
-  version "5.0.0-alpha.90"
-  resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.90.tgz#73700ba74e5c75096ee5d0bfe3ba4a3b3b81beef"
-  integrity sha512-hNKwzr+RkiuGsGrakz8Q2i5ezr4Dz4b4Qsdipt9SiMrhuFAra/i501VSaEIzwec9LC4G+vtW4fE7yJBB0XaAYw==
-  dependencies:
-    "@babel/runtime" "^7.17.2"
-    "@emotion/is-prop-valid" "^1.1.3"
-    "@mui/types" "^7.1.4"
-    "@mui/utils" "^5.9.1"
-    "@popperjs/core" "^2.11.5"
+    "@babel/runtime" "^7.20.1"
+    "@emotion/is-prop-valid" "^1.2.0"
+    "@mui/types" "^7.2.2"
+    "@mui/utils" "^5.10.16"
+    "@popperjs/core" "^2.11.6"
     clsx "^1.2.1"
     prop-types "^15.8.1"
     react-is "^18.2.0"
 
-"@mui/icons-material@5.6.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.6.0.tgz#bce757f7c7a8eb31b238311a15fa0a0bcdf9ec39"
-  integrity sha512-2GDGt+/BbwM3oVkF84b9FFKQdQ9TxBJIRnTwT99vO2mimdfJaojxMRB2lkysm9tUY4HOf0yoU6O//X6GTC0Zhw==
+"@mui/core-downloads-tracker@^5.10.16":
+  version "5.10.16"
+  resolved "https://registry.yarnpkg.com/@mui/core-downloads-tracker/-/core-downloads-tracker-5.10.16.tgz#4c2d36bcab58cb6250596b20601f499bfadc0642"
+  integrity sha512-eK9+olw2ZbXX+vGrtKnN01/vLP1aX0Lq0xok35bqWM1aB93Dcmky/xPNf8h31oJ/C+IzJBjZaZMEDzVZg4Qc0A==
+
+"@mui/icons-material@^5.10.16":
+  version "5.10.16"
+  resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.10.16.tgz#9c16054d0cc54d40267447128a07e79b516ead1e"
+  integrity sha512-jjCc0IF6iyLiucQCu5igg3fOscSqbbvRCmyRxXgzOcLR56B0sg2L8o+ZfJ0dAg59+wvgtXaxvjze/mJg0B4iWA==
   dependencies:
-    "@babel/runtime" "^7.17.2"
+    "@babel/runtime" "^7.20.1"
 
 "@mui/lab@^5.0.0-alpha.76":
-  version "5.0.0-alpha.76"
-  resolved "https://registry.yarnpkg.com/@mui/lab/-/lab-5.0.0-alpha.76.tgz#c41d1bd3413ab43b7da118088b121578dafc251c"
-  integrity sha512-MCx6t28L6xo5S3/GXFZqIfXBdFXfCO8UblEb+sf48UREDx1awUDLS7/n0BLC9N6pj6P95OpMx+at25gTSd2CQQ==
+  version "5.0.0-alpha.110"
+  resolved "https://registry.yarnpkg.com/@mui/lab/-/lab-5.0.0-alpha.110.tgz#d34638fb66334a1865a10b8a2d54beddb41adb3e"
+  integrity sha512-SkX5QNbaWouO7BXvb8zpFzDizLt7UzgaebqKSvFJLF28OXiNDfPVCle6IIB4g7hAyb/o19Kbhxs9V+LwK5gQzA==
   dependencies:
-    "@babel/runtime" "^7.17.2"
-    "@mui/base" "5.0.0-alpha.75"
-    "@mui/system" "^5.6.0"
-    "@mui/utils" "^5.6.0"
-    "@mui/x-date-pickers" "5.0.0-alpha.0"
-    clsx "^1.1.1"
-    prop-types "^15.7.2"
-    react-is "^17.0.2"
-    react-transition-group "^4.4.2"
-    rifm "^0.12.1"
-
-"@mui/material@5.6.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.6.0.tgz#284270f5e48d379a9b9bc4db412a807b807965b5"
-  integrity sha512-yh4FoRRPTgJWjv1oIu3YuvfYGD/WOEnyGizQ9fKs+hlMjIc0rzFpyUCo++P/3BUd0/hRKcI8D8mrpJK9OiOy1g==
-  dependencies:
-    "@babel/runtime" "^7.17.2"
-    "@mui/base" "5.0.0-alpha.75"
-    "@mui/system" "^5.6.0"
-    "@mui/types" "^7.1.3"
-    "@mui/utils" "^5.6.0"
-    "@types/react-transition-group" "^4.4.4"
-    clsx "^1.1.1"
-    csstype "^3.0.11"
-    hoist-non-react-statics "^3.3.2"
-    prop-types "^15.7.2"
-    react-is "^17.0.2"
-    react-transition-group "^4.4.2"
-
-"@mui/material@^5.0.0":
-  version "5.9.1"
-  resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.9.1.tgz#92990e6d4035792430dcf548b91db6f335aebdd3"
-  integrity sha512-c09SbaMm7Rl7Df9JRkXwPWNbnfrutmHERTJC46OJ9OMAM9+HGQihIbGln1k2Xj65jb3E+G498FZFAoSrrBDvwQ==
-  dependencies:
-    "@babel/runtime" "^7.17.2"
-    "@mui/base" "5.0.0-alpha.90"
-    "@mui/system" "^5.9.1"
-    "@mui/types" "^7.1.4"
-    "@mui/utils" "^5.9.1"
-    "@types/react-transition-group" "^4.4.5"
+    "@babel/runtime" "^7.20.1"
+    "@mui/base" "5.0.0-alpha.108"
+    "@mui/system" "^5.10.16"
+    "@mui/types" "^7.2.2"
+    "@mui/utils" "^5.10.16"
     clsx "^1.2.1"
-    csstype "^3.1.0"
     prop-types "^15.8.1"
     react-is "^18.2.0"
-    react-transition-group "^4.4.2"
 
-"@mui/private-theming@^5.9.1":
-  version "5.9.1"
-  resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.9.1.tgz#4f714ed9ebd587373dc77b3fc69e9f3e720f0190"
-  integrity sha512-eIh2IZJInNTdgPLMo9cruzm8UDX5amBBxxsSoNre7lRj3wcsu3TG5OKjIbzkf4VxHHEhdPeNNQyt92k7L78u2A==
+"@mui/material@^5.0.0", "@mui/material@^5.10.16":
+  version "5.10.16"
+  resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.10.16.tgz#4ad6e69d81f11487f502591d8d060143d2e89b97"
+  integrity sha512-JSHcDQQ+k30NKkCM/0KX6jq4F5LOrbFKZpS+cEl7scZWOCJpUPH5ccAT5a7O8wzrgNZ8Y9PnwzNvWBrfShpJFw==
   dependencies:
-    "@babel/runtime" "^7.17.2"
-    "@mui/utils" "^5.9.1"
-    prop-types "^15.8.1"
-
-"@mui/styled-engine@^5.8.7":
-  version "5.8.7"
-  resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.8.7.tgz#63d0779c07677fe76d4705a02c7ae99f89b50780"
-  integrity sha512-tVqtowjbYmiRq+qcqXK731L9eWoL9H8xTRhuTgaDGKdch1zlt4I2UwInUe1w2N9N/u3/jHsFbLcl1Un3uOwpQg==
-  dependencies:
-    "@babel/runtime" "^7.17.2"
-    "@emotion/cache" "^11.9.3"
-    csstype "^3.1.0"
-    prop-types "^15.8.1"
-
-"@mui/system@^5.6.0", "@mui/system@^5.9.1":
-  version "5.9.1"
-  resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.9.1.tgz#dadd1094b1582781cc524b112a0a126f60b23c25"
-  integrity sha512-ZixTmc2+sYp++avoYJ38eM70nfwwudN06vYCU4kfwa4nQPiH+bhLYZnfYkcXRKiDR/hfT0dptbOOfQGZqBYczQ==
-  dependencies:
-    "@babel/runtime" "^7.17.2"
-    "@mui/private-theming" "^5.9.1"
-    "@mui/styled-engine" "^5.8.7"
-    "@mui/types" "^7.1.4"
-    "@mui/utils" "^5.9.1"
+    "@babel/runtime" "^7.20.1"
+    "@mui/base" "5.0.0-alpha.108"
+    "@mui/core-downloads-tracker" "^5.10.16"
+    "@mui/system" "^5.10.16"
+    "@mui/types" "^7.2.2"
+    "@mui/utils" "^5.10.16"
+    "@types/react-transition-group" "^4.4.5"
     clsx "^1.2.1"
-    csstype "^3.1.0"
+    csstype "^3.1.1"
+    prop-types "^15.8.1"
+    react-is "^18.2.0"
+    react-transition-group "^4.4.5"
+
+"@mui/private-theming@^5.10.16":
+  version "5.10.16"
+  resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.10.16.tgz#181ab7568a3cf0c6b12cc12f5a91aeb4509df1ce"
+  integrity sha512-0MArkJaOHRCKqL/GWjngGZmyOeRz+uxffhx82bKcewr8swqV7xx7EFP02pk0L/gLdfcvYdqwH4YTVjG/+TaKrg==
+  dependencies:
+    "@babel/runtime" "^7.20.1"
+    "@mui/utils" "^5.10.16"
     prop-types "^15.8.1"
 
-"@mui/types@^7.1.3", "@mui/types@^7.1.4":
-  version "7.1.4"
-  resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.1.4.tgz#4185c05d6df63ec673cda15feab80440abadc764"
-  integrity sha512-uveM3byMbthO+6tXZ1n2zm0W3uJCQYtwt/v5zV5I77v2v18u0ITkb8xwhsDD2i3V2Kye7SaNR6FFJ6lMuY/WqQ==
-
-"@mui/utils@^5.2.3", "@mui/utils@^5.6.0", "@mui/utils@^5.7.0", "@mui/utils@^5.9.1":
-  version "5.9.1"
-  resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.9.1.tgz#2b2c9dadbf8ba6561e145b5688fb7df5ef15a934"
-  integrity sha512-8+4adOR3xusyJwvbnZxcjqcmbWvl7Og+260ZKIrSvwnFs0aLubL+8MhiceeDDGcmb0bTKxfUgRJ96j32Jb7P+A==
+"@mui/styled-engine@^5.10.16":
+  version "5.10.16"
+  resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.10.16.tgz#52a2d31e4012958d21c92b42acaca4c3e79841b4"
+  integrity sha512-ZMSjXvtiGwGDKqrSlXhpxK2voUaF2/lpC/pSTfFmZvKH9j9a9h1/iwo3ybgjFVYGgbfNeW4h0xEchiRohu9xsw==
   dependencies:
-    "@babel/runtime" "^7.17.2"
+    "@babel/runtime" "^7.20.1"
+    "@emotion/cache" "^11.10.5"
+    csstype "^3.1.1"
+    prop-types "^15.8.1"
+
+"@mui/system@^5.10.16":
+  version "5.10.16"
+  resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.10.16.tgz#2b07d78eb5e337463045b81a59f718795807fdc7"
+  integrity sha512-OqI9B1jZ9zQ/dmoqseku4CzdEs9DbLiiMOaWxC3WeAJxM1UavlCgXz0encqm93LIlmSL7TjuHN1/rW8BJCnU8A==
+  dependencies:
+    "@babel/runtime" "^7.20.1"
+    "@mui/private-theming" "^5.10.16"
+    "@mui/styled-engine" "^5.10.16"
+    "@mui/types" "^7.2.2"
+    "@mui/utils" "^5.10.16"
+    clsx "^1.2.1"
+    csstype "^3.1.1"
+    prop-types "^15.8.1"
+
+"@mui/types@^7.2.2":
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.2.2.tgz#723f6d40c25c89c2e0352a7e51794e8eb77cdbe3"
+  integrity sha512-siex8cZDtWeC916cXOoUOnEQQejuMYmHtc4hM6VkKVYaBICz3VIiqyiAomRboTQHt2jchxQ5Q5ATlbcDekTxDA==
+
+"@mui/utils@^5.10.16", "@mui/utils@^5.10.3":
+  version "5.10.16"
+  resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.10.16.tgz#7a981444855968ebdb1830d76e298d1ac47eaaf6"
+  integrity sha512-3MB/SGsgiiu9Z55CFmAfiONUoR7AAue/H4F6w3mc2LnhFQCsoVvXhioDPcsiRpUMIQr34jDPzGXdCuqWooPCXQ==
+  dependencies:
+    "@babel/runtime" "^7.20.1"
     "@types/prop-types" "^15.7.5"
     "@types/react-is" "^16.7.1 || ^17.0.0"
     prop-types "^15.8.1"
     react-is "^18.2.0"
 
-"@mui/x-date-pickers@5.0.0-alpha.0":
-  version "5.0.0-alpha.0"
-  resolved "https://registry.yarnpkg.com/@mui/x-date-pickers/-/x-date-pickers-5.0.0-alpha.0.tgz#a62ffbab453d3c2dcd4ec20bd4f3f6338ad2ed3f"
-  integrity sha512-JTzTaNSWbxNi8KDUJjHCH6im0YlIEv88gPoKhGm7s6xCGT1q6FtMp/oQ40nhfwrJ73nkM5G1JXRIzI/yfsHXQQ==
+"@mui/x-date-pickers@^5.0.0-alpha.4":
+  version "5.0.9"
+  resolved "https://registry.yarnpkg.com/@mui/x-date-pickers/-/x-date-pickers-5.0.9.tgz#7490ba4615285280fcb42bdd38f68578f2faa5f4"
+  integrity sha512-PM3RU8MiwDVi+dSDGJ7ylI0hCe79wSCDfrjghS8ApGGFn/n87S8pUZxsZ5czw3mVRN6VfS2C19peo4nM1Tx+nA==
   dependencies:
-    "@date-io/date-fns" "^2.11.0"
-    "@date-io/dayjs" "^2.11.0"
-    "@date-io/luxon" "^2.11.1"
-    "@date-io/moment" "^2.11.0"
-    "@mui/utils" "^5.2.3"
-    clsx "^1.1.1"
+    "@babel/runtime" "^7.18.9"
+    "@date-io/core" "^2.15.0"
+    "@date-io/date-fns" "^2.15.0"
+    "@date-io/dayjs" "^2.15.0"
+    "@date-io/luxon" "^2.15.0"
+    "@date-io/moment" "^2.15.0"
+    "@mui/utils" "^5.10.3"
+    "@types/react-transition-group" "^4.4.5"
+    clsx "^1.2.1"
     prop-types "^15.7.2"
-    react-transition-group "^4.4.2"
+    react-transition-group "^4.4.5"
     rifm "^0.12.1"
 
-"@mui/x-date-pickers@^5.0.0-alpha.4":
-  version "5.0.0-alpha.4"
-  resolved "https://registry.yarnpkg.com/@mui/x-date-pickers/-/x-date-pickers-5.0.0-alpha.4.tgz#853710d09b2dc29876e61a32d1f7b5c4b6d8816a"
-  integrity sha512-bPEsVygOI5KvrySYzi4ujJlRr4uskM5hDpcV8JCafHtSNQjUMQmCDtQKpAd8rViKBCBQMK8vhpqmf8ShfiZpLA==
+"@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1":
+  version "5.1.1-v1"
+  resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz#dbf733a965ca47b1973177dc0bb6c889edcfb129"
+  integrity sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==
   dependencies:
-    "@babel/runtime" "^7.17.2"
-    "@date-io/date-fns" "^2.14.0"
-    "@date-io/dayjs" "^2.14.0"
-    "@date-io/luxon" "^2.14.0"
-    "@date-io/moment" "^2.14.0"
-    "@mui/utils" "^5.7.0"
-    clsx "^1.1.1"
-    prop-types "^15.7.2"
-    react-transition-group "^4.4.2"
-    rifm "^0.12.1"
+    eslint-scope "5.1.1"
 
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
@@ -2292,7 +2405,7 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
   integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
 
-"@nodelib/fs.walk@^1.2.3":
+"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
   integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
@@ -2301,24 +2414,24 @@
     fastq "^1.6.0"
 
 "@pmmmwh/react-refresh-webpack-plugin@^0.5.3":
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.5.tgz#e77aac783bd079f548daa0a7f080ab5b5a9741ca"
-  integrity sha512-RbG7h6TuP6nFFYKJwbcToA1rjC1FyPg25NR2noAZ0vKI+la01KTSRPkuVPE+U88jXv7javx2JHglUcL1MHcshQ==
+  version "0.5.10"
+  resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.10.tgz#2eba163b8e7dbabb4ce3609ab5e32ab63dda3ef8"
+  integrity sha512-j0Ya0hCFZPd4x40qLzbhGsh9TMtdb+CJQiso+WxLOPNasohq9cc5SNUcwsZaRH6++Xh91Xkm/xHCkuIiIu0LUA==
   dependencies:
     ansi-html-community "^0.0.8"
     common-path-prefix "^3.0.0"
-    core-js-pure "^3.8.1"
+    core-js-pure "^3.23.3"
     error-stack-parser "^2.0.6"
     find-up "^5.0.0"
     html-entities "^2.1.0"
-    loader-utils "^2.0.0"
+    loader-utils "^2.0.4"
     schema-utils "^3.0.0"
     source-map "^0.7.3"
 
-"@popperjs/core@^2.11.4", "@popperjs/core@^2.11.5":
-  version "2.11.5"
-  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.5.tgz#db5a11bf66bdab39569719555b0f76e138d7bd64"
-  integrity sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw==
+"@popperjs/core@^2.11.6":
+  version "2.11.6"
+  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.6.tgz#cee20bd55e68a1720bdab363ecf0c821ded4cd45"
+  integrity sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==
 
 "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2":
   version "1.1.2"
@@ -2408,6 +2521,11 @@
   resolved "https://registry.yarnpkg.com/@react-dnd/shallowequal/-/shallowequal-4.0.2.tgz#d1b4befa423f692fa4abf1c79209702e7d8ae4b4"
   integrity sha512-/RVXdLvJxLg4QKvMoM5WlwNR9ViO9z8B/qPcc+C0Sa/teJY7QG7kJ441DwzOjMYEY7GmU4dj5EcGHIkKZiQZCA==
 
+"@remix-run/router@1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.0.3.tgz#953b88c20ea00d0eddaffdc1b115c08474aa295d"
+  integrity sha512-ceuyTSs7PZ/tQqi19YZNBc5X7kj1f8p+4DIyrcIYFY9h+hd1OKm4RqtiWldR9eGEvIiJfsqwM4BsuCtRIuEw6Q==
+
 "@rollup/plugin-babel@^5.2.0":
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz#04bc0608f4aa4b2e4b1aebf284344d0f68fda283"
@@ -2445,10 +2563,10 @@
     estree-walker "^1.0.1"
     picomatch "^2.2.2"
 
-"@rowy/form-builder@^0.7.0":
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/@rowy/form-builder/-/form-builder-0.7.0.tgz#75c95d7114d0912a944f737a1c61b60b6cefa935"
-  integrity sha512-D5koLnPdcGuHCMWgiU0stLVK8Dvu+mKWJY+WSKNUsPtqCxuSeoi1RWTQEy+DYkQl2msVFWvxt4Ei1FlPTNwNsQ==
+"@rowy/form-builder@^0.8.0":
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/@rowy/form-builder/-/form-builder-0.8.0.tgz#6bdf284033ce1dfa665e3adac01bcb99c981602a"
+  integrity sha512-FJRcfnDCTVn9+AyGWCa1SZ5bRGNZJ+uWo2vgrHep4Xef+pXmgxTLUXrpuUirCrL9F/omfC5/q3/KgcYUME4qdA==
   dependencies:
     "@hookform/resolvers" "^2.6.0"
     "@types/lodash-es" "^4.17.6"
@@ -2471,19 +2589,19 @@
   integrity sha512-XAHWKDeZjHWelNqjIRzS+RdAOXqWiQSv9dcWJAmwheLdhqRym2IjTEux41cy3OWyAKupAJkWacGDQmhLaRh1Lg==
 
 "@rushstack/eslint-patch@^1.1.0":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.1.1.tgz#782fa5da44c4f38ae9fd38e9184b54e451936118"
-  integrity sha512-BUyKJGdDWqvWC5GEhyOiUrGNi9iJUr4CU0O2WxJL6QJhHeeA/NVBalH+FeK0r/x/W0rPymXt5s78TDS7d6lCwg==
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz#8be36a1f66f3265389e90b5f9c9962146758f728"
+  integrity sha512-sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg==
 
-"@sinclair/typebox@^0.23.3":
-  version "0.23.5"
-  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.23.5.tgz#93f7b9f4e3285a7a9ade7557d9a8d36809cbc47d"
-  integrity sha512-AFBVi/iT4g20DHoujvMH1aEDn8fGJh4xsRGCP6d8RpLPMqsNPvW01Jcn0QysXTsg++/xj25NmJsGyH9xug/wKg==
+"@sinclair/typebox@^0.24.1":
+  version "0.24.51"
+  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.51.tgz#645f33fe4e02defe26f2f5c0410e1c094eac7f5f"
+  integrity sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==
 
 "@sinonjs/commons@^1.7.0":
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.2.tgz#858f5c4b48d80778fde4b9d541f27edc0d56488b"
-  integrity sha512-sruwd86RJHdsVf/AtBoijDmUqJp3B6hF/DGC23C+JaegnDHaZyewCjoVGTdg3J0uz3Zs7NnIT05OBOmML72lQw==
+  version "1.8.6"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.6.tgz#80c516a4dc264c2a69115e7578d62581ff455ed9"
+  integrity sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==
   dependencies:
     type-detect "4.0.8"
 
@@ -2607,118 +2725,103 @@
     "@svgr/plugin-svgo" "^5.5.0"
     loader-utils "^2.0.0"
 
-"@swc/core-android-arm-eabi@1.2.164":
-  version "1.2.164"
-  resolved "https://registry.yarnpkg.com/@swc/core-android-arm-eabi/-/core-android-arm-eabi-1.2.164.tgz#91dade277d6ff3017df0f08c48acef6c6f094129"
-  integrity sha512-TdVOB3SJEpcBr+AfWXtK/r8GWJjddLD2bVHZe5wcN+GOGFZpkDTvhT66neK3Z13IBOMWkc5HckjdZ+Rfj+n3Ew==
+"@swc/core-darwin-arm64@1.3.20":
+  version "1.3.20"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.20.tgz#e713ed63ef7b8096fb820b7cbd5aa776e824431f"
+  integrity sha512-ZLk5oVP4v/BAdC3FuBuyB0xpnkZStblIajiyo/kpp/7mq3YbABhOxTCUJGDozISbkaZlIZFXjqvHHnIS42tssw==
 
-"@swc/core-android-arm64@1.2.164":
-  version "1.2.164"
-  resolved "https://registry.yarnpkg.com/@swc/core-android-arm64/-/core-android-arm64-1.2.164.tgz#8a1542788c37f0c0f7ccae78338276c735ebc560"
-  integrity sha512-nAl9QFzA94ESL+UL+UvPywuEjHIADHBCurIVOHMg4XIrgNQwRlbi7RQDKtLyhsTSmZoGoP4bGt5dRnKEyiSzNg==
+"@swc/core-darwin-x64@1.3.20":
+  version "1.3.20"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.3.20.tgz#8f8fe3562da7472be87346ae4a6c1919705b5b9b"
+  integrity sha512-yM11/3n8PwougalAi9eWkz1r5QRDAg1qdXMSCn7sWlVGr0RvdPL20viKddm38yn+X3FzZzgdoajh7NGfEeqCIQ==
 
-"@swc/core-darwin-arm64@1.2.164":
-  version "1.2.164"
-  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.2.164.tgz#dc005f9ad96418d9aed8258b4c4e0932b665a488"
-  integrity sha512-OOsZybjAqcvsV/foB0K3RN6SEDJPb9UEJAYtKGeL1sae1vDq4JyuUhgWhGNmLJy4W1yeMCaDXLFSa9c/YN9pEg==
+"@swc/core-linux-arm-gnueabihf@1.3.20":
+  version "1.3.20"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.20.tgz#3fa68f374f04e9331b3aa7ba1cdc4d59a1cb9cd8"
+  integrity sha512-Y8YX7Ma7/xdvCR+hwqhU2lNKF7Qevlx3qZ+eGEpz2fP6k5iu8C5arUBjFWdC2OTY11OuD00TH43TgYfbWpU/Sw==
 
-"@swc/core-darwin-x64@1.2.164":
-  version "1.2.164"
-  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.2.164.tgz#dafff10f4850b2251c3786292665ce917954f8e2"
-  integrity sha512-nKh3qoM4V60NruuY+GZgVwS7aGOjRxovakT84L3ELVCoa1Z/1qnLy5Lq3b1wW+PICxCjapqFGQAu3TQ8IRUNEg==
+"@swc/core-linux-arm64-gnu@1.3.20":
+  version "1.3.20"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.20.tgz#998adffd8d21b63ce6b447cbcc3fa1fae0c2c5d1"
+  integrity sha512-XCjQj4zo2T4QIqxVgzXkKxTLw4adqMgFG2iXBRRu1kOZXJor7Yzc0wH0B4rGtlkcZnh57MBbo+N1TNzH1leSFw==
 
-"@swc/core-freebsd-x64@1.2.164":
-  version "1.2.164"
-  resolved "https://registry.yarnpkg.com/@swc/core-freebsd-x64/-/core-freebsd-x64-1.2.164.tgz#4be6a52f43022df409d964ae2f920e0eeb8f3955"
-  integrity sha512-yawmWGxFmFHMXc40ojmN4yXNXdNBGiauf1ZgF8VQK1Zqn+hcUaSIpNGJ4V9cDX97QKMmTJSEoeUbPGR5cIqEzQ==
+"@swc/core-linux-arm64-musl@1.3.20":
+  version "1.3.20"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.20.tgz#cb22719d615cd42ab9d89192ead228b2be983238"
+  integrity sha512-f+fIixoNNaDjmHX0kJn8Lm1Z+CJPHqcYocGaPrXETRAv+8F3Q0rUtxO9FhDKtsG4pI6HRLmS5nBQtBBJWOmfvw==
 
-"@swc/core-linux-arm-gnueabihf@1.2.164":
-  version "1.2.164"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.2.164.tgz#a6dac7f9654bdf863cdcc3143dc2abfb8faffeea"
-  integrity sha512-8U85zH0hIbgqFe/71ocDatvCLDzIv/GIIzcuuoTFsdPCDDUzxRjmyZqQfVdwqrbk/j4MiV+iSFnM86VQYs1fRQ==
+"@swc/core-linux-x64-gnu@1.3.20":
+  version "1.3.20"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.20.tgz#0090804c384ea343f8a39bbeee7a46d93cada714"
+  integrity sha512-F5TKwsZh3F7CzfYoTAiNwhZazQ02NCgFZSqSwO4lOYbT7RU+zXI3OfLoi2R8f0dzfqh26QSdeeMFPdMb3LpzXg==
 
-"@swc/core-linux-arm64-gnu@1.2.164":
-  version "1.2.164"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.2.164.tgz#26684021f8f2d974045ce29b3f4e17e441f6e964"
-  integrity sha512-NT3IuJGstGnAbBXxE2O2LrMlVUDUFVyybXoklNSL811Y1g6HPPbnGl+by1iEFyMHxSPnn5d6R5dvpvezMwBUDA==
+"@swc/core-linux-x64-musl@1.3.20":
+  version "1.3.20"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.20.tgz#64ed5e489f0bcde67aae973bca5eb94ab16fa8d8"
+  integrity sha512-svbrCeaWU2N9saeg5yKZ2aQh+eYE6vW7y+ptZHgLIriuhnelg38mNqNjKK9emhshUNqOPLFJbW8kA1P+jOyyLw==
 
-"@swc/core-linux-arm64-musl@1.2.164":
-  version "1.2.164"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.2.164.tgz#88731dfa9d61162710849383d0cd24f6a2e97335"
-  integrity sha512-L/he+XSa1oQ7V95kbjrcmef8fxTZFA6RMj9bbGk62Nj/kQFOyUpXKVvWD+kQkLxqPeN9s7OV6fCyBwRly2SpNQ==
+"@swc/core-win32-arm64-msvc@1.3.20":
+  version "1.3.20"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.20.tgz#1a0c27cca7a43932fd123d699e67741f9cc73129"
+  integrity sha512-rFrC8JtVlnyfj5wTAIMvNWqPv0KXUA8/TmEKUlg7jgF/IweFPOFvF509tiAstz16Ui2JKL9xaA566/I+XLd+og==
 
-"@swc/core-linux-x64-gnu@1.2.164":
-  version "1.2.164"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.2.164.tgz#bbe19048a58a5f639fccec47fde26c79d154b476"
-  integrity sha512-FiNan0A3zkgpMqhWMUvJ1QmpJlpPwkQ4OhERgyos1ZiTnF8PuTcN4kUqV0Pc4mrX5bfSeHRbrYr4owa2PjHv8w==
+"@swc/core-win32-ia32-msvc@1.3.20":
+  version "1.3.20"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.20.tgz#7873119494214fdc079be4aba17e7851261833e7"
+  integrity sha512-xIkBDw0Rd0G0SQ/g9FOUqrcmwcq/Iy7ScBQVV/NzziIGIUlrj9l4nYe3VyoMEH2lwAcyGo9AxwiNB0vq6vDjiQ==
 
-"@swc/core-linux-x64-musl@1.2.164":
-  version "1.2.164"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.2.164.tgz#dfbf220f3552e0d10a59c2aaad24a299145d3f11"
-  integrity sha512-yN8GLowpJAlKFnxfVEOEwHIVK3wC587Hyo+MwYx8dDDaQS/n4GQ9XyHjbEDVyf2thGtr3C+2umozi19AgbIs5g==
-
-"@swc/core-win32-arm64-msvc@1.2.164":
-  version "1.2.164"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.2.164.tgz#4164831f8af2da39461d2374bc784667f188d96a"
-  integrity sha512-Hdt+Q2kAPNjLfVj+xHbtjDNJjQNtktb3s+CrGhYkz9iW6w3qb7wO8i18yu6gUVH6HgVYuyDK56oRxOX7T7iP8w==
-
-"@swc/core-win32-ia32-msvc@1.2.164":
-  version "1.2.164"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.2.164.tgz#f647cc5de26e5eef464325a145b9a37044813f4d"
-  integrity sha512-+nNJMnFNQBUPoA3Zu/v9pBn1ZD13b0vHLrPhg6qDAkXCZJJYpr6jUvEcED4F/9sjQs3S+JrH47S6DtkuBn+TzQ==
-
-"@swc/core-win32-x64-msvc@1.2.164":
-  version "1.2.164"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.2.164.tgz#e5268d50d300fc863f2d7c146b8d41d338bf7ac9"
-  integrity sha512-qoE7VNS5Fo6BrmSCtVumrp0v86xoQtHIgCymymjF7C/DQ/lbVDdZ7kSREMnJD2OujKstsJmfiJiRdQcpEJKoAw==
+"@swc/core-win32-x64-msvc@1.3.20":
+  version "1.3.20"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.20.tgz#21b03ea39ea3e2af1a88fa35c0e7ae49adc89d87"
+  integrity sha512-1/vxiNasPvpCnVdMxGXEXYhRI65l7yNg/AQ9fYLQn3O5ouWJcd60+6ZoeVrnR5i/R87Fyu/A9fMhOJuOKLHXmA==
 
 "@swc/core@^1.2.161":
-  version "1.2.164"
-  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.2.164.tgz#158f49cf262357cdbae590a14c7a690b89e6e22a"
-  integrity sha512-vw+jzMIVNzSK+lURMH3kANNRLPGROMvw3NpNm9vbtyjgKz9k/qf5ULCq96mayTPB5yXa9bWGBvzvhy6PtsKtqA==
+  version "1.3.20"
+  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.3.20.tgz#1a290a3020cc272ea57f784e7d7669733b25eda2"
+  integrity sha512-wSuy5mFTbAPYGlo1DGWkTbXwUubpyYxY2Sf10Y861c4EPtwK7D1nbj35Zg0bsIQvcFG5Y2Q4sXNV5QpsnT0+1A==
   optionalDependencies:
-    "@swc/core-android-arm-eabi" "1.2.164"
-    "@swc/core-android-arm64" "1.2.164"
-    "@swc/core-darwin-arm64" "1.2.164"
-    "@swc/core-darwin-x64" "1.2.164"
-    "@swc/core-freebsd-x64" "1.2.164"
-    "@swc/core-linux-arm-gnueabihf" "1.2.164"
-    "@swc/core-linux-arm64-gnu" "1.2.164"
-    "@swc/core-linux-arm64-musl" "1.2.164"
-    "@swc/core-linux-x64-gnu" "1.2.164"
-    "@swc/core-linux-x64-musl" "1.2.164"
-    "@swc/core-win32-arm64-msvc" "1.2.164"
-    "@swc/core-win32-ia32-msvc" "1.2.164"
-    "@swc/core-win32-x64-msvc" "1.2.164"
+    "@swc/core-darwin-arm64" "1.3.20"
+    "@swc/core-darwin-x64" "1.3.20"
+    "@swc/core-linux-arm-gnueabihf" "1.3.20"
+    "@swc/core-linux-arm64-gnu" "1.3.20"
+    "@swc/core-linux-arm64-musl" "1.3.20"
+    "@swc/core-linux-x64-gnu" "1.3.20"
+    "@swc/core-linux-x64-musl" "1.3.20"
+    "@swc/core-win32-arm64-msvc" "1.3.20"
+    "@swc/core-win32-ia32-msvc" "1.3.20"
+    "@swc/core-win32-x64-msvc" "1.3.20"
 
 "@swc/helpers@^0.3.8":
-  version "0.3.8"
-  resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.3.8.tgz#5b9ecf4ee480ca00f1ffbc2d1a5d4eed0d1afe81"
-  integrity sha512-aWItSZvJj4+GI6FWkjZR13xPNPctq2RRakzo+O6vN7bC2yjwdg5EFpgaSAUn95b7BGSgcflvzVDPoKmJv24IOg==
+  version "0.3.17"
+  resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.3.17.tgz#7c1b91f43c77e2bba99492162a498d465ef253d5"
+  integrity sha512-tb7Iu+oZ+zWJZ3HJqwx8oNwSDIU440hmVMDPhpACWQWnrZHK99Bxs70gT1L2dnr5Hg50ZRWEFkQCAnOVVV0z1Q==
+  dependencies:
+    tslib "^2.4.0"
 
 "@swc/jest@^0.2.20":
-  version "0.2.20"
-  resolved "https://registry.yarnpkg.com/@swc/jest/-/jest-0.2.20.tgz#2bddb4348fb730296b86cdcd96748be131b11395"
-  integrity sha512-5qSUBYY1wyIMn7p0Vl9qqV4hMI69oJwZCIPUpBsTFWN2wlwn6RDugzdgCn+bLXVYh+Cxi8bJcZ1uumDgsoL+FA==
+  version "0.2.23"
+  resolved "https://registry.yarnpkg.com/@swc/jest/-/jest-0.2.23.tgz#0b7499d5927faaa090c5b7a4a0e35122968fef30"
+  integrity sha512-ZLj17XjHbPtNsgqjm83qizENw05emLkKGu3WuPUttcy9hkngl0/kcc7fDbcSBpADS0GUtsO+iKPjZFWVAtJSlA==
   dependencies:
     "@jest/create-cache-key-function" "^27.4.2"
+    jsonc-parser "^3.2.0"
 
 "@tanstack/react-table@^8.5.15":
-  version "8.5.15"
-  resolved "https://registry.yarnpkg.com/@tanstack/react-table/-/react-table-8.5.15.tgz#8179d24d7fdf909799a517e8897501c44e51284d"
-  integrity sha512-9rSvhIFeMpfXksFgQNTWnVoJbkae/U8CkHnHYGWAIB/O0Ca51IKap0Rjp5WkIUVBWxJ7Wfl2y13oY+aWcyM6Rg==
+  version "8.7.0"
+  resolved "https://registry.yarnpkg.com/@tanstack/react-table/-/react-table-8.7.0.tgz#853fae74db6bf49738d0f18e4d507b00262fc09c"
+  integrity sha512-VJ+9rsymDLaSU35rWOfX0bwNXnpW1i+T14wi+sHx8lxwAsfg6IY1Yw7FPfGADvUFP5eQn2t4nlohAJd+IoEj/Q==
   dependencies:
-    "@tanstack/table-core" "8.5.15"
+    "@tanstack/table-core" "8.7.0"
 
-"@tanstack/table-core@8.5.15":
-  version "8.5.15"
-  resolved "https://registry.yarnpkg.com/@tanstack/table-core/-/table-core-8.5.15.tgz#e1e674135cd6c36f29a1562a2b846f824861149b"
-  integrity sha512-k+BcCOAYD610Cij6p1BPyEqjMQjZIdAnVDoIUKVnA/tfHbF4JlDP7pKAftXPBxyyX5Z1yQPurPnOdEY007Snyg==
+"@tanstack/table-core@8.7.0":
+  version "8.7.0"
+  resolved "https://registry.yarnpkg.com/@tanstack/table-core/-/table-core-8.7.0.tgz#046e376cd536cd53727a91a880345f92d3ec5859"
+  integrity sha512-DRiRbOAmDHapzUBd4/C4Yy+FTug4fdGp5sdZWWfCq4wxRoaXQraQgbzmK23a3QcbwLFtLeNezPkZrqbJWuX+VA==
 
 "@testing-library/dom@^8.5.0":
-  version "8.13.0"
-  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.13.0.tgz#bc00bdd64c7d8b40841e27a70211399ad3af46f5"
-  integrity sha512-9VHgfIatKNXQNaZTtLnalIy0jNZzY35a4S3oi08YAt9Hv1VsfZ/DfA45lM8D/UhtHBGJ4/lGwp0PZkVndRkoOQ==
+  version "8.19.0"
+  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.19.0.tgz#bd3f83c217ebac16694329e413d9ad5fdcfd785f"
+  integrity sha512-6YWYPPpxG3e/xOo6HIWwB/58HukkwIVTOaZ0VwdMVjhRUX/01E4FtQbck9GazOOj7MXHc5RBzMrU86iBJHbI+A==
   dependencies:
     "@babel/code-frame" "^7.10.4"
     "@babel/runtime" "^7.12.5"
@@ -2730,33 +2833,33 @@
     pretty-format "^27.0.2"
 
 "@testing-library/jest-dom@^5.16.4":
-  version "5.16.4"
-  resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.16.4.tgz#938302d7b8b483963a3ae821f1c0808f872245cd"
-  integrity sha512-Gy+IoFutbMQcky0k+bqqumXZ1cTGswLsFqmNLzNdSKkU9KGV2u9oXhukCbbJ9/LRPKiqwxEE8VpV/+YZlfkPUA==
+  version "5.16.5"
+  resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.16.5.tgz#3912846af19a29b2dbf32a6ae9c31ef52580074e"
+  integrity sha512-N5ixQ2qKpi5OLYfwQmUb/5mSV9LneAcaUfp32pn4yCnpb8r/Yz0pXFPck21dIicKmi+ta5WRAknkZCfA8refMA==
   dependencies:
+    "@adobe/css-tools" "^4.0.1"
     "@babel/runtime" "^7.9.2"
     "@types/testing-library__jest-dom" "^5.9.1"
     aria-query "^5.0.0"
     chalk "^3.0.0"
-    css "^3.0.0"
     css.escape "^1.5.1"
     dom-accessibility-api "^0.5.6"
     lodash "^4.17.15"
     redent "^3.0.0"
 
 "@testing-library/react@^13.0.0":
-  version "13.1.1"
-  resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-13.1.1.tgz#6c1635e25acca8ca5be8ee3b19ad1391681c5846"
-  integrity sha512-8mirlAa0OKaUvnqnZF6MdAh2tReYA2KtWVw1PKvaF5EcCZqgK5pl8iF+3uW90JdG5Ua2c2c2E2wtLdaug3dsVg==
+  version "13.4.0"
+  resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-13.4.0.tgz#6a31e3bf5951615593ad984e96b9e5e2d9380966"
+  integrity sha512-sXOGON+WNTh3MLE9rve97ftaZukN3oNf2KjDy7YTx6hcTO2uuLHuCGynMDhFwGw/jYf4OJ2Qk0i4i79qMNNkyw==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@testing-library/dom" "^8.5.0"
     "@types/react-dom" "^18.0.0"
 
 "@testing-library/user-event@^14.0.4":
-  version "14.0.4"
-  resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-14.0.4.tgz#5b430a9c27f25078bff4471661b755115d0db9d4"
-  integrity sha512-VBZe5lcUsmrQyOwIFvqOxLBoaTw1/Qy4Ek+VgmFYs719bs2SxUp42vbsb7ATlQDkHdj4OIQlucfpwxe5WoG1jA==
+  version "14.4.3"
+  resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-14.4.3.tgz#af975e367743fa91989cd666666aec31a8f50591"
+  integrity sha512-kCUc5MEwaEMakkO5x7aoD+DLi02ehmEM2QCGWvNqAS1dV/fAvORWEjnjsEIvml59M7Y5kCkWN6fCCyPOe8OL6Q==
 
 "@tinymce/tinymce-react@^3":
   version "3.14.0"
@@ -2777,24 +2880,24 @@
   integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==
 
 "@tsconfig/node10@^1.0.7":
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.8.tgz#c1e4e80d6f964fbecb3359c43bd48b40f7cadad9"
-  integrity sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2"
+  integrity sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==
 
 "@tsconfig/node12@^1.0.7":
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.9.tgz#62c1f6dee2ebd9aead80dc3afa56810e58e1a04c"
-  integrity sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d"
+  integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==
 
 "@tsconfig/node14@^1.0.0":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.1.tgz#95f2d167ffb9b8d2068b0b235302fafd4df711f2"
-  integrity sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1"
+  integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==
 
 "@tsconfig/node16@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.2.tgz#423c77877d0569db20e1fc80885ac4118314010e"
-  integrity sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.3.tgz#472eaab5f15c1ffdd7f8628bd4c4f753995ec79e"
+  integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==
 
 "@types/aria-query@^4.2.0":
   version "4.2.2"
@@ -2802,9 +2905,9 @@
   integrity sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==
 
 "@types/babel__core@^7.0.0", "@types/babel__core@^7.1.14":
-  version "7.1.19"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.19.tgz#7b497495b7d1b4812bdb9d02804d0576f43ee460"
-  integrity sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==
+  version "7.1.20"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.20.tgz#e168cdd612c92a2d335029ed62ac94c95b362359"
+  integrity sha512-PVb6Bg2QuscZ30FvOU7z4guG6c926D9YRvOxEaelzndpMsvP+YM74Q/dAFASpg2l6+XLalxSGxcq/lrgYWZtyQ==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
@@ -2813,24 +2916,24 @@
     "@types/babel__traverse" "*"
 
 "@types/babel__generator@*":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.2.tgz#f3d71178e187858f7c45e30380f8f1b7415a12d8"
-  integrity sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ==
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.4.tgz#1f20ce4c5b1990b37900b63f050182d28c2439b7"
+  integrity sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==
   dependencies:
     "@babel/types" "^7.0.0"
 
 "@types/babel__template@*":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.0.tgz#0c888dd70b3ee9eebb6e4f200e809da0076262be"
-  integrity sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A==
+  version "7.4.1"
+  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.1.tgz#3d1a48fd9d6c0edfd56f2ff578daed48f36c8969"
+  integrity sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
 
 "@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.0.tgz#b9a1efa635201ba9bc850323a8793ee2d36c04a0"
-  integrity sha512-kSjgDMZONiIfSH1Nxcr5JIRMwUetDki63FSQfpTCz8ogF3Ulqm8+mr5f78dUYs6vMiB6gBusQqfQmBvHZj/lwg==
+  version "7.18.3"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.3.tgz#dfc508a85781e5698d5b33443416b6268c4b3e8d"
+  integrity sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w==
   dependencies:
     "@babel/types" "^7.3.0"
 
@@ -2872,59 +2975,56 @@
     "@types/ms" "*"
 
 "@types/dompurify@^2.3.3":
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/@types/dompurify/-/dompurify-2.3.3.tgz#c24c92f698f77ed9cc9d9fa7888f90cf2bfaa23f"
-  integrity sha512-nnVQSgRVuZ/843oAfhA25eRSNzUFcBPk/LOiw5gm8mD9/X7CNcbRkQu/OsjCewO8+VIYfPxUnXvPEVGenw14+w==
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@types/dompurify/-/dompurify-2.4.0.tgz#fd9706392a88e0e0e6d367f3588482d817df0ab9"
+  integrity sha512-IDBwO5IZhrKvHFUl+clZxgf3hn2b/lU6H1KaBShPkQyGJUQ0xwebezIPSuiyGwfz1UzJWQl4M7BDxtHtCCPlTg==
   dependencies:
     "@types/trusted-types" "*"
 
 "@types/eslint-scope@^3.7.3":
-  version "3.7.3"
-  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.3.tgz#125b88504b61e3c8bc6f870882003253005c3224"
-  integrity sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==
+  version "3.7.4"
+  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16"
+  integrity sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==
   dependencies:
     "@types/eslint" "*"
     "@types/estree" "*"
 
-"@types/eslint@*":
-  version "8.4.1"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.1.tgz#c48251553e8759db9e656de3efc846954ac32304"
-  integrity sha512-GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA==
+"@types/eslint@*", "@types/eslint@^7.29.0 || ^8.4.1":
+  version "8.4.10"
+  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.10.tgz#19731b9685c19ed1552da7052b6f668ed7eb64bb"
+  integrity sha512-Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw==
   dependencies:
     "@types/estree" "*"
     "@types/json-schema" "*"
 
-"@types/eslint@^7.28.2":
-  version "7.29.0"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.29.0.tgz#e56ddc8e542815272720bb0b4ccc2aff9c3e1c78"
-  integrity sha512-VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng==
-  dependencies:
-    "@types/estree" "*"
-    "@types/json-schema" "*"
-
-"@types/estree@*", "@types/estree@^0.0.51":
-  version "0.0.51"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40"
-  integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==
+"@types/estree@*":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2"
+  integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==
 
 "@types/estree@0.0.39":
   version "0.0.39"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
   integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
 
+"@types/estree@^0.0.51":
+  version "0.0.51"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40"
+  integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==
+
 "@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18":
-  version "4.17.28"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz#c47def9f34ec81dc6328d0b1b5303d1ec98d86b8"
-  integrity sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig==
+  version "4.17.31"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz#a1139efeab4e7323834bb0226e62ac019f474b2f"
+  integrity sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q==
   dependencies:
     "@types/node" "*"
     "@types/qs" "*"
     "@types/range-parser" "*"
 
 "@types/express@*", "@types/express@^4.17.13":
-  version "4.17.13"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034"
-  integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==
+  version "4.17.14"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.14.tgz#143ea0557249bc1b3b54f15db4c81c3d4eb3569c"
+  integrity sha512-TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg==
   dependencies:
     "@types/body-parser" "*"
     "@types/express-serve-static-core" "^4.17.18"
@@ -2950,7 +3050,7 @@
   dependencies:
     "@types/unist" "*"
 
-"@types/history@*", "@types/history@^4.7.11":
+"@types/history@^4.7.11":
   version "4.7.11"
   resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.11.tgz#56588b17ae8f50c53983a524fc3cc47437969d64"
   integrity sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA==
@@ -2969,9 +3069,9 @@
   integrity sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==
 
 "@types/http-proxy@^1.17.8":
-  version "1.17.8"
-  resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.8.tgz#968c66903e7e42b483608030ee85800f22d03f55"
-  integrity sha512-5kPLG5BKpWYkw/LVOGWpiq3nEVqxiN32rTgI53Sk12/xHFQ2rG3ehI9IO+O3W2QoKeyB92dJkoka8SUm6BX1pA==
+  version "1.17.9"
+  resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.9.tgz#7f0e7931343761efde1e2bf48c40f02f3f75705a"
+  integrity sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw==
   dependencies:
     "@types/node" "*"
 
@@ -2994,10 +3094,18 @@
   dependencies:
     "@types/istanbul-lib-report" "*"
 
-"@types/jest@*", "@types/jest@^27.4.1":
-  version "27.4.1"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-27.4.1.tgz#185cbe2926eaaf9662d340cc02e548ce9e11ab6d"
-  integrity sha512-23iPJADSmicDVrWk+HT58LMJtzLAnB2AgIzplQuq/bSrGaxCrlvRFjGbXmamnnk/mAmCdLStiGqggu28ocUyiw==
+"@types/jest@*":
+  version "29.2.3"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.2.3.tgz#f5fd88e43e5a9e4221ca361e23790d48fcf0a211"
+  integrity sha512-6XwoEbmatfyoCjWRX7z0fKMmgYKe9+/HrviJ5k0X/tjJWHGAezZOfYaxqQKuzG/TvQyr+ktjm4jgbk0s4/oF2w==
+  dependencies:
+    expect "^29.0.0"
+    pretty-format "^29.0.0"
+
+"@types/jest@^27.4.1":
+  version "27.5.2"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-27.5.2.tgz#ec49d29d926500ffb9fd22b84262e862049c026c"
+  integrity sha512-mpT8LJJ4CMeeahobofYWIjFo0xonRS/HfxnVEPMPFSQdGUt1uHCnoPT7Zhb+sjDU2wz0oKV0OLUR0WzrHNgfeA==
   dependencies:
     jest-matcher-utils "^27.0.0"
     pretty-format "^27.0.0"
@@ -3017,7 +3125,7 @@
 "@types/json5@^0.0.29":
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
-  integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
+  integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
 "@types/lodash-es@^4.17.6":
   version "4.17.6"
@@ -3027,9 +3135,9 @@
     "@types/lodash" "*"
 
 "@types/lodash@*", "@types/lodash@^4.14.175":
-  version "4.14.182"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.182.tgz#05301a4d5e62963227eaafe0ce04dd77c54ea5c2"
-  integrity sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==
+  version "4.14.190"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.190.tgz#d8e99647af141c63902d0ca53cf2b34d2df33545"
+  integrity sha512-5iJ3FBJBvQHQ8sFhEhJfjUP+G+LalhavTkYyrAYqz5MEJG+erSv0k9KJLb6q7++17Lafk1scaTIFXcMJlwK8Mw==
 
 "@types/long@^4.0.1":
   version "4.0.2"
@@ -3043,15 +3151,10 @@
   dependencies:
     "@types/unist" "*"
 
-"@types/mdurl@^1.0.0":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-1.0.2.tgz#e2ce9d83a613bacf284c7be7d491945e39e1f8e9"
-  integrity sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==
-
-"@types/mime@^1":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
-  integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
+"@types/mime@*":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.1.tgz#5f8f2bca0a5863cb69bc0b0acd88c96cb1d4ae10"
+  integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==
 
 "@types/ms@*":
   version "0.7.31"
@@ -3059,14 +3162,14 @@
   integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
 
 "@types/node@*", "@types/node@>=12.12.47", "@types/node@>=13.7.0":
-  version "18.0.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.0.0.tgz#67c7b724e1bcdd7a8821ce0d5ee184d3b4dd525a"
-  integrity sha512-cHlGmko4gWLVI27cGJntjs/Sj8th9aYwplmZFwmmgYQQvL5NUsgVJG7OddLvNfLqYS31KFN0s3qlaD9qCaxACA==
+  version "18.11.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.9.tgz#02d013de7058cea16d36168ef2fc653464cfbad4"
+  integrity sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==
 
 "@types/node@^17.0.23":
-  version "17.0.26"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.26.tgz#1bbff9b23ee5a64f87b4f30c0c854b112ee2e635"
-  integrity sha512-z/FG/6DUO7pnze3AE3TBGIjGGKkvCcGcWINe1C7cADY8hKLJPDYpzsNE37uExQ4md5RFtTCvg+M8Mu1Enyeg2A==
+  version "17.0.45"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.45.tgz#2c0fafd78705e7a18b7906b5201a522719dc5190"
+  integrity sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==
 
 "@types/parse-json@^4.0.0":
   version "4.0.0"
@@ -3079,9 +3182,9 @@
   integrity sha512-SuT16Q1K51EAVPz1K29DJ/sXjhSQ0zjvsypYJ6tlwVsRV9jwW5Adq2ch8Dq8kDBCkYnELS7N7VNCSB5nC56t/g==
 
 "@types/prettier@^2.1.5":
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.4.4.tgz#5d9b63132df54d8909fce1c3f8ca260fdd693e17"
-  integrity sha512-ReVR2rLTV1kvtlWFyuot+d1pkpG2Fw/XKE3PDAdj57rbM97ttSp9JZ2UsP+2EHTylra9cUf6JA7tGwW1INzUrA==
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.1.tgz#dfd20e2dc35f027cdd6c1908e80a5ddc7499670e"
+  integrity sha512-ri0UmynRRvZiiUJdiz38MmIblKK+oH30MztdBVR95dv/Ubw6neWSb8u1XpRb72L4qsZOhz+L+z9JD40SJmfWow==
 
 "@types/prismjs@^1.0.0":
   version "1.26.0"
@@ -3094,9 +3197,9 @@
   integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==
 
 "@types/q@^1.5.1":
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24"
-  integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==
+  version "1.5.5"
+  resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.5.tgz#75a2a8e7d8ab4b230414505d92335d1dcb53a6df"
+  integrity sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ==
 
 "@types/qs@*":
   version "6.9.7"
@@ -3129,10 +3232,10 @@
   dependencies:
     react-div-100vh "*"
 
-"@types/react-dom@^18.0.0":
-  version "18.0.0"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.0.tgz#b13f8d098e4b0c45df4f1ed123833143b0c71141"
-  integrity sha512-49897Y0UiCGmxZqpC8Blrf6meL8QUla6eb+BBhn69dTXlmuOlzkfr7HHY/O8J25e1lTUMs+YYxSlVDAaGHCOLg==
+"@types/react-dom@^18.0.0", "@types/react-dom@^18.0.9":
+  version "18.0.9"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.9.tgz#ffee5e4bfc2a2f8774b15496474f8e7fe8d0b504"
+  integrity sha512-qnVvHxASt/H7i+XG1U1xMiY5t+IHcPGUK7TDMDzom08xa7e86eCeKOiLZezwCKVxJn6NEiiy2ekgX8aQssjIKg==
   dependencies:
     "@types/react" "*"
 
@@ -3172,24 +3275,24 @@
     "@types/react-router-dom" "*"
 
 "@types/react-router@*":
-  version "5.1.16"
-  resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.16.tgz#f3ba045fb96634e38b21531c482f9aeb37608a99"
-  integrity sha512-8d7nR/fNSqlTFGHti0R3F9WwIertOaaA1UEB8/jr5l5mDMOs4CidEgvvYMw4ivqrBK+vtVLxyTj2P+Pr/dtgzg==
+  version "5.1.19"
+  resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.19.tgz#9b404246fba7f91474d7008a3d48c17b6e075ad6"
+  integrity sha512-Fv/5kb2STAEMT3wHzdKQK2z8xKq38EDIGVrutYLmQVVLe+4orDFquU52hQrULnEHinMKv9FSA6lf9+uNT1ITtA==
   dependencies:
-    "@types/history" "*"
+    "@types/history" "^4.7.11"
     "@types/react" "*"
 
-"@types/react-transition-group@^4.4.4", "@types/react-transition-group@^4.4.5":
+"@types/react-transition-group@^4.4.5":
   version "4.4.5"
   resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.5.tgz#aae20dcf773c5aa275d5b9f7cdbca638abc5e416"
   integrity sha512-juKD/eiSM3/xZYzjuzH6ZwpP+/lejltmiS3QEzV/vmb/Q8+HfDmxu+Baga8UEMGBqV88Nbg4l2hY/K2DkyaLLA==
   dependencies:
     "@types/react" "*"
 
-"@types/react@*", "@types/react@^18", "@types/react@^18.0.5":
-  version "18.0.5"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.5.tgz#1a4d4b705ae6af5aed369dec22800b20f89f5301"
-  integrity sha512-UPxNGInDCIKlfqBrm8LDXYWNfLHwIdisWcsH5GpMyGjhEDLFgTtlRBaoWuCua9HcyuE0rMkmAeZ3FXV1pYLIYQ==
+"@types/react@*", "@types/react@^18", "@types/react@^18.0.25":
+  version "18.0.25"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.25.tgz#8b1dcd7e56fe7315535a4af25435e0bb55c8ae44"
+  integrity sha512-xD6c0KDT4m7n9uD4ZHi02lzskaiqcBxf4zi+tXZY98a04wvc0hi/TcCPC2FOESZi51Nd7tlUeOJY8RofL799/g==
   dependencies:
     "@types/prop-types" "*"
     "@types/scheduler" "*"
@@ -3202,10 +3305,10 @@
   dependencies:
     "@types/node" "*"
 
-"@types/retry@^0.12.0":
-  version "0.12.1"
-  resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065"
-  integrity sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g==
+"@types/retry@0.12.0":
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d"
+  integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==
 
 "@types/scheduler@*":
   version "0.16.2"
@@ -3217,6 +3320,11 @@
   resolved "https://registry.yarnpkg.com/@types/seedrandom/-/seedrandom-3.0.2.tgz#7f30db28221067a90b02e73ffd46b6685b18df1a"
   integrity sha512-YPLqEOo0/X8JU3rdiq+RgUKtQhQtrppE766y7vMTu8dGML7TVtZNiiiaC/hhU9Zqw9UYopXxhuWWENclMVBwKQ==
 
+"@types/semver@^7.3.12":
+  version "7.3.13"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.13.tgz#da4bfd73f49bd541d28920ab0e2bf0ee80f71c91"
+  integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==
+
 "@types/serve-index@^1.9.1":
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.1.tgz#1b5e85370a192c01ec6cec4735cf2917337a6278"
@@ -3224,12 +3332,12 @@
   dependencies:
     "@types/express" "*"
 
-"@types/serve-static@*":
-  version "1.13.10"
-  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9"
-  integrity sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==
+"@types/serve-static@*", "@types/serve-static@^1.13.10":
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.0.tgz#c7930ff61afb334e121a9da780aac0d9b8f34155"
+  integrity sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==
   dependencies:
-    "@types/mime" "^1"
+    "@types/mime" "*"
     "@types/node" "*"
 
 "@types/sockjs@^0.3.33":
@@ -3240,14 +3348,14 @@
     "@types/node" "*"
 
 "@types/stack-utils@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff"
-  integrity sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"
+  integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==
 
 "@types/testing-library__jest-dom@^5.9.1":
-  version "5.14.1"
-  resolved "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.1.tgz#014162a5cee6571819d48e999980694e2f657c3c"
-  integrity sha512-Gk9vaXfbzc5zCXI9eYE9BI5BNHEp4D3FWjgqBE/ePGYElLAP+KvxBcsdkwfIVvezs605oiyd/VrpiHe3Oeg+Aw==
+  version "5.14.5"
+  resolved "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.5.tgz#d113709c90b3c75fdb127ec338dad7d5f86c974f"
+  integrity sha512-SBwbxYoyPIvxHbeHxTZX2Pe/74F/tX2/D3mMvzabdeJ25bBojfW0TyB8BHrbq/9zaaKICJZjLP+8r6AeZMFCuQ==
   dependencies:
     "@types/jest" "*"
 
@@ -3281,129 +3389,133 @@
     "@types/yargs-parser" "*"
 
 "@types/yargs@^17.0.8":
-  version "17.0.10"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.10.tgz#591522fce85d8739bca7b8bb90d048e4478d186a"
-  integrity sha512-gmEaFwpj/7f/ROdtIlci1R1VYU1J4j95m8T+Tj3iBgiBFKg1foE/PSl93bBd5T9LDXNPo8UlNN6W0qwD8O5OaA==
+  version "17.0.15"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.15.tgz#5b62c89fb049e2fc8378394a2861a593055f0866"
+  integrity sha512-ZHc4W2dnEQPfhn06TBEdWaiUHEZAocYaiVMfwOipY5jcJt/251wVrKCBWBetGZWO5CF8tdb7L3DmdxVlZ2BOIg==
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/eslint-plugin@^5.5.0":
-  version "5.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.18.0.tgz#950df411cec65f90d75d6320a03b2c98f6c3af7d"
-  integrity sha512-tzrmdGMJI/uii9/V6lurMo4/o+dMTKDH82LkNjhJ3adCW22YQydoRs5MwTiqxGF9CSYxPxQ7EYb4jLNlIs+E+A==
+"@typescript-eslint/eslint-plugin@^5.45.0", "@typescript-eslint/eslint-plugin@^5.5.0":
+  version "5.45.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.45.0.tgz#ffa505cf961d4844d38cfa19dcec4973a6039e41"
+  integrity sha512-CXXHNlf0oL+Yg021cxgOdMHNTXD17rHkq7iW6RFHoybdFgQBjU3yIXhhcPpGwr1CjZlo6ET8C6tzX5juQoXeGA==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.18.0"
-    "@typescript-eslint/type-utils" "5.18.0"
-    "@typescript-eslint/utils" "5.18.0"
-    debug "^4.3.2"
-    functional-red-black-tree "^1.0.1"
-    ignore "^5.1.8"
+    "@typescript-eslint/scope-manager" "5.45.0"
+    "@typescript-eslint/type-utils" "5.45.0"
+    "@typescript-eslint/utils" "5.45.0"
+    debug "^4.3.4"
+    ignore "^5.2.0"
+    natural-compare-lite "^1.4.0"
     regexpp "^3.2.0"
-    semver "^7.3.5"
+    semver "^7.3.7"
     tsutils "^3.21.0"
 
 "@typescript-eslint/experimental-utils@^5.0.0":
-  version "5.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.18.0.tgz#a6b5662e6b0452cb0e75a13662ce3b33cd1be59d"
-  integrity sha512-hypiw5N0aM2aH91/uMmG7RpyUH3PN/iOhilMwkMFZIbm/Bn/G3ZnbaYdSoAN4PG/XHQjdhBYLi0ZoRZsRYT4hA==
+  version "5.45.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.45.0.tgz#b59fea61a855cb2b1fdbd0fb45934a844f4bf870"
+  integrity sha512-DnRQg5+3uHHt/gaifTjwg9OKbg9/TWehfJzYHQIDJboPEbF897BKDE/qoqMhW7nf0jWRV1mwVXTaUvtB1/9Gwg==
   dependencies:
-    "@typescript-eslint/utils" "5.18.0"
+    "@typescript-eslint/utils" "5.45.0"
 
-"@typescript-eslint/parser@^5.18.0", "@typescript-eslint/parser@^5.5.0":
-  version "5.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.18.0.tgz#2bcd4ff21df33621df33e942ccb21cb897f004c6"
-  integrity sha512-+08nYfurBzSSPndngnHvFw/fniWYJ5ymOrn/63oMIbgomVQOvIDhBoJmYZ9lwQOCnQV9xHGvf88ze3jFGUYooQ==
+"@typescript-eslint/parser@^5.45.0", "@typescript-eslint/parser@^5.5.0":
+  version "5.45.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.45.0.tgz#b18a5f6b3cf1c2b3e399e9d2df4be40d6b0ddd0e"
+  integrity sha512-brvs/WSM4fKUmF5Ot/gEve6qYiCMjm6w4HkHPfS6ZNmxTS0m0iNN4yOChImaCkqc1hRwFGqUyanMXuGal6oyyQ==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.18.0"
-    "@typescript-eslint/types" "5.18.0"
-    "@typescript-eslint/typescript-estree" "5.18.0"
-    debug "^4.3.2"
+    "@typescript-eslint/scope-manager" "5.45.0"
+    "@typescript-eslint/types" "5.45.0"
+    "@typescript-eslint/typescript-estree" "5.45.0"
+    debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@5.18.0":
-  version "5.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.18.0.tgz#a7d7b49b973ba8cebf2a3710eefd457ef2fb5505"
-  integrity sha512-C0CZML6NyRDj+ZbMqh9FnPscg2PrzSaVQg3IpTmpe0NURMVBXlghGZgMYqBw07YW73i0MCqSDqv2SbywnCS8jQ==
+"@typescript-eslint/scope-manager@5.45.0":
+  version "5.45.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.45.0.tgz#7a4ac1bfa9544bff3f620ab85947945938319a96"
+  integrity sha512-noDMjr87Arp/PuVrtvN3dXiJstQR1+XlQ4R1EvzG+NMgXi8CuMCXpb8JqNtFHKceVSQ985BZhfRdowJzbv4yKw==
   dependencies:
-    "@typescript-eslint/types" "5.18.0"
-    "@typescript-eslint/visitor-keys" "5.18.0"
+    "@typescript-eslint/types" "5.45.0"
+    "@typescript-eslint/visitor-keys" "5.45.0"
 
-"@typescript-eslint/type-utils@5.18.0":
-  version "5.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.18.0.tgz#62dbfc8478abf36ba94a90ddf10be3cc8e471c74"
-  integrity sha512-vcn9/6J5D6jtHxpEJrgK8FhaM8r6J1/ZiNu70ZUJN554Y3D9t3iovi6u7JF8l/e7FcBIxeuTEidZDR70UuCIfA==
+"@typescript-eslint/type-utils@5.45.0":
+  version "5.45.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.45.0.tgz#aefbc954c40878fcebeabfb77d20d84a3da3a8b2"
+  integrity sha512-DY7BXVFSIGRGFZ574hTEyLPRiQIvI/9oGcN8t1A7f6zIs6ftbrU0nhyV26ZW//6f85avkwrLag424n+fkuoJ1Q==
   dependencies:
-    "@typescript-eslint/utils" "5.18.0"
-    debug "^4.3.2"
+    "@typescript-eslint/typescript-estree" "5.45.0"
+    "@typescript-eslint/utils" "5.45.0"
+    debug "^4.3.4"
     tsutils "^3.21.0"
 
-"@typescript-eslint/types@5.18.0":
-  version "5.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.18.0.tgz#4f0425d85fdb863071680983853c59a62ce9566e"
-  integrity sha512-bhV1+XjM+9bHMTmXi46p1Led5NP6iqQcsOxgx7fvk6gGiV48c6IynY0apQb7693twJDsXiVzNXTflhplmaiJaw==
+"@typescript-eslint/types@5.45.0":
+  version "5.45.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.45.0.tgz#794760b9037ee4154c09549ef5a96599621109c5"
+  integrity sha512-QQij+u/vgskA66azc9dCmx+rev79PzX8uDHpsqSjEFtfF2gBUTRCpvYMh2gw2ghkJabNkPlSUCimsyBEQZd1DA==
 
-"@typescript-eslint/typescript-estree@5.18.0":
-  version "5.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.18.0.tgz#6498e5ee69a32e82b6e18689e2f72e4060986474"
-  integrity sha512-wa+2VAhOPpZs1bVij9e5gyVu60ReMi/KuOx4LKjGx2Y3XTNUDJgQ+5f77D49pHtqef/klglf+mibuHs9TrPxdQ==
+"@typescript-eslint/typescript-estree@5.45.0":
+  version "5.45.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.45.0.tgz#f70a0d646d7f38c0dfd6936a5e171a77f1e5291d"
+  integrity sha512-maRhLGSzqUpFcZgXxg1qc/+H0bT36lHK4APhp0AEUVrpSwXiRAomm/JGjSG+kNUio5kAa3uekCYu/47cnGn5EQ==
   dependencies:
-    "@typescript-eslint/types" "5.18.0"
-    "@typescript-eslint/visitor-keys" "5.18.0"
-    debug "^4.3.2"
-    globby "^11.0.4"
+    "@typescript-eslint/types" "5.45.0"
+    "@typescript-eslint/visitor-keys" "5.45.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
     is-glob "^4.0.3"
-    semver "^7.3.5"
+    semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/utils@5.18.0", "@typescript-eslint/utils@^5.13.0":
-  version "5.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.18.0.tgz#27fc84cf95c1a96def0aae31684cb43a37e76855"
-  integrity sha512-+hFGWUMMri7OFY26TsOlGa+zgjEy1ssEipxpLjtl4wSll8zy85x0GrUSju/FHdKfVorZPYJLkF3I4XPtnCTewA==
+"@typescript-eslint/utils@5.45.0", "@typescript-eslint/utils@^5.13.0":
+  version "5.45.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.45.0.tgz#9cca2996eee1b8615485a6918a5c763629c7acf5"
+  integrity sha512-OUg2JvsVI1oIee/SwiejTot2OxwU8a7UfTFMOdlhD2y+Hl6memUSL4s98bpUTo8EpVEr0lmwlU7JSu/p2QpSvA==
   dependencies:
     "@types/json-schema" "^7.0.9"
-    "@typescript-eslint/scope-manager" "5.18.0"
-    "@typescript-eslint/types" "5.18.0"
-    "@typescript-eslint/typescript-estree" "5.18.0"
+    "@types/semver" "^7.3.12"
+    "@typescript-eslint/scope-manager" "5.45.0"
+    "@typescript-eslint/types" "5.45.0"
+    "@typescript-eslint/typescript-estree" "5.45.0"
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
+    semver "^7.3.7"
 
-"@typescript-eslint/visitor-keys@5.18.0":
-  version "5.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.18.0.tgz#c7c07709823804171d569017f3b031ced7253e60"
-  integrity sha512-Hf+t+dJsjAKpKSkg3EHvbtEpFFb/1CiOHnvI8bjHgOD4/wAw3gKrA0i94LrbekypiZVanJu3McWJg7rWDMzRTg==
+"@typescript-eslint/visitor-keys@5.45.0":
+  version "5.45.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.45.0.tgz#e0d160e9e7fdb7f8da697a5b78e7a14a22a70528"
+  integrity sha512-jc6Eccbn2RtQPr1s7th6jJWQHBHI6GBVQkCHoJFQ5UreaKm59Vxw+ynQUPPY2u2Amquc+7tmEoC2G52ApsGNNg==
   dependencies:
-    "@typescript-eslint/types" "5.18.0"
-    eslint-visitor-keys "^3.0.0"
+    "@typescript-eslint/types" "5.45.0"
+    eslint-visitor-keys "^3.3.0"
 
 "@uiw/copy-to-clipboard@~1.0.12":
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/@uiw/copy-to-clipboard/-/copy-to-clipboard-1.0.12.tgz#46f563bd6f3007895f95855e5b4bb692c7251933"
   integrity sha512-3tt7FVSbjtBCNBhffy7k26rpnEmk8GQj9QkTGZBIfpHU7mG3Buryt69u6xooYM7/gmv7GIqD4QxxIauIp2HHKg==
 
-"@uiw/react-markdown-preview@^4.0.10":
-  version "4.0.11"
-  resolved "https://registry.yarnpkg.com/@uiw/react-markdown-preview/-/react-markdown-preview-4.0.11.tgz#7c0e0ff6820f5878c378cf87034195eeb02fe00b"
-  integrity sha512-+vabc1MC/prdaDsrX6dPTx90QtUd63r9R7ZDM/GvCagj+wF7okNop0vxk2HCkU3VjpG7xpDAsQw/A54Pp4IdPg==
+"@uiw/react-markdown-preview@^4.1.5":
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/@uiw/react-markdown-preview/-/react-markdown-preview-4.1.5.tgz#d133f7a90f7c0268871f209d90123f388a620d79"
+  integrity sha512-CYiwzrarfg/jCsSHSfLkgxpLiqwZjmXhMJmwMa2SCct/PX/vt9wJJ84aNgUVbSjfQFKgmTlSWpDiN+kGnf8D/w==
   dependencies:
     "@babel/runtime" "^7.17.2"
     "@uiw/copy-to-clipboard" "~1.0.12"
     react-markdown "~8.0.0"
     rehype-attr "~2.0.7"
     rehype-autolink-headings "~6.1.1"
-    rehype-prism-plus "~1.3.2"
-    rehype-raw "~6.1.1"
+    rehype-ignore "^1.0.1"
+    rehype-prism-plus "~1.5.0"
+    rehype-raw "^6.1.1"
     rehype-rewrite "~3.0.6"
     rehype-slug "~5.0.1"
     remark-gfm "~3.0.1"
+    unist-util-visit "^4.1.0"
 
 "@uiw/react-md-editor@^3.14.1":
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/@uiw/react-md-editor/-/react-md-editor-3.14.1.tgz#754923f8d0fae025be4986c939d6f0f3ddd1c99e"
-  integrity sha512-F0BCKXv3bFte/7WwB4CKTM7VzvBNeJj0LjFDExMFUKr72R8+lC+dbZGAa1RlgGwqeSCqkyi5Wv4aqDu5jYEn0w==
+  version "3.19.7"
+  resolved "https://registry.yarnpkg.com/@uiw/react-md-editor/-/react-md-editor-3.19.7.tgz#e575c77a011083b806cdd90346f9ebe7a83e08f7"
+  integrity sha512-mZb8c6aTwq9k6t6xav8zNoD/f6q7w5BmMiixswiDCA7/YWc19Xp+qCtp5C5FQtb4AStxozIRjY1uWK4VQOI/gQ==
   dependencies:
     "@babel/runtime" "^7.14.6"
-    "@uiw/react-markdown-preview" "^4.0.10"
+    "@uiw/react-markdown-preview" "^4.1.5"
     rehype "~12.0.1"
-    rehype-sanitize "~5.0.1"
 
 "@webassemblyjs/ast@1.11.1":
   version "1.11.1"
@@ -3537,9 +3649,9 @@
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
 abab@^2.0.3, abab@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
-  integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
+  integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
 
 accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8:
   version "1.3.8"
@@ -3562,12 +3674,12 @@ acorn-import-assertions@^1.7.6:
   resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
   integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
 
-acorn-jsx@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b"
-  integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==
+acorn-jsx@^5.3.2:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
+  integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn-node@^1.6.1:
+acorn-node@^1.8.2:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.8.2.tgz#114c95d64539e53dede23de8b9d96df7c7ae2af8"
   integrity sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==
@@ -3591,15 +3703,15 @@ acorn@^7.0.0, acorn@^7.1.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.0:
-  version "8.7.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
-  integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==
+acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0:
+  version "8.8.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73"
+  integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==
 
 address@^1.0.1, address@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/address/-/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6"
-  integrity sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA==
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/address/-/address-1.2.1.tgz#25bb61095b7522d65b357baa11bc05492d4c8acd"
+  integrity sha512-B+6bi5D34+fDYENiH5qOlA0cV2rAGKuWZ9LeyUUehbXy8e0VS9e498yO0Jeeh+iM+6KbfudHTFjXw2MmJD4QRA==
 
 adjust-sourcemap-loader@^4.0.0:
   version "4.0.0"
@@ -3654,9 +3766,9 @@ ajv@^6.10.0, ajv@^6.12.2, ajv@^6.12.4, ajv@^6.12.5, ajv@~6.12.6:
     uri-js "^4.2.2"
 
 ajv@^8.0.0, ajv@^8.6.0, ajv@^8.8.0:
-  version "8.11.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f"
-  integrity sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==
+  version "8.11.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.2.tgz#aecb20b50607acf2569b6382167b65a96008bb78"
+  integrity sha512-E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg==
   dependencies:
     fast-deep-equal "^3.1.1"
     json-schema-traverse "^1.0.0"
@@ -3664,24 +3776,24 @@ ajv@^8.0.0, ajv@^8.6.0, ajv@^8.8.0:
     uri-js "^4.2.2"
 
 algoliasearch@^4.13.1:
-  version "4.13.1"
-  resolved "https://registry.yarnpkg.com/algoliasearch/-/algoliasearch-4.13.1.tgz#54195c41c9e4bd13ed64982248cf49d4576974fe"
-  integrity sha512-dtHUSE0caWTCE7liE1xaL+19AFf6kWEcyn76uhcitWpntqvicFHXKFoZe5JJcv9whQOTRM6+B8qJz6sFj+rDJA==
+  version "4.14.2"
+  resolved "https://registry.yarnpkg.com/algoliasearch/-/algoliasearch-4.14.2.tgz#63f142583bfc3a9bd3cd4a1b098bf6fe58e56f6c"
+  integrity sha512-ngbEQonGEmf8dyEh5f+uOIihv4176dgbuOZspiuhmTTBRBuzWu3KCGHre6uHj5YyuC7pNvQGzB6ZNJyZi0z+Sg==
   dependencies:
-    "@algolia/cache-browser-local-storage" "4.13.1"
-    "@algolia/cache-common" "4.13.1"
-    "@algolia/cache-in-memory" "4.13.1"
-    "@algolia/client-account" "4.13.1"
-    "@algolia/client-analytics" "4.13.1"
-    "@algolia/client-common" "4.13.1"
-    "@algolia/client-personalization" "4.13.1"
-    "@algolia/client-search" "4.13.1"
-    "@algolia/logger-common" "4.13.1"
-    "@algolia/logger-console" "4.13.1"
-    "@algolia/requester-browser-xhr" "4.13.1"
-    "@algolia/requester-common" "4.13.1"
-    "@algolia/requester-node-http" "4.13.1"
-    "@algolia/transporter" "4.13.1"
+    "@algolia/cache-browser-local-storage" "4.14.2"
+    "@algolia/cache-common" "4.14.2"
+    "@algolia/cache-in-memory" "4.14.2"
+    "@algolia/client-account" "4.14.2"
+    "@algolia/client-analytics" "4.14.2"
+    "@algolia/client-common" "4.14.2"
+    "@algolia/client-personalization" "4.14.2"
+    "@algolia/client-search" "4.14.2"
+    "@algolia/logger-common" "4.14.2"
+    "@algolia/logger-console" "4.14.2"
+    "@algolia/requester-browser-xhr" "4.14.2"
+    "@algolia/requester-common" "4.14.2"
+    "@algolia/requester-node-http" "4.14.2"
+    "@algolia/transporter" "4.14.2"
 
 anser@^1.4.1:
   version "1.4.10"
@@ -3730,9 +3842,9 @@ ansi-styles@^5.0.0:
   integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
 
 ansi-styles@^6.0.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.1.0.tgz#87313c102b8118abd57371afab34618bf7350ed3"
-  integrity sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
+  integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
 
 ansi-to-react@^6.1.6:
   version "6.1.6"
@@ -3743,9 +3855,9 @@ ansi-to-react@^6.1.6:
     escape-carriage "^1.3.0"
 
 anymatch@^3.0.3, anymatch@~3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
-  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
+  integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
   dependencies:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
@@ -3755,10 +3867,10 @@ arg@^4.1.0:
   resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
   integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
 
-arg@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.1.tgz#eb0c9a8f77786cad2af8ff2b862899842d7b6adb"
-  integrity sha512-e0hDa9H2Z9AwFkk2qDlwhoMYE4eToKarchkQHovNdLTCYMHZHeRjI71crOh+dio4K6u1IcwubQqo79Ga4CyAQA==
+arg@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.2.tgz#c81433cc427c92c4dcf4865142dbca6f15acd59c"
+  integrity sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==
 
 argparse@^1.0.7:
   version "1.0.10"
@@ -3781,29 +3893,31 @@ aria-query@^4.2.2:
     "@babel/runtime-corejs3" "^7.10.2"
 
 aria-query@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.0.0.tgz#210c21aaf469613ee8c9a62c7f86525e058db52c"
-  integrity sha512-V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg==
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.1.3.tgz#19db27cd101152773631396f7a95a3b58c22c35e"
+  integrity sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==
+  dependencies:
+    deep-equal "^2.0.5"
 
 array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
-  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
+  integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==
 
 array-flatten@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
   integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
 
-array-includes@^3.1.4:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz#f5b493162c760f3539631f005ba2bb46acb45ba9"
-  integrity sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==
+array-includes@^3.1.4, array-includes@^3.1.5, array-includes@^3.1.6:
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.6.tgz#9e9e720e194f198266ba9e18c29e6a9b0e4b225f"
+  integrity sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
-    get-intrinsic "^1.1.1"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+    get-intrinsic "^1.1.3"
     is-string "^1.0.7"
 
 array-move@^3.0.1:
@@ -3817,45 +3931,62 @@ array-union@^2.1.0:
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
 array.prototype.flat@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz#07e0975d84bbc7c48cd1879d609e682598d33e13"
-  integrity sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg==
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz#ffc6576a7ca3efc2f46a143b9d1dda9b4b3cf5e2"
+  integrity sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.0"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+    es-shim-unscopables "^1.0.0"
 
-array.prototype.flatmap@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.5.tgz#908dc82d8a406930fdf38598d51e7411d18d4446"
-  integrity sha512-08u6rVyi1Lj7oqWbS9nUxliETrtIROT4XGTA4D/LWGten6E3ocm7cy9SIrmNHOL5XVbVuckUp3X6Xyg8/zpvHA==
+array.prototype.flatmap@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz#1aae7903c2100433cb8261cd4ed310aab5c4a183"
+  integrity sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==
   dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.0"
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+    es-shim-unscopables "^1.0.0"
+
+array.prototype.reduce@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz#6b20b0daa9d9734dd6bc7ea66b5bbce395471eac"
+  integrity sha512-kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+    es-array-method-boxes-properly "^1.0.0"
+    is-string "^1.0.7"
+
+array.prototype.tosorted@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz#ccf44738aa2b5ac56578ffda97c03fd3e23dd532"
+  integrity sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+    es-shim-unscopables "^1.0.0"
+    get-intrinsic "^1.1.3"
 
 asap@~2.0.3, asap@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
-  integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
+  integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==
 
 ast-types-flow@^0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
-  integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0=
+  integrity sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==
 
 astral-regex@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
   integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
 
-async@^2.6.2:
-  version "2.6.4"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
-  integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==
-  dependencies:
-    lodash "^4.17.14"
-
 async@^3.2.3:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c"
@@ -3864,39 +3995,39 @@ async@^3.2.3:
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
+  integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
 
 at-least-node@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
   integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
 
-atob@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
-  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
-
 attr-accept@^2.0.0:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/attr-accept/-/attr-accept-2.2.2.tgz#646613809660110749e92f2c10833b70968d929b"
   integrity sha512-7prDjvt9HmqiZ0cl5CRjtS84sEyhsHP2coDkaZKRKVfCDo9s7iw7ChVmar78Gu9pC4SoR/28wFu/G5JJhTnqEg==
 
-autoprefixer@^10.4.4:
-  version "10.4.4"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.4.tgz#3e85a245b32da876a893d3ac2ea19f01e7ea5a1e"
-  integrity sha512-Tm8JxsB286VweiZ5F0anmbyGiNI3v3wGv3mz9W+cxEDYB/6jbnj6GM9H9mK3wIL8ftgl+C07Lcwb8PG5PCCPzA==
+autoprefixer@^10.4.13:
+  version "10.4.13"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.13.tgz#b5136b59930209a321e9fa3dca2e7c4d223e83a8"
+  integrity sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==
   dependencies:
-    browserslist "^4.20.2"
-    caniuse-lite "^1.0.30001317"
+    browserslist "^4.21.4"
+    caniuse-lite "^1.0.30001426"
     fraction.js "^4.2.0"
     normalize-range "^0.1.2"
     picocolors "^1.0.0"
     postcss-value-parser "^4.2.0"
 
-axe-core@^4.3.5:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.4.1.tgz#7dbdc25989298f9ad006645cd396782443757413"
-  integrity sha512-gd1kmb21kwNuWr6BQz8fv6GNECPBnUasepcoLbekws23NVBLODdsClRZ+bQ8+9Uomf3Sm3+Vwn0oYG9NvwnJCw==
+available-typed-arrays@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
+  integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
+
+axe-core@^4.4.3:
+  version "4.5.2"
+  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.5.2.tgz#823fdf491ff717ac3c58a52631d4206930c1d9f7"
+  integrity sha512-u2MVsXfew5HBvjsczCv+xlwdNnB1oQR9HlAcsejZttNjKKSkeDNVwB1vMThIUIFI9GoT57Vtk8iQLwqOfAkboA==
 
 axobject-query@^2.2.0:
   version "2.2.0"
@@ -3918,22 +4049,15 @@ babel-jest@^27.4.2, babel-jest@^27.5.1:
     slash "^3.0.0"
 
 babel-loader@^8.2.3:
-  version "8.2.4"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.4.tgz#95f5023c791b2e9e2ca6f67b0984f39c82ff384b"
-  integrity sha512-8dytA3gcvPPPv4Grjhnt8b5IIiTcq/zeXOPk4iTYI0SVXcsmuGg7JtBRDp8S9X+gJfhQ8ektjXZlDu1Bb33U8A==
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.3.0.tgz#124936e841ba4fe8176786d6ff28add1f134d6a8"
+  integrity sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==
   dependencies:
     find-cache-dir "^3.3.1"
     loader-utils "^2.0.0"
     make-dir "^3.1.0"
     schema-utils "^2.6.5"
 
-babel-plugin-dynamic-import-node@^2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3"
-  integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==
-  dependencies:
-    object.assign "^4.1.0"
-
 babel-plugin-istanbul@^6.1.1:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73"
@@ -3955,15 +4079,6 @@ babel-plugin-jest-hoist@^27.5.1:
     "@types/babel__core" "^7.0.0"
     "@types/babel__traverse" "^7.0.6"
 
-babel-plugin-macros@^2.6.1:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz#0f958a7cc6556b1e65344465d99111a1e5e10138"
-  integrity sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==
-  dependencies:
-    "@babel/runtime" "^7.7.2"
-    cosmiconfig "^6.0.0"
-    resolve "^1.12.0"
-
 babel-plugin-macros@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz#9ef6dc74deb934b4db344dc973ee851d148c50c1"
@@ -3978,29 +4093,29 @@ babel-plugin-named-asset-import@^0.3.8:
   resolved "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.8.tgz#6b7fa43c59229685368683c28bc9734f24524cc2"
   integrity sha512-WXiAc++qo7XcJ1ZnTYGtLxmBCVbddAml3CEXgWaBzNzLNoxtQ8AiGEFDMOhot9XjTCQbvP5E77Fj9Gk924f00Q==
 
-babel-plugin-polyfill-corejs2@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz#440f1b70ccfaabc6b676d196239b138f8a2cfba5"
-  integrity sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==
+babel-plugin-polyfill-corejs2@^0.3.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz#5d1bd3836d0a19e1b84bbf2d9640ccb6f951c122"
+  integrity sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==
   dependencies:
-    "@babel/compat-data" "^7.13.11"
-    "@babel/helper-define-polyfill-provider" "^0.3.1"
+    "@babel/compat-data" "^7.17.7"
+    "@babel/helper-define-polyfill-provider" "^0.3.3"
     semver "^6.1.1"
 
-babel-plugin-polyfill-corejs3@^0.5.0:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz#aabe4b2fa04a6e038b688c5e55d44e78cd3a5f72"
-  integrity sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==
+babel-plugin-polyfill-corejs3@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz#56ad88237137eade485a71b52f72dbed57c6230a"
+  integrity sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.1"
-    core-js-compat "^3.21.0"
+    "@babel/helper-define-polyfill-provider" "^0.3.3"
+    core-js-compat "^3.25.1"
 
-babel-plugin-polyfill-regenerator@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz#2c0678ea47c75c8cc2fbb1852278d8fb68233990"
-  integrity sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==
+babel-plugin-polyfill-regenerator@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz#390f91c38d90473592ed43351e801a9d3e0fd747"
+  integrity sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.1"
+    "@babel/helper-define-polyfill-provider" "^0.3.3"
 
 babel-plugin-transform-react-remove-prop-types@^0.4.24:
   version "0.4.24"
@@ -4078,12 +4193,12 @@ base64-js@^1.3.1:
 batch@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
-  integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=
+  integrity sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==
 
 bcp-47-match@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/bcp-47-match/-/bcp-47-match-2.0.2.tgz#3323e221eb5b40ddc3b91ed29d847ab459d549c4"
-  integrity sha512-zy5swVXwQ25ttElhoN9Dgnqm6VFlMkeDNljvHSGqGNr4zClUosdFzxD+fQHJVmx3g3KY+r//wV/fmBHsa1ErnA==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/bcp-47-match/-/bcp-47-match-2.0.3.tgz#603226f6e5d3914a581408be33b28a53144b09d0"
+  integrity sha512-JtTezzbAibu8G0R9op9zb3vcWZd9JF6M0xOYGPn0fNCd7wOpRB1mU2mH9T8gaBGbAAyIIVgB2G7xG0GP98zMAQ==
 
 bfj@^7.0.2:
   version "7.0.2"
@@ -4110,36 +4225,38 @@ bluebird@^3.5.5:
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
-body-parser@1.19.2:
-  version "1.19.2"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.2.tgz#4714ccd9c157d44797b8b5607d72c0b89952f26e"
-  integrity sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==
+body-parser@1.20.1:
+  version "1.20.1"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668"
+  integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==
   dependencies:
     bytes "3.1.2"
     content-type "~1.0.4"
     debug "2.6.9"
-    depd "~1.1.2"
-    http-errors "1.8.1"
+    depd "2.0.0"
+    destroy "1.2.0"
+    http-errors "2.0.0"
     iconv-lite "0.4.24"
-    on-finished "~2.3.0"
-    qs "6.9.7"
-    raw-body "2.4.3"
+    on-finished "2.4.1"
+    qs "6.11.0"
+    raw-body "2.5.1"
     type-is "~1.6.18"
+    unpipe "1.0.0"
 
 bonjour-service@^1.0.11:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.0.11.tgz#5418e5c1ac91c89a406f853a942e7892829c0d89"
-  integrity sha512-drMprzr2rDTCtgEE3VgdA9uUFaUHF+jXduwYSThHJnKMYM+FhI9Z3ph+TX3xy0LtgYHae6CHYPJ/2UnK8nQHcA==
+  version "1.0.14"
+  resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.0.14.tgz#c346f5bc84e87802d08f8d5a60b93f758e514ee7"
+  integrity sha512-HIMbgLnk1Vqvs6B4Wq5ep7mxvj9sGz5d1JJyDNSGNIdA/w2MCz6GTjWTdjqOJV1bEPj+6IkxDvWNFKEBxNt4kQ==
   dependencies:
     array-flatten "^2.1.2"
     dns-equal "^1.0.0"
     fast-deep-equal "^3.1.3"
-    multicast-dns "^7.2.4"
+    multicast-dns "^7.2.5"
 
 boolbase@^1.0.0, boolbase@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
-  integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
+  integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==
 
 brace-expansion@^1.1.7:
   version "1.1.11"
@@ -4183,16 +4300,15 @@ browser-process-hrtime@^1.0.0:
   resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
   integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
 
-browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4.17.5, browserslist@^4.18.1, browserslist@^4.19.1, browserslist@^4.20.2:
-  version "4.20.2"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.2.tgz#567b41508757ecd904dab4d1c646c612cd3d4f88"
-  integrity sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA==
+browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4.18.1, browserslist@^4.21.3, browserslist@^4.21.4:
+  version "4.21.4"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987"
+  integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==
   dependencies:
-    caniuse-lite "^1.0.30001317"
-    electron-to-chromium "^1.4.84"
-    escalade "^3.1.1"
-    node-releases "^2.0.2"
-    picocolors "^1.0.0"
+    caniuse-lite "^1.0.30001400"
+    electron-to-chromium "^1.4.251"
+    node-releases "^2.0.6"
+    update-browserslist-db "^1.0.9"
 
 bs-logger@0.x:
   version "0.2.6"
@@ -4216,7 +4332,7 @@ btoa@^1.2.1:
 buffer-equal@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz#91bc74b11ea405bc916bc6aa908faafa5b4aac4b"
-  integrity sha1-kbx0sR6kBbyRa8aqkI+q+ltKrEs=
+  integrity sha512-RgSV6InVQ9ODPdLWJ5UAqBqJBOg370Nz6ZQtRzpt6nUjc8v0St97uJ4PYC6NztqIScrAXafKM3mZPMygSe1ggA==
 
 buffer-from@^1.0.0:
   version "1.1.2"
@@ -4232,14 +4348,14 @@ buffer@^6.0.3:
     ieee754 "^1.2.1"
 
 builtin-modules@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.2.0.tgz#45d5db99e7ee5e6bc4f362e008bf917ab5049887"
-  integrity sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6"
+  integrity sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==
 
 bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
-  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
+  integrity sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==
 
 bytes@3.1.2:
   version "3.1.2"
@@ -4292,10 +4408,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001317:
-  version "1.0.30001328"
-  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001328.tgz"
-  integrity sha512-Ue55jHkR/s4r00FLNiX+hGMMuwml/QGqqzVeMQ5thUewznU2EdULFvI3JR7JJid6OrjJNfFvHY2G2dIjmRaDDQ==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001400, caniuse-lite@^1.0.30001426:
+  version "1.0.30001434"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001434.tgz#ec1ec1cfb0a93a34a0600d37903853030520a4e5"
+  integrity sha512-aOBHrLmTQw//WFa2rcF1If9fa3ypkC1wzqqiKHgfdrXTWcU8C4gKVZT77eQAPWN1APys3+uQ0Df07rKauXGEYA==
 
 case-sensitive-paths-webpack-plugin@^2.4.0:
   version "2.4.0"
@@ -4353,24 +4469,19 @@ character-entities-legacy@^3.0.0:
   integrity sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==
 
 character-entities@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-2.0.1.tgz#98724833e1e27990dee0bd0f2b8a859c3476aac7"
-  integrity sha512-OzmutCf2Kmc+6DrFrrPS8/tDh2+DpnrfzdICHWhcVC9eOd0N1PXmQEE1a8iM4IziIAG+8tmTq3K+oo0ubH6RRQ==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-2.0.2.tgz#2d09c2e72cd9523076ccb21157dff66ad43fcc22"
+  integrity sha512-shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ==
 
 character-reference-invalid@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-2.0.1.tgz#85c66b041e43b47210faf401278abf808ac45cb9"
   integrity sha512-iBZ4F4wRbyORVsu0jPV7gXkOsGYjGHPmAyv+HiHG8gi5PtC9KI2j1+v8/tlibRvjoWX027ypmG/n0HtO5t7unw==
 
-charcodes@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/charcodes/-/charcodes-0.2.0.tgz#5208d327e6cc05f99eb80ffc814707572d1f14e4"
-  integrity sha512-Y4kiDb+AM4Ecy58YkuZrrSRJBDQdQ2L+NyS1vHHFtNtUjgutcZfx3yp1dAONI/oPaPmyGfCLx5CxL+zauIMyKQ==
-
 check-types@^11.1.1:
-  version "11.1.2"
-  resolved "https://registry.yarnpkg.com/check-types/-/check-types-11.1.2.tgz#86a7c12bf5539f6324eb0e70ca8896c0e38f3e2f"
-  integrity sha512-tzWzvgePgLORb9/3a0YenggReLKAIb2owL03H2Xdoe5pKcUyWRSEQ8xfCar8t2SIAuEDwtmx2da1YB52YuHQMQ==
+  version "11.2.2"
+  resolved "https://registry.yarnpkg.com/check-types/-/check-types-11.2.2.tgz#7afc0b6a860d686885062f2dba888ba5710335b4"
+  integrity sha512-HBiYvXvn9Z70Z88XKjz3AEKd4HJhBXsa3j7xFnITAzoS8+q6eIGi8qDB8FKPBAjtuxjI/zFpwuiCb8oDtKOYrA==
 
 chokidar@^3.4.2, chokidar@^3.5.3:
   version "3.5.3"
@@ -4388,16 +4499,14 @@ chokidar@^3.4.2, chokidar@^3.5.3:
     fsevents "~2.3.2"
 
 chrome-trace-event@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4"
-  integrity sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==
-  dependencies:
-    tslib "^1.9.0"
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
+  integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==
 
 ci-info@^3.2.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.0.tgz#b4ed1fb6818dea4803a55c623041f9165d2066b2"
-  integrity sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw==
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.7.0.tgz#6d01b3696c59915b6ce057e4aa4adfc2fa25f5ef"
+  integrity sha512-2CpRNYmImPx+RXKLq6jko/L07phmS9I02TyqkcNU20GCF/GgaWvc58hPtjxDX8lPpkdwc9sNh72V9k00S7ezog==
 
 cjs-module-lexer@^1.0.0:
   version "1.2.2"
@@ -4405,14 +4514,14 @@ cjs-module-lexer@^1.0.0:
   integrity sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==
 
 classnames@^2.2.6:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e"
-  integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.2.tgz#351d813bf0137fcc6a76a16b88208d2560a0d924"
+  integrity sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==
 
 clean-css@^5.2.2:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.3.0.tgz#ad3d8238d5f3549e83d5f87205189494bc7cbb59"
-  integrity sha512-YYuuxv4H/iNb1Z/5IbMRoxgrzjWGhOEFfd+groZ5dMCVkpENiMZmwspdrzBo9286JjM1gZJPAyL7ZIdzuvu2AQ==
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.3.1.tgz#d0610b0b90d125196a2894d35366f734e5d7aa32"
+  integrity sha512-lCr8OHhiWCTw4v8POJovCoh4T7I9U11yVsPjMWWnnMmp9ZowCxyad1Pathle/9HjaDp+fdQKjO9fQydE6RHTZg==
   dependencies:
     source-map "~0.6.0"
 
@@ -4453,7 +4562,7 @@ cliui@^7.0.2:
     strip-ansi "^6.0.0"
     wrap-ansi "^7.0.0"
 
-clsx@^1.1.0, clsx@^1.1.1, clsx@^1.2.1:
+clsx@^1.1.0, clsx@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12"
   integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==
@@ -4461,7 +4570,7 @@ clsx@^1.1.0, clsx@^1.1.1, clsx@^1.2.1:
 co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
+  integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==
 
 coa@^2.0.2:
   version "2.0.2"
@@ -4499,7 +4608,7 @@ color-convert@^2.0.1:
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
 color-name@^1.1.4, color-name@~1.1.4:
   version "1.1.4"
@@ -4507,14 +4616,14 @@ color-name@^1.1.4, color-name@~1.1.4:
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
 colord@^2.9.1:
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.2.tgz#25e2bacbbaa65991422c07ea209e2089428effb1"
-  integrity sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ==
+  version "2.9.3"
+  resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.3.tgz#4f8ce919de456f1d5c1c368c307fe20f3e59fb43"
+  integrity sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==
 
-colorette@^2.0.10, colorette@^2.0.16:
-  version "2.0.16"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da"
-  integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==
+colorette@^2.0.10, colorette@^2.0.19:
+  version "2.0.19"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798"
+  integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==
 
 combined-stream@^1.0.8:
   version "1.0.8"
@@ -4524,9 +4633,9 @@ combined-stream@^1.0.8:
     delayed-stream "~1.0.0"
 
 comma-separated-tokens@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-2.0.2.tgz#d4c25abb679b7751c880be623c1179780fe1dd98"
-  integrity sha512-G5yTt3KQN4Yn7Yk4ed73hlZ1evrFKXeUW3086p3PRFNp7m2vIjI6Pg+Kgb+oyzhd9F2qdcoj67+y3SdxL5XWsg==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz#4e89c9458acb61bc8fef19f4529973b2392839ee"
+  integrity sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==
 
 commander@^2.20.0:
   version "2.20.3"
@@ -4548,25 +4657,30 @@ commander@^8.3.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
   integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
 
+commander@^9.4.1:
+  version "9.4.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-9.4.1.tgz#d1dd8f2ce6faf93147295c0df13c7c21141cfbdd"
+  integrity sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw==
+
 common-path-prefix@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/common-path-prefix/-/common-path-prefix-3.0.0.tgz#7d007a7e07c58c4b4d5f433131a19141b29f11e0"
   integrity sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==
 
 common-tags@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"
-  integrity sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6"
+  integrity sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==
 
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
-  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
+  integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==
 
 compare-versions@^4.1.3:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-4.1.3.tgz#8f7b8966aef7dc4282b45dfa6be98434fc18a1a4"
-  integrity sha512-WQfnbDcrYnGr55UwbxKiQKASnTtNnaAWVi8jZyy8NTpVAXWACSne8lMD1iaIo9AiU6mnuLvSVshCzewVuWxHUg==
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-4.1.4.tgz#3571f4d610924d4414846a4183d386c8f3d51112"
+  integrity sha512-FemMreK9xNyL8gQevsdRMrvO4lFCkQP7qbuktn1q8ndcNk1+0mz7lgE7b/sNvbhVgY4w6tMN1FDp6aADjqw2rw==
 
 compressible@~2.0.16:
   version "2.0.18"
@@ -4608,10 +4722,10 @@ confusing-browser-globals@^1.0.11:
   resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz#ae40e9b57cdd3915408a2805ebd3a5585608dc81"
   integrity sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==
 
-connect-history-api-fallback@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
-  integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
+connect-history-api-fallback@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz#647264845251a0daf25b97ce87834cace0f5f1c8"
+  integrity sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==
 
 content-disposition@0.5.4:
   version "0.5.4"
@@ -4626,44 +4740,41 @@ content-type@~1.0.4:
   integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
 convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
-  integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==
-  dependencies:
-    safe-buffer "~5.1.1"
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
+  integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
 
 cookie-signature@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
-  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
+  integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
 
-cookie@0.4.2:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
-  integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
+cookie@0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
+  integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
 
-core-js-compat@^3.20.2, core-js-compat@^3.21.0:
-  version "3.21.1"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.21.1.tgz#cac369f67c8d134ff8f9bd1623e3bc2c42068c82"
-  integrity sha512-gbgX5AUvMb8gwxC7FLVWYT7Kkgu/y7+h/h1X43yJkNqhlK2fuYyQimqvKGNZFAY6CKii/GFKJ2cp/1/42TN36g==
+core-js-compat@^3.25.1:
+  version "3.26.1"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.26.1.tgz#0e710b09ebf689d719545ac36e49041850f943df"
+  integrity sha512-622/KzTudvXCDLRw70iHW4KKs1aGpcRcowGWyYJr2DEBfRrd6hNJybxSWJFuZYD4ma86xhrwDDHxmDaIq4EA8A==
   dependencies:
-    browserslist "^4.19.1"
-    semver "7.0.0"
+    browserslist "^4.21.4"
 
-core-js-pure@^3.20.2, core-js-pure@^3.8.1:
-  version "3.21.1"
-  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.21.1.tgz#8c4d1e78839f5f46208de7230cebfb72bc3bdb51"
-  integrity sha512-12VZfFIu+wyVbBebyHmRTuEE/tZrB4tJToWcwAMcsp3h4+sHR+fMJWbKpYiCRWlhFBq+KNyO8rIV9rTkeVmznQ==
+core-js-pure@^3.23.3, core-js-pure@^3.25.1:
+  version "3.26.1"
+  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.26.1.tgz#653f4d7130c427820dcecd3168b594e8bb095a33"
+  integrity sha512-VVXcDpp/xJ21KdULRq/lXdLzQAtX7+37LzpyfFM973il0tWSsDEoyzG38G14AjTpK9VTfiNM9jnFauq/CpaWGQ==
 
 core-js@^3.19.2:
-  version "3.21.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.21.1.tgz#f2e0ddc1fc43da6f904706e8e955bc19d06a0d94"
-  integrity sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig==
+  version "3.26.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.26.1.tgz#7a9816dabd9ee846c1c0fe0e8fcad68f3709134e"
+  integrity sha512-21491RRQVzUn0GGM9Z1Jrpr6PNPxPi+Za8OM9q4tksTSnlbXXGKK1nXNg/QvwFYettXvSX6zWKCtHHfjN4puyA==
 
 core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
+  integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
 cosmiconfig-typescript-loader@^1.0.0:
   version "1.0.9"
@@ -4685,9 +4796,9 @@ cosmiconfig@^6.0.0:
     yaml "^1.7.2"
 
 cosmiconfig@^7, cosmiconfig@^7.0.0, cosmiconfig@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d"
-  integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz#1443b9afa596b670082ea46cbd8f6a62b84635f6"
+  integrity sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==
   dependencies:
     "@types/parse-json" "^4.0.0"
     import-fresh "^3.2.1"
@@ -4757,10 +4868,10 @@ css-box-model@^1.2.0:
   dependencies:
     tiny-invariant "^1.0.6"
 
-css-declaration-sorter@^6.2.2:
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.2.2.tgz#bfd2f6f50002d6a3ae779a87d3a0c5d5b10e0f02"
-  integrity sha512-Ufadglr88ZLsrvS11gjeu/40Lw74D9Am/Jpr3LlYm5Q4ZP5KdlUhG+6u2EjyXeZcxmZ2h1ebCKngDjolpeLHpg==
+css-declaration-sorter@^6.3.1:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz#be5e1d71b7a992433fb1c542c7a1b835e45682ec"
+  integrity sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w==
 
 css-has-pseudo@^3.0.4:
   version "3.0.4"
@@ -4770,18 +4881,18 @@ css-has-pseudo@^3.0.4:
     postcss-selector-parser "^6.0.9"
 
 css-loader@^6.5.1:
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.7.1.tgz#e98106f154f6e1baf3fc3bc455cb9981c1d5fd2e"
-  integrity sha512-yB5CNFa14MbPJcomwNh3wLThtkZgcNyI2bNMRt8iE5Z8Vwl7f8vQXFAzn2HDOJvtDq2NTZBUGMSUNNyrv3/+cw==
+  version "6.7.2"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.7.2.tgz#26bc22401b5921686a10fbeba75d124228302304"
+  integrity sha512-oqGbbVcBJkm8QwmnNzrFrWTnudnRZC+1eXikLJl0n4ljcfotgRifpg2a1lKy8jTrc4/d9A/ap1GFq1jDKG7J+Q==
   dependencies:
     icss-utils "^5.1.0"
-    postcss "^8.4.7"
+    postcss "^8.4.18"
     postcss-modules-extract-imports "^3.0.0"
     postcss-modules-local-by-default "^4.0.0"
     postcss-modules-scope "^3.0.0"
     postcss-modules-values "^4.0.0"
     postcss-value-parser "^4.2.0"
-    semver "^7.3.5"
+    semver "^7.3.8"
 
 css-minimizer-webpack-plugin@^3.2.0:
   version "3.4.1"
@@ -4860,58 +4971,49 @@ css-what@^6.0.1:
 css.escape@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz#42e27d4fa04ae32f931a4b4d4191fa9cddee97cb"
-  integrity sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s=
+  integrity sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==
 
-css@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/css/-/css-3.0.0.tgz#4447a4d58fdd03367c516ca9f64ae365cee4aa5d"
-  integrity sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==
-  dependencies:
-    inherits "^2.0.4"
-    source-map "^0.6.1"
-    source-map-resolve "^0.6.0"
-
-cssdb@^6.5.0:
-  version "6.5.0"
-  resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-6.5.0.tgz#61264b71f29c834f09b59cb3e5b43c8226590122"
-  integrity sha512-Rh7AAopF2ckPXe/VBcoUS9JrCZNSyc60+KpgE6X25vpVxA32TmiqvExjkfhwP4wGSb6Xe8Z/JIyGqwgx/zZYFA==
+cssdb@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-7.1.0.tgz#574f97235a83eb753a29f0b1f2cbacac0d628bb8"
+  integrity sha512-Sd99PrFgx28ez4GHu8yoQIufc/70h9oYowDf4EjeIKi8mac9whxRjhM3IaMr6EllP6KKKWtJrMfN6C7T9tIWvQ==
 
 cssesc@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
-cssnano-preset-default@^5.2.7:
-  version "5.2.7"
-  resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.2.7.tgz#791e3603fb8f1b46717ac53b47e3c418e950f5f3"
-  integrity sha512-JiKP38ymZQK+zVKevphPzNSGHSlTI+AOwlasoSRtSVMUU285O7/6uZyd5NbW92ZHp41m0sSHe6JoZosakj63uA==
+cssnano-preset-default@^5.2.13:
+  version "5.2.13"
+  resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.2.13.tgz#e7353b0c57975d1bdd97ac96e68e5c1b8c68e990"
+  integrity sha512-PX7sQ4Pb+UtOWuz8A1d+Rbi+WimBIxJTRyBdgGp1J75VU0r/HFQeLnMYgHiCAp6AR4rqrc7Y4R+1Rjk3KJz6DQ==
   dependencies:
-    css-declaration-sorter "^6.2.2"
+    css-declaration-sorter "^6.3.1"
     cssnano-utils "^3.1.0"
     postcss-calc "^8.2.3"
     postcss-colormin "^5.3.0"
-    postcss-convert-values "^5.1.0"
-    postcss-discard-comments "^5.1.1"
+    postcss-convert-values "^5.1.3"
+    postcss-discard-comments "^5.1.2"
     postcss-discard-duplicates "^5.1.0"
     postcss-discard-empty "^5.1.1"
     postcss-discard-overridden "^5.1.0"
-    postcss-merge-longhand "^5.1.4"
-    postcss-merge-rules "^5.1.1"
+    postcss-merge-longhand "^5.1.7"
+    postcss-merge-rules "^5.1.3"
     postcss-minify-font-values "^5.1.0"
     postcss-minify-gradients "^5.1.1"
-    postcss-minify-params "^5.1.2"
-    postcss-minify-selectors "^5.2.0"
+    postcss-minify-params "^5.1.4"
+    postcss-minify-selectors "^5.2.1"
     postcss-normalize-charset "^5.1.0"
     postcss-normalize-display-values "^5.1.0"
-    postcss-normalize-positions "^5.1.0"
-    postcss-normalize-repeat-style "^5.1.0"
+    postcss-normalize-positions "^5.1.1"
+    postcss-normalize-repeat-style "^5.1.1"
     postcss-normalize-string "^5.1.0"
     postcss-normalize-timing-functions "^5.1.0"
-    postcss-normalize-unicode "^5.1.0"
+    postcss-normalize-unicode "^5.1.1"
     postcss-normalize-url "^5.1.0"
     postcss-normalize-whitespace "^5.1.1"
-    postcss-ordered-values "^5.1.1"
-    postcss-reduce-initial "^5.1.0"
+    postcss-ordered-values "^5.1.3"
+    postcss-reduce-initial "^5.1.1"
     postcss-reduce-transforms "^5.1.0"
     postcss-svgo "^5.1.0"
     postcss-unique-selectors "^5.1.1"
@@ -4922,11 +5024,11 @@ cssnano-utils@^3.1.0:
   integrity sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==
 
 cssnano@^5.0.6:
-  version "5.1.7"
-  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.7.tgz#99858bef6c76c9240f0cdc9239570bc7db8368be"
-  integrity sha512-pVsUV6LcTXif7lvKKW9ZrmX+rGRzxkEdJuVJcp5ftUjWITgwam5LMZOgaTvUrWPkcORBey6he7JKb4XAJvrpKg==
+  version "5.1.14"
+  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.14.tgz#07b0af6da73641276fe5a6d45757702ebae2eb05"
+  integrity sha512-Oou7ihiTocbKqi0J1bB+TRJIQX5RMR3JghA8hcWSw9mjBLQ5Y3RWqEDoYG3sRNlAbCIXpqMoZGbq5KDR3vdzgw==
   dependencies:
-    cssnano-preset-default "^5.2.7"
+    cssnano-preset-default "^5.2.13"
     lilconfig "^2.0.3"
     yaml "^1.10.2"
 
@@ -4954,17 +5056,17 @@ cssstyle@^2.3.0:
   dependencies:
     cssom "~0.3.6"
 
-csstype@^3.0.11, csstype@^3.0.2, csstype@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.0.tgz#4ddcac3718d787cf9df0d1b7d15033925c8f29f2"
-  integrity sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA==
+csstype@^3.0.2, csstype@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.1.tgz#841b532c45c758ee546a11d5bd7b7b473c8c30b9"
+  integrity sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==
 
 csv-parse@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/csv-parse/-/csv-parse-5.1.0.tgz#e587e969bf0385ecf4f36f584ed5ddebba0237ab"
-  integrity sha512-JL+Q6YEikT2uoe57InjFFa6VejhSv0tDwOxeQ1bVQKeUC/NCnLAAZ8n3PzowPQQLuZ37fysDYZipB2UJkH9C6A==
+  version "5.3.3"
+  resolved "https://registry.yarnpkg.com/csv-parse/-/csv-parse-5.3.3.tgz#3b75d2279e2edb550cbc54c65b25cbbf3d0033ad"
+  integrity sha512-kEWkAPleNEdhFNkHQpFHu9RYPogsFj3dx6bCxL847fsiLgidzWg0z/O0B1kVWMJUc5ky64zGp18LX2T3DQrOfw==
 
-damerau-levenshtein@^1.0.7:
+damerau-levenshtein@^1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7"
   integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==
@@ -4979,9 +5081,9 @@ data-urls@^2.0.0:
     whatwg-url "^8.0.0"
 
 date-fns@^2.22.1, date-fns@^2.28.0:
-  version "2.28.0"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.28.0.tgz#9570d656f5fc13143e50c975a3b6bbeb46cd08b2"
-  integrity sha512-8d35hViGYx/QH0icHYCeLmsLmMUheMmTyV9Fcm6gvNwdw31yXXH+O85sOBJ+OLnLQMKZowvpKb6FgMIQjcpvQw==
+  version "2.29.3"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8"
+  integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==
 
 debug@2.6.9, debug@^2.6.0, debug@^2.6.9:
   version "2.6.9"
@@ -4990,14 +5092,14 @@ debug@2.6.9, debug@^2.6.0, debug@^2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3:
+debug@4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
   dependencies:
     ms "2.1.2"
 
-debug@^3.1.1, debug@^3.2.7:
+debug@^3.2.7:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
   integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
@@ -5005,31 +5107,47 @@ debug@^3.1.1, debug@^3.2.7:
     ms "^2.1.1"
 
 decimal.js@^10.2.1:
-  version "10.3.1"
-  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783"
-  integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==
+  version "10.4.2"
+  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.2.tgz#0341651d1d997d86065a2ce3a441fbd0d8e8b98e"
+  integrity sha512-ic1yEvwT6GuvaYwBLLY6/aFFgjZdySKTE8en/fkU3QICTmRtgtSlFn0u0BXN06InZwtfCelR7j8LRiDI/02iGA==
 
 decode-named-character-reference@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/decode-named-character-reference/-/decode-named-character-reference-1.0.1.tgz#57b2bd9112659cacbc449d3577d7dadb8e1f3d1b"
-  integrity sha512-YV/0HQHreRwKb7uBopyIkLG17jG6Sv2qUchk9qSoVJ2f+flwRsPNBO0hAnjt6mTNYUT+vw9Gy2ihXg4sUWPi2w==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/decode-named-character-reference/-/decode-named-character-reference-1.0.2.tgz#daabac9690874c394c81e4162a0304b35d824f0e"
+  integrity sha512-O8x12RzrUF8xyVcY0KJowWsmaJxQbmy0/EtnNtHRpsOcT7dFk5W598coHqBVpmWo1oQQfsCqfCmkZN5DJrZVdg==
   dependencies:
     character-entities "^2.0.0"
 
-decode-uri-component@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
-  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
-
 dedent@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
-  integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=
+  integrity sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==
+
+deep-equal@^2.0.5:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.1.0.tgz#5ba60402cf44ab92c2c07f3f3312c3d857a0e1dd"
+  integrity sha512-2pxgvWu3Alv1PoWEyVg7HS8YhGlUFUV7N5oOvfL6d+7xAmLSemMwv/c8Zv/i9KFzxV5Kt5CAvQc70fLwVuf4UA==
+  dependencies:
+    call-bind "^1.0.2"
+    es-get-iterator "^1.1.2"
+    get-intrinsic "^1.1.3"
+    is-arguments "^1.1.1"
+    is-date-object "^1.0.5"
+    is-regex "^1.1.4"
+    isarray "^2.0.5"
+    object-is "^1.1.5"
+    object-keys "^1.1.1"
+    object.assign "^4.1.4"
+    regexp.prototype.flags "^1.4.3"
+    side-channel "^1.0.4"
+    which-boxed-primitive "^1.0.2"
+    which-collection "^1.0.1"
+    which-typed-array "^1.1.8"
 
 deep-is@^0.1.3, deep-is@~0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
-  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
+  integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
 deepmerge@^4.2.2:
   version "4.2.2"
@@ -5048,37 +5166,43 @@ define-lazy-prop@^2.0.0:
   resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
   integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==
 
-define-properties@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
-  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
+define-properties@^1.1.3, define-properties@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1"
+  integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==
   dependencies:
-    object-keys "^1.0.12"
+    has-property-descriptors "^1.0.0"
+    object-keys "^1.1.1"
 
 defined@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
-  integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.1.tgz#c0b9db27bfaffd95d6f61399419b893df0f91ebf"
+  integrity sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==
 
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
+  integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
+
+depd@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
+  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
 
 depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
-  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
+  integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==
 
 dequal@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.2.tgz#85ca22025e3a87e65ef75a7a437b35284a7e319d"
-  integrity sha512-q9K8BlJVxK7hQYqa6XISGmBZbtQQWVXSrRrWreHC94rMt1QL/Impruc+7p2CYSYuVIUr+YCt6hjrs1kkdJRTug==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be"
+  integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==
 
-destroy@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
-  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
+destroy@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
+  integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
 
 detect-newline@^3.0.0:
   version "3.1.0"
@@ -5086,9 +5210,9 @@ detect-newline@^3.0.0:
   integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
 
 detect-node@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
-  integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
+  integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
 
 detect-port-alt@^1.1.6:
   version "1.1.6"
@@ -5098,14 +5222,14 @@ detect-port-alt@^1.1.6:
     address "^1.0.1"
     debug "^2.6.0"
 
-detective@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/detective/-/detective-5.2.0.tgz#feb2a77e85b904ecdea459ad897cc90a99bd2a7b"
-  integrity sha512-6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg==
+detective@^5.2.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/detective/-/detective-5.2.1.tgz#6af01eeda11015acb0e73f933242b70f24f91034"
+  integrity sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw==
   dependencies:
-    acorn-node "^1.6.1"
+    acorn-node "^1.8.2"
     defined "^1.0.0"
-    minimist "^1.1.1"
+    minimist "^1.2.6"
 
 dialog-polyfill@^0.4.7:
   version "0.4.10"
@@ -5122,15 +5246,20 @@ diff-sequences@^27.5.1:
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.5.1.tgz#eaecc0d327fd68c8d9672a1e64ab8dccb2ef5327"
   integrity sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==
 
+diff-sequences@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.3.1.tgz#104b5b95fe725932421a9c6e5b4bef84c3f2249e"
+  integrity sha512-hlM3QR272NXCi4pq+N4Kok4kOp6EsgOM3ZSpJI7Da3UAs+Ttsi8MRmB6trM/lhyzUxGfOgnpkHtgqm5Q/CTcfQ==
+
 diff@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
   integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
 
 diff@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b"
-  integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-5.1.0.tgz#bc52d298c5ea8df9194800224445ed43ffc87e40"
+  integrity sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==
 
 dir-glob@^3.0.1:
   version "3.0.1"
@@ -5170,12 +5299,12 @@ dnd-core@^16.0.1:
 dns-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
-  integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
+  integrity sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==
 
 dns-packet@^5.2.2:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.3.1.tgz#eb94413789daec0f0ebe2fcc230bdc9d7c91b43d"
-  integrity sha512-spBwIj0TK0Ey3666GwIdWVfUpLyubpU53BTCu8iPn4r4oXd9O14Hjg3EHw3ts2oed77/SeckunUYCyRlSngqHw==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.4.0.tgz#1f88477cf9f27e78a213fb6d118ae38e759a879b"
+  integrity sha512-EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g==
   dependencies:
     "@leichtgewicht/ip-codec" "^2.0.1"
 
@@ -5222,9 +5351,9 @@ dom-serializer@0:
     entities "^2.0.0"
 
 dom-serializer@^1.0.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91"
-  integrity sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30"
+  integrity sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==
   dependencies:
     domelementtype "^2.0.1"
     domhandler "^4.2.0"
@@ -5255,9 +5384,9 @@ domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.1:
     domelementtype "^2.2.0"
 
 dompurify@^2.2.9, dompurify@^2.3.6:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.6.tgz#2e019d7d7617aacac07cbbe3d88ae3ad354cf875"
-  integrity sha512-OFP2u/3T1R5CEgWCEONuJ1a5+MFKnOYpkywpUSxv/dj1LeBT1erK+JwM7zK0ROy2BRhqVCf0LRw/kHqKuMkVGg==
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.4.1.tgz#f9cb1a275fde9af6f2d0a2644ef648dd6847b631"
+  integrity sha512-ewwFzHzrrneRjxzmK6oVz/rZn9VWspGFRDb4/rRtIsM1n36t9AKma/ye8syCpcw+XJ25kOK/hOG7t1j2I2yBqA==
 
 domutils@^1.7.0:
   version "1.7.0"
@@ -5297,7 +5426,7 @@ dotenv@^10.0.0:
 duplexer2@~0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
-  integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=
+  integrity sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==
   dependencies:
     readable-stream "^2.0.2"
 
@@ -5314,7 +5443,7 @@ eastasianwidth@^0.2.0:
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
-  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
+  integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
 ejs@^3.1.5, ejs@^3.1.6:
   version "3.1.8"
@@ -5323,10 +5452,15 @@ ejs@^3.1.5, ejs@^3.1.6:
   dependencies:
     jake "^10.8.5"
 
-electron-to-chromium@^1.4.84:
-  version "1.4.106"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.106.tgz#e7a3bfa9d745dd9b9e597616cb17283cc349781a"
-  integrity sha512-ZYfpVLULm67K7CaaGP7DmjyeMY4naxsbTy+syVVxT6QHI1Ww8XbJjmr9fDckrhq44WzCrcC5kH3zGpdusxwwqg==
+electron-to-chromium@^1.4.251:
+  version "1.4.284"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592"
+  integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==
+
+emittery@^0.10.2:
+  version "0.10.2"
+  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.10.2.tgz#902eec8aedb8c41938c46e9385e9db7e03182933"
+  integrity sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==
 
 emittery@^0.8.1:
   version "0.8.1"
@@ -5351,7 +5485,7 @@ emojis-list@^3.0.0:
 encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
-  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
+  integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
 
 encoding@^0.1.11:
   version "0.1.13"
@@ -5360,10 +5494,10 @@ encoding@^0.1.11:
   dependencies:
     iconv-lite "^0.6.2"
 
-enhanced-resolve@^5.9.2:
-  version "5.9.2"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.9.2.tgz#0224dcd6a43389ebfb2d55efee517e5466772dd9"
-  integrity sha512-GIm3fQfwLJ8YZx2smuHpBKkXC1yOk+OBEmKckVyL0i/ea8mqDEykK3ld5dgH1QYPNyT/lIllxV2LULnxCHaHkA==
+enhanced-resolve@^5.10.0:
+  version "5.12.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz#300e1c90228f5b570c4d35babf263f6da7155634"
+  integrity sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==
   dependencies:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
@@ -5381,43 +5515,73 @@ error-ex@^1.3.1:
     is-arrayish "^0.2.1"
 
 error-stack-parser@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.6.tgz#5a99a707bd7a4c58a797902d48d82803ede6aad8"
-  integrity sha512-d51brTeqC+BHlwF0BhPtcYgF5nlzf9ZZ0ZIUQNZpc9ZB9qw5IJ2diTrBY9jlCJkTLITYPjmiX6OWCwH+fuyNgQ==
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.1.4.tgz#229cb01cdbfa84440bfa91876285b94680188286"
+  integrity sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==
   dependencies:
-    stackframe "^1.1.1"
+    stackframe "^1.3.4"
 
-es-abstract@^1.17.2, es-abstract@^1.18.0-next.2, es-abstract@^1.19.0, es-abstract@^1.19.1:
-  version "1.19.2"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.2.tgz#8f7b696d8f15b167ae3640b4060670f3d054143f"
-  integrity sha512-gfSBJoZdlL2xRiOCy0g8gLMryhoe1TlimjzU99L/31Z8QEGIhVQI+EWwt5lT+AuU9SnorVupXFqqOGqGfsyO6w==
+es-abstract@^1.17.2, es-abstract@^1.19.0, es-abstract@^1.20.4:
+  version "1.20.4"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.4.tgz#1d103f9f8d78d4cf0713edcd6d0ed1a46eed5861"
+  integrity sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==
   dependencies:
     call-bind "^1.0.2"
     es-to-primitive "^1.2.1"
     function-bind "^1.1.1"
-    get-intrinsic "^1.1.1"
+    function.prototype.name "^1.1.5"
+    get-intrinsic "^1.1.3"
     get-symbol-description "^1.0.0"
     has "^1.0.3"
+    has-property-descriptors "^1.0.0"
     has-symbols "^1.0.3"
     internal-slot "^1.0.3"
-    is-callable "^1.2.4"
+    is-callable "^1.2.7"
     is-negative-zero "^2.0.2"
     is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.1"
+    is-shared-array-buffer "^1.0.2"
     is-string "^1.0.7"
     is-weakref "^1.0.2"
-    object-inspect "^1.12.0"
+    object-inspect "^1.12.2"
     object-keys "^1.1.1"
-    object.assign "^4.1.2"
-    string.prototype.trimend "^1.0.4"
-    string.prototype.trimstart "^1.0.4"
-    unbox-primitive "^1.0.1"
+    object.assign "^4.1.4"
+    regexp.prototype.flags "^1.4.3"
+    safe-regex-test "^1.0.0"
+    string.prototype.trimend "^1.0.5"
+    string.prototype.trimstart "^1.0.5"
+    unbox-primitive "^1.0.2"
+
+es-array-method-boxes-properly@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e"
+  integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==
+
+es-get-iterator@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.2.tgz#9234c54aba713486d7ebde0220864af5e2b283f7"
+  integrity sha512-+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.1.0"
+    has-symbols "^1.0.1"
+    is-arguments "^1.1.0"
+    is-map "^2.0.2"
+    is-set "^2.0.2"
+    is-string "^1.0.5"
+    isarray "^2.0.5"
 
 es-module-lexer@^0.9.0:
   version "0.9.3"
   resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19"
   integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==
 
+es-shim-unscopables@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241"
+  integrity sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==
+  dependencies:
+    has "^1.0.3"
+
 es-to-primitive@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
@@ -5440,12 +5604,12 @@ escape-carriage@^1.3.0:
 escape-html@^1.0.3, escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
-  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
+  integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==
 
 escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+  integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
 
 escape-string-regexp@^2.0.0:
   version "2.0.0"
@@ -5503,10 +5667,10 @@ eslint-config-prettier@^8.5.0:
   resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1"
   integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==
 
-eslint-config-react-app@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-7.0.0.tgz#0fa96d5ec1dfb99c029b1554362ab3fa1c3757df"
-  integrity sha512-xyymoxtIt1EOsSaGag+/jmcywRuieQoA2JbPCjnw9HukFj9/97aGPoZVFioaotzk1K5Qt9sHO5EutZbkrAXS0g==
+eslint-config-react-app@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-7.0.1.tgz#73ba3929978001c5c86274c017ea57eb5fa644b4"
+  integrity sha512-K6rNzvkIeHaTd8m/QEh1Zko0KI7BACWkkneSs6s9cKZC/J27X3eZR6Upt1jkmZ/4FK+XUOPPxMEN7+lbUXfSlA==
   dependencies:
     "@babel/core" "^7.16.0"
     "@babel/eslint-parser" "^7.16.3"
@@ -5532,12 +5696,11 @@ eslint-import-resolver-node@^0.3.6:
     resolve "^1.20.0"
 
 eslint-module-utils@^2.7.3:
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz#ad7e3a10552fdd0642e1e55292781bd6e34876ee"
-  integrity sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz#4f3e41116aaf13a20792261e61d3a2e7e0583974"
+  integrity sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==
   dependencies:
     debug "^3.2.7"
-    find-up "^2.1.0"
 
 eslint-plugin-flowtype@^8.0.3:
   version "8.0.3"
@@ -5574,72 +5737,74 @@ eslint-plugin-jest@^25.3.0:
     "@typescript-eslint/experimental-utils" "^5.0.0"
 
 eslint-plugin-jsx-a11y@^6.5.1:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.5.1.tgz#cdbf2df901040ca140b6ec14715c988889c2a6d8"
-  integrity sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g==
+  version "6.6.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.6.1.tgz#93736fc91b83fdc38cc8d115deedfc3091aef1ff"
+  integrity sha512-sXgFVNHiWffBq23uiS/JaP6eVR622DqwB4yTzKvGZGcPq6/yZ3WmOZfuBks/vHWo9GaFOqC2ZK4i6+C35knx7Q==
   dependencies:
-    "@babel/runtime" "^7.16.3"
+    "@babel/runtime" "^7.18.9"
     aria-query "^4.2.2"
-    array-includes "^3.1.4"
+    array-includes "^3.1.5"
     ast-types-flow "^0.0.7"
-    axe-core "^4.3.5"
+    axe-core "^4.4.3"
     axobject-query "^2.2.0"
-    damerau-levenshtein "^1.0.7"
+    damerau-levenshtein "^1.0.8"
     emoji-regex "^9.2.2"
     has "^1.0.3"
-    jsx-ast-utils "^3.2.1"
+    jsx-ast-utils "^3.3.2"
     language-tags "^1.0.5"
-    minimatch "^3.0.4"
+    minimatch "^3.1.2"
+    semver "^6.3.0"
 
 eslint-plugin-local-rules@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-local-rules/-/eslint-plugin-local-rules-1.1.0.tgz#5f934f685b08c96eed40b92aee7b02f03cf55f7b"
-  integrity sha512-FdPyzxakUKgZkeNM3x/vvRcB6nCjTNbui5gWALhvcaH1R6aCiD37fWtdesagcyBpEe9S9XRHAJ8CJ4rUJ3K9tQ==
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-local-rules/-/eslint-plugin-local-rules-1.3.2.tgz#b9c9522915faeb9e430309fb909fc1dbcd7aedb3"
+  integrity sha512-X4ziX+cjlCYnZa+GB1ly3mmj44v2PeIld3tQVAxelY6AMrhHSjz6zsgsT6nt0+X5b7eZnvL/O7Q3pSSK2kF/+Q==
 
 eslint-plugin-no-relative-import-paths@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-no-relative-import-paths/-/eslint-plugin-no-relative-import-paths-1.2.0.tgz#ae969752ae910f4a92f7d3f467076e3cb19c6acf"
-  integrity sha512-UQiGNGU8Jite02FLMgB0J1Cg4D9GwpeDPvJo6x1++eKqqghNGRyFA68WVx6p6KjD9THDaenXnDOj/1YAobQ5Ag==
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-no-relative-import-paths/-/eslint-plugin-no-relative-import-paths-1.5.0.tgz#d277fd4d9644e2405cea32541af3bfbde00f02e9"
+  integrity sha512-4if/PGGzpSP+DfOscGZ2nYd8XObc5rN9Ux5lhDzAVqLEaz8XD3ikzApSogXBdf+lnpTsTE5LJSqXFmFpNkZ3LQ==
 
 eslint-plugin-react-hooks@^4.3.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.4.0.tgz#71c39e528764c848d8253e1aa2c7024ed505f6c4"
-  integrity sha512-U3RVIfdzJaeKDQKEJbz5p3NW8/L80PCATJAfuojwbaEL+gBjfGdhUcGde+WGUW46Q5sr/NgxevsIiDtNXrvZaQ==
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz#4c3e697ad95b77e93f8646aaa1630c1ba607edd3"
+  integrity sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==
 
 eslint-plugin-react@^7.27.1:
-  version "7.29.4"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.29.4.tgz#4717de5227f55f3801a5fd51a16a4fa22b5914d2"
-  integrity sha512-CVCXajliVh509PcZYRFyu/BoUEz452+jtQJq2b3Bae4v3xBUWPLCmtmBM+ZinG4MzwmxJgJ2M5rMqhqLVn7MtQ==
+  version "7.31.11"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.31.11.tgz#011521d2b16dcf95795df688a4770b4eaab364c8"
+  integrity sha512-TTvq5JsT5v56wPa9OYHzsrOlHzKZKjV+aLgS+55NJP/cuzdiQPC7PfYoUjMoxlffKtvijpk7vA/jmuqRb9nohw==
   dependencies:
-    array-includes "^3.1.4"
-    array.prototype.flatmap "^1.2.5"
+    array-includes "^3.1.6"
+    array.prototype.flatmap "^1.3.1"
+    array.prototype.tosorted "^1.1.1"
     doctrine "^2.1.0"
     estraverse "^5.3.0"
     jsx-ast-utils "^2.4.1 || ^3.0.0"
     minimatch "^3.1.2"
-    object.entries "^1.1.5"
-    object.fromentries "^2.0.5"
-    object.hasown "^1.1.0"
-    object.values "^1.1.5"
+    object.entries "^1.1.6"
+    object.fromentries "^2.0.6"
+    object.hasown "^1.1.2"
+    object.values "^1.1.6"
     prop-types "^15.8.1"
     resolve "^2.0.0-next.3"
     semver "^6.3.0"
-    string.prototype.matchall "^4.0.6"
+    string.prototype.matchall "^4.0.8"
 
 eslint-plugin-testing-library@^5.0.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.2.1.tgz#3f89cd28ade81329a11584e0bbea129bede01619"
-  integrity sha512-88qJv6uzYALtiYJDzhelP3ov0Px/GLgnu+UekjjDxL2nMyvgdTyboKqcDBsvFPmAeizlCoSWOjeBN4DxO0BxaA==
+  version "5.9.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.9.1.tgz#12e4bd34c48683ee98af4df2e3318ec9f51dcf8a"
+  integrity sha512-6BQp3tmb79jLLasPHJmy8DnxREe+2Pgf7L+7o09TSWPfdqqtQfRZmZNetr5mOs3yqZk/MRNxpN3RUpJe0wB4LQ==
   dependencies:
     "@typescript-eslint/utils" "^5.13.0"
 
 eslint-plugin-tsdoc@^0.2.16:
-  version "0.2.16"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-tsdoc/-/eslint-plugin-tsdoc-0.2.16.tgz#a3d31fb9c7955faa3c66a43dd43da7635f1c5e0d"
-  integrity sha512-F/RWMnyDQuGlg82vQEFHQtGyWi7++XJKdYNn0ulIbyMOFqYIjoJOUdE6olORxgwgLkpJxsCJpJbTHgxJ/ggfXw==
+  version "0.2.17"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-tsdoc/-/eslint-plugin-tsdoc-0.2.17.tgz#27789495bbd8778abbf92db1707fec2ed3dfe281"
+  integrity sha512-xRmVi7Zx44lOBuYqG8vzTXuL6IdGOeF9nHX17bjJ8+VE6fsxpdGem0/SBTmAwgYMKYB1WBkqRJVQ+n8GK041pA==
   dependencies:
-    "@microsoft/tsdoc" "0.14.1"
-    "@microsoft/tsdoc-config" "0.16.1"
+    "@microsoft/tsdoc" "0.14.2"
+    "@microsoft/tsdoc-config" "0.16.2"
 
 eslint-scope@5.1.1, eslint-scope@^5.1.1:
   version "5.1.1"
@@ -5669,29 +5834,31 @@ eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
   integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
-eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.3.0:
+eslint-visitor-keys@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
   integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
 
 eslint-webpack-plugin@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-webpack-plugin/-/eslint-webpack-plugin-3.1.1.tgz#83dad2395e5f572d6f4d919eedaa9cf902890fcb"
-  integrity sha512-xSucskTN9tOkfW7so4EaiFIkulWLXwCB/15H917lR6pTv0Zot6/fetFucmENRb7J5whVSFKIvwnrnsa78SG2yg==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-webpack-plugin/-/eslint-webpack-plugin-3.2.0.tgz#1978cdb9edc461e4b0195a20da950cf57988347c"
+  integrity sha512-avrKcGncpPbPSUHX6B3stNGzkKFto3eL+DKM4+VyMrVnhPc3vRczVlCq3uhuFOdRvDHTVXuzwk1ZKUrqDQHQ9w==
   dependencies:
-    "@types/eslint" "^7.28.2"
-    jest-worker "^27.3.1"
-    micromatch "^4.0.4"
+    "@types/eslint" "^7.29.0 || ^8.4.1"
+    jest-worker "^28.0.2"
+    micromatch "^4.0.5"
     normalize-path "^3.0.0"
-    schema-utils "^3.1.1"
+    schema-utils "^4.0.0"
 
-eslint@^8.12.0, eslint@^8.3.0:
-  version "8.12.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.12.0.tgz#c7a5bd1cfa09079aae64c9076c07eada66a46e8e"
-  integrity sha512-it1oBL9alZg1S8UycLm5YDMAkIhtH6FtAzuZs6YvoGVldWjbS08BkAdb/ymP9LlAyq8koANu32U7Ib/w+UNh8Q==
+eslint@^8.28.0, eslint@^8.3.0:
+  version "8.28.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.28.0.tgz#81a680732634677cc890134bcdd9fdfea8e63d6e"
+  integrity sha512-S27Di+EVyMxcHiwDrFzk8dJYAaD+/5SoWKxL1ri/71CRHsnJnRDPNt2Kzj24+MT9FDupf4aqqyqPrvI8MvQ4VQ==
   dependencies:
-    "@eslint/eslintrc" "^1.2.1"
-    "@humanwhocodes/config-array" "^0.9.2"
+    "@eslint/eslintrc" "^1.3.3"
+    "@humanwhocodes/config-array" "^0.11.6"
+    "@humanwhocodes/module-importer" "^1.0.1"
+    "@nodelib/fs.walk" "^1.2.8"
     ajv "^6.10.0"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
@@ -5701,44 +5868,46 @@ eslint@^8.12.0, eslint@^8.3.0:
     eslint-scope "^7.1.1"
     eslint-utils "^3.0.0"
     eslint-visitor-keys "^3.3.0"
-    espree "^9.3.1"
+    espree "^9.4.0"
     esquery "^1.4.0"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
     file-entry-cache "^6.0.1"
-    functional-red-black-tree "^1.0.1"
-    glob-parent "^6.0.1"
-    globals "^13.6.0"
+    find-up "^5.0.0"
+    glob-parent "^6.0.2"
+    globals "^13.15.0"
+    grapheme-splitter "^1.0.4"
     ignore "^5.2.0"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
+    is-path-inside "^3.0.3"
+    js-sdsl "^4.1.4"
     js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
     lodash.merge "^4.6.2"
-    minimatch "^3.0.4"
+    minimatch "^3.1.2"
     natural-compare "^1.4.0"
     optionator "^0.9.1"
     regexpp "^3.2.0"
     strip-ansi "^6.0.1"
     strip-json-comments "^3.1.0"
     text-table "^0.2.0"
-    v8-compile-cache "^2.0.3"
 
-espree@^9.3.1:
-  version "9.3.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.1.tgz#8793b4bc27ea4c778c19908e0719e7b8f4115bcd"
-  integrity sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ==
+espree@^9.4.0:
+  version "9.4.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.1.tgz#51d6092615567a2c2cff7833445e37c28c0065bd"
+  integrity sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==
   dependencies:
-    acorn "^8.7.0"
-    acorn-jsx "^5.3.1"
+    acorn "^8.8.0"
+    acorn-jsx "^5.3.2"
     eslint-visitor-keys "^3.3.0"
 
 esprima@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
-  integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=
+  integrity sha512-AWwVMNxwhN8+NIPQzAQZCm7RkLC4RbM3B1OobMuyp3i+w73X57KCKaVIxaRZb+DYCojq7rspo+fmuQfAboyhFg==
 
 esprima@^4.0.0, esprima@^4.0.1:
   version "4.0.1"
@@ -5782,7 +5951,7 @@ esutils@^2.0.2:
 etag@~1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
-  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
+  integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==
 
 eventemitter3@^4.0.0:
   version "4.0.7"
@@ -5794,7 +5963,7 @@ events@^3.2.0:
   resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
   integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
 
-execa@^5.0.0, execa@^5.1.1:
+execa@^5.0.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
   integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
@@ -5809,10 +5978,25 @@ execa@^5.0.0, execa@^5.1.1:
     signal-exit "^3.0.3"
     strip-final-newline "^2.0.0"
 
+execa@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-6.1.0.tgz#cea16dee211ff011246556388effa0818394fb20"
+  integrity sha512-QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA==
+  dependencies:
+    cross-spawn "^7.0.3"
+    get-stream "^6.0.1"
+    human-signals "^3.0.1"
+    is-stream "^3.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^5.1.0"
+    onetime "^6.0.0"
+    signal-exit "^3.0.7"
+    strip-final-newline "^3.0.0"
+
 exit@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
-  integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
+  integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==
 
 expect@^27.5.1:
   version "27.5.1"
@@ -5824,38 +6008,50 @@ expect@^27.5.1:
     jest-matcher-utils "^27.5.1"
     jest-message-util "^27.5.1"
 
+expect@^29.0.0:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-29.3.1.tgz#92877aad3f7deefc2e3f6430dd195b92295554a6"
+  integrity sha512-gGb1yTgU30Q0O/tQq+z30KBWv24ApkMgFUpvKBkyLUBL68Wv8dHdJxTBZFl/iT8K/bqDHvUYRH6IIN3rToopPA==
+  dependencies:
+    "@jest/expect-utils" "^29.3.1"
+    jest-get-type "^29.2.0"
+    jest-matcher-utils "^29.3.1"
+    jest-message-util "^29.3.1"
+    jest-util "^29.3.1"
+
 express@^4.17.3:
-  version "4.17.3"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.17.3.tgz#f6c7302194a4fb54271b73a1fe7a06478c8f85a1"
-  integrity sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==
+  version "4.18.2"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59"
+  integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==
   dependencies:
     accepts "~1.3.8"
     array-flatten "1.1.1"
-    body-parser "1.19.2"
+    body-parser "1.20.1"
     content-disposition "0.5.4"
     content-type "~1.0.4"
-    cookie "0.4.2"
+    cookie "0.5.0"
     cookie-signature "1.0.6"
     debug "2.6.9"
-    depd "~1.1.2"
+    depd "2.0.0"
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
     etag "~1.8.1"
-    finalhandler "~1.1.2"
+    finalhandler "1.2.0"
     fresh "0.5.2"
+    http-errors "2.0.0"
     merge-descriptors "1.0.1"
     methods "~1.1.2"
-    on-finished "~2.3.0"
+    on-finished "2.4.1"
     parseurl "~1.3.3"
     path-to-regexp "0.1.7"
     proxy-addr "~2.0.7"
-    qs "6.9.7"
+    qs "6.11.0"
     range-parser "~1.2.1"
     safe-buffer "5.2.1"
-    send "0.17.2"
-    serve-static "1.14.2"
+    send "0.18.0"
+    serve-static "1.15.0"
     setprototypeof "1.2.0"
-    statuses "~1.5.0"
+    statuses "2.0.1"
     type-is "~1.6.18"
     utils-merge "1.0.1"
     vary "~1.1.2"
@@ -5866,24 +6062,22 @@ extend@^3.0.0:
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
 falafel@^2.1.0:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/falafel/-/falafel-2.2.4.tgz#b5d86c060c2412a43166243cb1bce44d1abd2819"
-  integrity sha512-0HXjo8XASWRmsS0X1EkhwEMZaD3Qvp7FfURwjLKjG1ghfRm/MGZl2r4cWUTv41KdNghTw4OUMmVtdGQp3+H+uQ==
+  version "2.2.5"
+  resolved "https://registry.yarnpkg.com/falafel/-/falafel-2.2.5.tgz#3ccb4970a09b094e9e54fead2deee64b4a589d56"
+  integrity sha512-HuC1qF9iTnHDnML9YZAdCDQwT0yKl/U55K4XSUXqGAA2GLoafFgWRqdAbhWJxXaYD4pyoVxAJ8wH670jMpI9DQ==
   dependencies:
     acorn "^7.1.1"
-    foreach "^2.0.5"
     isarray "^2.0.1"
-    object-keys "^1.0.6"
 
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-fast-glob@^3.2.11, fast-glob@^3.2.9:
-  version "3.2.11"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9"
-  integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==
+fast-glob@^3.2.12, fast-glob@^3.2.9:
+  version "3.2.12"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
+  integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
     "@nodelib/fs.walk" "^1.2.3"
@@ -5899,7 +6093,7 @@ fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0, fast-json-sta
 fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
-  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
+  integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
 fastq@^1.6.0:
   version "1.13.0"
@@ -5916,9 +6110,9 @@ faye-websocket@0.11.4, faye-websocket@^0.11.3:
     websocket-driver ">=0.5.1"
 
 fb-watchman@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85"
-  integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.2.tgz#e9524ee6b5c77e9e5001af0f85f3adbb8623255c"
+  integrity sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==
   dependencies:
     bser "2.1.1"
 
@@ -5993,23 +6187,23 @@ fill-range@^7.0.1:
   dependencies:
     to-regex-range "^5.0.1"
 
-finalhandler@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
-  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
+finalhandler@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32"
+  integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==
   dependencies:
     debug "2.6.9"
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
-    on-finished "~2.3.0"
+    on-finished "2.4.1"
     parseurl "~1.3.3"
-    statuses "~1.5.0"
+    statuses "2.0.1"
     unpipe "~1.0.0"
 
 find-cache-dir@^3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880"
-  integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b"
+  integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==
   dependencies:
     commondir "^1.0.1"
     make-dir "^3.0.2"
@@ -6020,13 +6214,6 @@ find-root@^1.1.0:
   resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
   integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==
 
-find-up@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
-  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
-  dependencies:
-    locate-path "^2.0.0"
-
 find-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
@@ -6051,41 +6238,41 @@ find-up@^5.0.0:
     path-exists "^4.0.0"
 
 firebase@^9.12.1:
-  version "9.12.1"
-  resolved "https://registry.yarnpkg.com/firebase/-/firebase-9.12.1.tgz#f2ef2560a3a122bcf82dee09d5ae3a3805bb890a"
-  integrity sha512-sBp4rvkCC7TUnGeneRNs6GVcajO+iSXmYjxqXN4FsrBzldJ5/AOnDXf4bi9OUZtQSl+EHDgUWShBieht15ijgQ==
+  version "9.14.0"
+  resolved "https://registry.yarnpkg.com/firebase/-/firebase-9.14.0.tgz#407de4855092e607d3ee1fb222294ab2b45c4798"
+  integrity sha512-wePrsf7W33mhT7RVXQavragoAgXb/NDm22vuhwJXkprrQ2Y9alrEKC5LTAtLJL3P2dHdDmeylS6PLZwWPEE79A==
   dependencies:
-    "@firebase/analytics" "0.8.3"
-    "@firebase/analytics-compat" "0.1.16"
-    "@firebase/app" "0.8.2"
-    "@firebase/app-check" "0.5.15"
-    "@firebase/app-check-compat" "0.2.15"
-    "@firebase/app-compat" "0.1.37"
-    "@firebase/app-types" "0.8.0"
-    "@firebase/auth" "0.20.10"
-    "@firebase/auth-compat" "0.2.23"
-    "@firebase/database" "0.13.9"
-    "@firebase/database-compat" "0.2.9"
-    "@firebase/firestore" "3.7.1"
-    "@firebase/firestore-compat" "0.2.1"
-    "@firebase/functions" "0.8.7"
-    "@firebase/functions-compat" "0.2.7"
-    "@firebase/installations" "0.5.15"
-    "@firebase/installations-compat" "0.1.15"
-    "@firebase/messaging" "0.9.19"
-    "@firebase/messaging-compat" "0.1.19"
-    "@firebase/performance" "0.5.15"
-    "@firebase/performance-compat" "0.1.15"
-    "@firebase/remote-config" "0.3.14"
-    "@firebase/remote-config-compat" "0.1.15"
-    "@firebase/storage" "0.9.12"
-    "@firebase/storage-compat" "0.1.20"
-    "@firebase/util" "1.7.2"
+    "@firebase/analytics" "0.8.4"
+    "@firebase/analytics-compat" "0.1.17"
+    "@firebase/app" "0.8.4"
+    "@firebase/app-check" "0.5.17"
+    "@firebase/app-check-compat" "0.2.17"
+    "@firebase/app-compat" "0.1.39"
+    "@firebase/app-types" "0.8.1"
+    "@firebase/auth" "0.20.11"
+    "@firebase/auth-compat" "0.2.24"
+    "@firebase/database" "0.13.10"
+    "@firebase/database-compat" "0.2.10"
+    "@firebase/firestore" "3.7.3"
+    "@firebase/firestore-compat" "0.2.3"
+    "@firebase/functions" "0.8.8"
+    "@firebase/functions-compat" "0.2.8"
+    "@firebase/installations" "0.5.16"
+    "@firebase/installations-compat" "0.1.16"
+    "@firebase/messaging" "0.11.0"
+    "@firebase/messaging-compat" "0.1.21"
+    "@firebase/performance" "0.5.17"
+    "@firebase/performance-compat" "0.1.17"
+    "@firebase/remote-config" "0.3.15"
+    "@firebase/remote-config-compat" "0.1.16"
+    "@firebase/storage" "0.9.14"
+    "@firebase/storage-compat" "0.1.22"
+    "@firebase/util" "1.7.3"
 
 firebaseui@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/firebaseui/-/firebaseui-6.0.1.tgz#bdabc69de9c245975a1277d507b2f0ff0044e558"
-  integrity sha512-SMNCFt/xns3mnvd0hImEDu7di5fqRU3MVyIaXpVEfg6v0bH6f3m+YybivU7KElRUT/47DHMn++D8MrZYYnoN5g==
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/firebaseui/-/firebaseui-6.0.2.tgz#14411920e17a7986e2ae969cb4890dfbf94fbfc5"
+  integrity sha512-Jwwn2I657loKrvedeCrwED9UibLFl8Cm0uH2ntDBSCpruWzG4HXlIWb35WsDdXMILRPQjJ1PwVwuRsrnsxcaXA==
   dependencies:
     dialog-polyfill "^0.4.7"
     material-design-lite "^1.2.0"
@@ -6099,9 +6286,9 @@ flat-cache@^3.0.4:
     rimraf "^3.0.2"
 
 flatted@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469"
-  integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"
+  integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
 
 flux@^4.0.1:
   version "4.0.3"
@@ -6112,19 +6299,21 @@ flux@^4.0.1:
     fbjs "^3.0.1"
 
 follow-redirects@^1.0.0:
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.2.tgz#dd73c8effc12728ba5cf4259d760ea5fb83e3147"
-  integrity sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA==
+  version "1.15.2"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
+  integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
 
-foreach@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
-  integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k=
+for-each@^0.3.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
+  integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==
+  dependencies:
+    is-callable "^1.1.3"
 
 fork-ts-checker-webpack-plugin@^6.5.0:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.1.tgz#fd689e2d9de6ac76abb620909eea56438cd0f232"
-  integrity sha512-x1wumpHOEf4gDROmKTaB6i4/Q6H3LwmjVO7fIX47vBwlZbtPjU33hgoMuD/Q/y6SU8bnuYSoN6ZQOLshGp0T/g==
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.2.tgz#4f67183f2f9eb8ba7df7177ce3cf3e75cdafb340"
+  integrity sha512-m5cUmF30xkZ7h4tWUgTAcEaKmUW7tfyUyTqNNOz7OxWJ0v1VWKTcOvH8FWHUwSjlW/356Ijc9vi3XfcPstpQKA==
   dependencies:
     "@babel/code-frame" "^7.8.3"
     "@types/json-schema" "^7.0.5"
@@ -6162,12 +6351,12 @@ fraction.js@^4.2.0:
 fresh@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
-  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
+  integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
 
 fs-extra@^10.0.0:
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.1.tgz#27de43b4320e833f6867cc044bfce29fdf0ef3b8"
-  integrity sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
+  integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
   dependencies:
     graceful-fs "^4.2.0"
     jsonfile "^6.0.1"
@@ -6183,7 +6372,7 @@ fs-extra@^9.0.0, fs-extra@^9.0.1:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
-fs-monkey@1.0.3:
+fs-monkey@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3"
   integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==
@@ -6191,7 +6380,7 @@ fs-monkey@1.0.3:
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
 fsevents@^2.3.2, fsevents@~2.3.2:
   version "2.3.2"
@@ -6203,10 +6392,20 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
-functional-red-black-tree@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
-  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
+function.prototype.name@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621"
+  integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.0"
+    functions-have-names "^1.2.2"
+
+functions-have-names@^1.2.2:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
+  integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
@@ -6218,14 +6417,14 @@ get-caller-file@^2.0.5:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
-  integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385"
+  integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==
   dependencies:
     function-bind "^1.1.1"
     has "^1.0.3"
-    has-symbols "^1.0.1"
+    has-symbols "^1.0.3"
 
 get-own-enumerable-property-symbols@^3.0.0:
   version "3.0.2"
@@ -6237,7 +6436,7 @@ get-package-type@^0.1.0:
   resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
   integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
 
-get-stream@^6.0.0:
+get-stream@^6.0.0, get-stream@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
   integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
@@ -6251,9 +6450,9 @@ get-symbol-description@^1.0.0:
     get-intrinsic "^1.1.1"
 
 github-slugger@^1.1.1:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.4.0.tgz#206eb96cdb22ee56fdc53a28d5a302338463444e"
-  integrity sha512-w0dzqw/nt51xMVmlaV1+JRzN+oCa1KfcgGEWhxUG16wbdA+Xnt/yoFO8Z8x/V82ZcZ0wy6ln9QDup5avbhiDhQ==
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.5.0.tgz#17891bbc73232051474d68bd867a34625c955f7d"
+  integrity sha512-wIh+gKBI9Nshz2o46B0B3f5k/W+WI9ZAv6y5Dn5WJ5SK1t0TnDimB4WE5rmTD05ZAIn8HALCZVmCsvj0w0v0lw==
 
 glob-parent@^5.1.2, glob-parent@~5.1.2:
   version "5.1.2"
@@ -6262,7 +6461,7 @@ glob-parent@^5.1.2, glob-parent@~5.1.2:
   dependencies:
     is-glob "^4.0.1"
 
-glob-parent@^6.0.1, glob-parent@^6.0.2:
+glob-parent@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
   integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
@@ -6275,14 +6474,14 @@ glob-to-regexp@^0.4.1:
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
 glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
-  version "7.1.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
-  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
+  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
     inherits "2"
-    minimatch "^3.0.4"
+    minimatch "^3.1.1"
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
@@ -6307,14 +6506,14 @@ globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globals@^13.6.0, globals@^13.9.0:
-  version "13.11.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.11.0.tgz#40ef678da117fe7bd2e28f1fab24951bd0255be7"
-  integrity sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==
+globals@^13.15.0:
+  version "13.18.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.18.0.tgz#fb224daeeb2bb7d254cd2c640f003528b8d0c1dc"
+  integrity sha512-/mR4KI8Ps2spmoc0Ulu9L7agOF0du1CZNQ3dke8yItYlyKNmGrkONemBbd6V8UTc1Wgcqn21t3WYB7dbRmh6/A==
   dependencies:
     type-fest "^0.20.2"
 
-globby@^11.0.4:
+globby@^11.0.4, globby@^11.1.0:
   version "11.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
   integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
@@ -6326,11 +6525,23 @@ globby@^11.0.4:
     merge2 "^1.4.1"
     slash "^3.0.0"
 
+gopd@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
+  integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==
+  dependencies:
+    get-intrinsic "^1.1.3"
+
 graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
   version "4.2.10"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
 
+grapheme-splitter@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
+  integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
+
 gzip-size@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462"
@@ -6344,25 +6555,32 @@ handle-thing@^2.0.0:
   integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==
 
 harmony-reflect@^1.4.6:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.1.tgz#c108d4f2bb451efef7a37861fdbdae72c9bdefa9"
-  integrity sha512-WJTeyp0JzGtHcuMsi7rw2VwtkvLa+JyfEKJCFyfcS0+CDkjQ5lHPu7zEhFZP+PDSRrEgXa5Ah0l1MbgbE41XjA==
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.2.tgz#31ecbd32e648a34d030d86adb67d4d47547fe710"
+  integrity sha512-HIp/n38R9kQjDEziXyDTuW3vvoxxyxjxFzXLrBr18uB47GnSt+G9D29fqrpM5ZkspMcPICud3XsBJQ4Y2URg8g==
 
-has-bigints@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
-  integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
+has-bigints@^1.0.1, has-bigints@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
+  integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==
 
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+  integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
 
 has-flag@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
+has-property-descriptors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861"
+  integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==
+  dependencies:
+    get-intrinsic "^1.1.1"
+
 has-symbols@^1.0.1, has-symbols@^1.0.2, has-symbols@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
@@ -6437,9 +6655,9 @@ hast-util-parse-selector@^3.0.0:
     "@types/hast" "^2.0.0"
 
 hast-util-raw@^7.2.0:
-  version "7.2.1"
-  resolved "https://registry.yarnpkg.com/hast-util-raw/-/hast-util-raw-7.2.1.tgz#6e964cee098dbdd93d1b77cf180b5827d48048ab"
-  integrity sha512-wgtppqXVdXzkDXDFclLLdAyVUJSKMYYi6LWIAbA8oFqEdwksYIcPGM3RkKV1Dfn5GElvxhaOCs0jmCOMayxd3A==
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/hast-util-raw/-/hast-util-raw-7.2.2.tgz#1974360b2d7f15b5ce26c2a4bac892d5d8185a18"
+  integrity sha512-0x3BhhdlBcqRIKyc095lBSDvmQNMY3Eulj2PLsT5XCyKYrxssI5yr3P4Kv/PBo1s/DMkZy2voGkMXECnFCZRLQ==
   dependencies:
     "@types/hast" "^2.0.0"
     "@types/parse5" "^6.0.0"
@@ -6453,13 +6671,6 @@ hast-util-raw@^7.2.0:
     web-namespaces "^2.0.0"
     zwitch "^2.0.0"
 
-hast-util-sanitize@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/hast-util-sanitize/-/hast-util-sanitize-4.0.0.tgz#71a02ca2e50d04b852a5500846418070ca364f60"
-  integrity sha512-pw56+69jq+QSr/coADNvWTmBPDy+XsmwaF5KnUys4/wM1jt/fZdl7GPxhXXXYdXnz3Gj3qMkbUCH2uKjvX0MgQ==
-  dependencies:
-    "@types/hast" "^2.0.0"
-
 hast-util-select@~5.0.1:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/hast-util-select/-/hast-util-select-5.0.2.tgz#8c603ebacf0f47e154c5fa2e5b7efc520813866b"
@@ -6523,9 +6734,9 @@ hast-util-whitespace@^2.0.0:
   integrity sha512-Pkw+xBHuV6xFeJprJe2BBEoDV+AvQySaz3pPDRUs5PNZEMQjpXJJueqrpcHIXxnWTcAGi/UOCgVShlkY6kLoqg==
 
 hastscript@^7.0.0:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/hastscript/-/hastscript-7.0.2.tgz#d811fc040817d91923448a28156463b2e40d590a"
-  integrity sha512-uA8ooUY4ipaBvKcMuPehTAB/YfFLSSzCwFSwT6ltJbocFUKH/GDHLN+tflq7lSRf9H86uOuxOFkh1KgIy3Gg2g==
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/hastscript/-/hastscript-7.1.0.tgz#e402ed48f46161cf2f093badbff30583a5c3c315"
+  integrity sha512-uBjaTTLN0MkCZxY/R2fWUOcu7FRtUVzKRO5P/RAfgsu3yFiMB1JWCO4AjeVkgHxAira1f2UecHK5WfS9QurlWA==
   dependencies:
     "@types/hast" "^2.0.0"
     comma-separated-tokens "^2.0.0"
@@ -6538,13 +6749,6 @@ he@^1.2.0:
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
   integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
 
-history@^5.2.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/history/-/history-5.3.0.tgz#1548abaa245ba47992f063a0783db91ef201c73b"
-  integrity sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==
-  dependencies:
-    "@babel/runtime" "^7.7.6"
-
 hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.1, hoist-non-react-statics@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
@@ -6560,7 +6764,7 @@ hoopy@^0.1.4:
 hpack.js@^2.1.6:
   version "2.1.6"
   resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
-  integrity sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=
+  integrity sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==
   dependencies:
     inherits "^2.0.1"
     obuf "^1.0.0"
@@ -6626,23 +6830,23 @@ htmlparser2@^6.1.0:
 http-deceiver@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
-  integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=
+  integrity sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==
 
-http-errors@1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c"
-  integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==
+http-errors@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3"
+  integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==
   dependencies:
-    depd "~1.1.2"
+    depd "2.0.0"
     inherits "2.0.4"
     setprototypeof "1.2.0"
-    statuses ">= 1.5.0 < 2"
+    statuses "2.0.1"
     toidentifier "1.0.1"
 
 http-errors@~1.6.2:
   version "1.6.3"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
-  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
+  integrity sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==
   dependencies:
     depd "~1.1.2"
     inherits "2.0.3"
@@ -6650,9 +6854,9 @@ http-errors@~1.6.2:
     statuses ">= 1.4.0 < 2"
 
 http-parser-js@>=0.5.1:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz#01d2709c79d41698bb01d4decc5e9da4e4a033d9"
-  integrity sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==
+  version "0.5.8"
+  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.8.tgz#af23090d9ac4e24573de6f6aecc9d84a48bf20e3"
+  integrity sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==
 
 http-proxy-agent@^4.0.1:
   version "4.0.1"
@@ -6664,9 +6868,9 @@ http-proxy-agent@^4.0.1:
     debug "4"
 
 http-proxy-middleware@^2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.4.tgz#03af0f4676d172ae775cb5c33f592f40e1a4e07a"
-  integrity sha512-m/4FxX17SUvz4lJ5WPXOHDUuCwIqXLfLHs1s0uZ3oYjhoXlx9csYxaOa0ElDEJ+h8Q4iJ1s+lTMbiCa4EXIJqg==
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz#e1a4dd6979572c7ab5a4e4b55095d1f32a74963f"
+  integrity sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==
   dependencies:
     "@types/http-proxy" "^1.17.8"
     http-proxy "^1.18.1"
@@ -6684,9 +6888,9 @@ http-proxy@^1.18.1:
     requires-port "^1.0.0"
 
 https-proxy-agent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
-  integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
+  integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
   dependencies:
     agent-base "6"
     debug "4"
@@ -6696,10 +6900,15 @@ human-signals@^2.1.0:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
   integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
 
+human-signals@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-3.0.1.tgz#c740920859dafa50e5a3222da9d3bf4bb0e5eef5"
+  integrity sha512-rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ==
+
 husky@>=7.0.4:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-7.0.4.tgz#242048245dc49c8fb1bf0cc7cfb98dd722531535"
-  integrity sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ==
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-8.0.2.tgz#5816a60db02650f1f22c8b69b928fd6bcd77a236"
+  integrity sha512-Tkv80jtvbnkK3mYWxPZePGFpQ/tT3HNSs/sasF9P2YfkMezDl3ON37YN6jUUI4eTg5LcyVynlb6r4eyvOmspvg==
 
 iconv-lite@0.4.24:
   version "0.4.24"
@@ -6725,15 +6934,15 @@ idb@7.0.1:
   resolved "https://registry.yarnpkg.com/idb/-/idb-7.0.1.tgz#d2875b3a2f205d854ee307f6d196f246fea590a7"
   integrity sha512-UUxlE7vGWK5RfB/fDwEGgRf84DY/ieqNha6msMV99UsEMQhJ1RwbCd8AYBj3QMgnE3VZnfQvm4oKVCJTYlqIgg==
 
-idb@^6.1.4:
-  version "6.1.5"
-  resolved "https://registry.yarnpkg.com/idb/-/idb-6.1.5.tgz#dbc53e7adf1ac7c59f9b2bf56e00b4ea4fce8c7b"
-  integrity sha512-IJtugpKkiVXQn5Y+LteyBCNk1N8xpGV3wWZk9EVtZWH8DYkjBn0bX1XnGP9RkyZF0sAcywa6unHqSWKe7q4LGw==
+idb@^7.0.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/idb/-/idb-7.1.1.tgz#d910ded866d32c7ced9befc5bfdf36f572ced72b"
+  integrity sha512-gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ==
 
 identity-obj-proxy@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz#94d2bda96084453ef36fbc5aaec37e0f79f1fc14"
-  integrity sha1-lNK9qWCERT7zb7xarsN+D3nx/BQ=
+  integrity sha512-00n6YnVHKrinT9t0d9+5yZC6UBNJANpYEQvL2LlX6Ab9lnmxzIRcEmTPuyGScvl1+jKuCICX1Z0Ab1pPKKdikA==
   dependencies:
     harmony-reflect "^1.4.6"
 
@@ -6742,20 +6951,20 @@ ieee754@^1.2.1:
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
-ignore@^5.1.8, ignore@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
-  integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
+ignore@^5.2.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.1.tgz#c2b1f76cb999ede1502f3a226a9310fdfe88d46c"
+  integrity sha512-d2qQLzTJ9WxQftPAuEQpSPmKqzxePjzVbpAVv62AQ64NTL+wR4JkrVqR/LqFsFEUsHDAiId52mJteHDFuDkElA==
 
 immediate@~3.0.5:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
-  integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
+  integrity sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==
 
 immer@^9.0.7:
-  version "9.0.12"
-  resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.12.tgz#2d33ddf3ee1d247deab9d707ca472c8c942a0f20"
-  integrity sha512-lk7UNmSbAukB5B6dh9fnh5D0bJTOFKxVg2cyJWTYrWRfhLrLMBquONcUs3aFq507hNoIZEDDh8lb8UtOizSMhA==
+  version "9.0.16"
+  resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.16.tgz#8e7caab80118c2b54b37ad43e05758cdefad0198"
+  integrity sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==
 
 import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1:
   version "3.3.0"
@@ -6766,9 +6975,9 @@ import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1:
     resolve-from "^4.0.0"
 
 import-local@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6"
-  integrity sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4"
+  integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==
   dependencies:
     pkg-dir "^4.2.0"
     resolve-cwd "^3.0.0"
@@ -6776,7 +6985,7 @@ import-local@^3.0.2:
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
+  integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
 
 indent-string@^4.0.0:
   version "4.0.0"
@@ -6786,12 +6995,12 @@ indent-string@^4.0.0:
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
   dependencies:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3, inherits@~2.0.4:
+inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3, inherits@~2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -6799,7 +7008,7 @@ inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, i
 inherits@2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+  integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==
 
 ini@^1.3.5:
   version "1.3.8"
@@ -6850,10 +7059,18 @@ is-alphanumerical@^2.0.0:
     is-alphabetical "^2.0.0"
     is-decimal "^2.0.0"
 
+is-arguments@^1.1.0, is-arguments@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b"
+  integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==
+  dependencies:
+    call-bind "^1.0.2"
+    has-tostringtag "^1.0.0"
+
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
+  integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
 
 is-bigint@^1.0.1:
   version "1.0.4"
@@ -6882,19 +7099,19 @@ is-buffer@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191"
   integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==
 
-is-callable@^1.1.4, is-callable@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
-  integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
+is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
+  integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
 
-is-core-module@^2.1.0, is-core-module@^2.2.0, is-core-module@^2.8.1:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69"
-  integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==
+is-core-module@^2.1.0, is-core-module@^2.8.1, is-core-module@^2.9.0:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144"
+  integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==
   dependencies:
     has "^1.0.3"
 
-is-date-object@^1.0.1:
+is-date-object@^1.0.1, is-date-object@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
   integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==
@@ -6914,7 +7131,7 @@ is-docker@^2.0.0, is-docker@^2.1.1:
 is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
 
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
@@ -6943,10 +7160,15 @@ is-hexadecimal@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-2.0.1.tgz#86b5bf668fca307498d319dfc03289d781a90027"
   integrity sha512-DgZQp241c8oO6cA1SbTEWiXeoxV42vlcJxgH+B3hi1AiqqKruZR3ZGF8In3fj4+/y/7rHvlOZLZtgJ/4ttYGZg==
 
+is-map@^2.0.1, is-map@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127"
+  integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==
+
 is-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
-  integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=
+  integrity sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==
 
 is-negative-zero@^2.0.2:
   version "2.0.2"
@@ -6968,7 +7190,12 @@ is-number@^7.0.0:
 is-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
-  integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
+  integrity sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==
+
+is-path-inside@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
+  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
 
 is-plain-obj@^3.0.0:
   version "3.0.0"
@@ -6976,9 +7203,9 @@ is-plain-obj@^3.0.0:
   integrity sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==
 
 is-plain-obj@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-4.0.0.tgz#06c0999fd7574edf5a906ba5644ad0feb3a84d22"
-  integrity sha512-NXRbBtUdBioI73y/HmOhogw/U5msYPC9DAtGkJXeFcFWSFZw0mCUsPxk/snTuJHzNKA8kLBK4rH97RMB1BfCXw==
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-4.1.0.tgz#d65025edec3657ce032fd7db63c97883eaed71f0"
+  integrity sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==
 
 is-potential-custom-element-name@^1.0.1:
   version "1.0.1"
@@ -6996,14 +7223,19 @@ is-regex@^1.1.4:
 is-regexp@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
-  integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk=
+  integrity sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==
 
 is-root@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-root/-/is-root-2.1.0.tgz#809e18129cf1129644302a4f8544035d51984a9c"
   integrity sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg==
 
-is-shared-array-buffer@^1.0.1:
+is-set@^2.0.1, is-set@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec"
+  integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==
+
+is-shared-array-buffer@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
   integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==
@@ -7013,12 +7245,17 @@ is-shared-array-buffer@^1.0.1:
 is-stream@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
+  integrity sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==
 
 is-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
-  integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
+  integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
+
+is-stream@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-3.0.0.tgz#e6bfd7aa6bef69f4f472ce9bb681e3e57b4319ac"
+  integrity sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==
 
 is-string@^1.0.5, is-string@^1.0.7:
   version "1.0.7"
@@ -7034,16 +7271,32 @@ is-symbol@^1.0.2, is-symbol@^1.0.3:
   dependencies:
     has-symbols "^1.0.2"
 
+is-typed-array@^1.1.10:
+  version "1.1.10"
+  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.10.tgz#36a5b5cb4189b575d1a3e4b08536bfb485801e3f"
+  integrity sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==
+  dependencies:
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    gopd "^1.0.1"
+    has-tostringtag "^1.0.0"
+
 is-typedarray@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
+  integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==
 
 is-url@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/is-url/-/is-url-1.2.4.tgz#04a4df46d28c4cff3d73d01ff06abeb318a1aa52"
   integrity sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==
 
+is-weakmap@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2"
+  integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==
+
 is-weakref@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
@@ -7051,6 +7304,14 @@ is-weakref@^1.0.2:
   dependencies:
     call-bind "^1.0.2"
 
+is-weakset@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.2.tgz#4569d67a747a1ce5a994dfd4ef6dcea76e7c0a1d"
+  integrity sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.1.1"
+
 is-wsl@^2.1.1, is-wsl@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
@@ -7058,7 +7319,7 @@ is-wsl@^2.1.1, is-wsl@^2.2.0:
   dependencies:
     is-docker "^2.0.0"
 
-isarray@^2.0.1:
+isarray@^2.0.1, isarray@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
   integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
@@ -7066,17 +7327,17 @@ isarray@^2.0.1:
 isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+  integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
 
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
 isomorphic-fetch@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
-  integrity sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=
+  integrity sha512-9c4TNAKYXM5PRyVcwUZrF3W09nQ+sO7+jydgs4ZGW9dhsLG2VOlISJABombdQqQRXCwuYG3sYV/puGf5rp0qmA==
   dependencies:
     node-fetch "^1.0.1"
     whatwg-fetch ">=0.10.0"
@@ -7087,9 +7348,9 @@ istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
   integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==
 
 istanbul-lib-instrument@^5.0.4, istanbul-lib-instrument@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz#7b49198b657b27a730b8e9cb601f1e1bff24c59a"
-  integrity sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q==
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz#d10c8885c2125574e1c231cacadf955675e1ce3d"
+  integrity sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==
   dependencies:
     "@babel/core" "^7.12.3"
     "@babel/parser" "^7.14.7"
@@ -7107,18 +7368,18 @@ istanbul-lib-report@^3.0.0:
     supports-color "^7.1.0"
 
 istanbul-lib-source-maps@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz#75743ce6d96bb86dc7ee4352cf6366a23f0b1ad9"
-  integrity sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz#895f3a709fcfba34c6de5a42939022f3e4358551"
+  integrity sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==
   dependencies:
     debug "^4.1.1"
     istanbul-lib-coverage "^3.0.0"
     source-map "^0.6.1"
 
 istanbul-reports@^3.1.3:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.4.tgz#1b6f068ecbc6c331040aab5741991273e609e40c"
-  integrity sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw==
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.5.tgz#cc9a6ab25cb25659810e4785ed9d9fb742578bae"
+  integrity sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==
   dependencies:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
@@ -7225,6 +7486,16 @@ jest-diff@^27.5.1:
     jest-get-type "^27.5.1"
     pretty-format "^27.5.1"
 
+jest-diff@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.3.1.tgz#d8215b72fed8f1e647aed2cae6c752a89e757527"
+  integrity sha512-vU8vyiO7568tmin2lA3r2DP8oRvzhvRcD4DjpXc6uGveQodyk7CKLhQlCSiwgx3g0pFaE88/KLZ0yaTWMc4Uiw==
+  dependencies:
+    chalk "^4.0.0"
+    diff-sequences "^29.3.1"
+    jest-get-type "^29.2.0"
+    pretty-format "^29.3.1"
+
 jest-docblock@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.5.1.tgz#14092f364a42c6108d42c33c8cf30e058e25f6c0"
@@ -7273,6 +7544,11 @@ jest-get-type@^27.5.1:
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.5.1.tgz#3cd613c507b0f7ace013df407a1c1cd578bcb4f1"
   integrity sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==
 
+jest-get-type@^29.2.0:
+  version "29.2.0"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.2.0.tgz#726646f927ef61d583a3b3adb1ab13f3a5036408"
+  integrity sha512-uXNJlg8hKFEnDgFsrCjznB+sTxdkuqiCL6zMgA75qEbAJjJYTs9XPrvDctrEig2GDow22T/LvHgO57iJhXB/UA==
+
 jest-haste-map@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.5.1.tgz#9fd8bd7e7b4fa502d9c6164c5640512b4e811e7f"
@@ -7334,6 +7610,16 @@ jest-matcher-utils@^27.0.0, jest-matcher-utils@^27.5.1:
     jest-get-type "^27.5.1"
     pretty-format "^27.5.1"
 
+jest-matcher-utils@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.3.1.tgz#6e7f53512f80e817dfa148672bd2d5d04914a572"
+  integrity sha512-fkRMZUAScup3txIKfMe3AIZZmPEjWEdsPJFK3AIy5qRohWqQFg1qrmKfYXR9qEkNc7OdAu2N4KPHibEmy4HPeQ==
+  dependencies:
+    chalk "^4.0.0"
+    jest-diff "^29.3.1"
+    jest-get-type "^29.2.0"
+    pretty-format "^29.3.1"
+
 jest-message-util@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.5.1.tgz#bdda72806da10d9ed6425e12afff38cd1458b6cf"
@@ -7349,6 +7635,36 @@ jest-message-util@^27.5.1:
     slash "^3.0.0"
     stack-utils "^2.0.3"
 
+jest-message-util@^28.1.3:
+  version "28.1.3"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-28.1.3.tgz#232def7f2e333f1eecc90649b5b94b0055e7c43d"
+  integrity sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@jest/types" "^28.1.3"
+    "@types/stack-utils" "^2.0.0"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.9"
+    micromatch "^4.0.4"
+    pretty-format "^28.1.3"
+    slash "^3.0.0"
+    stack-utils "^2.0.3"
+
+jest-message-util@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.3.1.tgz#37bc5c468dfe5120712053dd03faf0f053bd6adb"
+  integrity sha512-lMJTbgNcDm5z+6KDxWtqOFWlGQxD6XaYwBqHR8kmpkP+WWWG90I35kdtQHY67Ay5CSuydkTBbJG+tH9JShFCyA==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@jest/types" "^29.3.1"
+    "@types/stack-utils" "^2.0.0"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.9"
+    micromatch "^4.0.4"
+    pretty-format "^29.3.1"
+    slash "^3.0.0"
+    stack-utils "^2.0.3"
+
 jest-mock@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.5.1.tgz#19948336d49ef4d9c52021d34ac7b5f36ff967d6"
@@ -7358,15 +7674,20 @@ jest-mock@^27.5.1:
     "@types/node" "*"
 
 jest-pnp-resolver@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c"
-  integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz#930b1546164d4ad5937d5540e711d4d38d4cad2e"
+  integrity sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==
 
-jest-regex-util@^27.0.0, jest-regex-util@^27.5.1:
+jest-regex-util@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.5.1.tgz#4da143f7e9fd1e542d4aa69617b38e4a78365b95"
   integrity sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==
 
+jest-regex-util@^28.0.0:
+  version "28.0.2"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-28.0.2.tgz#afdc377a3b25fb6e80825adcf76c854e5bf47ead"
+  integrity sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==
+
 jest-resolve-dependencies@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.1.tgz#d811ecc8305e731cc86dd79741ee98fed06f1da8"
@@ -7495,12 +7816,24 @@ jest-util@^27.5.1:
     graceful-fs "^4.2.9"
     picomatch "^2.2.3"
 
-jest-util@^28.0.0:
-  version "28.1.0"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-28.1.0.tgz#d54eb83ad77e1dd441408738c5a5043642823be5"
-  integrity sha512-qYdCKD77k4Hwkose2YBEqQk7PzUf/NSE+rutzceduFveQREeH6b+89Dc9+wjX9dAwHcgdx4yedGA3FQlU/qCTA==
+jest-util@^28.0.0, jest-util@^28.1.3:
+  version "28.1.3"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-28.1.3.tgz#f4f932aa0074f0679943220ff9cbba7e497028b0"
+  integrity sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==
   dependencies:
-    "@jest/types" "^28.1.0"
+    "@jest/types" "^28.1.3"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    ci-info "^3.2.0"
+    graceful-fs "^4.2.9"
+    picomatch "^2.2.3"
+
+jest-util@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.3.1.tgz#1dda51e378bbcb7e3bc9d8ab651445591ed373e1"
+  integrity sha512-7YOVZaiX7RJLv76ZfHt4nbNEzzTRiMW/IiOG7ZOKmTXmoGBxUDefgMAxQubu6WPVqP5zSzAdZG0FfLcC7HOIFQ==
+  dependencies:
+    "@jest/types" "^29.3.1"
     "@types/node" "*"
     chalk "^4.0.0"
     ci-info "^3.2.0"
@@ -7520,19 +7853,19 @@ jest-validate@^27.5.1:
     pretty-format "^27.5.1"
 
 jest-watch-typeahead@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/jest-watch-typeahead/-/jest-watch-typeahead-1.0.0.tgz#4de2ca1eb596acb1889752afbab84b74fcd99173"
-  integrity sha512-jxoszalAb394WElmiJTFBMzie/RDCF+W7Q29n5LzOPtcoQoHWfdUtHFkbhgf5NwWe8uMOxvKb/g7ea7CshfkTw==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/jest-watch-typeahead/-/jest-watch-typeahead-1.1.0.tgz#b4a6826dfb9c9420da2f7bc900de59dad11266a9"
+  integrity sha512-Va5nLSJTN7YFtC2jd+7wsoe1pNe5K4ShLux/E5iHEwlB9AxaxmggY7to9KUqKojhaJw3aXqt5WAb4jGPOolpEw==
   dependencies:
     ansi-escapes "^4.3.1"
     chalk "^4.0.0"
-    jest-regex-util "^27.0.0"
-    jest-watcher "^27.0.0"
+    jest-regex-util "^28.0.0"
+    jest-watcher "^28.0.0"
     slash "^4.0.0"
     string-length "^5.0.1"
     strip-ansi "^7.0.1"
 
-jest-watcher@^27.0.0, jest-watcher@^27.5.1:
+jest-watcher@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.5.1.tgz#71bd85fb9bde3a2c2ec4dc353437971c43c642a2"
   integrity sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw==
@@ -7545,6 +7878,20 @@ jest-watcher@^27.0.0, jest-watcher@^27.5.1:
     jest-util "^27.5.1"
     string-length "^4.0.1"
 
+jest-watcher@^28.0.0:
+  version "28.1.3"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-28.1.3.tgz#c6023a59ba2255e3b4c57179fc94164b3e73abd4"
+  integrity sha512-t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g==
+  dependencies:
+    "@jest/test-result" "^28.1.3"
+    "@jest/types" "^28.1.3"
+    "@types/node" "*"
+    ansi-escapes "^4.2.1"
+    chalk "^4.0.0"
+    emittery "^0.10.2"
+    jest-util "^28.1.3"
+    string-length "^4.0.1"
+
 jest-worker@^26.2.1:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
@@ -7554,7 +7901,7 @@ jest-worker@^26.2.1:
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
-jest-worker@^27.0.2, jest-worker@^27.3.1, jest-worker@^27.4.5, jest-worker@^27.5.1:
+jest-worker@^27.0.2, jest-worker@^27.4.5, jest-worker@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0"
   integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==
@@ -7563,6 +7910,15 @@ jest-worker@^27.0.2, jest-worker@^27.3.1, jest-worker@^27.4.5, jest-worker@^27.5
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
+jest-worker@^28.0.2:
+  version "28.1.3"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-28.1.3.tgz#7e3c4ce3fa23d1bb6accb169e7f396f98ed4bb98"
+  integrity sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==
+  dependencies:
+    "@types/node" "*"
+    merge-stream "^2.0.0"
+    supports-color "^8.0.0"
+
 jest@^27.4.3:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest/-/jest-27.5.1.tgz#dadf33ba70a779be7a6fc33015843b51494f63fc"
@@ -7575,18 +7931,23 @@ jest@^27.4.3:
 jju@~1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/jju/-/jju-1.4.0.tgz#a3abe2718af241a2b2904f84a625970f389ae32a"
-  integrity sha1-o6vicYryQaKykE+EpiWXDzia4yo=
+  integrity sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==
 
 jotai@^1.8.4:
-  version "1.8.4"
-  resolved "https://registry.yarnpkg.com/jotai/-/jotai-1.8.4.tgz#e188bff3cc790c758d25646f6f5daf9854c98eef"
-  integrity sha512-bkHDHNxm7bU4+bJL4z96fTlJYN34UDRTu3ghEajJrDepayON9YEaxPrXr7xhLnIRntoFC6eDYYhMNA/ilbj2RQ==
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/jotai/-/jotai-1.10.0.tgz#50c5224789282eca1cdc907a51e316d8d94c5976"
+  integrity sha512-3Q8kQU3Ktds+80Ku4dVcvnwSXEcK0Fg0b6mC1+4wz3rmF64lOGNUySKXQ4njvYCWodR8bw2HygOKYSYkHxQQmA==
 
 js-base64@^2.4.3:
   version "2.6.4"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4"
   integrity sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==
 
+js-sdsl@^4.1.4:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.2.0.tgz#278e98b7bea589b8baaf048c20aeb19eb7ad09d0"
+  integrity sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==
+
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -7648,14 +8009,9 @@ jsesc@^2.5.1:
 jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
-  integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
+  integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==
 
-json-parse-better-errors@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
-  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
-
-json-parse-even-better-errors@^2.3.0:
+json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
   integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
@@ -7678,7 +8034,7 @@ json-schema@^0.4.0:
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
-  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
+  integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
 
 json2csv@^5.0.7:
   version "5.0.7"
@@ -7689,11 +8045,6 @@ json2csv@^5.0.7:
     jsonparse "^1.3.1"
     lodash.get "^4.4.2"
 
-json5@2.x, json5@^2.1.2, json5@^2.2.0, json5@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
-  integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
-
 json5@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
@@ -7701,10 +8052,15 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
-jsonc-parser@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.0.0.tgz#abdd785701c7e7eaca8a9ec8cf070ca51a745a22"
-  integrity sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==
+json5@^2.1.2, json5@^2.2.0, json5@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
+  integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
+
+jsonc-parser@^3.0.0, jsonc-parser@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76"
+  integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==
 
 jsonfile@^6.0.1:
   version "6.1.0"
@@ -7721,22 +8077,22 @@ jsonparse@^1.3.1:
   integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==
 
 jsonpointer@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-5.0.0.tgz#f802669a524ec4805fa7389eadbc9921d5dc8072"
-  integrity sha512-PNYZIdMjVIvVgDSYKTT63Y+KZ6IZvGRNNWcxwD+GNnUz1MKPfv30J8ueCjdwcN0nDx2SlshgyB7Oy0epAzVRRg==
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-5.0.1.tgz#2110e0af0900fd37467b5907ecd13a7884a1b559"
+  integrity sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==
 
-"jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.2.1:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.2.tgz#6ab1e52c71dfc0c0707008a91729a9491fe9f76c"
-  integrity sha512-HDAyJ4MNQBboGpUnHAVUNJs6X0lh058s6FuixsFGP7MgJYpD6Vasd6nzSG5iIfXu1zAYlHJ/zsOKNlrenTUBnw==
+"jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.3.2:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz#76b3e6e6cece5c69d49a5792c3d01bd1a0cdc7ea"
+  integrity sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw==
   dependencies:
-    array-includes "^3.1.4"
-    object.assign "^4.1.2"
+    array-includes "^3.1.5"
+    object.assign "^4.1.3"
 
-jszip@^3.10.0, jszip@^3.6.0:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.10.0.tgz#faf3db2b4b8515425e34effcdbb086750a346061"
-  integrity sha512-LDfVtOLtOxb9RXkYOwPyNBTQDL4eUbqahtoY6x07GiDJHwSYvn8sHHIw8wINImV3MqbMNve2gSuM1DDqEKk09Q==
+jszip@^3.10.0:
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.10.1.tgz#34aee70eb18ea1faec2f589208a157d1feb091c2"
+  integrity sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==
   dependencies:
     lie "~3.3.0"
     pako "~1.0.2"
@@ -7754,9 +8110,9 @@ kleur@^3.0.3:
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
 kleur@^4.0.3:
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/kleur/-/kleur-4.1.4.tgz#8c202987d7e577766d039a8cd461934c01cda04d"
-  integrity sha512-8QADVssbrFjivHWQU7KkMgptGTl6WAcSdlbBPY4uNF+mWr6DGcKrvY2w4FQJoXch7+fKMjj0dRrL75vk3k23OA==
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/kleur/-/kleur-4.1.5.tgz#95106101795f7050c6c650f350c683febddb1780"
+  integrity sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==
 
 klona@^2.0.4, klona@^2.0.5:
   version "2.0.5"
@@ -7764,14 +8120,14 @@ klona@^2.0.4, klona@^2.0.5:
   integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==
 
 language-subtag-registry@~0.3.2:
-  version "0.3.21"
-  resolved "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz#04ac218bea46f04cb039084602c6da9e788dd45a"
-  integrity sha512-L0IqwlIXjilBVVYKFT37X9Ih11Um5NEl9cbJIuU/SwP/zEEAbBPOnEeeuxVMf45ydWQRDQN3Nqc96OgbH1K+Pg==
+  version "0.3.22"
+  resolved "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz#2e1500861b2e457eba7e7ae86877cbd08fa1fd1d"
+  integrity sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w==
 
 language-tags@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/language-tags/-/language-tags-1.0.5.tgz#d321dbc4da30ba8bf3024e040fa5c14661f9193a"
-  integrity sha1-0yHbxNowuovzAk4ED6XBRmH5GTo=
+  integrity sha512-qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ==
   dependencies:
     language-subtag-registry "~0.3.2"
 
@@ -7791,7 +8147,7 @@ levn@^0.4.1:
 levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
+  integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==
   dependencies:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
@@ -7803,15 +8159,10 @@ lie@~3.3.0:
   dependencies:
     immediate "~3.0.5"
 
-lilconfig@2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.4.tgz#f4507d043d7058b380b6a8f5cb7bcd4b34cee082"
-  integrity sha512-bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA==
-
-lilconfig@^2.0.3, lilconfig@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.5.tgz#19e57fd06ccc3848fd1891655b5a447092225b25"
-  integrity sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==
+lilconfig@2.0.6, lilconfig@^2.0.3, lilconfig@^2.0.5, lilconfig@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.6.tgz#32a384558bd58af3d4c6e077dd1ad1d397bc69d4"
+  integrity sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg==
 
 lines-and-columns@^1.1.6:
   version "1.2.4"
@@ -7819,45 +8170,44 @@ lines-and-columns@^1.1.6:
   integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
 
 lint-staged@>=12.3.7:
-  version "12.3.7"
-  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-12.3.7.tgz#ad0e2014302f704f9cf2c0ebdb97ac63d0f17be0"
-  integrity sha512-/S4D726e2GIsDVWIk1XGvheCaDm1SJRQp8efamZFWJxQMVEbOwSysp7xb49Oo73KYCdy97mIWinhlxcoNqIfIQ==
+  version "13.0.4"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-13.0.4.tgz#c4b4391280c35165b805ad43304ba01f733067a0"
+  integrity sha512-HxlHCXoYRsq9QCby5wFozmZW00hMs/9e3l+/dz6Qr8Kle4UH0kJTdABAbqhzG+3pcG6QjL9kz7NgGBfph+a5dw==
   dependencies:
     cli-truncate "^3.1.0"
-    colorette "^2.0.16"
-    commander "^8.3.0"
-    debug "^4.3.3"
-    execa "^5.1.1"
-    lilconfig "2.0.4"
-    listr2 "^4.0.1"
-    micromatch "^4.0.4"
+    colorette "^2.0.19"
+    commander "^9.4.1"
+    debug "^4.3.4"
+    execa "^6.1.0"
+    lilconfig "2.0.6"
+    listr2 "^5.0.5"
+    micromatch "^4.0.5"
     normalize-path "^3.0.0"
-    object-inspect "^1.12.0"
-    pidtree "^0.5.0"
+    object-inspect "^1.12.2"
+    pidtree "^0.6.0"
     string-argv "^0.3.1"
-    supports-color "^9.2.1"
-    yaml "^1.10.2"
+    yaml "^2.1.3"
 
-listr2@^4.0.1:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/listr2/-/listr2-4.0.5.tgz#9dcc50221583e8b4c71c43f9c7dfd0ef546b75d5"
-  integrity sha512-juGHV1doQdpNT3GSTs9IUN43QJb7KHdF9uqg7Vufs/tG9VTzpFphqF4pm/ICdAABGQxsyNn9CiYA3StkI6jpwA==
+listr2@^5.0.5:
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/listr2/-/listr2-5.0.6.tgz#3c61153383869ffaad08a8908d63edfde481dff8"
+  integrity sha512-u60KxKBy1BR2uLJNTWNptzWQ1ob/gjMzIJPZffAENzpZqbMZ/5PrXXOomDcevIS/+IB7s1mmCEtSlT2qHWMqag==
   dependencies:
     cli-truncate "^2.1.0"
-    colorette "^2.0.16"
+    colorette "^2.0.19"
     log-update "^4.0.0"
     p-map "^4.0.0"
     rfdc "^1.3.0"
-    rxjs "^7.5.5"
+    rxjs "^7.5.7"
     through "^2.3.8"
     wrap-ansi "^7.0.0"
 
 loader-runner@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384"
-  integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1"
+  integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==
 
-loader-utils@^2.0.0:
+loader-utils@^2.0.0, loader-utils@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c"
   integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==
@@ -7867,17 +8217,9 @@ loader-utils@^2.0.0:
     json5 "^2.1.2"
 
 loader-utils@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-3.2.0.tgz#bcecc51a7898bee7473d4bc6b845b23af8304d4f"
-  integrity sha512-HVl9ZqccQihZ7JM85dco1MvO9G+ONvxoGa9rkhzFsneGLKSUg1gJf9bWzhRhcvm2qChhWpebQhP44qxjKIUCaQ==
-
-locate-path@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
-  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
-  dependencies:
-    p-locate "^2.0.0"
-    path-exists "^3.0.0"
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-3.2.1.tgz#4fb104b599daafd82ef3e1a41fb9265f87e1f576"
+  integrity sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==
 
 locate-path@^3.0.0:
   version "3.0.0"
@@ -7909,22 +8251,22 @@ lodash-es@^4.17.21:
 lodash.camelcase@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
-  integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY=
+  integrity sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==
 
 lodash.curry@^4.0.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.curry/-/lodash.curry-4.1.1.tgz#248e36072ede906501d75966200a86dab8b23170"
-  integrity sha1-JI42By7ekGUB11lmIAqG2riyMXA=
+  integrity sha512-/u14pXGviLaweY5JI0IUzgzF2J6Ne8INyzAZjImcryjgkZ+ebruBxy2/JaOOkTqScddcYtakjhSaeemV8lR0tA==
 
 lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
-  integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
+  integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
 
 lodash.flow@^3.3.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/lodash.flow/-/lodash.flow-3.5.0.tgz#87bf40292b8cf83e4e8ce1a3ae4209e20071675a"
-  integrity sha1-h79AKSuM+D5OjOGjrkIJ4gBxZ1o=
+  integrity sha512-ff3BX/tSioo+XojX4MOsOMhJw0nZoUEF011LX8g8d3gvjVbxd89cCio4BCXronjxcTUIJUoqKEUA+n4CqvvRPw==
 
 lodash.get@^4.4.2:
   version "4.4.2"
@@ -7934,7 +8276,7 @@ lodash.get@^4.4.2:
 lodash.memoize@4.x, lodash.memoize@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
-  integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
+  integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==
 
 lodash.merge@^4.6.2:
   version "4.6.2"
@@ -7944,14 +8286,14 @@ lodash.merge@^4.6.2:
 lodash.sortby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
-  integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
+  integrity sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==
 
 lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
-  integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
+  integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==
 
-lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0:
+lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -7971,10 +8313,15 @@ long@^4.0.0:
   resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
   integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
 
+long@^5.0.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/long/-/long-5.2.1.tgz#e27595d0083d103d2fa2c20c7699f8e0c92b897f"
+  integrity sha512-GKSNGeNAtw8IryjjkhZxuKB3JzlcLTwjtiQCHKvqQet81I93kXslhDQruGI/QsddO83mcDToBVy7GqGS/zYf/A==
+
 longest-streak@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-3.0.1.tgz#c97315b7afa0e7d9525db9a5a2953651432bdc5d"
-  integrity sha512-cHlYSUpL2s7Fb3394mYxwTYj8niTaNHUCLr0qdiCXQfSjfuA7CKofpX2uSwEfFDQ0EB7JcnMnm+GjbqqoinYYg==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-3.1.0.tgz#62fa67cd958742a1574af9f39866364102d90cd4"
+  integrity sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g==
 
 loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0:
   version "1.4.0"
@@ -8005,7 +8352,7 @@ lunr@^2.3.9:
 lz-string@^1.4.4:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.4.4.tgz#c0d8eaf36059f705796e1e344811cf4c498d3a26"
-  integrity sha1-wNjq82BZ9wV5bh40SBHPTEmNOiY=
+  integrity sha512-0ckx7ZHRPqb0oUm8zNr+90mtf9DQB60H1wMCjBtfi62Kl3a7JbHob6gA2bC+xRvZoOL+1hzUK8jeuEIQE8svEQ==
 
 magic-string@^0.22.4:
   version "0.22.5"
@@ -8015,11 +8362,11 @@ magic-string@^0.22.4:
     vlq "^0.2.2"
 
 magic-string@^0.25.0, magic-string@^0.25.7:
-  version "0.25.7"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051"
-  integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==
+  version "0.25.9"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz#de7f9faf91ef8a1c91d02c2e5314c8277dbcdd1c"
+  integrity sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==
   dependencies:
-    sourcemap-codec "^1.4.4"
+    sourcemap-codec "^1.4.8"
 
 make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
   version "3.1.0"
@@ -8033,12 +8380,12 @@ make-error@1.x, make-error@^1.1.1:
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
   integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
 
-makeerror@1.0.x:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
-  integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=
+makeerror@1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a"
+  integrity sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==
   dependencies:
-    tmpl "1.0.x"
+    tmpl "1.0.5"
 
 markdown-table@^3.0.0:
   version "3.0.2"
@@ -8061,12 +8408,12 @@ match-sorter@^6.3.1:
 material-design-lite@^1.2.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/material-design-lite/-/material-design-lite-1.3.0.tgz#d004ce3fee99a1eeb74a78b8a325134a5f1171d3"
-  integrity sha1-0ATOP+6Zoe63Sni4oyUTSl8RcdM=
+  integrity sha512-ao76b0bqSTKcEMt7Pui+J/S3eVF0b3GWfuKUwfe2lP5DKlLZOwBq37e0/bXEzxrw7/SuHAuYAdoCwY6mAYhrsg==
 
 material-ui-popup-state@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/material-ui-popup-state/-/material-ui-popup-state-4.0.1.tgz#356258aa5d6be40d22512c1e9bb4c58f303d0e3f"
-  integrity sha512-4Ywj2QFOaS4mirRRtX4xps1waJQPa+IIEnVj/nnA4+aglinEcPkALPq+akAlvzKAjkjkmIjiku8SbdmTl0hTCQ==
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/material-ui-popup-state/-/material-ui-popup-state-4.1.0.tgz#0e3e1536a449bb19b5a8b5e0c3cbbbca8a4c9688"
+  integrity sha512-YAxLT10XALsUuuo46sc81NKD6oKJzlkcKP3e+IqC0pKwzAhOAZIQ+RUHXT6Mz3bXHKoHCsM+NdIQxR4mOH/KEQ==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@mui/material" "^5.0.0"
@@ -8074,22 +8421,22 @@ material-ui-popup-state@^4.0.1:
     prop-types "^15.7.2"
 
 mdast-util-definitions@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-5.1.0.tgz#b6d10ef00a3c4cf191e8d9a5fa58d7f4a366f817"
-  integrity sha512-5hcR7FL2EuZ4q6lLMUK5w4lHT2H3vqL9quPvYZ/Ku5iifrirfMHiGdhxdXMUbUkDmz5I+TYMd7nbaxUhbQkfpQ==
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-5.1.1.tgz#2c1d684b28e53f84938bb06317944bee8efa79db"
+  integrity sha512-rQ+Gv7mHttxHOBx2dkF4HWTg+EE+UR78ptQWDylzPKaQuVGdG4HIoY3SrS/pCp80nZ04greFvXbVFHT+uf0JVQ==
   dependencies:
     "@types/mdast" "^3.0.0"
     "@types/unist" "^2.0.0"
-    unist-util-visit "^3.0.0"
+    unist-util-visit "^4.0.0"
 
 mdast-util-find-and-replace@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/mdast-util-find-and-replace/-/mdast-util-find-and-replace-2.1.0.tgz#69728acd250749f8aac6e150e07d1fd15619e829"
-  integrity sha512-1w1jbqAd13oU78QPBf5223+xB+37ecNtQ1JElq2feWols5oEYAl+SgNDnOZipe7NfLemoEt362yUS15/wip4mw==
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/mdast-util-find-and-replace/-/mdast-util-find-and-replace-2.2.1.tgz#249901ef43c5f41d6e8a8d446b3b63b17e592d7c"
+  integrity sha512-SobxkQXFAdd4b5WmEakmkVoh18icjQRxGy5OWTCzgsLRm1Fu/KCtwD1HIQSsmq5ZRjVH0Ehwg6/Fn3xIUk+nKw==
   dependencies:
     escape-string-regexp "^5.0.0"
     unist-util-is "^5.0.0"
-    unist-util-visit-parents "^4.0.0"
+    unist-util-visit-parents "^5.0.0"
 
 mdast-util-from-markdown@^1.0.0:
   version "1.2.0"
@@ -8129,18 +8476,19 @@ mdast-util-gfm-footnote@^1.0.0:
     micromark-util-normalize-identifier "^1.0.0"
 
 mdast-util-gfm-strikethrough@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-1.0.1.tgz#a4a74c36864ec6a6e3bbd31e1977f29beb475789"
-  integrity sha512-zKJbEPe+JP6EUv0mZ0tQUyLQOC+FADt0bARldONot/nefuISkaZFlmVK4tU6JgfyZGrky02m/I6PmehgAgZgqg==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-1.0.2.tgz#6b4fa4ae37d449ccb988192ac0afbb2710ffcefd"
+  integrity sha512-T/4DVHXcujH6jx1yqpcAYYwd+z5lAYMw4Ls6yhTfbMMtCt0PHY4gEfhW9+lKsLBtyhUGKRIzcUA2FATVqnvPDA==
   dependencies:
     "@types/mdast" "^3.0.0"
     mdast-util-to-markdown "^1.3.0"
 
 mdast-util-gfm-table@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mdast-util-gfm-table/-/mdast-util-gfm-table-1.0.4.tgz#0dbb25f04fd9c0877dc63b76203ecbdf5d945755"
-  integrity sha512-aEuoPwZyP4iIMkf2cLWXxx3EQ6Bmh2yKy9MVCg4i6Sd3cX80dcLEfXO/V4ul3pGH9czBK4kp+FAl+ZHmSUt9/w==
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/mdast-util-gfm-table/-/mdast-util-gfm-table-1.0.6.tgz#184e900979fe790745fc3dabf77a4114595fcd7f"
+  integrity sha512-uHR+fqFq3IvB3Rd4+kzXW8dmpxUhvgCQZep6KdjsLK4O6meK5dYZEayLtIxNus1XO3gfjfcIFe8a7L0HZRGgag==
   dependencies:
+    "@types/mdast" "^3.0.0"
     markdown-table "^3.0.0"
     mdast-util-from-markdown "^1.0.0"
     mdast-util-to-markdown "^1.3.0"
@@ -8167,16 +8515,15 @@ mdast-util-gfm@^2.0.0:
     mdast-util-to-markdown "^1.0.0"
 
 mdast-util-to-hast@^12.1.0:
-  version "12.1.1"
-  resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-12.1.1.tgz#89a2bb405eaf3b05eb8bf45157678f35eef5dbca"
-  integrity sha512-qE09zD6ylVP14jV4mjLIhDBOrpFdShHZcEsYvvKGABlr9mGbV7mTlRWdoFxL/EYSTNDiC9GZXy7y8Shgb9Dtzw==
+  version "12.2.4"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-12.2.4.tgz#34c1ef2b6cf01c27b3e3504e2c977c76f722e7e1"
+  integrity sha512-a21xoxSef1l8VhHxS1Dnyioz6grrJkoaCUgGzMD/7dWHvboYX3VW53esRUfB5tgTyz4Yos1n25SPcj35dJqmAg==
   dependencies:
     "@types/hast" "^2.0.0"
     "@types/mdast" "^3.0.0"
-    "@types/mdurl" "^1.0.0"
     mdast-util-definitions "^5.0.0"
-    mdurl "^1.0.0"
-    micromark-util-sanitize-uri "^1.0.0"
+    micromark-util-sanitize-uri "^1.1.0"
+    trim-lines "^3.0.0"
     unist-builder "^3.0.0"
     unist-util-generated "^2.0.0"
     unist-util-position "^4.0.0"
@@ -8201,9 +8548,9 @@ mdast-util-to-string@^3.0.0, mdast-util-to-string@^3.1.0:
   integrity sha512-n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA==
 
 mdi-material-ui@^7.2.0, mdi-material-ui@^7.3.0:
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/mdi-material-ui/-/mdi-material-ui-7.3.0.tgz#db3ed681d35ae12c37fb1c95bcfe679a1be80c0b"
-  integrity sha512-BJ4JF+LlO/aYcOg9wrgbzRiInyRH6padgfBdJpoPNc3CoZDaik9ARTP3PWzgMjRSQQZ2KvxtFVpOHDkHfrc2Fw==
+  version "7.6.0"
+  resolved "https://registry.yarnpkg.com/mdi-material-ui/-/mdi-material-ui-7.6.0.tgz#bf166c9eab5b5e5abbf38edee1650674ad2f5660"
+  integrity sha512-daqyXS2tVPB9AulKee4LOwf6llx/eiA969HFx0rOGEC2Cgup/nAmHWnN7yYtndhXpvd2cXwov5kjw40HxjjjZg==
 
 mdn-data@2.0.14:
   version "2.0.14"
@@ -8215,22 +8562,17 @@ mdn-data@2.0.4:
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b"
   integrity sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==
 
-mdurl@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
-  integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=
-
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
-  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
+  integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==
 
-memfs@^3.1.2, memfs@^3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.1.tgz#b78092f466a0dce054d63d39275b24c71d3f1305"
-  integrity sha512-1c9VPVvW5P7I85c35zAdEr1TD5+F11IToIHIlrVIcflfnzPkJa0ZoYEoEdYDP8KgPFoSZ/opDrUsAoZWym3mtw==
+memfs@^3.1.2, memfs@^3.4.3:
+  version "3.4.12"
+  resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.12.tgz#d00f8ad8dab132dc277c659dc85bfd14b07d03bd"
+  integrity sha512-BcjuQn6vfqP+k100e0E9m61Hyqa//Brp+I3f0OBmN0ATHlFA8vx3Lt8z57R3u2bPqe3WGDBC+nF72fTH7isyEw==
   dependencies:
-    fs-monkey "1.0.3"
+    fs-monkey "^1.0.3"
 
 memoize-one@^5.1.1:
   version "5.2.1"
@@ -8240,12 +8582,12 @@ memoize-one@^5.1.1:
 merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
-  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
+  integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==
 
 merge-source-map@1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.0.4.tgz#a5de46538dae84d4114cc5ea02b4772a6346701f"
-  integrity sha1-pd5GU42uhNQRTMXqArR3KmNGcB8=
+  integrity sha512-PGSmS0kfnTnMJCzJ16BLLCEe6oeYCamKFFdQKshi4BmM6FUwipjVOcBFGxqtQtirtAG4iZvHlqST9CpZKqlRjA==
   dependencies:
     source-map "^0.5.6"
 
@@ -8262,7 +8604,7 @@ merge2@^1.3.0, merge2@^1.4.1:
 methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
-  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
+  integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
 
 micromark-core-commonmark@^1.0.0, micromark-core-commonmark@^1.0.1:
   version "1.0.6"
@@ -8469,9 +8811,9 @@ micromark-util-encode@^1.0.0:
   integrity sha512-U2s5YdnAYexjKDel31SVMPbfi+eF8y1U4pfiRW/Y8EFVCy/vgxk/2wWTxzcqE71LHtCuCzlBDRU2a5CQ5j+mQA==
 
 micromark-util-html-tag-name@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-html-tag-name/-/micromark-util-html-tag-name-1.0.0.tgz#75737e92fef50af0c6212bd309bc5cb8dbd489ed"
-  integrity sha512-NenEKIshW2ZI/ERv9HtFNsrn3llSPZtY337LID/24WeLqMzeZhBEE6BQ0vS2ZBjshm5n40chKtJ3qjAbVV8S0g==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-html-tag-name/-/micromark-util-html-tag-name-1.1.0.tgz#eb227118befd51f48858e879b7a419fc0df20497"
+  integrity sha512-BKlClMmYROy9UiV03SwNmckkjn8QHVaWkqoAqzivabvdGcwNGMMMH/5szAnywmsTBUzDsU57/mFi0sp4BQO6dA==
 
 micromark-util-normalize-identifier@^1.0.0:
   version "1.0.0"
@@ -8487,10 +8829,10 @@ micromark-util-resolve-all@^1.0.0:
   dependencies:
     micromark-util-types "^1.0.0"
 
-micromark-util-sanitize-uri@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-1.0.0.tgz#27dc875397cd15102274c6c6da5585d34d4f12b2"
-  integrity sha512-cCxvBKlmac4rxCGx6ejlIviRaMKZc0fWm5HdCHEeDWRSkn44l6NdYVRyU+0nT1XC72EQJMZV8IPHF+jTr56lAg==
+micromark-util-sanitize-uri@^1.0.0, micromark-util-sanitize-uri@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-1.1.0.tgz#f12e07a85106b902645e0364feb07cf253a85aee"
+  integrity sha512-RoxtuSCX6sUNtxhbmsEFQfWzs8VN7cTctmBPvYivo98xb/kDEoTCtJQX5wyzIYEmk/lvNFTat4hL8oW0KndFpg==
   dependencies:
     micromark-util-character "^1.0.0"
     micromark-util-encode "^1.0.0"
@@ -8517,9 +8859,9 @@ micromark-util-types@^1.0.0, micromark-util-types@^1.0.1:
   integrity sha512-DCfg/T8fcrhrRKTPjRrw/5LLvdGV7BHySf/1LOZx7TzWZdYRjogNtyNq885z3nNallwr3QUKARjqvHqX1/7t+w==
 
 micromark@^3.0.0:
-  version "3.0.10"
-  resolved "https://registry.yarnpkg.com/micromark/-/micromark-3.0.10.tgz#1eac156f0399d42736458a14b0ca2d86190b457c"
-  integrity sha512-ryTDy6UUunOXy2HPjelppgJ2sNfcPz1pLlMdA6Rz9jPzhLikWXv/irpWV/I2jd68Uhmny7hHxAlAhk4+vWggpg==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/micromark/-/micromark-3.1.0.tgz#eeba0fe0ac1c9aaef675157b52c166f125e89f62"
+  integrity sha512-6Mj0yHLdUZjHnOPgr5xfWIMqMWS12zDN6iws9SLuSz76W8jTtAv24MN4/CL7gJrl5vtxGInkkqDv/JIoRsQOvA==
   dependencies:
     "@types/debug" "^4.0.0"
     debug "^4.0.0"
@@ -8539,7 +8881,7 @@ micromark@^3.0.0:
     micromark-util-types "^1.0.1"
     uvu "^0.5.0"
 
-micromatch@^4.0.2, micromatch@^4.0.4:
+micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
   integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
@@ -8569,15 +8911,20 @@ mimic-fn@^2.1.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
+mimic-fn@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-4.0.0.tgz#60a90550d5cb0b239cca65d893b1a53b29871ecc"
+  integrity sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==
+
 min-indent@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
   integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
 
 mini-css-extract-plugin@^2.4.5:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.6.0.tgz#578aebc7fc14d32c0ad304c2c34f08af44673f5e"
-  integrity sha512-ndG8nxCEnAemsg4FSgS+yNyHKgkTB4nPKqCOgh65j3/30qqC5RaSQQXMm++Y6sb6E1zRSxPkztj9fqxhS1Eo6w==
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.0.tgz#d7d9ba0c5b596d155e36e2b174082fc7f010dd64"
+  integrity sha512-auqtVo8KhTScMsba7MbijqZTfibbXiBNlPAQbsVt7enQfcDYLdgG57eGxMqwVU3mfeWANY4F1wUg+rMF+ycZgw==
   dependencies:
     schema-utils "^4.0.0"
 
@@ -8586,14 +8933,7 @@ minimalistic-assert@^1.0.0:
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
   integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
-minimatch@3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimatch@^3.0.4, minimatch@^3.1.2:
+minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -8607,12 +8947,12 @@ minimatch@^5.0.1, minimatch@^5.1.0:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.6:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
-  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
+minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.6:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
+  integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
 
-mkdirp@^0.5.1, mkdirp@^0.5.5, mkdirp@~0.5.1:
+mkdirp@^0.5.1, mkdirp@~0.5.1:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
   integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
@@ -8620,9 +8960,9 @@ mkdirp@^0.5.1, mkdirp@^0.5.5, mkdirp@~0.5.1:
     minimist "^1.2.6"
 
 monaco-editor-auto-typings@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/monaco-editor-auto-typings/-/monaco-editor-auto-typings-0.4.0.tgz#52c0b1c74086fbf23568a0322a505808ecd95566"
-  integrity sha512-rd98fgFtHIvetD/Pr3bU5u2lZkd39d8mFJJOIOuEPcf+ZLj1YpRWM0rv/7KKBbOkR50ya6IAp/xR1gE1BEiXrw==
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/monaco-editor-auto-typings/-/monaco-editor-auto-typings-0.4.3.tgz#24498064ff876c641467815e65d54ae75f31cd7f"
+  integrity sha512-7lpiWHkg8eX2DRJGApaFq1wGn95Ute3Xv4PLz36qFyTytzz86irjxwMl00JnOOGX/R0eUbfuudbEtkQh2VK9Gg==
 
 monaco-editor@^0.33.0:
   version "0.33.0"
@@ -8637,7 +8977,7 @@ mri@^1.1.0:
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+  integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
 
 ms@2.1.2:
   version "2.1.2"
@@ -8649,10 +8989,10 @@ ms@2.1.3, ms@^2.1.1:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
-multicast-dns@^7.2.4:
-  version "7.2.4"
-  resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-7.2.4.tgz#cf0b115c31e922aeb20b64e6556cbeb34cf0dd19"
-  integrity sha512-XkCYOU+rr2Ft3LI6w4ye51M3VK31qJXFIxu0XLw169PtKG0Zx47OrXeVW/GCYOfpC9s1yyyf1S+L8/4LY0J9Zw==
+multicast-dns@^7.2.5:
+  version "7.2.5"
+  resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-7.2.5.tgz#77eb46057f4d7adbd16d9290fa7299f6fa64cced"
+  integrity sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==
   dependencies:
     dns-packet "^5.2.2"
     thunky "^1.0.2"
@@ -8662,15 +9002,20 @@ nanoclone@^0.2.1:
   resolved "https://registry.yarnpkg.com/nanoclone/-/nanoclone-0.2.1.tgz#dd4090f8f1a110d26bb32c49ed2f5b9235209ed4"
   integrity sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA==
 
-nanoid@^3.3.1:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.2.tgz#c89622fafb4381cd221421c69ec58547a1eec557"
-  integrity sha512-CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA==
+nanoid@^3.3.4:
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
+  integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
+
+natural-compare-lite@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4"
+  integrity sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==
 
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
-  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
+  integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
 negotiator@0.6.3:
   version "0.6.3"
@@ -8713,12 +9058,12 @@ node-forge@^1:
 node-int64@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
-  integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
+  integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==
 
-node-releases@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.2.tgz#7139fe71e2f4f11b47d4d2986aaf8c48699e0c01"
-  integrity sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg==
+node-releases@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503"
+  integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==
 
 normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
@@ -8728,7 +9073,7 @@ normalize-path@^3.0.0, normalize-path@~3.0.0:
 normalize-range@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
-  integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
+  integrity sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==
 
 normalize-url@^6.0.1:
   version "6.1.0"
@@ -8741,9 +9086,9 @@ not@^0.1.0:
   integrity sha512-5PDmaAsVfnWUgTUbJ3ERwn7u79Z0dYxN9ErxCpVJJqe2RK0PJ3z+iFUxuqjwtlDDegXvtWoxD/3Fzxox7tFGWA==
 
 notistack@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/notistack/-/notistack-2.0.4.tgz#9e043991d4788bed3d1701d1b2f694233ad38dd8"
-  integrity sha512-kOJmKvTG91ElMzi4aHu82BDe1liQ0zMrBp+TnWJptgowDsTbeTKbZmsRqJNIj145BmlOtZsEE9xjcrN46zVo3w==
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/notistack/-/notistack-2.0.8.tgz#78cdf34c64e311bf1d1d71c2123396bcdea5e95b"
+  integrity sha512-/IY14wkFp5qjPgKNvAdfL5Jp6q90+MjgKTPh4c81r/lW70KeuX6b9pE/4f8L4FG31cNudbN9siiFS5ql1aSLRw==
   dependencies:
     clsx "^1.1.0"
     hoist-non-react-statics "^3.3.0"
@@ -8755,6 +9100,13 @@ npm-run-path@^4.0.1:
   dependencies:
     path-key "^3.0.0"
 
+npm-run-path@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-5.1.0.tgz#bc62f7f3f6952d9894bd08944ba011a6ee7b7e00"
+  integrity sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==
+  dependencies:
+    path-key "^4.0.0"
+
 nth-check@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
@@ -8770,98 +9122,107 @@ nth-check@^2.0.0, nth-check@^2.0.1:
     boolbase "^1.0.0"
 
 nwsapi@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
-  integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.2.tgz#e5418863e7905df67d51ec95938d67bf801f0bb0"
+  integrity sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==
 
 object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
+  integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
-object-hash@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.2.0.tgz#5ad518581eefc443bd763472b8ff2e9c2c0d54a5"
-  integrity sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==
+object-hash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-3.0.0.tgz#73f97f753e7baffc0e2cc9d6e079079744ac82e9"
+  integrity sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==
 
-object-inspect@^1.12.0, object-inspect@^1.9.0:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0"
-  integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==
+object-inspect@^1.12.2, object-inspect@^1.9.0:
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea"
+  integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==
 
 object-inspect@~1.4.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.4.1.tgz#37ffb10e71adaf3748d05f713b4c9452f402cbc4"
   integrity sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw==
 
-object-keys@^1.0.12, object-keys@^1.0.6, object-keys@^1.1.1:
+object-is@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac"
+  integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+
+object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
-object.assign@^4.1.0, object.assign@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
-  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
+object.assign@^4.1.3, object.assign@^4.1.4:
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
+  integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==
   dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-    has-symbols "^1.0.1"
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    has-symbols "^1.0.3"
     object-keys "^1.1.1"
 
-object.entries@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz#e1acdd17c4de2cd96d5a08487cfb9db84d881861"
-  integrity sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==
+object.entries@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.6.tgz#9737d0e5b8291edd340a3e3264bb8a3b00d5fa23"
+  integrity sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
 
-object.fromentries@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.5.tgz#7b37b205109c21e741e605727fe8b0ad5fa08251"
-  integrity sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==
+object.fromentries@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.6.tgz#cdb04da08c539cffa912dcd368b886e0904bfa73"
+  integrity sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
 
 object.getownpropertydescriptors@^2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz#1bd63aeacf0d5d2d2f31b5e393b03a7c601a23f7"
-  integrity sha512-WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ==
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.5.tgz#db5a9002489b64eef903df81d6623c07e5b4b4d3"
+  integrity sha512-yDNzckpM6ntyQiGTik1fKV1DcVDRS+w8bvpWNCBanvH5LfRX9O8WTHqQzG4RZwRAM4I0oU7TV11Lj5v0g20ibw==
+  dependencies:
+    array.prototype.reduce "^1.0.5"
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+
+object.hasown@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.2.tgz#f919e21fad4eb38a57bc6345b3afd496515c3f92"
+  integrity sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==
+  dependencies:
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+
+object.values@^1.1.0, object.values@^1.1.5, object.values@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.6.tgz#4abbaa71eba47d63589d402856f908243eea9b1d"
+  integrity sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.2"
-
-object.hasown@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.0.tgz#7232ed266f34d197d15cac5880232f7a4790afe5"
-  integrity sha512-MhjYRfj3GBlhSkDHo6QmvgjRLXQ2zndabdf3nX0yTyZK9rPfxb6uRpAac8HXNLy1GpqWtZ81Qh4v3uOls2sRAg==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
-
-object.values@^1.1.0, object.values@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac"
-  integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
 
 obuf@^1.0.0, obuf@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
   integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
 
-on-finished@~2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
-  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
+on-finished@2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
+  integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==
   dependencies:
     ee-first "1.1.1"
 
@@ -8873,7 +9234,7 @@ on-headers@~1.0.2:
 once@^1.3.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
   dependencies:
     wrappy "1"
 
@@ -8884,6 +9245,13 @@ onetime@^5.1.0, onetime@^5.1.2:
   dependencies:
     mimic-fn "^2.1.0"
 
+onetime@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-6.0.0.tgz#7c24c18ed1fd2e9bca4bd26806a33613c77d34b4"
+  integrity sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==
+  dependencies:
+    mimic-fn "^4.0.0"
+
 open@^7.3.1:
   version "7.4.2"
   resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321"
@@ -8925,13 +9293,6 @@ optionator@^0.9.1:
     type-check "^0.4.0"
     word-wrap "^1.2.3"
 
-p-limit@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
-  integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
-  dependencies:
-    p-try "^1.0.0"
-
 p-limit@^2.0.0, p-limit@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
@@ -8946,13 +9307,6 @@ p-limit@^3.0.2:
   dependencies:
     yocto-queue "^0.1.0"
 
-p-locate@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
-  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
-  dependencies:
-    p-limit "^1.1.0"
-
 p-locate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
@@ -8982,18 +9336,13 @@ p-map@^4.0.0:
     aggregate-error "^3.0.0"
 
 p-retry@^4.5.0:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.1.tgz#8fcddd5cdf7a67a0911a9cf2ef0e5df7f602316c"
-  integrity sha512-e2xXGNhZOZ0lfgR9kL34iGlU8N/KO0xZnQxVEwdeOvpqNDQfdnxIYizvWtK8RglUa3bGqI8g0R/BdfzLMxRkiA==
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.2.tgz#9baae7184057edd4e17231cee04264106e092a16"
+  integrity sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==
   dependencies:
-    "@types/retry" "^0.12.0"
+    "@types/retry" "0.12.0"
     retry "^0.13.1"
 
-p-try@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
-  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
-
 p-try@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
@@ -9002,7 +9351,7 @@ p-try@^2.0.0:
 pako@^0.2.5:
   version "0.2.9"
   resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
-  integrity sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=
+  integrity sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==
 
 pako@^1.0.6, pako@~1.0.2:
   version "1.0.11"
@@ -9079,7 +9428,7 @@ path-browserify@^1.0.1:
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
+  integrity sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==
 
 path-exists@^4.0.0:
   version "4.0.0"
@@ -9089,13 +9438,18 @@ path-exists@^4.0.0:
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
 path-key@^3.0.0, path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
+path-key@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-4.0.0.tgz#295588dc3aee64154f877adb9d780b81c554bf18"
+  integrity sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==
+
 path-parse@^1.0.6, path-parse@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
@@ -9104,7 +9458,7 @@ path-parse@^1.0.6, path-parse@^1.0.7:
 path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
-  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
+  integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==
 
 path-type@^4.0.0:
   version "4.0.0"
@@ -9119,7 +9473,7 @@ pb-util@^1.0.3:
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
+  integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
 
 picocolors@^0.2.1:
   version "0.2.1"
@@ -9136,10 +9490,15 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3, picomatc
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
-pidtree@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.5.0.tgz#ad5fbc1de78b8a5f99d6fbdd4f6e4eee21d1aca1"
-  integrity sha512-9nxspIM7OpZuhBxPg73Zvyq7j1QMPMPsGKTqRc2XOaFQauDvoNz9fM1Wdkjmeo7l9GXOZiRs97sPkuayl39wjA==
+pidtree@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.6.0.tgz#90ad7b6d42d5841e69e0a2419ef38f8883aa057c"
+  integrity sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==
+
+pify@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+  integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==
 
 pirates@^4.0.4:
   version "4.0.5"
@@ -9165,21 +9524,12 @@ pluralize@^7.0.0:
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
   integrity sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==
 
-portfinder@^1.0.28:
-  version "1.0.28"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778"
-  integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==
+postcss-attribute-case-insensitive@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz#03d761b24afc04c09e757e92ff53716ae8ea2741"
+  integrity sha512-XIidXV8fDr0kKt28vqki84fRK8VW8eTuIa4PChv2MqKuT6C9UjmSKzen6KaWhWEoYvwxFCa7n/tC1SZ3tyq4SQ==
   dependencies:
-    async "^2.6.2"
-    debug "^3.1.1"
-    mkdirp "^0.5.5"
-
-postcss-attribute-case-insensitive@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.0.tgz#39cbf6babf3ded1e4abf37d09d6eda21c644105c"
-  integrity sha512-b4g9eagFGq9T5SWX4+USfVyjIb3liPnjhHHRMP7FMB2kFVpYyfEscV0wP3eaXhKlcHKUut8lt5BGoeylWA/dBQ==
-  dependencies:
-    postcss-selector-parser "^6.0.2"
+    postcss-selector-parser "^6.0.10"
 
 postcss-browser-comments@^4:
   version "4.0.0"
@@ -9201,24 +9551,24 @@ postcss-clamp@^4.1.0:
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-color-functional-notation@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.2.tgz#f59ccaeb4ee78f1b32987d43df146109cc743073"
-  integrity sha512-DXVtwUhIk4f49KK5EGuEdgx4Gnyj6+t2jBSEmxvpIK9QI40tWrpS2Pua8Q7iIZWBrki2QOaeUdEaLPPa91K0RQ==
+postcss-color-functional-notation@^4.2.4:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.4.tgz#21a909e8d7454d3612d1659e471ce4696f28caec"
+  integrity sha512-2yrTAUZUab9s6CpxkxC4rVgFEVaR6/2Pipvi6qcgvnYiVqZcbDHEoBDhrXzyb7Efh2CCfHQNtcqWcIruDTIUeg==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-color-hex-alpha@^8.0.3:
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.3.tgz#61a0fd151d28b128aa6a8a21a2dad24eebb34d52"
-  integrity sha512-fESawWJCrBV035DcbKRPAVmy21LpoyiXdPTuHUfWJ14ZRjY7Y7PA6P4g8z6LQGYhU1WAxkTxjIjurXzoe68Glw==
+postcss-color-hex-alpha@^8.0.4:
+  version "8.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.4.tgz#c66e2980f2fbc1a63f5b079663340ce8b55f25a5"
+  integrity sha512-nLo2DCRC9eE4w2JmuKgVA3fGL3d01kGq752pVALF68qpGLmx2Qrk91QTKkdUqqp45T1K1XV8IhQpcu1hoAQflQ==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-color-rebeccapurple@^7.0.2:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.0.2.tgz#5d397039424a58a9ca628762eb0b88a61a66e079"
-  integrity sha512-SFc3MaocHaQ6k3oZaFwH8io6MdypkUtEy/eXzXEB1vEQlO3S3oDc/FSZA8AsS04Z25RirQhlDlHLh3dn7XewWw==
+postcss-color-rebeccapurple@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.1.1.tgz#63fdab91d878ebc4dd4b7c02619a0c3d6a56ced0"
+  integrity sha512-pGxkuVEInwLHgkNxUc4sdg4g3py7zUeCQ9sMfwyHAT+Ezk8a4OaaVZ8lIY5+oNqA/BXXgLyXv0+5wHP68R79hg==
   dependencies:
     postcss-value-parser "^4.2.0"
 
@@ -9232,43 +9582,46 @@ postcss-colormin@^5.3.0:
     colord "^2.9.1"
     postcss-value-parser "^4.2.0"
 
-postcss-convert-values@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.1.0.tgz#f8d3abe40b4ce4b1470702a0706343eac17e7c10"
-  integrity sha512-GkyPbZEYJiWtQB0KZ0X6qusqFHUepguBCNFi9t5JJc7I2OTXG7C0twbTLvCfaKOLl3rSXmpAwV7W5txd91V84g==
+postcss-convert-values@^5.1.3:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz#04998bb9ba6b65aa31035d669a6af342c5f9d393"
+  integrity sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==
+  dependencies:
+    browserslist "^4.21.4"
+    postcss-value-parser "^4.2.0"
+
+postcss-custom-media@^8.0.2:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-8.0.2.tgz#c8f9637edf45fef761b014c024cee013f80529ea"
+  integrity sha512-7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-custom-media@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-8.0.0.tgz#1be6aff8be7dc9bf1fe014bde3b71b92bb4552f1"
-  integrity sha512-FvO2GzMUaTN0t1fBULDeIvxr5IvbDXcIatt6pnJghc736nqNgsGao5NT+5+WVLAQiTt6Cb3YUms0jiPaXhL//g==
-
-postcss-custom-properties@^12.1.5:
-  version "12.1.6"
-  resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-12.1.6.tgz#345b5b64c9520bb66390393646e8d5fbb7f10b58"
-  integrity sha512-QEnQkDkb+J+j2bfJisJJpTAFL+lUFl66rUNvnjPBIvRbZACLG4Eu5bmBCIY4FJCqhwsfbBpmJUyb3FcR/31lAg==
+postcss-custom-properties@^12.1.10:
+  version "12.1.10"
+  resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-12.1.10.tgz#624517179fd4cf50078a7a60f628d5782e7d4903"
+  integrity sha512-U3BHdgrYhCrwTVcByFHs9EOBoqcKq4Lf3kXwbTi4hhq0qWhl/pDWq2THbv/ICX/Fl9KqeHBb8OVrTf2OaYF07A==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-custom-selectors@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-6.0.0.tgz#022839e41fbf71c47ae6e316cb0e6213012df5ef"
-  integrity sha512-/1iyBhz/W8jUepjGyu7V1OPcGbc636snN1yXEQCinb6Bwt7KxsiU7/bLQlp8GwAXzCh7cobBU5odNn/2zQWR8Q==
+postcss-custom-selectors@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-6.0.3.tgz#1ab4684d65f30fed175520f82d223db0337239d9"
+  integrity sha512-fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg==
   dependencies:
     postcss-selector-parser "^6.0.4"
 
-postcss-dir-pseudo-class@^6.0.4:
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.4.tgz#9afe49ea631f0cb36fa0076e7c2feb4e7e3f049c"
-  integrity sha512-I8epwGy5ftdzNWEYok9VjW9whC4xnelAtbajGv4adql4FIF09rnrxnA9Y8xSHN47y7gqFIv10C5+ImsLeJpKBw==
+postcss-dir-pseudo-class@^6.0.5:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.5.tgz#2bf31de5de76added44e0a25ecf60ae9f7c7c26c"
+  integrity sha512-eqn4m70P031PF7ZQIvSgy9RSJ5uI2171O/OO/zcRNYpJbvaeKFUlar1aJ7rmgiQtbm0FSPsRewjpdS0Oew7MPA==
   dependencies:
-    postcss-selector-parser "^6.0.9"
+    postcss-selector-parser "^6.0.10"
 
-postcss-discard-comments@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.1.1.tgz#e90019e1a0e5b99de05f63516ce640bd0df3d369"
-  integrity sha512-5JscyFmvkUxz/5/+TB3QTTT9Gi9jHkcn8dcmmuN68JQcv3aQg4y88yEHHhwFB52l/NkaJ43O0dbksGMAo49nfQ==
+postcss-discard-comments@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz#8df5e81d2925af2780075840c1526f0660e53696"
+  integrity sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==
 
 postcss-discard-duplicates@^5.1.0:
   version "5.1.0"
@@ -9285,10 +9638,10 @@ postcss-discard-overridden@^5.1.0:
   resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz#7e8c5b53325747e9d90131bb88635282fb4a276e"
   integrity sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==
 
-postcss-double-position-gradients@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.1.tgz#a12cfdb7d11fa1a99ccecc747f0c19718fb37152"
-  integrity sha512-jM+CGkTs4FcG53sMPjrrGE0rIvLDdCrqMzgDC5fLI7JHDO7o6QG8C5TQBtExb13hdBdoH9C2QVbG4jo2y9lErQ==
+postcss-double-position-gradients@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.2.tgz#b96318fdb477be95997e86edd29c6e3557a49b91"
+  integrity sha512-GX+FuE/uBR6eskOK+4vkXgT6pDkexLokPaz/AbJna9s5Kzp/yl488pKPjhy0obB475ovfT1Wv8ho7U/cHNaRgQ==
   dependencies:
     "@csstools/postcss-progressive-custom-properties" "^1.1.0"
     postcss-value-parser "^4.2.0"
@@ -9324,18 +9677,27 @@ postcss-font-variant@^5.0.0:
   resolved "https://registry.yarnpkg.com/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz#efd59b4b7ea8bb06127f2d031bfbb7f24d32fa66"
   integrity sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==
 
-postcss-gap-properties@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-gap-properties/-/postcss-gap-properties-3.0.3.tgz#6401bb2f67d9cf255d677042928a70a915e6ba60"
-  integrity sha512-rPPZRLPmEKgLk/KlXMqRaNkYTUpE7YC+bOIQFN5xcu1Vp11Y4faIXv6/Jpft6FMnl6YRxZqDZG0qQOW80stzxQ==
+postcss-gap-properties@^3.0.5:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-gap-properties/-/postcss-gap-properties-3.0.5.tgz#f7e3cddcf73ee19e94ccf7cb77773f9560aa2fff"
+  integrity sha512-IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg==
 
-postcss-image-set-function@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/postcss-image-set-function/-/postcss-image-set-function-4.0.6.tgz#bcff2794efae778c09441498f40e0c77374870a9"
-  integrity sha512-KfdC6vg53GC+vPd2+HYzsZ6obmPqOk6HY09kttU19+Gj1nC3S3XBVEXDHxkhxTohgZqzbUb94bKXvKDnYWBm/A==
+postcss-image-set-function@^4.0.7:
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/postcss-image-set-function/-/postcss-image-set-function-4.0.7.tgz#08353bd756f1cbfb3b6e93182c7829879114481f"
+  integrity sha512-9T2r9rsvYzm5ndsBE8WgtrMlIT7VbtTfE7b3BQnudUqnBcBo7L758oc+o+pdj/dUV0l5wjwSdjeOH2DZtfv8qw==
   dependencies:
     postcss-value-parser "^4.2.0"
 
+postcss-import@^14.1.0:
+  version "14.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-14.1.0.tgz#a7333ffe32f0b8795303ee9e40215dac922781f0"
+  integrity sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==
+  dependencies:
+    postcss-value-parser "^4.0.0"
+    read-cache "^1.0.0"
+    resolve "^1.1.7"
+
 postcss-initial@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-4.0.1.tgz#529f735f72c5724a0fb30527df6fb7ac54d7de42"
@@ -9348,15 +9710,15 @@ postcss-js@^4.0.0:
   dependencies:
     camelcase-css "^2.0.1"
 
-postcss-lab-function@^4.1.2:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-4.2.0.tgz#e054e662c6480202f5760887ec1ae0d153357123"
-  integrity sha512-Zb1EO9DGYfa3CP8LhINHCcTTCTLI+R3t7AX2mKsDzdgVQ/GkCpHOTgOr6HBHslP7XDdVbqgHW5vvRPMdVANQ8w==
+postcss-lab-function@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-4.2.1.tgz#6fe4c015102ff7cd27d1bd5385582f67ebdbdc98"
+  integrity sha512-xuXll4isR03CrQsmxyz92LJB2xX9n+pZJ5jE9JgcnmsCammLyKdlzrBin+25dy6wIjfhJpKBAN80gsTlCgRk2w==
   dependencies:
     "@csstools/postcss-progressive-custom-properties" "^1.1.0"
     postcss-value-parser "^4.2.0"
 
-postcss-load-config@^3.1.0:
+postcss-load-config@^3.1.4:
   version "3.1.4"
   resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.4.tgz#1ab2571faf84bb078877e1d07905eabe9ebda855"
   integrity sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==
@@ -9383,20 +9745,20 @@ postcss-media-minmax@^5.0.0:
   resolved "https://registry.yarnpkg.com/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz#7140bddec173e2d6d657edbd8554a55794e2a5b5"
   integrity sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==
 
-postcss-merge-longhand@^5.1.4:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.4.tgz#0f46f8753989a33260efc47de9a0cdc571f2ec5c"
-  integrity sha512-hbqRRqYfmXoGpzYKeW0/NCZhvNyQIlQeWVSao5iKWdyx7skLvCfQFGIUsP9NUs3dSbPac2IC4Go85/zG+7MlmA==
+postcss-merge-longhand@^5.1.7:
+  version "5.1.7"
+  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz#24a1bdf402d9ef0e70f568f39bdc0344d568fb16"
+  integrity sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==
   dependencies:
     postcss-value-parser "^4.2.0"
-    stylehacks "^5.1.0"
+    stylehacks "^5.1.1"
 
-postcss-merge-rules@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.1.1.tgz#d327b221cd07540bcc8d9ff84446d8b404d00162"
-  integrity sha512-8wv8q2cXjEuCcgpIB1Xx1pIy8/rhMPIQqYKNzEdyx37m6gpq83mQQdCxgIkFgliyEnKvdwJf/C61vN4tQDq4Ww==
+postcss-merge-rules@^5.1.3:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.1.3.tgz#8f97679e67cc8d08677a6519afca41edf2220894"
+  integrity sha512-LbLd7uFC00vpOuMvyZop8+vvhnfRGpp2S+IMQKeuOZZapPRY4SMq5ErjQeHbHsjCUgJkRNrlU+LmxsKIqPKQlA==
   dependencies:
-    browserslist "^4.16.6"
+    browserslist "^4.21.4"
     caniuse-api "^3.0.0"
     cssnano-utils "^3.1.0"
     postcss-selector-parser "^6.0.5"
@@ -9417,19 +9779,19 @@ postcss-minify-gradients@^5.1.1:
     cssnano-utils "^3.1.0"
     postcss-value-parser "^4.2.0"
 
-postcss-minify-params@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.1.2.tgz#77e250780c64198289c954884ebe3ee4481c3b1c"
-  integrity sha512-aEP+p71S/urY48HWaRHasyx4WHQJyOYaKpQ6eXl8k0kxg66Wt/30VR6/woh8THgcpRbonJD5IeD+CzNhPi1L8g==
+postcss-minify-params@^5.1.4:
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz#c06a6c787128b3208b38c9364cfc40c8aa5d7352"
+  integrity sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw==
   dependencies:
-    browserslist "^4.16.6"
+    browserslist "^4.21.4"
     cssnano-utils "^3.1.0"
     postcss-value-parser "^4.2.0"
 
-postcss-minify-selectors@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.2.0.tgz#17c2be233e12b28ffa8a421a02fc8b839825536c"
-  integrity sha512-vYxvHkW+iULstA+ctVNx0VoRAR4THQQRkG77o0oa4/mBS0OzGvvzLIvHDv/nNEM0crzN2WIyFU5X7wZhaUK3RA==
+postcss-minify-selectors@^5.2.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz#d4e7e6b46147b8117ea9325a915a801d5fe656c6"
+  integrity sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==
   dependencies:
     postcss-selector-parser "^6.0.5"
 
@@ -9461,18 +9823,19 @@ postcss-modules-values@^4.0.0:
   dependencies:
     icss-utils "^5.0.0"
 
-postcss-nested@5.0.6:
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-5.0.6.tgz#466343f7fc8d3d46af3e7dba3fcd47d052a945bc"
-  integrity sha512-rKqm2Fk0KbA8Vt3AdGN0FB9OBOMDVajMG6ZCf/GoHgdxUJ4sBFp0A/uMIRm+MJUdo33YXEtjqIz8u7DAp8B7DA==
+postcss-nested@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-6.0.0.tgz#1572f1984736578f360cffc7eb7dca69e30d1735"
+  integrity sha512-0DkamqrPcmkBDsLn+vQDIrtkSbNkv5AD/M322ySo9kqFkCIYklym2xEmWkwo+Y3/qZo34tzEPNUw4y7yMCdv5w==
   dependencies:
-    postcss-selector-parser "^6.0.6"
+    postcss-selector-parser "^6.0.10"
 
-postcss-nesting@^10.1.3:
-  version "10.1.4"
-  resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-10.1.4.tgz#80de9d1c2717bc44df918dd7f118929300192a7a"
-  integrity sha512-2ixdQ59ik/Gt1+oPHiI1kHdwEI8lLKEmui9B1nl6163ANLC+GewQn7fXMxJF2JSb4i2MKL96GU8fIiQztK4TTA==
+postcss-nesting@^10.2.0:
+  version "10.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-10.2.0.tgz#0b12ce0db8edfd2d8ae0aaf86427370b898890be"
+  integrity sha512-EwMkYchxiDiKUhlJGzWsD9b2zvq/r2SSubcRrgP+jujMXFzqvANLt16lJANC+5uZ6hjI7lpRmI6O8JIl+8l1KA==
   dependencies:
+    "@csstools/selector-specificity" "^2.0.0"
     postcss-selector-parser "^6.0.10"
 
 postcss-normalize-charset@^5.1.0:
@@ -9487,17 +9850,17 @@ postcss-normalize-display-values@^5.1.0:
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-normalize-positions@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.1.0.tgz#902a7cb97cf0b9e8b1b654d4a43d451e48966458"
-  integrity sha512-8gmItgA4H5xiUxgN/3TVvXRoJxkAWLW6f/KKhdsH03atg0cB8ilXnrB5PpSshwVu/dD2ZsRFQcR1OEmSBDAgcQ==
+postcss-normalize-positions@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz#ef97279d894087b59325b45c47f1e863daefbb92"
+  integrity sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-normalize-repeat-style@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.0.tgz#f6d6fd5a54f51a741cc84a37f7459e60ef7a6398"
-  integrity sha512-IR3uBjc+7mcWGL6CtniKNQ4Rr5fTxwkaDHwMBDGGs1x9IVRkYIT/M4NelZWkAOBdV6v3Z9S46zqaKGlyzHSchw==
+postcss-normalize-repeat-style@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz#e9eb96805204f4766df66fd09ed2e13545420fb2"
+  integrity sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==
   dependencies:
     postcss-value-parser "^4.2.0"
 
@@ -9515,12 +9878,12 @@ postcss-normalize-timing-functions@^5.1.0:
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-normalize-unicode@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.0.tgz#3d23aede35e160089a285e27bf715de11dc9db75"
-  integrity sha512-J6M3MizAAZ2dOdSjy2caayJLQT8E8K9XjLce8AUQMwOrCvjCHv24aLC/Lps1R1ylOfol5VIDMaM/Lo9NGlk1SQ==
+postcss-normalize-unicode@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz#f67297fca3fea7f17e0d2caa40769afc487aa030"
+  integrity sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA==
   dependencies:
-    browserslist "^4.16.6"
+    browserslist "^4.21.4"
     postcss-value-parser "^4.2.0"
 
 postcss-normalize-url@^5.1.0:
@@ -9552,93 +9915,101 @@ postcss-opacity-percentage@^1.1.2:
   resolved "https://registry.yarnpkg.com/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.2.tgz#bd698bb3670a0a27f6d657cc16744b3ebf3b1145"
   integrity sha512-lyUfF7miG+yewZ8EAk9XUBIlrHyUE6fijnesuz+Mj5zrIHIEw6KcIZSOk/elVMqzLvREmXB83Zi/5QpNRYd47w==
 
-postcss-ordered-values@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.1.1.tgz#0b41b610ba02906a3341e92cab01ff8ebc598adb"
-  integrity sha512-7lxgXF0NaoMIgyihL/2boNAEZKiW0+HkMhdKMTD93CjW8TdCy2hSdj8lsAo+uwm7EDG16Da2Jdmtqpedl0cMfw==
+postcss-ordered-values@^5.1.3:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz#b6fd2bd10f937b23d86bc829c69e7732ce76ea38"
+  integrity sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==
   dependencies:
     cssnano-utils "^3.1.0"
     postcss-value-parser "^4.2.0"
 
-postcss-overflow-shorthand@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.3.tgz#ebcfc0483a15bbf1b27fdd9b3c10125372f4cbc2"
-  integrity sha512-CxZwoWup9KXzQeeIxtgOciQ00tDtnylYIlJBBODqkgS/PU2jISuWOL/mYLHmZb9ZhZiCaNKsCRiLp22dZUtNsg==
+postcss-overflow-shorthand@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.4.tgz#7ed6486fec44b76f0eab15aa4866cda5d55d893e"
+  integrity sha512-otYl/ylHK8Y9bcBnPLo3foYFLL6a6Ak+3EQBPOTR7luMYCOsiVTUk1iLvNf6tVPNGXcoL9Hoz37kpfriRIFb4A==
+  dependencies:
+    postcss-value-parser "^4.2.0"
 
 postcss-page-break@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/postcss-page-break/-/postcss-page-break-3.0.4.tgz#7fbf741c233621622b68d435babfb70dd8c1ee5f"
   integrity sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==
 
-postcss-place@^7.0.4:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-place/-/postcss-place-7.0.4.tgz#eb026650b7f769ae57ca4f938c1addd6be2f62c9"
-  integrity sha512-MrgKeiiu5OC/TETQO45kV3npRjOFxEHthsqGtkh3I1rPbZSbXGD/lZVi9j13cYh+NA8PIAPyk6sGjT9QbRyvSg==
+postcss-place@^7.0.5:
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-place/-/postcss-place-7.0.5.tgz#95dbf85fd9656a3a6e60e832b5809914236986c4"
+  integrity sha512-wR8igaZROA6Z4pv0d+bvVrvGY4GVHihBCBQieXFY3kuSuMyOmEnnfFzHl/tQuqHZkfkIVBEbDvYcFfHmpSet9g==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-preset-env@^7.0.1:
-  version "7.4.3"
-  resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-7.4.3.tgz#fb1c8b4cb405da042da0ddb8c5eda7842c08a449"
-  integrity sha512-dlPA65g9KuGv7YsmGyCKtFkZKCPLkoVMUE3omOl6yM+qrynVHxFvf0tMuippIrXB/sB/MyhL1FgTIbrO+qMERg==
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-7.8.3.tgz#2a50f5e612c3149cc7af75634e202a5b2ad4f1e2"
+  integrity sha512-T1LgRm5uEVFSEF83vHZJV2z19lHg4yJuZ6gXZZkqVsqv63nlr6zabMH3l4Pc01FQCyfWVrh2GaUeCVy9Po+Aag==
   dependencies:
-    "@csstools/postcss-color-function" "^1.0.3"
-    "@csstools/postcss-font-format-keywords" "^1.0.0"
-    "@csstools/postcss-hwb-function" "^1.0.0"
-    "@csstools/postcss-ic-unit" "^1.0.0"
-    "@csstools/postcss-is-pseudo-class" "^2.0.1"
-    "@csstools/postcss-normalize-display-values" "^1.0.0"
-    "@csstools/postcss-oklab-function" "^1.0.2"
+    "@csstools/postcss-cascade-layers" "^1.1.1"
+    "@csstools/postcss-color-function" "^1.1.1"
+    "@csstools/postcss-font-format-keywords" "^1.0.1"
+    "@csstools/postcss-hwb-function" "^1.0.2"
+    "@csstools/postcss-ic-unit" "^1.0.1"
+    "@csstools/postcss-is-pseudo-class" "^2.0.7"
+    "@csstools/postcss-nested-calc" "^1.0.0"
+    "@csstools/postcss-normalize-display-values" "^1.0.1"
+    "@csstools/postcss-oklab-function" "^1.1.1"
     "@csstools/postcss-progressive-custom-properties" "^1.3.0"
-    autoprefixer "^10.4.4"
-    browserslist "^4.20.2"
+    "@csstools/postcss-stepped-value-functions" "^1.0.1"
+    "@csstools/postcss-text-decoration-shorthand" "^1.0.0"
+    "@csstools/postcss-trigonometric-functions" "^1.0.2"
+    "@csstools/postcss-unset-value" "^1.0.2"
+    autoprefixer "^10.4.13"
+    browserslist "^4.21.4"
     css-blank-pseudo "^3.0.3"
     css-has-pseudo "^3.0.4"
     css-prefers-color-scheme "^6.0.3"
-    cssdb "^6.5.0"
-    postcss-attribute-case-insensitive "^5.0.0"
+    cssdb "^7.1.0"
+    postcss-attribute-case-insensitive "^5.0.2"
     postcss-clamp "^4.1.0"
-    postcss-color-functional-notation "^4.2.2"
-    postcss-color-hex-alpha "^8.0.3"
-    postcss-color-rebeccapurple "^7.0.2"
-    postcss-custom-media "^8.0.0"
-    postcss-custom-properties "^12.1.5"
-    postcss-custom-selectors "^6.0.0"
-    postcss-dir-pseudo-class "^6.0.4"
-    postcss-double-position-gradients "^3.1.1"
+    postcss-color-functional-notation "^4.2.4"
+    postcss-color-hex-alpha "^8.0.4"
+    postcss-color-rebeccapurple "^7.1.1"
+    postcss-custom-media "^8.0.2"
+    postcss-custom-properties "^12.1.10"
+    postcss-custom-selectors "^6.0.3"
+    postcss-dir-pseudo-class "^6.0.5"
+    postcss-double-position-gradients "^3.1.2"
     postcss-env-function "^4.0.6"
     postcss-focus-visible "^6.0.4"
     postcss-focus-within "^5.0.4"
     postcss-font-variant "^5.0.0"
-    postcss-gap-properties "^3.0.3"
-    postcss-image-set-function "^4.0.6"
+    postcss-gap-properties "^3.0.5"
+    postcss-image-set-function "^4.0.7"
     postcss-initial "^4.0.1"
-    postcss-lab-function "^4.1.2"
+    postcss-lab-function "^4.2.1"
     postcss-logical "^5.0.4"
     postcss-media-minmax "^5.0.0"
-    postcss-nesting "^10.1.3"
+    postcss-nesting "^10.2.0"
     postcss-opacity-percentage "^1.1.2"
-    postcss-overflow-shorthand "^3.0.3"
+    postcss-overflow-shorthand "^3.0.4"
     postcss-page-break "^3.0.4"
-    postcss-place "^7.0.4"
-    postcss-pseudo-class-any-link "^7.1.1"
+    postcss-place "^7.0.5"
+    postcss-pseudo-class-any-link "^7.1.6"
     postcss-replace-overflow-wrap "^4.0.0"
-    postcss-selector-not "^5.0.0"
+    postcss-selector-not "^6.0.1"
     postcss-value-parser "^4.2.0"
 
-postcss-pseudo-class-any-link@^7.1.1:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.2.tgz#81ec491aa43f97f9015e998b7a14263b4630bdf0"
-  integrity sha512-76XzEQv3g+Vgnz3tmqh3pqQyRojkcJ+pjaePsyhcyf164p9aZsu3t+NWxkZYbcHLK1ju5Qmalti2jPI5IWCe5w==
+postcss-pseudo-class-any-link@^7.1.6:
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.6.tgz#2693b221902da772c278def85a4d9a64b6e617ab"
+  integrity sha512-9sCtZkO6f/5ML9WcTLcIyV1yz9D1rf0tWc+ulKcvV30s0iZKS/ONyETvoWsr6vnrmW+X+KmuK3gV/w5EWnT37w==
   dependencies:
     postcss-selector-parser "^6.0.10"
 
-postcss-reduce-initial@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.1.0.tgz#fc31659ea6e85c492fb2a7b545370c215822c5d6"
-  integrity sha512-5OgTUviz0aeH6MtBjHfbr57tml13PuedK/Ecg8szzd4XRMbYxH4572JFG067z+FqBIf6Zp/d+0581glkvvWMFw==
+postcss-reduce-initial@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.1.1.tgz#c18b7dfb88aee24b1f8e4936541c29adbd35224e"
+  integrity sha512-//jeDqWcHPuXGZLoolFrUXBDyuEGbr9S2rMo19bkTIjBQ4PqkaO+oI8wua5BOUxpfi97i3PCoInsiFIEBfkm9w==
   dependencies:
-    browserslist "^4.16.6"
+    browserslist "^4.21.4"
     caniuse-api "^3.0.0"
 
 postcss-reduce-transforms@^5.1.0:
@@ -9653,17 +10024,17 @@ postcss-replace-overflow-wrap@^4.0.0:
   resolved "https://registry.yarnpkg.com/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz#d2df6bed10b477bf9c52fab28c568b4b29ca4319"
   integrity sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==
 
-postcss-selector-not@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-5.0.0.tgz#ac5fc506f7565dd872f82f5314c0f81a05630dc7"
-  integrity sha512-/2K3A4TCP9orP4TNS7u3tGdRFVKqz/E6pX3aGnriPG0jU78of8wsUcqE4QAhWEU0d+WnMSF93Ah3F//vUtK+iQ==
+postcss-selector-not@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-6.0.1.tgz#8f0a709bf7d4b45222793fc34409be407537556d"
+  integrity sha512-1i9affjAe9xu/y9uqWH+tD4r6/hDaXJruk8xn2x1vzxC2U3J3LKO3zJW4CyxlNhA56pADJ/djpEwpH1RClI2rQ==
   dependencies:
-    balanced-match "^1.0.0"
+    postcss-selector-parser "^6.0.10"
 
-postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.6, postcss-selector-parser@^6.0.9:
-  version "6.0.10"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz#79b61e2c0d1bfc2602d549e11d0876256f8df88d"
-  integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==
+postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.9:
+  version "6.0.11"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz#2e41dc39b7ad74046e1615185185cd0b17d0c8dc"
+  integrity sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==
   dependencies:
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
@@ -9683,7 +10054,7 @@ postcss-unique-selectors@^5.1.1:
   dependencies:
     postcss-selector-parser "^6.0.5"
 
-postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0:
+postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
@@ -9696,12 +10067,12 @@ postcss@^7.0.35:
     picocolors "^0.2.1"
     source-map "^0.6.1"
 
-postcss@^8.3.5, postcss@^8.4.4, postcss@^8.4.6, postcss@^8.4.7:
-  version "8.4.12"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.12.tgz#1e7de78733b28970fa4743f7da6f3763648b1905"
-  integrity sha512-lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg==
+postcss@^8.3.5, postcss@^8.4.18, postcss@^8.4.4:
+  version "8.4.19"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.19.tgz#61178e2add236b17351897c8bcc0b4c8ecab56fc"
+  integrity sha512-h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA==
   dependencies:
-    nanoid "^3.3.1"
+    nanoid "^3.3.4"
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
@@ -9713,12 +10084,12 @@ prelude-ls@^1.2.1:
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
-  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
+  integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==
 
 prettier@^2.6.2:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.2.tgz#e26d71a18a74c3d0f0597f55f01fb6c06c206032"
-  integrity sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.0.tgz#c7df58393c9ba77d6fba3921ae01faf994fb9dc9"
+  integrity sha512-9Lmg8hTFZKG0Asr/kW9Bp8tJjRVluO8EJQVfY2T7FMw9T5jy4I/Uvx0Rca/XWf50QQ1/SS48+6IJWnrb+2yemA==
 
 pretty-bytes@^5.3.0, pretty-bytes@^5.4.1:
   version "5.6.0"
@@ -9742,10 +10113,29 @@ pretty-format@^27.0.0, pretty-format@^27.0.2, pretty-format@^27.5.1:
     ansi-styles "^5.0.0"
     react-is "^17.0.1"
 
+pretty-format@^28.1.3:
+  version "28.1.3"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-28.1.3.tgz#c9fba8cedf99ce50963a11b27d982a9ae90970d5"
+  integrity sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==
+  dependencies:
+    "@jest/schemas" "^28.1.3"
+    ansi-regex "^5.0.1"
+    ansi-styles "^5.0.0"
+    react-is "^18.0.0"
+
+pretty-format@^29.0.0, pretty-format@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.3.1.tgz#1841cac822b02b4da8971dacb03e8a871b4722da"
+  integrity sha512-FyLnmb1cYJV8biEIiRyzRFvs2lry7PPIvOqKVe1GCUEYg4YGmlx1qG9EJNMxArYm7piII4qb8UV1Pncq5dxmcg==
+  dependencies:
+    "@jest/schemas" "^29.0.0"
+    ansi-styles "^5.0.0"
+    react-is "^18.0.0"
+
 process-nextick-args@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
-  integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=
+  integrity sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==
 
 process-nextick-args@~2.0.0:
   version "2.0.1"
@@ -9760,9 +10150,9 @@ promise@^7.1.1:
     asap "~2.0.3"
 
 promise@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/promise/-/promise-8.1.0.tgz#697c25c3dfe7435dd79fcd58c38a135888eaf05e"
-  integrity sha512-W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q==
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/promise/-/promise-8.3.0.tgz#8cb333d1edeb61ef23869fbb8a4ea0279ab60e0a"
+  integrity sha512-rZPNPKTOYVNEEKFaq1HqTgOwZD+4/YHS5ukLzQCypkj+OkYx7iv0mA91lJlpPPZ8vMau3IIGj5Qlwrx+8iiSmg==
   dependencies:
     asap "~2.0.6"
 
@@ -9789,9 +10179,9 @@ property-expr@^2.0.4:
   integrity sha512-IJUkICM5dP5znhCckHSv30Q4b5/JA5enCtkRHYaOVOAocnH/1BQEYTC5NMfT3AVl/iXKdr3aqQbQn9DxyWknwA==
 
 property-information@^6.0.0:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/property-information/-/property-information-6.1.1.tgz#5ca85510a3019726cb9afed4197b7b8ac5926a22"
-  integrity sha512-hrzC564QIl0r0vy4l6MvRLhafmUowhO/O3KgVSoXIbbA2Sz4j8HGpJc6T2cubRVwMwpdiG/vKGfhT4IixmKN9w==
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/property-information/-/property-information-6.2.0.tgz#b74f522c31c097b5149e3c3cb8d7f3defd986a1d"
+  integrity sha512-kma4U7AFCTwpqq5twzC1YVIDXSqg6qQK6JN0smOw8fgRy1OkMi0CYSzFmsy6dnqSenamAtj0CyXMUJ1Mf6oROg==
 
 protobufjs@^6.11.3:
   version "6.11.3"
@@ -9812,6 +10202,24 @@ protobufjs@^6.11.3:
     "@types/node" ">=13.7.0"
     long "^4.0.0"
 
+protobufjs@^7.0.0:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.1.2.tgz#a0cf6aeaf82f5625bffcf5a38b7cd2a7de05890c"
+  integrity sha512-4ZPTPkXCdel3+L81yw3dG6+Kq3umdWKh7Dc7GW/CpNk4SX3hK58iPCWeCyhVTDrbkNeKrYNZ7EojM5WDaEWTLQ==
+  dependencies:
+    "@protobufjs/aspromise" "^1.1.2"
+    "@protobufjs/base64" "^1.1.2"
+    "@protobufjs/codegen" "^2.0.4"
+    "@protobufjs/eventemitter" "^1.1.0"
+    "@protobufjs/fetch" "^1.1.0"
+    "@protobufjs/float" "^1.0.2"
+    "@protobufjs/inquire" "^1.1.0"
+    "@protobufjs/path" "^1.1.2"
+    "@protobufjs/pool" "^1.1.0"
+    "@protobufjs/utf8" "^1.1.0"
+    "@types/node" ">=13.7.0"
+    long "^5.0.0"
+
 proxy-addr@~2.0.7:
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
@@ -9821,9 +10229,9 @@ proxy-addr@~2.0.7:
     ipaddr.js "1.9.1"
 
 psl@^1.1.33:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
-  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
+  integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
 
 punycode@^2.1.0, punycode@^2.1.1:
   version "2.1.1"
@@ -9833,17 +10241,24 @@ punycode@^2.1.0, punycode@^2.1.1:
 pure-color@^1.2.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/pure-color/-/pure-color-1.3.0.tgz#1fe064fb0ac851f0de61320a8bf796836422f33e"
-  integrity sha1-H+Bk+wrIUfDeYTIKi/eWg2Qi8z4=
+  integrity sha512-QFADYnsVoBMw1srW7OVKEYjG+MbIa49s54w1MA1EDY6r2r/sTcKKYqRX1f4GYvnXP7eN/Pe9HFcX+hwzmrXRHA==
 
 q@^1.1.2:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
-  integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
+  integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==
 
-qs@6.9.7:
-  version "6.9.7"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.7.tgz#4610846871485e1e048f44ae3b94033f0e675afe"
-  integrity sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==
+qs@6.11.0:
+  version "6.11.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a"
+  integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==
+  dependencies:
+    side-channel "^1.0.4"
+
+querystringify@^2.1.1:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
+  integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
 
 queue-microtask@^1.2.2:
   version "1.2.3"
@@ -9856,9 +10271,9 @@ quick-lru@^5.1.1:
   integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==
 
 quicktype-core@^6.0.71:
-  version "6.0.71"
-  resolved "https://registry.yarnpkg.com/quicktype-core/-/quicktype-core-6.0.71.tgz#01e9cf870a4d57112a4f0678835902bdd2f45934"
-  integrity sha512-NqyPyMhKFUzDKxk5+omV165x2HfxgAMuKaImjuUY3X0CSREBU7p3Bo2uXCMr16bdghpmc/dXOz4ZXvzayQritg==
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/quicktype-core/-/quicktype-core-6.1.0.tgz#d190dbf79bf424ebcfca92b3437daf8cf096b7f3"
+  integrity sha512-r5+sRrUBX5RSdNNG2zpYD706Lxsq/0Tvh7te52csKrKKcAGGcSd1mx4sWWjhnBc54I0ZkrLHk/urIWwCDihgMg==
   dependencies:
     "@mark.probst/unicode-properties" "~1.1.0"
     browser-or-node "^1.2.1"
@@ -9876,7 +10291,7 @@ quicktype-core@^6.0.71:
 quote-stream@^1.0.1, quote-stream@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/quote-stream/-/quote-stream-1.0.2.tgz#84963f8c9c26b942e153feeb53aae74652b7e0b2"
-  integrity sha1-hJY/jJwmuULhU/7rU6rnRlK34LI=
+  integrity sha512-kKr2uQ2AokadPjvTyKJQad9xELbZwYzWlNfI3Uz2j/ib5u6H9lDP7fUUR//rMycd0gv4Z5P1qXMfXR8YpIxrjQ==
   dependencies:
     buffer-equal "0.0.1"
     minimist "^1.1.3"
@@ -9906,13 +10321,13 @@ range-parser@^1.2.1, range-parser@~1.2.1:
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
-raw-body@2.4.3:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.3.tgz#8f80305d11c2a0a545c2d9d89d7a0286fcead43c"
-  integrity sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==
+raw-body@2.5.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857"
+  integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==
   dependencies:
     bytes "3.1.2"
-    http-errors "1.8.1"
+    http-errors "2.0.0"
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
@@ -9939,7 +10354,7 @@ react-app-polyfill@^3.0.0:
 react-base16-styling@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/react-base16-styling/-/react-base16-styling-0.6.0.tgz#ef2156d66cf4139695c8a167886cb69ea660792c"
-  integrity sha1-7yFW1mz0E5aVyKFniGy2nqZgeSw=
+  integrity sha512-yvh/7CArceR/jNATXOKDlvTnPKPmGZz7zsenQ3jUwLzHkNUR0CvY3yGYJbWJ/nnxsL8Sgmt5cO3/SILVuPO6TQ==
   dependencies:
     base16 "^1.0.0"
     lodash.curry "^4.0.1"
@@ -9947,9 +10362,9 @@ react-base16-styling@^0.6.0:
     pure-color "^1.2.0"
 
 react-beautiful-dnd@^13.1.0:
-  version "13.1.0"
-  resolved "https://registry.yarnpkg.com/react-beautiful-dnd/-/react-beautiful-dnd-13.1.0.tgz#ec97c81093593526454b0de69852ae433783844d"
-  integrity sha512-aGvblPZTJowOWUNiwd6tNfEpgkX5OxmpqxHKNW/4VmvZTNTbeiq7bA3bn5T+QSF2uibXB0D1DmJsb1aC/+3cUA==
+  version "13.1.1"
+  resolved "https://registry.yarnpkg.com/react-beautiful-dnd/-/react-beautiful-dnd-13.1.1.tgz#b0f3087a5840920abf8bb2325f1ffa46d8c4d0a2"
+  integrity sha512-0Lvs4tq2VcrEjEgDXHjT98r+63drkKEgqyxdA7qD3mvKwga6a5SscbdLPO2IExotU1jW8L0Ksdl0Cj2AF67nPQ==
   dependencies:
     "@babel/runtime" "^7.9.2"
     css-box-model "^1.2.0"
@@ -9969,10 +10384,10 @@ react-detect-offline@^2.4.5:
   resolved "https://registry.yarnpkg.com/react-detect-offline/-/react-detect-offline-2.4.5.tgz#3c242516c37b6789cf89102881031f87e70b80e6"
   integrity sha512-sI13NPEKl3uQp95FT5CwrYzH3DnXCwNP6TnY6NRF5gFDM4NU9KDlbtA6HG2dwhDVS0RYQGXwZW/mHbdf8fCnaw==
 
-react-dev-utils@^12.0.0:
-  version "12.0.0"
-  resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-12.0.0.tgz#4eab12cdb95692a077616770b5988f0adf806526"
-  integrity sha512-xBQkitdxozPxt1YZ9O1097EJiVpwHr9FoAuEVURCKV0Av8NBERovJauzP7bo1ThvuhZ4shsQ1AJiu4vQpoT1AQ==
+react-dev-utils@^12.0.1:
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-12.0.1.tgz#ba92edb4a1f379bd46ccd6bcd4e7bc398df33e73"
+  integrity sha512-84Ivxmr17KjUupyqzFode6xKhjwuEJDROWKJy/BthkL7Wn6NJ8h4WE6k/exAv6ImS+0oZLRRW5j/aINMHyeGeQ==
   dependencies:
     "@babel/code-frame" "^7.16.0"
     address "^1.1.2"
@@ -9993,7 +10408,7 @@ react-dev-utils@^12.0.0:
     open "^8.4.0"
     pkg-up "^3.1.0"
     prompts "^2.4.2"
-    react-error-overlay "^6.0.10"
+    react-error-overlay "^6.0.11"
     recursive-readdir "^2.2.2"
     shell-quote "^1.7.3"
     strip-ansi "^6.0.1"
@@ -10040,13 +10455,13 @@ react-dnd@^16.0.1:
     fast-deep-equal "^3.1.3"
     hoist-non-react-statics "^3.3.2"
 
-react-dom@^18.0.0:
-  version "18.0.0"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.0.0.tgz#26b88534f8f1dbb80853e1eabe752f24100d8023"
-  integrity sha512-XqX7uzmFo0pUceWFCt7Gff6IyIMzFUn7QMZrbrQfGxtaxXZIcGQzoNpRLE3fQLnS4XzLLPMZX2T9TRcSrasicw==
+react-dom@^18.2.0:
+  version "18.2.0"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.2.0.tgz#22aaf38708db2674ed9ada224ca4aa708d821e3d"
+  integrity sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==
   dependencies:
     loose-envify "^1.1.0"
-    scheduler "^0.21.0"
+    scheduler "^0.23.0"
 
 react-dropzone@^10:
   version "10.2.2"
@@ -10069,10 +10484,10 @@ react-error-boundary@^3.1.4:
   dependencies:
     "@babel/runtime" "^7.12.5"
 
-react-error-overlay@^6.0.10:
-  version "6.0.10"
-  resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.10.tgz#0fe26db4fa85d9dbb8624729580e90e7159a59a6"
-  integrity sha512-mKR90fX7Pm5seCOfz8q9F+66VCc1PGsWSBxKbITjfKVQHMNF2zudxHnMdJiB1fRCb+XsbQV9sO9DCkgsMQgBIA==
+react-error-overlay@^6.0.11:
+  version "6.0.11"
+  resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.11.tgz#92835de5841c5cf08ba00ddd2d677b6d17ff9adb"
+  integrity sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg==
 
 react-fast-compare@^3.2.0:
   version "3.2.0"
@@ -10091,9 +10506,9 @@ react-helmet-async@^1.3.0:
     shallowequal "^1.1.0"
 
 react-hook-form@^7.10.0, react-hook-form@^7.30.0:
-  version "7.30.0"
-  resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.30.0.tgz#c9e2fd54d3627e43bd94bf38ef549df2e80c1371"
-  integrity sha512-DzjiM6o2vtDGNMB9I4yCqW8J21P314SboNG1O0obROkbg7KVS0I7bMtwSdKyapnCPjHgnxc3L7E5PEdISeEUcQ==
+  version "7.39.7"
+  resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.39.7.tgz#8eabf2dbb9fce5baccfa60f401f6ef99c4e17fb4"
+  integrity sha512-RT0NE1uW1bY3nAuMdzfqHrpv2+sICVFaxBOvNJsCva4if2sxPxcyJy/CSqU56UXqAdRg724CNDhjMYPSHSF3rg==
 
 react-image@^4:
   version "4.0.3"
@@ -10152,9 +10567,9 @@ react-markdown@^8.0.3, react-markdown@~8.0.0:
     vfile "^5.0.0"
 
 react-redux@^7.2.0:
-  version "7.2.8"
-  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.8.tgz#a894068315e65de5b1b68899f9c6ee0923dd28de"
-  integrity sha512-6+uDjhs3PSIclqoCk0kd6iX74gzrGc3W5zcAjbrFgEdIjRSQObdIwfx80unTkVUYvbQ95Y8Av3OvFHq1w5EOUw==
+  version "7.2.9"
+  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.9.tgz#09488fbb9416a4efe3735b7235055442b042481d"
+  integrity sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==
   dependencies:
     "@babel/runtime" "^7.15.4"
     "@types/react-redux" "^7.1.20"
@@ -10169,12 +10584,12 @@ react-refresh@^0.11.0:
   integrity sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==
 
 react-router-dom@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.3.0.tgz#a0216da813454e521905b5fa55e0e5176123f43d"
-  integrity sha512-uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw==
+  version "6.4.3"
+  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.4.3.tgz#70093b5f65f85f1df9e5d4182eb7ff3a08299275"
+  integrity sha512-MiaYQU8CwVCaOfJdYvt84KQNjT78VF0TJrA17SIQgNHRvLnXDJO6qsFqq8F/zzB1BWZjCFIrQpu4QxcshitziQ==
   dependencies:
-    history "^5.2.0"
-    react-router "6.3.0"
+    "@remix-run/router" "1.0.3"
+    react-router "6.4.3"
 
 react-router-hash-link@^2.4.3:
   version "2.4.3"
@@ -10183,17 +10598,17 @@ react-router-hash-link@^2.4.3:
   dependencies:
     prop-types "^15.7.2"
 
-react-router@6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.3.0.tgz#3970cc64b4cb4eae0c1ea5203a80334fdd175557"
-  integrity sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ==
+react-router@6.4.3:
+  version "6.4.3"
+  resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.4.3.tgz#9ed3ee4d6e95889e9b075a5d63e29acc7def0d49"
+  integrity sha512-BT6DoGn6aV1FVP5yfODMOiieakp3z46P1Fk0RNzJMACzE7C339sFuHebfvWtnB4pzBvXXkHP2vscJzWRuUjTtA==
   dependencies:
-    history "^5.2.0"
+    "@remix-run/router" "1.0.3"
 
-react-scripts@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-5.0.0.tgz#6547a6d7f8b64364ef95273767466cc577cb4b60"
-  integrity sha512-3i0L2CyIlROz7mxETEdfif6Sfhh9Lfpzi10CtcGs1emDQStmZfWjJbAIMtRD0opVUjQuFWqHZyRZ9PPzKCFxWg==
+react-scripts@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-5.0.1.tgz#6285dbd65a8ba6e49ca8d651ce30645a6d980003"
+  integrity sha512-8VAmEm/ZAwQzJ+GOMLbBsTdDKOpuZh7RPs0UymvBR2vRk4iZWCskjbFnxqjrzoIvlNNRZ3QJFx6/qDSi6zSnaQ==
   dependencies:
     "@babel/core" "^7.16.0"
     "@pmmmwh/react-refresh-webpack-plugin" "^0.5.3"
@@ -10211,7 +10626,7 @@ react-scripts@^5.0.0:
     dotenv "^10.0.0"
     dotenv-expand "^5.1.0"
     eslint "^8.3.0"
-    eslint-config-react-app "^7.0.0"
+    eslint-config-react-app "^7.0.1"
     eslint-webpack-plugin "^3.1.1"
     file-loader "^6.2.0"
     fs-extra "^10.0.0"
@@ -10228,7 +10643,7 @@ react-scripts@^5.0.0:
     postcss-preset-env "^7.0.1"
     prompts "^2.4.2"
     react-app-polyfill "^3.0.0"
-    react-dev-utils "^12.0.0"
+    react-dev-utils "^12.0.1"
     react-refresh "^0.11.0"
     resolve "^1.20.0"
     resolve-url-loader "^4.0.0"
@@ -10246,18 +10661,18 @@ react-scripts@^5.0.0:
     fsevents "^2.3.2"
 
 react-textarea-autosize@^8.3.2:
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-8.3.4.tgz#270a343de7ad350534141b02c9cb78903e553524"
-  integrity sha512-CdtmP8Dc19xL8/R6sWvtknD/eCXkQr30dtvC4VmGInhRsfF8X/ihXCq6+9l9qbxmKRiq407/7z5fxE7cVWQNgQ==
+  version "8.4.0"
+  resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-8.4.0.tgz#4d0244d6a50caa897806b8c44abc0540a69bfc8c"
+  integrity sha512-YrTFaEHLgJsi8sJVYHBzYn+mkP3prGkmP2DKb/tm0t7CLJY5t1Rxix8070LAKb0wby7bl/lf2EeHkuMihMZMwQ==
   dependencies:
     "@babel/runtime" "^7.10.2"
     use-composed-ref "^1.3.0"
     use-latest "^1.2.1"
 
-react-transition-group@^4.4.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz#8b59a56f09ced7b55cbd53c36768b922890d5470"
-  integrity sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg==
+react-transition-group@^4.4.5:
+  version "4.4.5"
+  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.5.tgz#e53d4e3f3344da8521489fbef8f2581d42becdd1"
+  integrity sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==
   dependencies:
     "@babel/runtime" "^7.5.5"
     dom-helpers "^5.0.1"
@@ -10276,13 +10691,20 @@ react-virtual@^2.10.4:
   dependencies:
     "@reach/observe-rect" "^1.1.0"
 
-react@^18.0.0:
-  version "18.0.0"
-  resolved "https://registry.yarnpkg.com/react/-/react-18.0.0.tgz#b468736d1f4a5891f38585ba8e8fb29f91c3cb96"
-  integrity sha512-x+VL6wbT4JRVPm7EGxXhZ8w8LTROaxPXOqhlGyVSrv0sB1jkyFGgXxJ8LVoPRLvPR6/CIZGFmfzqUa2NYeMr2A==
+react@^18.2.0:
+  version "18.2.0"
+  resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5"
+  integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==
   dependencies:
     loose-envify "^1.1.0"
 
+read-cache@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
+  integrity sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==
+  dependencies:
+    pify "^2.3.0"
+
 readable-stream@2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.0.tgz#640f5dcda88c91a8dc60787145629170813a1ed2"
@@ -10326,11 +10748,11 @@ readdirp@~3.6.0:
     picomatch "^2.2.1"
 
 recursive-readdir@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.2.tgz#9946fb3274e1628de6e36b2f6714953b4845094f"
-  integrity sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.3.tgz#e726f328c0d69153bcabd5c322d3195252379372"
+  integrity sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA==
   dependencies:
-    minimatch "3.0.4"
+    minimatch "^3.0.5"
 
 redent@^3.0.0:
   version "3.0.0"
@@ -10347,20 +10769,20 @@ redux@^4.0.0, redux@^4.0.4, redux@^4.1.1, redux@^4.2.0:
   dependencies:
     "@babel/runtime" "^7.9.2"
 
-refractor@^4.5.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/refractor/-/refractor-4.7.0.tgz#aad649d7857acdc0d5792f1a7900867256941ac0"
-  integrity sha512-X3JUDE7nq1csWs7Etg5v7hW10RzF4lYesEn/KDbllocj0itZrs3paO2ZEgYUXrlgXzY3IN+eDRByyIvzcfF9Tg==
+refractor@^4.7.0:
+  version "4.8.0"
+  resolved "https://registry.yarnpkg.com/refractor/-/refractor-4.8.0.tgz#ed56963d66765ac4f304bf9f16e901c5642164d2"
+  integrity sha512-SVOnWUJiEBFNiBlHbudSpSpDfDhDY1UHF0CMKgdvPsMYNQQ4rnqFxyGvP07UmteNC8V12mTF2c0lEsGS7lKaGw==
   dependencies:
     "@types/hast" "^2.0.0"
     "@types/prismjs" "^1.0.0"
     hastscript "^7.0.0"
     parse-entities "^4.0.0"
 
-regenerate-unicode-properties@^10.0.1:
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz#7f442732aa7934a3740c779bb9b3340dccc1fb56"
-  integrity sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==
+regenerate-unicode-properties@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz#7c3192cab6dd24e21cb4461e5ddd7dd24fa8374c"
+  integrity sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==
   dependencies:
     regenerate "^1.4.2"
 
@@ -10369,15 +10791,15 @@ regenerate@^1.4.2:
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
   integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
-regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.9:
-  version "0.13.9"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
-  integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
+regenerator-runtime@^0.13.11, regenerator-runtime@^0.13.9:
+  version "0.13.11"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
+  integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
 
-regenerator-transform@^0.15.0:
-  version "0.15.0"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.0.tgz#cbd9ead5d77fae1a48d957cf889ad0586adb6537"
-  integrity sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==
+regenerator-transform@^0.15.1:
+  version "0.15.1"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.1.tgz#f6c4e99fc1b4591f780db2586328e4d9a9d8dc56"
+  integrity sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==
   dependencies:
     "@babel/runtime" "^7.8.4"
 
@@ -10386,40 +10808,41 @@ regex-parser@^2.2.11:
   resolved "https://registry.yarnpkg.com/regex-parser/-/regex-parser-2.2.11.tgz#3b37ec9049e19479806e878cabe7c1ca83ccfe58"
   integrity sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==
 
-regexp.prototype.flags@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz#b3f4c0059af9e47eca9f3f660e51d81307e72307"
-  integrity sha512-pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ==
+regexp.prototype.flags@^1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac"
+  integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
+    functions-have-names "^1.2.2"
 
 regexpp@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
   integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
 
-regexpu-core@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.0.1.tgz#c531122a7840de743dcf9c83e923b5560323ced3"
-  integrity sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw==
+regexpu-core@^5.2.1:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.2.2.tgz#3e4e5d12103b64748711c3aad69934d7718e75fc"
+  integrity sha512-T0+1Zp2wjF/juXMrMxHxidqGYn8U4R+zleSJhX9tQ1PUsS8a9UtYfbsF9LdiVgNX3kiX8RNaKM42nfSgvFJjmw==
   dependencies:
     regenerate "^1.4.2"
-    regenerate-unicode-properties "^10.0.1"
-    regjsgen "^0.6.0"
-    regjsparser "^0.8.2"
+    regenerate-unicode-properties "^10.1.0"
+    regjsgen "^0.7.1"
+    regjsparser "^0.9.1"
     unicode-match-property-ecmascript "^2.0.0"
-    unicode-match-property-value-ecmascript "^2.0.0"
+    unicode-match-property-value-ecmascript "^2.1.0"
 
-regjsgen@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.6.0.tgz#83414c5354afd7d6627b16af5f10f41c4e71808d"
-  integrity sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA==
+regjsgen@^0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.7.1.tgz#ee5ef30e18d3f09b7c369b76e7c2373ed25546f6"
+  integrity sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA==
 
-regjsparser@^0.8.2:
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.8.4.tgz#8a14285ffcc5de78c5b95d62bbf413b6bc132d5f"
-  integrity sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==
+regjsparser@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709"
+  integrity sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==
   dependencies:
     jsesc "~0.5.0"
 
@@ -10444,6 +10867,15 @@ rehype-autolink-headings@~6.1.1:
     unified "^10.0.0"
     unist-util-visit "^4.0.0"
 
+rehype-ignore@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/rehype-ignore/-/rehype-ignore-1.0.3.tgz#0bc78cf2e82d8b12069e37f0944acf8509d8c95e"
+  integrity sha512-N8eAcq9+QUFhTZqB4oxJ8WL1D2EWp+Jr+j6DKlV21j8+TBLkPdotWNPSzo4FNJbIy6SWxjS/dgDpHmJm8YD6XQ==
+  dependencies:
+    hast-util-select "~5.0.1"
+    unified "~10.1.2"
+    unist-util-visit "~4.1.0"
+
 rehype-parse@^8.0.0, rehype-parse@^8.0.2:
   version "8.0.4"
   resolved "https://registry.yarnpkg.com/rehype-parse/-/rehype-parse-8.0.4.tgz#3d17c9ff16ddfef6bbcc8e6a25a99467b482d688"
@@ -10454,19 +10886,19 @@ rehype-parse@^8.0.0, rehype-parse@^8.0.2:
     parse5 "^6.0.0"
     unified "^10.0.0"
 
-rehype-prism-plus@~1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/rehype-prism-plus/-/rehype-prism-plus-1.3.2.tgz#4ee433200a44b779afa919b48e186f89a9648330"
-  integrity sha512-fQXzzMpQu+XM/GUsT0GdwfU8gwpUJ1QjE0BLrMjuULkpFW6/GViNvUJKtIiYc9/uSh6k33CB0YbSa90Bs6R3TQ==
+rehype-prism-plus@~1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/rehype-prism-plus/-/rehype-prism-plus-1.5.0.tgz#113aae19687c0f8faf6f5fb16964ff1527d130d7"
+  integrity sha512-KNJYMQHqN+53ZbT5Pa/lO7uorMpBIR3x9RjFeG1lPlQherZDZiPqyOFS464L4BniZ4VG5PnG5DXVqjGtwxWJew==
   dependencies:
     hast-util-to-string "^2.0.0"
     parse-numeric-range "^1.3.0"
-    refractor "^4.5.0"
+    refractor "^4.7.0"
     rehype-parse "^8.0.2"
     unist-util-filter "^4.0.0"
     unist-util-visit "^4.0.0"
 
-rehype-raw@~6.1.1:
+rehype-raw@^6.1.1:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/rehype-raw/-/rehype-raw-6.1.1.tgz#81bbef3793bd7abacc6bf8335879d1b6c868c9d4"
   integrity sha512-d6AKtisSRtDRX4aSPsJGTfnzrX2ZkHQLE5kiUuGOeEoLpbEulFF4hj0mLPbsa+7vmguDKOVVEQdHKDSwoaIDsQ==
@@ -10484,15 +10916,6 @@ rehype-rewrite@~3.0.6:
     unified "~10.1.1"
     unist-util-visit "~4.1.0"
 
-rehype-sanitize@~5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/rehype-sanitize/-/rehype-sanitize-5.0.1.tgz#dac01a7417bdd329260c74c74449697b4be5eb56"
-  integrity sha512-da/jIOjq8eYt/1r9GN6GwxIR3gde7OZ+WV8pheu1tL8K0D9KxM2AyMh+UEfke+FfdM3PvGHeYJU0Td5OWa7L5A==
-  dependencies:
-    "@types/hast" "^2.0.0"
-    hast-util-sanitize "^4.0.0"
-    unified "^10.0.0"
-
 rehype-slug@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/rehype-slug/-/rehype-slug-5.0.1.tgz#6e732d0c55b3b1e34187e74b7363fb53229e5f52"
@@ -10528,7 +10951,7 @@ rehype@~12.0.1:
 relateurl@^0.2.7:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
-  integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=
+  integrity sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==
 
 remark-gfm@^3.0.1, remark-gfm@~3.0.1:
   version "3.0.1"
@@ -10562,7 +10985,7 @@ remark-rehype@^10.0.0:
 remove-accents@0.4.2:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/remove-accents/-/remove-accents-0.4.2.tgz#0a43d3aaae1e80db919e07ae254b285d9e1c7bb5"
-  integrity sha1-CkPTqq4egNuRngeuJUsoXZ4ce7U=
+  integrity sha512-7pXIJqJOq5tFgG1A2Zxti3Ht8jJF337m4sowbuHsW30ZnkQFnDzy9qBNhgzX8ZLW4+UBcXiiR7SwR6pokHsxiA==
 
 renderkid@^3.0.0:
   version "3.0.0"
@@ -10578,7 +11001,7 @@ renderkid@^3.0.0:
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+  integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
 
 require-from-string@^2.0.2:
   version "2.0.2"
@@ -10588,7 +11011,7 @@ require-from-string@^2.0.2:
 requires-port@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
+  integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
 
 resolve-cwd@^3.0.0:
   version "3.0.0"
@@ -10623,22 +11046,23 @@ resolve.exports@^1.1.0:
   resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9"
   integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==
 
-resolve@^1.1.5, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
-  integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
+resolve@^1.1.5, resolve@^1.1.7, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.22.1:
+  version "1.22.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
+  integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
   dependencies:
-    is-core-module "^2.8.1"
+    is-core-module "^2.9.0"
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
 resolve@^2.0.0-next.3:
-  version "2.0.0-next.3"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.3.tgz#d41016293d4a8586a39ca5d9b5f15cbea1f55e46"
-  integrity sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q==
+  version "2.0.0-next.4"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.4.tgz#3d37a113d6429f496ec4752d2a2e58efb1fd4660"
+  integrity sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==
   dependencies:
-    is-core-module "^2.2.0"
-    path-parse "^1.0.6"
+    is-core-module "^2.9.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
 
 resolve@~1.19.0:
   version "1.19.0"
@@ -10701,9 +11125,9 @@ rollup-plugin-terser@^7.0.0:
     terser "^5.0.0"
 
 rollup@^2.43.1:
-  version "2.70.1"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.70.1.tgz#824b1f1f879ea396db30b0fc3ae8d2fead93523e"
-  integrity sha512-CRYsI5EuzLbXdxC6RnYhOuRdtz4bhejPMSWjsFLfVM/7w/85n2szZv6yExqUXsBdz5KT8eoubeyDUDjhLHEslA==
+  version "2.79.1"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7"
+  integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==
   optionalDependencies:
     fsevents "~2.3.2"
 
@@ -10714,10 +11138,10 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
-rxjs@^7.5.5:
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.5.tgz#2ebad89af0f560f460ad5cc4213219e1f7dd4e9f"
-  integrity sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==
+rxjs@^7.5.7:
+  version "7.5.7"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.7.tgz#2ec0d57fdc89ece220d2e702730ae8f1e49def39"
+  integrity sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==
   dependencies:
     tslib "^2.1.0"
 
@@ -10738,6 +11162,15 @@ safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.1.0, safe-buffer@~5.2.0:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
+safe-regex-test@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295"
+  integrity sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.1.3"
+    is-regex "^1.1.4"
+
 "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0":
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
@@ -10768,10 +11201,10 @@ saxes@^5.0.1:
   dependencies:
     xmlchars "^2.2.0"
 
-scheduler@^0.21.0:
-  version "0.21.0"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.21.0.tgz#6fd2532ff5a6d877b6edb12f00d8ab7e8f308820"
-  integrity sha512-1r87x5fz9MXqswA2ERLo0EbOAU74DpIUO090gIasYTqlVoJeMcl+Z1Rg7WHz+qtPujhS/hGIt9kxZOYBV3faRQ==
+scheduler@^0.23.0:
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.0.tgz#ba8041afc3d30eb206a487b6b384002e4e61fdfe"
+  integrity sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==
   dependencies:
     loose-envify "^1.1.0"
 
@@ -10820,33 +11253,28 @@ seedrandom@^3.0.5:
 select-hose@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
-  integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
+  integrity sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==
 
-selenium-webdriver@4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-4.1.2.tgz#d463b4335632d2ea41a9e988e435a55dc41f5314"
-  integrity sha512-e4Ap8vQvhipgBB8Ry9zBiKGkU6kHKyNnWiavGGLKkrdW81Zv7NVMtFOL/j3yX0G8QScM7XIXijKssNd4EUxSOw==
+selenium-webdriver@4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-4.5.0.tgz#7e20d0fc038177970dad81159950c12f7411ac0d"
+  integrity sha512-9mSFii+lRwcnT2KUAB1kqvx6+mMiiQHH60Y0VUtr3kxxi3oZ3CV3B8e2nuJ7T4SPb+Q6VA0swswe7rYpez07Bg==
   dependencies:
-    jszip "^3.6.0"
+    jszip "^3.10.0"
     tmp "^0.2.1"
-    ws ">=7.4.6"
+    ws ">=8.7.0"
 
-selfsigned@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.0.1.tgz#8b2df7fa56bf014d19b6007655fff209c0ef0a56"
-  integrity sha512-LmME957M1zOsUhG+67rAjKfiWFox3SBxE/yymatMZsAx+oMrJ0YQ8AToOnyCm7xbeg2ep37IHLxdu0o2MavQOQ==
+selfsigned@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.1.1.tgz#18a7613d714c0cd3385c48af0075abf3f266af61"
+  integrity sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==
   dependencies:
     node-forge "^1"
 
-semver@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
-  integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
-
-semver@7.x, semver@^7.3.2, semver@^7.3.5:
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
-  integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
+semver@7.x, semver@^7.3.2, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8:
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
+  integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
   dependencies:
     lru-cache "^6.0.0"
 
@@ -10855,24 +11283,24 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-send@0.17.2:
-  version "0.17.2"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz#926622f76601c41808012c8bf1688fe3906f7820"
-  integrity sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==
+send@0.18.0:
+  version "0.18.0"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be"
+  integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==
   dependencies:
     debug "2.6.9"
-    depd "~1.1.2"
-    destroy "~1.0.4"
+    depd "2.0.0"
+    destroy "1.2.0"
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
     etag "~1.8.1"
     fresh "0.5.2"
-    http-errors "1.8.1"
+    http-errors "2.0.0"
     mime "1.6.0"
     ms "2.1.3"
-    on-finished "~2.3.0"
+    on-finished "2.4.1"
     range-parser "~1.2.1"
-    statuses "~1.5.0"
+    statuses "2.0.1"
 
 serialize-javascript@^4.0.0:
   version "4.0.0"
@@ -10891,7 +11319,7 @@ serialize-javascript@^6.0.0:
 serve-index@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
-  integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=
+  integrity sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==
   dependencies:
     accepts "~1.3.4"
     batch "0.6.1"
@@ -10901,20 +11329,20 @@ serve-index@^1.9.1:
     mime-types "~2.1.17"
     parseurl "~1.3.2"
 
-serve-static@1.14.2:
-  version "1.14.2"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.2.tgz#722d6294b1d62626d41b43a013ece4598d292bfa"
-  integrity sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==
+serve-static@1.15.0:
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540"
+  integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==
   dependencies:
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
     parseurl "~1.3.3"
-    send "0.17.2"
+    send "0.18.0"
 
 setimmediate@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
+  integrity sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==
 
 setprototypeof@1.1.0:
   version "1.1.0"
@@ -10929,7 +11357,7 @@ setprototypeof@1.2.0:
 shallow-copy@~0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/shallow-copy/-/shallow-copy-0.0.1.tgz#415f42702d73d810330292cc5ee86eae1a11a170"
-  integrity sha1-QV9CcC1z2BAzApLMXuhurhoRoXA=
+  integrity sha512-b6i4ZpVuUxB9h5gfCxPiusKYkqTMOjEbBs4wMaFbkfia4yFv92UKZ6Df8WXcKbn08JNL/abvg3FnMAOfakDvUw==
 
 "shallowequal@^0.1.0 || ^0.2.0 || ^1.0.0", shallowequal@^1.1.0:
   version "1.1.0"
@@ -10949,9 +11377,9 @@ shebang-regex@^3.0.0:
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
 shell-quote@^1.7.3:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123"
-  integrity sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.4.tgz#33fe15dee71ab2a81fcbd3a52106c5cfb9fb75d8"
+  integrity sha512-8o/QEhSSRb1a5i7TFR0iM4G16Z0vYB2OQVs4G3aAFXjn3T6yEx8AZxy1PgDF7I00LZHYA3WxaSYIf5e5sAX8Rw==
 
 shiki@^0.11.1:
   version "0.11.1"
@@ -10971,10 +11399,10 @@ side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
-signal-exit@^3.0.2, signal-exit@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
-  integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
+signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
+  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
 sisteransi@^1.0.5:
   version "1.0.5"
@@ -11017,13 +11445,13 @@ slice-ansi@^5.0.0:
     ansi-styles "^6.0.0"
     is-fullwidth-code-point "^4.0.0"
 
-sockjs@^0.3.21:
-  version "0.3.21"
-  resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.21.tgz#b34ffb98e796930b60a0cfa11904d6a339a7d417"
-  integrity sha512-DhbPFGpxjc6Z3I+uX07Id5ZO2XwYsWOrYjaSeieES78cq+JaJvVe5q/m1uvjIQhXinhIeCFRH6JgXe+mvVMyXw==
+sockjs@^0.3.24:
+  version "0.3.24"
+  resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.24.tgz#c9bc8995f33a111bea0395ec30aa3206bdb5ccce"
+  integrity sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==
   dependencies:
     faye-websocket "^0.11.3"
-    uuid "^3.4.0"
+    uuid "^8.3.2"
     websocket-driver "^0.7.4"
 
 source-list-map@^2.0.0, source-list-map@^2.0.1:
@@ -11032,9 +11460,9 @@ source-list-map@^2.0.0, source-list-map@^2.0.1:
   integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
 source-map-explorer@^2.5.2:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/source-map-explorer/-/source-map-explorer-2.5.2.tgz#857cab5dd9d1d7175e9c5c2739dc9ccfb99f2dc5"
-  integrity sha512-gBwOyCcHPHcdLbgw6Y6kgoH1uLKL6hN3zz0xJcNI2lpnElZliIlmSYAjUVwAWnc7+HscoTyh1ScR7ITtFuEnxg==
+  version "2.5.3"
+  resolved "https://registry.yarnpkg.com/source-map-explorer/-/source-map-explorer-2.5.3.tgz#33551b51e33b70f56d15e79083cdd4c43e583b69"
+  integrity sha512-qfUGs7UHsOBE5p/lGfQdaAj/5U/GWYBw2imEpD6UQNkqElYonkow8t+HBL1qqIl3CuGZx7n8/CQo4x1HwSHhsg==
   dependencies:
     btoa "^1.2.1"
     chalk "^4.1.0"
@@ -11045,7 +11473,7 @@ source-map-explorer@^2.5.2:
     gzip-size "^6.0.0"
     lodash "^4.17.20"
     open "^7.3.1"
-    source-map "^0.7.3"
+    source-map "^0.7.4"
     temp "^0.9.4"
     yargs "^16.2.0"
 
@@ -11055,22 +11483,14 @@ source-map-js@^1.0.1, source-map-js@^1.0.2:
   integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
 
 source-map-loader@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-3.0.1.tgz#9ae5edc7c2d42570934be4c95d1ccc6352eba52d"
-  integrity sha512-Vp1UsfyPvgujKQzi4pyDiTOnE3E4H+yHvkVRN3c/9PJmQS4CQJExvcDvaX/D+RV+xQben9HJ56jMJS3CgUeWyA==
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-3.0.2.tgz#af23192f9b344daa729f6772933194cc5fa54fee"
+  integrity sha512-BokxPoLjyl3iOrgkWaakaxqnelAJSS+0V+De0kKIq6lyWrXuiPgYTGp6z3iHmqljKAaLXwZa+ctD8GccRJeVvg==
   dependencies:
     abab "^2.0.5"
     iconv-lite "^0.6.3"
     source-map-js "^1.0.1"
 
-source-map-resolve@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz#3d9df87e236b53f16d01e58150fc7711138e5ed2"
-  integrity sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==
-  dependencies:
-    atob "^2.1.2"
-    decode-uri-component "^0.2.0"
-
 source-map-support@^0.5.6, source-map-support@~0.5.20:
   version "0.5.21"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
@@ -11084,15 +11504,15 @@ source-map@0.6.1, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, sourc
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7:
+source-map@^0.5.6, source-map@^0.5.7:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
+  integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
 
-source-map@^0.7.3:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
-  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
+source-map@^0.7.3, source-map@^0.7.4:
+  version "0.7.4"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656"
+  integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==
 
 source-map@^0.8.0-beta.0:
   version "0.8.0-beta.0"
@@ -11101,15 +11521,15 @@ source-map@^0.8.0-beta.0:
   dependencies:
     whatwg-url "^7.0.0"
 
-sourcemap-codec@^1.4.4:
+sourcemap-codec@^1.4.8:
   version "1.4.8"
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
   integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
 
 space-separated-tokens@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-2.0.1.tgz#43193cec4fb858a2ce934b7f98b7f2c18107098b"
-  integrity sha512-ekwEbFp5aqSPKaqeY1PGrlGQxPNaq+Cnx4+bE2D8sciBQrHpbwoBbawqTN2+6jPs9IdWxxiUcN0K2pkczD3zmw==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz#1ecd9d2350a3844572c3f4a312bceb018348859f"
+  integrity sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==
 
 spdy-transport@^3.0.0:
   version "3.0.0"
@@ -11137,7 +11557,7 @@ spdy@^4.0.2:
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
+  integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
 stable@^0.1.8:
   version "0.1.8"
@@ -11145,16 +11565,16 @@ stable@^0.1.8:
   integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==
 
 stack-utils@^2.0.3:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.5.tgz#d25265fca995154659dbbfba3b49254778d2fdd5"
-  integrity sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f"
+  integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==
   dependencies:
     escape-string-regexp "^2.0.0"
 
-stackframe@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.2.0.tgz#52429492d63c62eb989804c11552e3d22e779303"
-  integrity sha512-GrdeshiRmS1YLMYgzF16olf2jJ/IzxXY9lhKOskuVziubpTYcYqyOwYeJKzQkwy7uN0fYSsbsC4RQaXf9LCrYA==
+stackframe@^1.3.4:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.3.4.tgz#b881a004c8c149a5e8efef37d51b16e412943310"
+  integrity sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==
 
 state-local@^1.0.6:
   version "1.0.7"
@@ -11188,10 +11608,15 @@ static-module@^2.2.0:
     static-eval "^2.0.0"
     through2 "~2.0.3"
 
-"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
+statuses@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
+  integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
+
+"statuses@>= 1.4.0 < 2":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
-  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
+  integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
 
 stream-browserify@^3.0.0:
   version "3.0.0"
@@ -11207,9 +11632,9 @@ string-argv@^0.3.1:
   integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==
 
 string-length@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz#4a973bf31ef77c4edbceadd6af2611996985f8a1"
-  integrity sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw==
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a"
+  integrity sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==
   dependencies:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
@@ -11228,13 +11653,13 @@ string-natural-compare@^3.0.1:
   integrity sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw==
 
 string-width@^4.1.0, string-width@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
-  integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
   dependencies:
     emoji-regex "^8.0.0"
     is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.0"
+    strip-ansi "^6.0.1"
 
 string-width@^5.0.0:
   version "5.1.2"
@@ -11245,35 +11670,37 @@ string-width@^5.0.0:
     emoji-regex "^9.2.2"
     strip-ansi "^7.0.1"
 
-string.prototype.matchall@^4.0.6:
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.7.tgz#8e6ecb0d8a1fb1fda470d81acecb2dba057a481d"
-  integrity sha512-f48okCX7JiwVi1NXCVWcFnZgADDC/n2vePlQ/KUCNqCikLLilQvwjMO8+BHVKvgzH0JB0J9LEPgxOGT02RoETg==
+string.prototype.matchall@^4.0.6, string.prototype.matchall@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz#3bf85722021816dcd1bf38bb714915887ca79fd3"
+  integrity sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
-    get-intrinsic "^1.1.1"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+    get-intrinsic "^1.1.3"
     has-symbols "^1.0.3"
     internal-slot "^1.0.3"
-    regexp.prototype.flags "^1.4.1"
+    regexp.prototype.flags "^1.4.3"
     side-channel "^1.0.4"
 
-string.prototype.trimend@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
-  integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==
+string.prototype.trimend@^1.0.5:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533"
+  integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
 
-string.prototype.trimstart@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"
-  integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==
+string.prototype.trimstart@^1.0.5:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4"
+  integrity sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
 
 string_decoder@^1.1.1:
   version "1.3.0"
@@ -11330,7 +11757,7 @@ strip-ansi@^7.0.1:
 strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
+  integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==
 
 strip-bom@^4.0.0:
   version "4.0.0"
@@ -11347,6 +11774,11 @@ strip-final-newline@^2.0.0:
   resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
   integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
+strip-final-newline@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-3.0.0.tgz#52894c313fbff318835280aed60ff71ebf12b8fd"
+  integrity sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==
+
 strip-indent@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"
@@ -11371,18 +11803,18 @@ style-to-object@^0.3.0:
   dependencies:
     inline-style-parser "0.1.1"
 
-stylehacks@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.1.0.tgz#a40066490ca0caca04e96c6b02153ddc39913520"
-  integrity sha512-SzLmvHQTrIWfSgljkQCw2++C9+Ne91d/6Sp92I8c5uHTcy/PgeHamwITIbBW9wnFTY/3ZfSXR9HIL6Ikqmcu6Q==
+stylehacks@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.1.1.tgz#7934a34eb59d7152149fa69d6e9e56f2fc34bcc9"
+  integrity sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw==
   dependencies:
-    browserslist "^4.16.6"
+    browserslist "^4.21.4"
     postcss-selector-parser "^6.0.4"
 
-stylis@4.0.13:
-  version "4.0.13"
-  resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.13.tgz#f5db332e376d13cc84ecfe5dace9a2a51d954c91"
-  integrity sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag==
+stylis@4.1.3:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.1.3.tgz#fd2fbe79f5fed17c55269e16ed8da14c84d069f7"
+  integrity sha512-GP6WDNWf+o403jrEp9c5jibKavrtLW+/qYGhFxFrG8maXhwTBI7gLLhiBb0o7uFccWN+EOS9aMO6cGHWAO07OA==
 
 supports-color@^5.3.0:
   version "5.5.0"
@@ -11405,15 +11837,10 @@ supports-color@^8.0.0:
   dependencies:
     has-flag "^4.0.0"
 
-supports-color@^9.2.1:
-  version "9.2.2"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-9.2.2.tgz#502acaf82f2b7ee78eb7c83dcac0f89694e5a7bb"
-  integrity sha512-XC6g/Kgux+rJXmwokjm9ECpD6k/smUoS5LKlUCcsYr4IY3rW0XyAympon2RmxGrlnZURMpg5T18gWDP9CsHXFA==
-
 supports-hyperlinks@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz#f663df252af5f37c5d49bbd7eeefa9e0b9e59e47"
-  integrity sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz#3943544347c1ff90b15effb03fc14ae45ec10624"
+  integrity sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==
   dependencies:
     has-flag "^4.0.0"
     supports-color "^7.0.0"
@@ -11461,11 +11888,9 @@ svgo@^2.7.0:
     stable "^0.1.8"
 
 swc-loader@^0.1.15:
-  version "0.1.15"
-  resolved "https://registry.yarnpkg.com/swc-loader/-/swc-loader-0.1.15.tgz#cb9c630ccfbb46dabc5aebc5560cced658e32992"
-  integrity sha512-cn1WPIeQJvXM4bbo3OwdEIapsQ4uUGOfyFj0h2+2+brT0k76DCGnZXDE2KmcqTd2JSQ+b61z2NPMib7eEwMYYw==
-  dependencies:
-    loader-utils "^2.0.0"
+  version "0.1.16"
+  resolved "https://registry.yarnpkg.com/swc-loader/-/swc-loader-0.1.16.tgz#4c718d698e518f3e6ceb9f7872c1855cdb187066"
+  integrity sha512-NKIm8aJjK/z/yfzk+v7YGwJMjBKaLaUs9ZKI2zoaIGKAjtkwjO92ZLI0fiTZuwzRqVLQl/29fBdSgFCBzquR0w==
 
 swr@^1.3.0:
   version "1.3.0"
@@ -11478,31 +11903,33 @@ symbol-tree@^3.2.4:
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
 tailwindcss@^3.0.2:
-  version "3.0.23"
-  resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.0.23.tgz#c620521d53a289650872a66adfcb4129d2200d10"
-  integrity sha512-+OZOV9ubyQ6oI2BXEhzw4HrqvgcARY38xv3zKcjnWtMIZstEsXdI9xftd1iB7+RbOnj2HOEzkA0OyB5BaSxPQA==
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.2.4.tgz#afe3477e7a19f3ceafb48e4b083e292ce0dc0250"
+  integrity sha512-AhwtHCKMtR71JgeYDaswmZXhPcW9iuI9Sp2LvZPo9upDZ7231ZJ7eA9RaURbhpXGVlrjX4cFNlB4ieTetEb7hQ==
   dependencies:
-    arg "^5.0.1"
-    chalk "^4.1.2"
+    arg "^5.0.2"
     chokidar "^3.5.3"
     color-name "^1.1.4"
-    cosmiconfig "^7.0.1"
-    detective "^5.2.0"
+    detective "^5.2.1"
     didyoumean "^1.2.2"
     dlv "^1.1.3"
-    fast-glob "^3.2.11"
+    fast-glob "^3.2.12"
     glob-parent "^6.0.2"
     is-glob "^4.0.3"
+    lilconfig "^2.0.6"
+    micromatch "^4.0.5"
     normalize-path "^3.0.0"
-    object-hash "^2.2.0"
-    postcss "^8.4.6"
+    object-hash "^3.0.0"
+    picocolors "^1.0.0"
+    postcss "^8.4.18"
+    postcss-import "^14.1.0"
     postcss-js "^4.0.0"
-    postcss-load-config "^3.1.0"
-    postcss-nested "5.0.6"
-    postcss-selector-parser "^6.0.9"
+    postcss-load-config "^3.1.4"
+    postcss-nested "6.0.0"
+    postcss-selector-parser "^6.0.10"
     postcss-value-parser "^4.2.0"
     quick-lru "^5.1.1"
-    resolve "^1.22.0"
+    resolve "^1.22.1"
 
 tapable@^1.0.0:
   version "1.1.3"
@@ -11546,20 +11973,20 @@ terminal-link@^2.0.0:
     supports-hyperlinks "^2.0.0"
 
 terser-webpack-plugin@^5.1.3, terser-webpack-plugin@^5.2.5:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz#0320dcc270ad5372c1e8993fabbd927929773e54"
-  integrity sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g==
+  version "5.3.6"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz#5590aec31aa3c6f771ce1b1acca60639eab3195c"
+  integrity sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==
   dependencies:
+    "@jridgewell/trace-mapping" "^0.3.14"
     jest-worker "^27.4.5"
     schema-utils "^3.1.1"
     serialize-javascript "^6.0.0"
-    source-map "^0.6.1"
-    terser "^5.7.2"
+    terser "^5.14.1"
 
-terser@^5.0.0, terser@^5.10.0, terser@^5.7.2:
-  version "5.14.2"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.2.tgz#9ac9f22b06994d736174f4091aa368db896f1c10"
-  integrity sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==
+terser@^5.0.0, terser@^5.10.0, terser@^5.14.1:
+  version "5.16.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.0.tgz#29362c6f5506e71545c73b069ccd199bb28f7f54"
+  integrity sha512-KjTV81QKStSfwbNiwlBXfcgMcOloyuRdb62/iLFPGBcVNF4EXjhdYBhYHmbJpiBrVxZhDvltE11j+LBQUxEEJg==
   dependencies:
     "@jridgewell/source-map" "^0.3.2"
     acorn "^8.5.0"
@@ -11578,7 +12005,7 @@ test-exclude@^6.0.0:
 text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
-  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
+  integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
 
 throat@^6.0.1:
   version "6.0.1"
@@ -11596,7 +12023,7 @@ through2@^2.0.0, through2@~2.0.3:
 through@^2.3.8:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
+  integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
 
 thunky@^1.0.2:
   version "1.1.0"
@@ -11609,14 +12036,14 @@ tiny-inflate@^1.0.0:
   integrity sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw==
 
 tiny-invariant@^1.0.6:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.2.0.tgz#a1141f86b672a9148c72e978a19a73b9b94a15a9"
-  integrity sha512-1Uhn/aqw5C6RI4KejVeTg6mIS7IqxnLJ8Mv2tV5rTc0qWobay7pDUz6Wi392Cnc8ak1H0F2cjoRzb2/AW4+Fvg==
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.1.tgz#8560808c916ef02ecfd55e66090df23a4b7aa642"
+  integrity sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==
 
 tinymce@^5, tinymce@^5.5.1:
-  version "5.10.4"
-  resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-5.10.4.tgz#24ee843c7648ade708605dec15d8dad07809f7db"
-  integrity sha512-L0ivAhGu7bEo6cUBrCzhtKlkIQqG2sTcL+uu7soMSxrECQIC5VwUnzp9HCEf+fRl36q6zavLV48lf8jelj+gXA==
+  version "5.10.6"
+  resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-5.10.6.tgz#ea03927e9d20c035619dfd32ec4fd471c55e32c5"
+  integrity sha512-bnF2LUoycDsoZZLQBNHbOijrmoJuEeR1rQdqgo4s77BedufpOVnDh00OZKbseHeTMCxhVH05wvOqxLsi6vpeZw==
 
 tmp@^0.2.1:
   version "0.2.1"
@@ -11625,7 +12052,7 @@ tmp@^0.2.1:
   dependencies:
     rimraf "^3.0.0"
 
-tmpl@1.0.x:
+tmpl@1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
   integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
@@ -11633,7 +12060,7 @@ tmpl@1.0.x:
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
-  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
+  integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==
 
 to-regex-range@^5.0.1:
   version "5.0.1"
@@ -11650,21 +12077,22 @@ toidentifier@1.0.1:
 toposort@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330"
-  integrity sha1-riF2gXXRVZ1IvvNUILL0li8JwzA=
+  integrity sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg==
 
 tough-cookie@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4"
-  integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874"
+  integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==
   dependencies:
     psl "^1.1.33"
     punycode "^2.1.1"
-    universalify "^0.1.2"
+    universalify "^0.2.0"
+    url-parse "^1.5.3"
 
 tr46@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
-  integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=
+  integrity sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==
   dependencies:
     punycode "^2.1.0"
 
@@ -11678,7 +12106,12 @@ tr46@^2.1.0:
 tr46@~0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
-  integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
+  integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
+
+trim-lines@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/trim-lines/-/trim-lines-3.0.1.tgz#d802e332a07df861c48802c04321017b1bd87338"
+  integrity sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==
 
 trough@^2.0.0:
   version "2.1.0"
@@ -11691,25 +12124,25 @@ tryer@^1.0.1:
   integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==
 
 ts-jest@^28.0.2:
-  version "28.0.2"
-  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-28.0.2.tgz#e4026357006731f96a033b94db89d01e0d3c0591"
-  integrity sha512-IOZMb3D0gx6IHO9ywPgiQxJ3Zl4ECylEFwoVpENB55aTn5sdO0Ptyx/7noNBxAaUff708RqQL4XBNxxOVjY0vQ==
+  version "28.0.8"
+  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-28.0.8.tgz#cd204b8e7a2f78da32cf6c95c9a6165c5b99cc73"
+  integrity sha512-5FaG0lXmRPzApix8oFG8RKjAz4ehtm8yMKOTy5HX3fY6W8kmvOrmcY0hKDElW52FJov+clhUbrKAqofnj4mXTg==
   dependencies:
     bs-logger "0.x"
     fast-json-stable-stringify "2.x"
     jest-util "^28.0.0"
-    json5 "2.x"
+    json5 "^2.2.1"
     lodash.memoize "4.x"
     make-error "1.x"
     semver "7.x"
-    yargs-parser "^20.x"
+    yargs-parser "^21.0.1"
 
 ts-node@^10.7.0:
-  version "10.7.0"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.7.0.tgz#35d503d0fab3e2baa672a0e94f4b40653c2463f5"
-  integrity sha512-TbIGS4xgJoX2i3do417KSaep1uRAW/Lu+WAL2doDHC0D6ummjirVOXU5/7aiZotbQ5p1Zp9tP7U6cYhA0O7M8A==
+  version "10.9.1"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b"
+  integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==
   dependencies:
-    "@cspotcode/source-map-support" "0.7.0"
+    "@cspotcode/source-map-support" "^0.8.0"
     "@tsconfig/node10" "^1.0.7"
     "@tsconfig/node12" "^1.0.7"
     "@tsconfig/node14" "^1.0.0"
@@ -11720,7 +12153,7 @@ ts-node@^10.7.0:
     create-require "^1.1.0"
     diff "^4.0.1"
     make-error "^1.1.1"
-    v8-compile-cache-lib "^3.0.0"
+    v8-compile-cache-lib "^3.0.1"
     yn "3.1.1"
 
 tsconfig-paths@^3.14.1:
@@ -11733,20 +12166,20 @@ tsconfig-paths@^3.14.1:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tslib@^1.8.1, tslib@^1.9.0:
+tslib@^1.8.1:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
-  integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
+tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.4.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e"
+  integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==
 
-tss-react@^3.6.2:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/tss-react/-/tss-react-3.6.2.tgz#5e995d8b82ca730ba04a21203ae68f1c5372a85e"
-  integrity sha512-+ecQIqCNFVlVJVk3NiCWZY2+5DhVKMVUVxIbEwv9nYsTRQA/KxyKCU8g+KMj5ByqFv9LW76+TUYzbWck/IHkfA==
+tss-react@^4.4.4:
+  version "4.4.4"
+  resolved "https://registry.yarnpkg.com/tss-react/-/tss-react-4.4.4.tgz#12207842dfc58676a9f4d0f532741257428a78e7"
+  integrity sha512-Bzyg99bIQq3Lk4Rwc5XMOps58c1biw1rghCkApIX5XkAB+/VjGCIFSl63PePhmiRNvKRxJRpawGPPxHytiw1TA==
   dependencies:
     "@emotion/cache" "*"
     "@emotion/serialize" "*"
@@ -11769,7 +12202,7 @@ type-check@^0.4.0, type-check@~0.4.0:
 type-check@~0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
-  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
+  integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==
   dependencies:
     prelude-ls "~1.1.2"
 
@@ -11811,7 +12244,7 @@ typedarray-to-buffer@^3.1.5:
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
-  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
+  integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
 
 typedoc@^0.23.21:
   version "0.23.21"
@@ -11823,24 +12256,24 @@ typedoc@^0.23.21:
     minimatch "^5.1.0"
     shiki "^0.11.1"
 
-typescript@^4.6.3:
-  version "4.6.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.3.tgz#eefeafa6afdd31d725584c67a0eaba80f6fc6c6c"
-  integrity sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==
+typescript@^4.9.3:
+  version "4.9.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.3.tgz#3aea307c1746b8c384435d8ac36b8a2e580d85db"
+  integrity sha512-CIfGzTelbKNEnLpLdGFgdyKhG23CKdKgQPOBc+OUNrkJ2vr+KSzsSV5kq5iWhEQbok+quxgGzrAtGWCyU7tHnA==
 
 ua-parser-js@^0.7.30:
-  version "0.7.31"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.31.tgz#649a656b191dffab4f21d5e053e27ca17cbff5c6"
-  integrity sha512-qLK/Xe9E2uzmYI3qLeOmI0tEOt+TBBQyUIAh4aAgU05FVYzeZrKUdkAZfBNVGRaHVgV0TDkdEngJSw/SyQchkQ==
+  version "0.7.32"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.32.tgz#cd8c639cdca949e30fa68c44b7813ef13e36d211"
+  integrity sha512-f9BESNVhzlhEFf2CHMSj40NWOjYPl1YKYbrvIr/hFTDEmLq7SRbWvm7FcdcpCYT95zrOhC7gZSxjdnnTpBcwVw==
 
-unbox-primitive@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
-  integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==
+unbox-primitive@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
+  integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==
   dependencies:
-    function-bind "^1.1.1"
-    has-bigints "^1.0.1"
-    has-symbols "^1.0.2"
+    call-bind "^1.0.2"
+    has-bigints "^1.0.2"
+    has-symbols "^1.0.3"
     which-boxed-primitive "^1.0.2"
 
 unicode-canonical-property-names-ecmascript@^2.0.0:
@@ -11856,25 +12289,25 @@ unicode-match-property-ecmascript@^2.0.0:
     unicode-canonical-property-names-ecmascript "^2.0.0"
     unicode-property-aliases-ecmascript "^2.0.0"
 
-unicode-match-property-value-ecmascript@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714"
-  integrity sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==
+unicode-match-property-value-ecmascript@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz#cb5fffdcd16a05124f5a4b0bf7c3770208acbbe0"
+  integrity sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==
 
 unicode-property-aliases-ecmascript@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8"
-  integrity sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz#43d41e3be698bd493ef911077c9b131f827e8ccd"
+  integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==
 
 unicode-trie@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/unicode-trie/-/unicode-trie-0.3.1.tgz#d671dddd89101a08bac37b6a5161010602052085"
-  integrity sha1-1nHd3YkQGgi6w3tqUWEBBgIFIIU=
+  integrity sha512-WgVuO0M2jDl7hVfbPgXv2LUrD81HM0bQj/bvLGiw6fJ4Zo8nNFnDrA0/hU2Te/wz6pjxCm5cxJwtLjo2eyV51Q==
   dependencies:
     pako "^0.2.5"
     tiny-inflate "^1.0.0"
 
-unified@^10.0.0, unified@~10.1.1:
+unified@^10.0.0, unified@~10.1.1, unified@~10.1.2:
   version "10.1.2"
   resolved "https://registry.yarnpkg.com/unified/-/unified-10.1.2.tgz#b1d64e55dafe1f0b98bb6c719881103ecf6c86df"
   integrity sha512-pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q==
@@ -11934,44 +12367,27 @@ unist-util-stringify-position@^3.0.0:
   dependencies:
     "@types/unist" "^2.0.0"
 
-unist-util-visit-parents@^4.0.0:
+unist-util-visit-parents@^5.0.0, unist-util-visit-parents@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-5.1.1.tgz#868f353e6fce6bf8fa875b251b0f4fec3be709bb"
+  integrity sha512-gks4baapT/kNRaWxuGkl5BIhoanZo7sC/cUT/JToSRNL1dYoXRFl75d++NkjYk4TAu2uv2Px+l8guMajogeuiw==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    unist-util-is "^5.0.0"
+
+unist-util-visit@^4.0.0, unist-util-visit@^4.1.0, unist-util-visit@~4.1.0:
   version "4.1.1"
-  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-4.1.1.tgz#e83559a4ad7e6048a46b1bdb22614f2f3f4724f2"
-  integrity sha512-1xAFJXAKpnnJl8G7K5KgU7FY55y3GcLIXqkzUj5QF/QVP7biUm0K0O2oqVkYsdjzJKifYeWn9+o6piAK2hGSHw==
+  resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-4.1.1.tgz#1c4842d70bd3df6cc545276f5164f933390a9aad"
+  integrity sha512-n9KN3WV9k4h1DxYR1LoajgN93wpEi/7ZplVe02IoB4gH5ctI1AaF2670BLHQYbwj+pY83gFtyeySFiyMHJklrg==
   dependencies:
     "@types/unist" "^2.0.0"
     unist-util-is "^5.0.0"
+    unist-util-visit-parents "^5.1.1"
 
-unist-util-visit-parents@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-5.1.0.tgz#44bbc5d25f2411e7dfc5cecff12de43296aa8521"
-  integrity sha512-y+QVLcY5eR/YVpqDsLf/xh9R3Q2Y4HxkZTp7ViLDU6WtJCEcPmRzW1gpdWDCDIqIlhuPDXOgttqPlykrHYDekg==
-  dependencies:
-    "@types/unist" "^2.0.0"
-    unist-util-is "^5.0.0"
-
-unist-util-visit@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-3.1.0.tgz#9420d285e1aee938c7d9acbafc8e160186dbaf7b"
-  integrity sha512-Szoh+R/Ll68QWAyQyZZpQzZQm2UPbxibDvaY8Xc9SUtYgPsDzx5AWSk++UUt2hJuow8mvwR+rG+LQLw+KsuAKA==
-  dependencies:
-    "@types/unist" "^2.0.0"
-    unist-util-is "^5.0.0"
-    unist-util-visit-parents "^4.0.0"
-
-unist-util-visit@^4.0.0, unist-util-visit@~4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-4.1.0.tgz#f41e407a9e94da31594e6b1c9811c51ab0b3d8f5"
-  integrity sha512-n7lyhFKJfVZ9MnKtqbsqkQEk5P1KShj0+//V7mAcoI6bpbUjh3C/OG8HVD+pBihfh6Ovl01m8dkcv9HNqYajmQ==
-  dependencies:
-    "@types/unist" "^2.0.0"
-    unist-util-is "^5.0.0"
-    unist-util-visit-parents "^5.0.0"
-
-universalify@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
-  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
+universalify@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0"
+  integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==
 
 universalify@^2.0.0:
   version "2.0.0"
@@ -11981,18 +12397,26 @@ universalify@^2.0.0:
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
-  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
+  integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
 
 unquote@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544"
-  integrity sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=
+  integrity sha512-vRCqFv6UhXpWxZPyGDh/F3ZpNv8/qo7w6iufLpQg9aKnQ71qM4B5KiI7Mia9COcjEhrO9LueHpMYjYzsWH3OIg==
 
 upath@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
   integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
 
+update-browserslist-db@^1.0.9:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3"
+  integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==
+  dependencies:
+    escalade "^3.1.1"
+    picocolors "^1.0.0"
+
 uri-js@^4.2.2:
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
@@ -12005,6 +12429,14 @@ urijs@^1.19.1:
   resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.11.tgz#204b0d6b605ae80bea54bea39280cdb7c9f923cc"
   integrity sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ==
 
+url-parse@^1.5.3:
+  version "1.5.10"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
+  integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
+  dependencies:
+    querystringify "^2.1.1"
+    requires-port "^1.0.0"
+
 use-algolia@^1.5.3:
   version "1.5.3"
   resolved "https://registry.yarnpkg.com/use-algolia/-/use-algolia-1.5.3.tgz#7a194144a0050665e2134d18974a9408a9dae176"
@@ -12021,9 +12453,9 @@ use-composed-ref@^1.3.0:
   integrity sha512-GLMG0Jc/jiKov/3Ulid1wbv3r54K9HlMW29IWcDFPEqFkSO2nS0MuefWgMJpeHQ9YJeXDL3ZUF+P3jdXlZX/cQ==
 
 use-debounce@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/use-debounce/-/use-debounce-8.0.0.tgz#fd8d24858dd0d1986bb9a45af4d0aa6ce99226d2"
-  integrity sha512-rKavD/3NxRR8MnCBhcS+TiBEqLQHEFRPjm/MYKYZsRE8Z8u1einvgqRKcBTNkt4SfIXfYZNTJe3YSDBC+Vhz5g==
+  version "8.0.4"
+  resolved "https://registry.yarnpkg.com/use-debounce/-/use-debounce-8.0.4.tgz#27e93b2f010bd0b8ad06e9fc7de891d9ee5d6b8e"
+  integrity sha512-fGqsYQzl8kLHF2QpQSgIwgOgJmnh6j5L6SIzQiHdLfwp3q1egUL3btq5Bg2SJysH6A0ILLgT2IqXZKoNJr0nFw==
 
 use-isomorphic-layout-effect@^1.1.1:
   version "1.1.2"
@@ -12038,9 +12470,9 @@ use-latest@^1.2.1:
     use-isomorphic-layout-effect "^1.1.1"
 
 use-memo-one@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/use-memo-one/-/use-memo-one-1.1.2.tgz#0c8203a329f76e040047a35a1197defe342fab20"
-  integrity sha512-u2qFKtxLsia/r8qG0ZKkbytbztzRb317XCkT7yP8wxL0tZ/CzK2G+WWie5vWvpyeP7+YoPIwbJoIHJ4Ba4k0oQ==
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/use-memo-one/-/use-memo-one-1.1.3.tgz#2fd2e43a2169eabc7496960ace8c79efef975e99"
+  integrity sha512-g66/K7ZQGYrI6dy8GLpVcMsBp4s17xNkYJVSMvTEevGy3nDxHOfE6z8BVE22+5G5x7t3+bhzrlTDB7ObrEE0cQ==
 
 use-memo-value@^1.0.1:
   version "1.0.1"
@@ -12052,7 +12484,7 @@ use-memo-value@^1.0.1:
 util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+  integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
 util.promisify@~1.0.0:
   version "1.0.1"
@@ -12067,37 +12499,32 @@ util.promisify@~1.0.0:
 utila@~0.4:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"
-  integrity sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=
+  integrity sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==
 
 utils-merge@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
-  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
+  integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
 
-uuid@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
-  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+uuid@^8.3.2:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
 uvu@^0.5.0:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/uvu/-/uvu-0.5.3.tgz#3d83c5bc1230f153451877bfc7f4aea2392219ae"
-  integrity sha512-brFwqA3FXzilmtnIyJ+CxdkInkY/i4ErvP7uV0DnUVxQcQ55reuHphorpF+tZoVHK2MniZ/VJzI7zJQoc9T9Yw==
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/uvu/-/uvu-0.5.6.tgz#2754ca20bcb0bb59b64e9985e84d2e81058502df"
+  integrity sha512-+g8ENReyr8YsOc6fv/NVJs2vFdHBnBNdfE49rshrTzDWOlUx4Gq7KOS2GD8eqhy2j+Ejq29+SbKH8yjkAqXqoA==
   dependencies:
     dequal "^2.0.0"
     diff "^5.0.0"
     kleur "^4.0.3"
     sade "^1.7.3"
 
-v8-compile-cache-lib@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.0.tgz#0582bcb1c74f3a2ee46487ceecf372e46bce53e8"
-  integrity sha512-mpSYqfsFvASnSn5qMiwrr4VKfumbPyONLCOPmsR3A6pTY/r0+tSaVbgPWSAIuzbk3lCTa+FForeTiO+wBQGkjA==
-
-v8-compile-cache@^2.0.3:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz#9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132"
-  integrity sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q==
+v8-compile-cache-lib@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
+  integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
 
 v8-to-istanbul@^8.1.0:
   version "8.1.1"
@@ -12111,7 +12538,7 @@ v8-to-istanbul@^8.1.0:
 vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
-  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
+  integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
 
 vfile-location@^4.0.0:
   version "4.0.1"
@@ -12122,17 +12549,17 @@ vfile-location@^4.0.0:
     vfile "^5.0.0"
 
 vfile-message@^3.0.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-3.1.2.tgz#a2908f64d9e557315ec9d7ea3a910f658ac05f7d"
-  integrity sha512-QjSNP6Yxzyycd4SVOtmKKyTsSvClqBPJcd00Z0zuPj3hOIjg0rUPG6DbFGPvUKRgYyaIWLPKpuEclcuvb3H8qA==
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-3.1.3.tgz#1360c27a99234bebf7bddbbbca67807115e6b0dd"
+  integrity sha512-0yaU+rj2gKAyEk12ffdSbBfjnnj+b1zqTBv3OQCTn8yEB02bsPizwdBPrLJjHnK+cU9EMMcUnNv938XcZIkmdA==
   dependencies:
     "@types/unist" "^2.0.0"
     unist-util-stringify-position "^3.0.0"
 
 vfile@^5.0.0:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/vfile/-/vfile-5.3.2.tgz#b499fbc50197ea50ad3749e9b60beb16ca5b7c54"
-  integrity sha512-w0PLIugRY3Crkgw89TeMvHCzqCs/zpreR31hl4D92y6SOE07+bfJe+dK5Q2akwS+i/c801kzjoOr9gMcTe6IAA==
+  version "5.3.6"
+  resolved "https://registry.yarnpkg.com/vfile/-/vfile-5.3.6.tgz#61b2e70690cc835a5d0d0fd135beae74e5a39546"
+  integrity sha512-ADBsmerdGBs2WYckrLBEmuETSPyTD4TuLxTrw0DvjirxW1ra4ZwkbzG8ndsv3Q57smvHxo677MHaQrY9yxH8cA==
   dependencies:
     "@types/unist" "^2.0.0"
     is-buffer "^2.0.0"
@@ -12145,9 +12572,9 @@ vlq@^0.2.2:
   integrity sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==
 
 vscode-oniguruma@^1.6.1:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/vscode-oniguruma/-/vscode-oniguruma-1.6.2.tgz#aeb9771a2f1dbfc9083c8a7fdd9cccaa3f386607"
-  integrity sha512-KH8+KKov5eS/9WhofZR8M8dMHWN2gTxjMsG4jd04YhpbPR91fUj7rYQ2/XjeHCJWbg7X++ApRIU9NUwM2vTvLA==
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/vscode-oniguruma/-/vscode-oniguruma-1.7.0.tgz#439bfad8fe71abd7798338d1cd3dc53a8beea94b"
+  integrity sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA==
 
 vscode-textmate@^6.0.0:
   version "6.0.0"
@@ -12169,16 +12596,16 @@ w3c-xmlserializer@^2.0.0:
     xml-name-validator "^3.0.0"
 
 walker@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
-  integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f"
+  integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==
   dependencies:
-    makeerror "1.0.x"
+    makeerror "1.0.12"
 
-watchpack@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.3.1.tgz#4200d9447b401156eeca7767ee610f8809bc9d25"
-  integrity sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==
+watchpack@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"
+  integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==
   dependencies:
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.1.2"
@@ -12203,7 +12630,7 @@ web-vitals@^2.1.4:
 webidl-conversions@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
-  integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
+  integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
 
 webidl-conversions@^4.0.2:
   version "4.0.2"
@@ -12221,25 +12648,26 @@ webidl-conversions@^6.1.0:
   integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
 
 webpack-dev-middleware@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.1.tgz#aa079a8dedd7e58bfeab358a9af7dab304cee57f"
-  integrity sha512-81EujCKkyles2wphtdrnPg/QqegC/AtqNH//mQkBYSMqwFVCQrxM6ktB2O/SPlZy7LqeEfTbV3cZARGQz6umhg==
+  version "5.3.3"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz#efae67c2793908e7311f1d9b06f2a08dcc97e51f"
+  integrity sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==
   dependencies:
     colorette "^2.0.10"
-    memfs "^3.4.1"
+    memfs "^3.4.3"
     mime-types "^2.1.31"
     range-parser "^1.2.1"
     schema-utils "^4.0.0"
 
 webpack-dev-server@^4.6.0:
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.8.1.tgz#58f9d797710d6e25fa17d6afab8708f958c11a29"
-  integrity sha512-dwld70gkgNJa33czmcj/PlKY/nOy/BimbrgZRaR9vDATBQAYgLzggR0nxDtPLJiLrMgZwbE6RRfJ5vnBBasTyg==
+  version "4.11.1"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.11.1.tgz#ae07f0d71ca0438cf88446f09029b92ce81380b5"
+  integrity sha512-lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw==
   dependencies:
     "@types/bonjour" "^3.5.9"
     "@types/connect-history-api-fallback" "^1.3.5"
     "@types/express" "^4.17.13"
     "@types/serve-index" "^1.9.1"
+    "@types/serve-static" "^1.13.10"
     "@types/sockjs" "^0.3.33"
     "@types/ws" "^8.5.1"
     ansi-html-community "^0.0.8"
@@ -12247,7 +12675,7 @@ webpack-dev-server@^4.6.0:
     chokidar "^3.5.3"
     colorette "^2.0.10"
     compression "^1.7.4"
-    connect-history-api-fallback "^1.6.0"
+    connect-history-api-fallback "^2.0.0"
     default-gateway "^6.0.3"
     express "^4.17.3"
     graceful-fs "^4.2.6"
@@ -12256,12 +12684,11 @@ webpack-dev-server@^4.6.0:
     ipaddr.js "^2.0.1"
     open "^8.0.9"
     p-retry "^4.5.0"
-    portfinder "^1.0.28"
     rimraf "^3.0.2"
     schema-utils "^4.0.0"
-    selfsigned "^2.0.1"
+    selfsigned "^2.1.1"
     serve-index "^1.9.1"
-    sockjs "^0.3.21"
+    sockjs "^0.3.24"
     spdy "^4.0.2"
     webpack-dev-middleware "^5.3.1"
     ws "^8.4.2"
@@ -12303,33 +12730,33 @@ webpack-sources@^3.2.3:
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
 webpack@^5.64.4:
-  version "5.72.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.72.0.tgz#f8bc40d9c6bb489a4b7a8a685101d6022b8b6e28"
-  integrity sha512-qmSmbspI0Qo5ld49htys8GY9XhS9CGqFoHTsOVAnjBdg0Zn79y135R+k4IR4rKK6+eKaabMhJwiVB7xw0SJu5w==
+  version "5.75.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.75.0.tgz#1e440468647b2505860e94c9ff3e44d5b582c152"
+  integrity sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==
   dependencies:
     "@types/eslint-scope" "^3.7.3"
     "@types/estree" "^0.0.51"
     "@webassemblyjs/ast" "1.11.1"
     "@webassemblyjs/wasm-edit" "1.11.1"
     "@webassemblyjs/wasm-parser" "1.11.1"
-    acorn "^8.4.1"
+    acorn "^8.7.1"
     acorn-import-assertions "^1.7.6"
     browserslist "^4.14.5"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.9.2"
+    enhanced-resolve "^5.10.0"
     es-module-lexer "^0.9.0"
     eslint-scope "5.1.1"
     events "^3.2.0"
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.2.9"
-    json-parse-better-errors "^1.0.2"
+    json-parse-even-better-errors "^2.3.1"
     loader-runner "^4.2.0"
     mime-types "^2.1.27"
     neo-async "^2.6.2"
     schema-utils "^3.1.0"
     tapable "^2.1.1"
     terser-webpack-plugin "^5.1.3"
-    watchpack "^2.3.1"
+    watchpack "^2.4.0"
     webpack-sources "^3.2.3"
 
 websocket-driver@>=0.5.1, websocket-driver@^0.7.4:
@@ -12366,7 +12793,7 @@ whatwg-mimetype@^2.3.0:
 whatwg-url@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
-  integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0=
+  integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
   dependencies:
     tr46 "~0.0.3"
     webidl-conversions "^3.0.0"
@@ -12400,6 +12827,28 @@ which-boxed-primitive@^1.0.2:
     is-string "^1.0.5"
     is-symbol "^1.0.3"
 
+which-collection@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.1.tgz#70eab71ebbbd2aefaf32f917082fc62cdcb70906"
+  integrity sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==
+  dependencies:
+    is-map "^2.0.1"
+    is-set "^2.0.1"
+    is-weakmap "^2.0.1"
+    is-weakset "^2.0.1"
+
+which-typed-array@^1.1.8:
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6"
+  integrity sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==
+  dependencies:
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    gopd "^1.0.1"
+    has-tostringtag "^1.0.0"
+    is-typed-array "^1.1.10"
+
 which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
@@ -12422,27 +12871,27 @@ word-wrap@^1.2.3, word-wrap@~1.2.3:
 wordwrap@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
-  integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
+  integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
 
-workbox-background-sync@6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-6.5.2.tgz#28be9bf89b8e4e0379d45903280c7c12f4df836f"
-  integrity sha512-EjG37LSMDJ1TFlFg56wx6YXbH4/NkG09B9OHvyxx+cGl2gP5OuOzsCY3rOPJSpbcz6jpuA40VIC3HzSD4OvE1g==
+workbox-background-sync@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-6.5.4.tgz#3141afba3cc8aa2ae14c24d0f6811374ba8ff6a9"
+  integrity sha512-0r4INQZMyPky/lj4Ou98qxcThrETucOde+7mRGJl13MPJugQNKeZQOdIJe/1AchOP23cTqHcN/YVpD6r8E6I8g==
   dependencies:
-    idb "^6.1.4"
-    workbox-core "6.5.2"
+    idb "^7.0.1"
+    workbox-core "6.5.4"
 
-workbox-broadcast-update@6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/workbox-broadcast-update/-/workbox-broadcast-update-6.5.2.tgz#b1f32bb40a9dcb5b05ca27e09fb7c01a0a126182"
-  integrity sha512-DjJYraYnprTZE/AQNoeogaxI1dPuYmbw+ZJeeP8uXBSbg9SNv5wLYofQgywXeRepv4yr/vglMo9yaHUmBMc+4Q==
+workbox-broadcast-update@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-broadcast-update/-/workbox-broadcast-update-6.5.4.tgz#8441cff5417cd41f384ba7633ca960a7ffe40f66"
+  integrity sha512-I/lBERoH1u3zyBosnpPEtcAVe5lwykx9Yg1k6f8/BGEPGaMMgZrwVrqL1uA9QZ1NGGFoyE6t9i7lBjOlDhFEEw==
   dependencies:
-    workbox-core "6.5.2"
+    workbox-core "6.5.4"
 
-workbox-build@6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/workbox-build/-/workbox-build-6.5.2.tgz#774faafd84b1dc94b74739ceb5d8ff367748523b"
-  integrity sha512-TVi4Otf6fgwikBeMpXF9n0awHfZTMNu/nwlMIT9W+c13yvxkmDFMPb7vHYK6RUmbcxwPnz4I/R+uL76+JxG4JQ==
+workbox-build@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-build/-/workbox-build-6.5.4.tgz#7d06d31eb28a878817e1c991c05c5b93409f0389"
+  integrity sha512-kgRevLXEYvUW9WS4XoziYqZ8Q9j/2ziJYEtTrjdz5/L/cTUa2XfyMP2i7c3p34lgqJ03+mTiz13SdFef2POwbA==
   dependencies:
     "@apideck/better-ajv-errors" "^0.3.1"
     "@babel/core" "^7.11.1"
@@ -12466,132 +12915,132 @@ workbox-build@6.5.2:
     strip-comments "^2.0.1"
     tempy "^0.6.0"
     upath "^1.2.0"
-    workbox-background-sync "6.5.2"
-    workbox-broadcast-update "6.5.2"
-    workbox-cacheable-response "6.5.2"
-    workbox-core "6.5.2"
-    workbox-expiration "6.5.2"
-    workbox-google-analytics "6.5.2"
-    workbox-navigation-preload "6.5.2"
-    workbox-precaching "6.5.2"
-    workbox-range-requests "6.5.2"
-    workbox-recipes "6.5.2"
-    workbox-routing "6.5.2"
-    workbox-strategies "6.5.2"
-    workbox-streams "6.5.2"
-    workbox-sw "6.5.2"
-    workbox-window "6.5.2"
+    workbox-background-sync "6.5.4"
+    workbox-broadcast-update "6.5.4"
+    workbox-cacheable-response "6.5.4"
+    workbox-core "6.5.4"
+    workbox-expiration "6.5.4"
+    workbox-google-analytics "6.5.4"
+    workbox-navigation-preload "6.5.4"
+    workbox-precaching "6.5.4"
+    workbox-range-requests "6.5.4"
+    workbox-recipes "6.5.4"
+    workbox-routing "6.5.4"
+    workbox-strategies "6.5.4"
+    workbox-streams "6.5.4"
+    workbox-sw "6.5.4"
+    workbox-window "6.5.4"
 
-workbox-cacheable-response@6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-6.5.2.tgz#d9252eb99f0d0fceb70f63866172f4eaac56a3e8"
-  integrity sha512-UnHGih6xqloV808T7ve1iNKZMbpML0jGLqkkmyXkJbZc5j16+HRSV61Qrh+tiq3E3yLvFMGJ3AUBODOPNLWpTg==
+workbox-cacheable-response@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-6.5.4.tgz#a5c6ec0c6e2b6f037379198d4ef07d098f7cf137"
+  integrity sha512-DCR9uD0Fqj8oB2TSWQEm1hbFs/85hXXoayVwFKLVuIuxwJaihBsLsp4y7J9bvZbqtPJ1KlCkmYVGQKrBU4KAug==
   dependencies:
-    workbox-core "6.5.2"
+    workbox-core "6.5.4"
 
-workbox-core@6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.5.2.tgz#f5e06a22c6cb4651d3e13107443d972fdbd47364"
-  integrity sha512-IlxLGQf+wJHCR+NM0UWqDh4xe/Gu6sg2i4tfZk6WIij34IVk9BdOQgi6WvqSHd879jbQIUgL2fBdJUJyAP5ypQ==
+workbox-core@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.5.4.tgz#df48bf44cd58bb1d1726c49b883fb1dffa24c9ba"
+  integrity sha512-OXYb+m9wZm8GrORlV2vBbE5EC1FKu71GGp0H4rjmxmF4/HLbMCoTFws87M3dFwgpmg0v00K++PImpNQ6J5NQ6Q==
 
-workbox-expiration@6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-6.5.2.tgz#ee6ed755a220a0b375d67831f9237e4dcbccb59c"
-  integrity sha512-5Hfp0uxTZJrgTiy9W7AjIIec+9uTOtnxY/tRBm4DbqcWKaWbVTa+izrKzzOT4MXRJJIJUmvRhWw4oo8tpmMouw==
+workbox-expiration@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-6.5.4.tgz#501056f81e87e1d296c76570bb483ce5e29b4539"
+  integrity sha512-jUP5qPOpH1nXtjGGh1fRBa1wJL2QlIb5mGpct3NzepjGG2uFFBn4iiEBiI9GUmfAFR2ApuRhDydjcRmYXddiEQ==
   dependencies:
-    idb "^6.1.4"
-    workbox-core "6.5.2"
+    idb "^7.0.1"
+    workbox-core "6.5.4"
 
-workbox-google-analytics@6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/workbox-google-analytics/-/workbox-google-analytics-6.5.2.tgz#a79fa7a40824873baaa333dcd72d1fdf1c53adf5"
-  integrity sha512-8SMar+N0xIreP5/2we3dwtN1FUmTMScoopL86aKdXBpio8vXc8Oqb5fCJG32ialjN8BAOzDqx/FnGeCtkIlyvw==
+workbox-google-analytics@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-google-analytics/-/workbox-google-analytics-6.5.4.tgz#c74327f80dfa4c1954cbba93cd7ea640fe7ece7d"
+  integrity sha512-8AU1WuaXsD49249Wq0B2zn4a/vvFfHkpcFfqAFHNHwln3jK9QUYmzdkKXGIZl9wyKNP+RRX30vcgcyWMcZ9VAg==
   dependencies:
-    workbox-background-sync "6.5.2"
-    workbox-core "6.5.2"
-    workbox-routing "6.5.2"
-    workbox-strategies "6.5.2"
+    workbox-background-sync "6.5.4"
+    workbox-core "6.5.4"
+    workbox-routing "6.5.4"
+    workbox-strategies "6.5.4"
 
-workbox-navigation-preload@6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/workbox-navigation-preload/-/workbox-navigation-preload-6.5.2.tgz#ffb3d9d5cdb881a3824851707da221dbb0bb3f23"
-  integrity sha512-iqDNWWMswjCsZuvGFDpcX1Z8InBVAlVBELJ28xShsWWntALzbtr0PXMnm2WHkXCc56JimmGldZi1N5yDPiTPOg==
+workbox-navigation-preload@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-navigation-preload/-/workbox-navigation-preload-6.5.4.tgz#ede56dd5f6fc9e860a7e45b2c1a8f87c1c793212"
+  integrity sha512-IIwf80eO3cr8h6XSQJF+Hxj26rg2RPFVUmJLUlM0+A2GzB4HFbQyKkrgD5y2d84g2IbJzP4B4j5dPBRzamHrng==
   dependencies:
-    workbox-core "6.5.2"
+    workbox-core "6.5.4"
 
-workbox-precaching@6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-6.5.2.tgz#a3117b4d3eb61ce8d01b9dfc063c48155bd7f9d3"
-  integrity sha512-OZAlQ8AAT20KugGKKuJMHdQ8X1IyNQaLv+mPTHj+8Dmv8peBq5uWNzs4g/1OSFmXsbXZ6a1CBC6YtQWVPhJQ9w==
+workbox-precaching@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-6.5.4.tgz#740e3561df92c6726ab5f7471e6aac89582cab72"
+  integrity sha512-hSMezMsW6btKnxHB4bFy2Qfwey/8SYdGWvVIKFaUm8vJ4E53JAY+U2JwLTRD8wbLWoP6OVUdFlXsTdKu9yoLTg==
   dependencies:
-    workbox-core "6.5.2"
-    workbox-routing "6.5.2"
-    workbox-strategies "6.5.2"
+    workbox-core "6.5.4"
+    workbox-routing "6.5.4"
+    workbox-strategies "6.5.4"
 
-workbox-range-requests@6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-6.5.2.tgz#b8b7e5b5830fecc22f0a1d8815457921df2e5bf9"
-  integrity sha512-zi5VqF1mWqfCyJLTMXn1EuH/E6nisqWDK1VmOJ+TnjxGttaQrseOhMn+BMvULFHeF8AvrQ0ogfQ6bSv0rcfAlg==
+workbox-range-requests@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-6.5.4.tgz#86b3d482e090433dab38d36ae031b2bb0bd74399"
+  integrity sha512-Je2qR1NXCFC8xVJ/Lux6saH6IrQGhMpDrPXWZWWS8n/RD+WZfKa6dSZwU+/QksfEadJEr/NfY+aP/CXFFK5JFg==
   dependencies:
-    workbox-core "6.5.2"
+    workbox-core "6.5.4"
 
-workbox-recipes@6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/workbox-recipes/-/workbox-recipes-6.5.2.tgz#19f47ec25a8788c65d0cc8d217cbebc0bbbb5c63"
-  integrity sha512-2lcUKMYDiJKvuvRotOxLjH2z9K7jhj8GNUaHxHNkJYbTCUN3LsX1cWrsgeJFDZ/LgI565t3fntpbG9J415ZBXA==
+workbox-recipes@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-recipes/-/workbox-recipes-6.5.4.tgz#cca809ee63b98b158b2702dcfb741b5cc3e24acb"
+  integrity sha512-QZNO8Ez708NNwzLNEXTG4QYSKQ1ochzEtRLGaq+mr2PyoEIC1xFW7MrWxrONUxBFOByksds9Z4//lKAX8tHyUA==
   dependencies:
-    workbox-cacheable-response "6.5.2"
-    workbox-core "6.5.2"
-    workbox-expiration "6.5.2"
-    workbox-precaching "6.5.2"
-    workbox-routing "6.5.2"
-    workbox-strategies "6.5.2"
+    workbox-cacheable-response "6.5.4"
+    workbox-core "6.5.4"
+    workbox-expiration "6.5.4"
+    workbox-precaching "6.5.4"
+    workbox-routing "6.5.4"
+    workbox-strategies "6.5.4"
 
-workbox-routing@6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.2.tgz#e0ad46246ba51224fd57eff0dd46891b3220cb9a"
-  integrity sha512-nR1w5PjF6IVwo0SX3oE88LhmGFmTnqqU7zpGJQQPZiKJfEKgDENQIM9mh3L1ksdFd9Y3CZVkusopHfxQvit/BA==
+workbox-routing@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.4.tgz#6a7fbbd23f4ac801038d9a0298bc907ee26fe3da"
+  integrity sha512-apQswLsbrrOsBUWtr9Lf80F+P1sHnQdYodRo32SjiByYi36IDyL2r7BH1lJtFX8fwNHDa1QOVY74WKLLS6o5Pg==
   dependencies:
-    workbox-core "6.5.2"
+    workbox-core "6.5.4"
 
-workbox-strategies@6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.5.2.tgz#56b02e6959c6391351011fc2e5b0829aff1ed859"
-  integrity sha512-fgbwaUMxbG39BHjJIs2y2X21C0bmf1Oq3vMQxJ1hr6y5JMJIm8rvKCcf1EIdAr+PjKdSk4ddmgyBQ4oO8be4Uw==
+workbox-strategies@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.5.4.tgz#4edda035b3c010fc7f6152918370699334cd204d"
+  integrity sha512-DEtsxhx0LIYWkJBTQolRxG4EI0setTJkqR4m7r4YpBdxtWJH1Mbg01Cj8ZjNOO8etqfA3IZaOPHUxCs8cBsKLw==
   dependencies:
-    workbox-core "6.5.2"
+    workbox-core "6.5.4"
 
-workbox-streams@6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/workbox-streams/-/workbox-streams-6.5.2.tgz#2fb6ba307f7d2cbda63f64522a197be868b4ea25"
-  integrity sha512-ovD0P4UrgPtZ2Lfc/8E8teb1RqNOSZr+1ZPqLR6sGRZnKZviqKbQC3zVvvkhmOIwhWbpL7bQlWveLVONHjxd5w==
+workbox-streams@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-streams/-/workbox-streams-6.5.4.tgz#1cb3c168a6101df7b5269d0353c19e36668d7d69"
+  integrity sha512-FXKVh87d2RFXkliAIheBojBELIPnWbQdyDvsH3t74Cwhg0fDheL1T8BqSM86hZvC0ZESLsznSYWw+Va+KVbUzg==
   dependencies:
-    workbox-core "6.5.2"
-    workbox-routing "6.5.2"
+    workbox-core "6.5.4"
+    workbox-routing "6.5.4"
 
-workbox-sw@6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-6.5.2.tgz#2f5dca0e96c61a450fccf0405095ddf1b6f43bc7"
-  integrity sha512-2KhlYqtkoqlnPdllj2ujXUKRuEFsRDIp6rdE4l1PsxiFHRAFaRTisRQpGvRem5yxgXEr+fcEKiuZUW2r70KZaw==
+workbox-sw@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-6.5.4.tgz#d93e9c67924dd153a61367a4656ff4d2ae2ed736"
+  integrity sha512-vo2RQo7DILVRoH5LjGqw3nphavEjK4Qk+FenXeUsknKn14eCNedHOXWbmnvP4ipKhlE35pvJ4yl4YYf6YsJArA==
 
-workbox-webpack-plugin@^6.4.1:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/workbox-webpack-plugin/-/workbox-webpack-plugin-6.5.2.tgz#0cf6e1d23d5107a88fd8502fd4f534215e1dd298"
-  integrity sha512-StrJ7wKp5tZuGVcoKLVjFWlhDy+KT7ZWsKnNcD6F08wA9Cpt6JN+PLIrplcsTHbQpoAV8+xg6RvcG0oc9z+RpQ==
+workbox-webpack-plugin@^6.4.1, workbox-webpack-plugin@^6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-webpack-plugin/-/workbox-webpack-plugin-6.5.4.tgz#baf2d3f4b8f435f3469887cf4fba2b7fac3d0fd7"
+  integrity sha512-LmWm/zoaahe0EGmMTrSLUi+BjyR3cdGEfU3fS6PN1zKFYbqAKuQ+Oy/27e4VSXsyIwAw8+QDfk1XHNGtZu9nQg==
   dependencies:
     fast-json-stable-stringify "^2.1.0"
     pretty-bytes "^5.4.1"
     upath "^1.2.0"
     webpack-sources "^1.4.3"
-    workbox-build "6.5.2"
+    workbox-build "6.5.4"
 
-workbox-window@6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/workbox-window/-/workbox-window-6.5.2.tgz#46d6412cd57039bdf3d5dd914ad21fb3f98fe980"
-  integrity sha512-2kZH37r9Wx8swjEOL4B8uGM53lakMxsKkQ7mOKzGA/QAn/DQTEZGrdHWtypk2tbhKY5S0jvPS+sYDnb2Z3378A==
+workbox-window@6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/workbox-window/-/workbox-window-6.5.4.tgz#d991bc0a94dff3c2dbb6b84558cff155ca878e91"
+  integrity sha512-HnLZJDwYBE+hpG25AQBO8RUWBJRaCsI9ksQJEp3aCOFCaG5kqaToAYXFRAHxzRluM2cQbGzdQF5rjKPWPA1fug==
   dependencies:
     "@types/trusted-types" "^2.0.2"
-    workbox-core "6.5.2"
+    workbox-core "6.5.4"
 
 wrap-ansi@^6.2.0:
   version "6.2.0"
@@ -12614,7 +13063,7 @@ wrap-ansi@^7.0.0:
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
 write-file-atomic@^3.0.0:
   version "3.0.3"
@@ -12626,15 +13075,15 @@ write-file-atomic@^3.0.0:
     signal-exit "^3.0.2"
     typedarray-to-buffer "^3.1.5"
 
-ws@>=7.4.6, ws@^8.4.2:
-  version "8.5.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f"
-  integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==
+ws@>=8.7.0, ws@^8.4.2:
+  version "8.11.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143"
+  integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==
 
 ws@^7.4.6:
-  version "7.5.7"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67"
-  integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==
+  version "7.5.9"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
+  integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
 
 xml-name-validator@^3.0.0:
   version "3.0.0"
@@ -12666,11 +13115,21 @@ yaml@^1.10.0, yaml@^1.10.2, yaml@^1.5.0, yaml@^1.7.2:
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
-yargs-parser@^20.2.2, yargs-parser@^20.x:
+yaml@^2.1.3:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.1.3.tgz#9b3a4c8aff9821b696275c79a8bee8399d945207"
+  integrity sha512-AacA8nRULjKMX2DvWvOAdBZMOfQlypSFkjcOcu9FalllIDJ1kvlREzcdIZmidQUqqeMv7jorHjq2HlLv/+c2lg==
+
+yargs-parser@^20.2.2:
   version "20.2.9"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
+yargs-parser@^21.0.1:
+  version "21.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
+  integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
+
 yargs@^16.2.0:
   version "16.2.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
@@ -12708,6 +13167,6 @@ yup@^0.32.9:
     toposort "^2.0.2"
 
 zwitch@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-2.0.2.tgz#91f8d0e901ffa3d66599756dde7f57b17c95dce1"
-  integrity sha512-JZxotl7SxAJH0j7dN4pxsTV6ZLXoLdGME+PsjkL/DaBrVryK9kTGq06GfKrwcSOqypP+fdXGoCHE36b99fWVoA==
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-2.0.4.tgz#c827d4b0acb76fc3e685a4c6ec2902d51070e9d7"
+  integrity sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==

From a93fefa92b7bd82568a47c706aaf0326a83454f4 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Tue, 29 Nov 2022 17:26:02 +1100
Subject: [PATCH 306/309] lock react-router-dom to v6.3.0

---
 package.json |  2 +-
 yarn.lock    | 36 +++++++++++++++++++-----------------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index 67e11563..4fac6672 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
     "react-image": "^4",
     "react-json-view": "^1.21.3",
     "react-markdown": "^8.0.3",
-    "react-router-dom": "^6.3.0",
+    "react-router-dom": "6.3.0",
     "react-router-hash-link": "^2.4.3",
     "react-scripts": "^5.0.1",
     "react-usestateref": "^1.0.8",
diff --git a/yarn.lock b/yarn.lock
index 3f159757..003c37e7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1137,7 +1137,7 @@
     core-js-pure "^3.25.1"
     regenerator-runtime "^0.13.11"
 
-"@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.6", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.2", "@babel/runtime@^7.18.3", "@babel/runtime@^7.18.9", "@babel/runtime@^7.20.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.6", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.2", "@babel/runtime@^7.18.3", "@babel/runtime@^7.18.9", "@babel/runtime@^7.20.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
   version "7.20.6"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.6.tgz#facf4879bfed9b5326326273a64220f099b0fce3"
   integrity sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==
@@ -2521,11 +2521,6 @@
   resolved "https://registry.yarnpkg.com/@react-dnd/shallowequal/-/shallowequal-4.0.2.tgz#d1b4befa423f692fa4abf1c79209702e7d8ae4b4"
   integrity sha512-/RVXdLvJxLg4QKvMoM5WlwNR9ViO9z8B/qPcc+C0Sa/teJY7QG7kJ441DwzOjMYEY7GmU4dj5EcGHIkKZiQZCA==
 
-"@remix-run/router@1.0.3":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.0.3.tgz#953b88c20ea00d0eddaffdc1b115c08474aa295d"
-  integrity sha512-ceuyTSs7PZ/tQqi19YZNBc5X7kj1f8p+4DIyrcIYFY9h+hd1OKm4RqtiWldR9eGEvIiJfsqwM4BsuCtRIuEw6Q==
-
 "@rollup/plugin-babel@^5.2.0":
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz#04bc0608f4aa4b2e4b1aebf284344d0f68fda283"
@@ -6749,6 +6744,13 @@ he@^1.2.0:
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
   integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
 
+history@^5.2.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/history/-/history-5.3.0.tgz#1548abaa245ba47992f063a0783db91ef201c73b"
+  integrity sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==
+  dependencies:
+    "@babel/runtime" "^7.7.6"
+
 hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.1, hoist-non-react-statics@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
@@ -10583,13 +10585,13 @@ react-refresh@^0.11.0:
   resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.11.0.tgz#77198b944733f0f1f1a90e791de4541f9f074046"
   integrity sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==
 
-react-router-dom@^6.3.0:
-  version "6.4.3"
-  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.4.3.tgz#70093b5f65f85f1df9e5d4182eb7ff3a08299275"
-  integrity sha512-MiaYQU8CwVCaOfJdYvt84KQNjT78VF0TJrA17SIQgNHRvLnXDJO6qsFqq8F/zzB1BWZjCFIrQpu4QxcshitziQ==
+react-router-dom@6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.3.0.tgz#a0216da813454e521905b5fa55e0e5176123f43d"
+  integrity sha512-uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw==
   dependencies:
-    "@remix-run/router" "1.0.3"
-    react-router "6.4.3"
+    history "^5.2.0"
+    react-router "6.3.0"
 
 react-router-hash-link@^2.4.3:
   version "2.4.3"
@@ -10598,12 +10600,12 @@ react-router-hash-link@^2.4.3:
   dependencies:
     prop-types "^15.7.2"
 
-react-router@6.4.3:
-  version "6.4.3"
-  resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.4.3.tgz#9ed3ee4d6e95889e9b075a5d63e29acc7def0d49"
-  integrity sha512-BT6DoGn6aV1FVP5yfODMOiieakp3z46P1Fk0RNzJMACzE7C339sFuHebfvWtnB4pzBvXXkHP2vscJzWRuUjTtA==
+react-router@6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.3.0.tgz#3970cc64b4cb4eae0c1ea5203a80334fdd175557"
+  integrity sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ==
   dependencies:
-    "@remix-run/router" "1.0.3"
+    history "^5.2.0"
 
 react-scripts@^5.0.1:
   version "5.0.1"

From bc48d809bcc0e4f73c3157b984e3756eeb9184e1 Mon Sep 17 00:00:00 2001
From: Raj Gaurav Maurya <rajgmsocial19@gmail.com>
Date: Tue, 29 Nov 2022 17:57:45 +0530
Subject: [PATCH 307/309] Feat:Email validation regex field added along with
 default values (#820)

* Feat:Email validation regex field added along with default values

Signed-off-by: Raj Gaurav Maurya <rajgmsocial19@gmail.com>

* Bug:regex fixed

Signed-off-by: Raj Gaurav Maurya <rajgmsocial19@gmail.com>

* Update CONTRIBUTING.md

* ref added with button and inputfield but current not working

Signed-off-by: Raj Gaurav Maurya <rajgmsocial19@gmail.com>

* Feat: standard Regex is now being filled into the input

* Feat: Copy feature added, ref deleted, working as expected

Signed-off-by: Raj Gaurav Maurya <rajgmsocial19@gmail.com>

* Update src/components/fields/Email/Settings.tsx

* Update src/components/fields/Email/Settings.tsx

Signed-off-by: Raj Gaurav Maurya <rajgmsocial19@gmail.com>
Co-authored-by: Sidney Alcantara <sidney@sidney.me>
---
 src/components/fields/Email/Settings.tsx | 28 ++++++++++++++++++++++++
 src/components/fields/Email/index.tsx    |  5 +++++
 2 files changed, 33 insertions(+)
 create mode 100644 src/components/fields/Email/Settings.tsx

diff --git a/src/components/fields/Email/Settings.tsx b/src/components/fields/Email/Settings.tsx
new file mode 100644
index 00000000..72246736
--- /dev/null
+++ b/src/components/fields/Email/Settings.tsx
@@ -0,0 +1,28 @@
+import { ISettingsProps } from "@src/components/fields/types";
+import { TextField, Button } from "@mui/material";
+
+export default function Settings({ onChange, config }: ISettingsProps) {
+
+    const copyStandardRegex = () => {
+      onChange("validationRegex")("^[a-zA-Z0-9+_.-]+@[a-zA-Z0-9.-]+.[a-zA-z]{2,3}$");
+    }
+
+    return (
+        <>
+            <TextField
+                type="text"
+                label="Validation regex"
+                id="validation-regex"
+                value={config.validationRegex}
+                fullWidth
+                onChange={(e) => {
+                    if (e.target.value === "") onChange("validationRegex")(null);
+                    else onChange("validationRegex")(e.target.value);
+                }}
+            />
+            <Button style={{ width: "200px", margin: "20px auto auto" }} onClick={copyStandardRegex}>
+                Use standard regex
+            </Button>
+        </>
+    );
+}
diff --git a/src/components/fields/Email/index.tsx b/src/components/fields/Email/index.tsx
index 3ea395d8..29e274c0 100644
--- a/src/components/fields/Email/index.tsx
+++ b/src/components/fields/Email/index.tsx
@@ -13,6 +13,10 @@ const SideDrawerField = lazy(
     import("./SideDrawerField" /* webpackChunkName: "SideDrawerField-Email" */)
 );
 
+const Settings = lazy(
+  () => import("./Settings" /* webpackChunkName: "Settings-ShortText" */)
+);
+
 export const config: IFieldConfig = {
   type: FieldType.email,
   name: "Email",
@@ -25,6 +29,7 @@ export const config: IFieldConfig = {
   contextMenuActions: BasicContextMenuActions,
   TableCell: withRenderTableCell(DisplayCell, EditorCell),
   SideDrawerField,
+  settings: Settings,
   filter: {
     operators: filterOperators,
   },

From d7065ad8bb99276cceb095c5e4269a36d8761c4d Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 30 Nov 2022 15:32:28 +1100
Subject: [PATCH 308/309] fix mock cell crashing

---
 src/components/Table/Mock/Cell.tsx | 97 +++++++++++++-----------------
 1 file changed, 41 insertions(+), 56 deletions(-)

diff --git a/src/components/Table/Mock/Cell.tsx b/src/components/Table/Mock/Cell.tsx
index b614e9ce..959765a0 100644
--- a/src/components/Table/Mock/Cell.tsx
+++ b/src/components/Table/Mock/Cell.tsx
@@ -1,46 +1,12 @@
 import { createElement } from "react";
 
-import { styled } from "@mui/material";
+import StyledTable from "@src/components/Table/Styled/StyledTable";
+import StyledCell from "@src/components/Table/Styled/StyledCell";
 import EmptyState from "@src/components/EmptyState";
 
 import { FieldType } from "@src/constants/fields";
 import { getFieldProp } from "@src/components/fields";
-
-const Root = styled("div")(({ theme }) => ({
-  width: "100%",
-  height: 43,
-  position: "relative",
-  overflow: "hidden",
-  whiteSpace: "nowrap",
-
-  pointerEvents: "none",
-
-  border: `1px solid ${theme.palette.divider}`,
-  borderTopWidth: 0,
-  backgroundColor: theme.palette.background.paper,
-
-  display: "flex",
-  alignItems: "center",
-  padding: theme.spacing(0, 1.25),
-
-  ...theme.typography.body2,
-  fontSize: "0.75rem",
-  lineHeight: "inherit",
-  color: theme.palette.text.secondary,
-
-  "& .cell-collapse-padding": {
-    margin: theme.spacing(0, -1.5),
-    width: `calc(100% + ${theme.spacing(3)})`,
-  },
-}));
-
-const Value = styled("div")(({ theme }) => ({
-  width: "100%",
-  height: 43,
-  display: "flex",
-  justifyContent: "flex-start",
-  alignItems: "center",
-}));
+import { DEFAULT_ROW_HEIGHT } from "@src/components/Table";
 
 export interface ICellProps
   extends Partial<
@@ -53,6 +19,7 @@ export interface ICellProps
   type: FieldType;
   value: any;
   name?: string;
+  rowHeight?: number;
 }
 
 export default function Cell({
@@ -60,29 +27,47 @@ export default function Cell({
   type,
   value,
   name,
+  rowHeight = DEFAULT_ROW_HEIGHT,
   ...props
 }: ICellProps) {
-  const formatter = type ? getFieldProp("TableCell", type) : null;
+  const tableCell = type ? getFieldProp("TableCell", type) : null;
 
   return (
-    <Root {...props}>
-      <Value>
-        {formatter ? (
-          createElement(formatter, {
+    <StyledTable>
+      <StyledCell
+        {...props}
+        style={
+          {
+            ...props.style,
+            height: rowHeight,
+            "--row-height": rowHeight,
+          } as any
+        }
+      >
+        {tableCell ? (
+          createElement(tableCell, {
             value,
-            rowIdx: 0,
             column: {
-              type,
-              key: field,
-              name,
-              config: { options: [] },
-              editable: false,
-            } as any,
-            row: { [field]: value },
-            isRowSelected: false,
-            onRowSelectionChange: () => {},
-            isSummaryRow: false,
-          } as any)
+              columnDef: {
+                meta: {
+                  type,
+                  key: field,
+                  name,
+                  config: { options: [] },
+                  editable: false,
+                },
+              },
+            },
+            row: {
+              original: {
+                _rowy_ref: { path: "_rowy_/_mockCell" },
+                [field]: value,
+              },
+            },
+            focusInsideCell: false,
+            disabled: true,
+            rowHeight: DEFAULT_ROW_HEIGHT,
+          })
         ) : typeof value === "string" ||
           typeof value === "number" ||
           value === undefined ||
@@ -93,7 +78,7 @@ export default function Cell({
         ) : (
           <EmptyState basic wrap="nowrap" message="Invalid column type" />
         )}
-      </Value>
-    </Root>
+      </StyledCell>
+    </StyledTable>
   );
 }

From 9d146d7478fa99bc0fcd889fde821d569e5fcd20 Mon Sep 17 00:00:00 2001
From: Sidney Alcantara <sidney@sidney.me>
Date: Wed, 30 Nov 2022 15:37:43 +1100
Subject: [PATCH 309/309] ROWY-795 change useFirestoreDocWithAtom
 createIfNonExistent behavior to prevent existing documents being reset

---
 src/hooks/useFirestoreDocWithAtom.ts | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/hooks/useFirestoreDocWithAtom.ts b/src/hooks/useFirestoreDocWithAtom.ts
index c387a3bb..49736600 100644
--- a/src/hooks/useFirestoreDocWithAtom.ts
+++ b/src/hooks/useFirestoreDocWithAtom.ts
@@ -88,15 +88,12 @@ export function useFirestoreDocWithAtom<T = TableRow>(
       { includeMetadataChanges: true },
       (docSnapshot) => {
         try {
-          // Create doc if it doesn’t exist and we’re online
-          // WARNING: If offline and we doc doesn’t exist in cache, it will
-          // ovewrite with default values when we go online
-          if (
-            !docSnapshot.exists() &&
-            !!createIfNonExistent &&
-            !docSnapshot.metadata.fromCache
-          ) {
-            setDoc(docSnapshot.ref, createIfNonExistent);
+          // If doc doesn’t exist, set data atom to default value
+          // But don’t create a new document in db, since this has previously
+          // caused documents to be reset, and the bug is hard to reproduce.
+          // Instead, when the user updates the document, it will be created.
+          if (!docSnapshot.exists() && !!createIfNonExistent) {
+            // Temporarily set the data atom to the default data
             setDataAtom({ ...createIfNonExistent, _rowy_ref: docSnapshot.ref });
           } else {
             setDataAtom({