Skip to content

Commit

Permalink
Merge pull request #647 from rowyio/rc
Browse files Browse the repository at this point in the history 
v2.3.2
  • Loading branch information
@notsidney
notsidney authored Feb 11, 2022
2 parents 8842e0f + 57e6c10 commit 51acfc4
Show file tree
Hide file tree
Showing 6 changed files with 109 additions and 111 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/deploy-preview.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ on:
# paths:
# - "website/**"
env:
REACT_APP_FIREBASE_PROJECT_ID: tryrowy
REACT_APP_FIREBASE_PROJECT_ID: rowyio
REACT_APP_FIREBASE_PROJECT_WEB_API_KEY:
"${{ secrets.FIREBASE_WEB_API_KEY_TRYROWY }}"
"${{ secrets.FIREBASE_WEB_API_KEY_ROWYIO }}"
CI: ""
jobs:
build_and_preview:
Expand All @@ -27,6 +27,6 @@ jobs:
with:
repoToken: "${{ secrets.GITHUB_TOKEN }}"
firebaseServiceAccount:
"${{ secrets.FIREBASE_SERVICE_ACCOUNT_TRYROWY }}"
"${{ secrets.FIREBASE_SERVICE_ACCOUNT_ROWYIO }}"
expires: 14d
projectId: tryrowy
projectId: rowyio
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ cloud_functions/functions/lib
*.firebaserc
*-firebase.json
.firebase/
*firebase-adminsdk*.json

# misc
.DS_Store
Expand Down
12 changes: 6 additions & 6 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Rowy",
"version": "2.3.1",
"version": "2.3.2",
"homepage": "https://rowy.io",
"repository": {
"type": "git",
Expand All @@ -15,11 +15,11 @@
"@hookform/resolvers": "^2.8.5",
"@mdi/js": "^6.5.95",
"@monaco-editor/react": "^4.3.1",
"@mui/icons-material": "^5.2.0",
"@mui/lab": "^5.0.0-alpha.58",
"@mui/material": "^5.2.2",
"@mui/styles": "^5.2.2",
"@rowy/form-builder": "^0.5.2",
"@mui/icons-material": "^5.4.1",
"@mui/lab": "^5.0.0-alpha.68",
"@mui/material": "^5.4.1",
"@mui/styles": "^5.4.1",
"@rowy/form-builder": "^0.5.3",
"@rowy/multiselect": "^0.2.3",
"@tinymce/tinymce-react": "^3.12.6",
"algoliasearch": "^4.8.6",
Expand Down
3 changes: 1 addition & 2 deletions src/hooks/useTable/useTableConfig.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,15 +157,14 @@ const useTableConfig = (tableId?: string) => {
*/
const remove = (key: string) => {
const { columns } = tableConfigState;

/**
* Filter column, and remove key index
* Sort and reorder column
* Rewrite column index for firestore
*/
const updatedColumns: any = Object.values(columns)
.filter((c: any) => c.key !== key)
.sort((c: any) => c.index)
.sort((a: any, b: any) => a.index - b.index)
.reduce((acc: any, curr: any, index: any) => {
acc[curr.key] = { ...curr, index };
return acc;
Expand Down
16 changes: 9 additions & 7 deletions src/hooks/useTable/useTableData.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ const rowsReducer = (prevRows: any, update: any) => {
switch (update.type) {
case "onSnapshot":
const snapshotDocs = update.docs;
console.log("onSnapshot", snapshotDocs);

// Get rows that may not be part of the snapshot
// Rows with missing required fields haven’t been written to the db yet
Expand Down Expand Up @@ -167,13 +168,14 @@ const useTableData = () => {

const unsubscribe = query.limit(limit).onSnapshot(
(snapshot) => {
if (snapshot.docs.length > 0) {
rowsDispatch({
type: "onSnapshot",
docs: snapshot.docs,
// changes: snapshot.docChanges(),
});
}
console.log("snapshot", snapshot);
// if (snapshot.docs.length > 0) {
rowsDispatch({
type: "onSnapshot",
docs: snapshot.docs,
// changes: snapshot.docChanges(),
});
// }
tableDispatch({ loading: false });
},
(error: any) => {
Expand Down
180 changes: 88 additions & 92 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1495,10 +1495,10 @@
dependencies:
regenerator-runtime "^0.13.4"

"@babel/runtime@^7.16.3":
version "7.16.3"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.3.tgz#b86f0db02a04187a3c17caa77de69840165d42d5"
integrity sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==
"@babel/runtime@^7.17.0":
version "7.17.2"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.2.tgz#66f68591605e59da47523c631416b18508779941"
integrity sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw==
dependencies:
regenerator-runtime "^0.13.4"

Expand Down Expand Up @@ -1723,16 +1723,16 @@
"@emotion/weak-memoize" "^0.2.5"
stylis "^4.0.3"

"@emotion/cache@^11.6.0":
version "11.6.0"
resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.6.0.tgz#65fbdbbe4382f1991d8b20853c38e63ecccec9a1"
integrity sha512-ElbsWY1KMwEowkv42vGo0UPuLgtPYfIs9BxxVrmvsaJVvktknsHYYlx5NQ5g6zLDcOTyamlDc7FkRg2TAcQDKQ==
"@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.10"
stylis "4.0.13"

"@emotion/hash@^0.8.0":
version "0.8.0"
Expand Down Expand Up @@ -2421,55 +2421,55 @@
"@monaco-editor/loader" "^1.2.0"
prop-types "^15.7.2"

"@mui/[email protected].58":
version "5.0.0-alpha.58"
resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.58.tgz#01ab59a028f314e2f9a79f903a8336ac45853652"
integrity sha512-YZorCbbzkokQZUnj+sdjUWIe+jaesuSVpKgwWS2mWdE50v1Ti/qMmevIrOT1lvFAilpj80Bkcg4KtlGWBJ6utQ==
"@mui/[email protected].68":
version "5.0.0-alpha.68"
resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.68.tgz#d93d77e662bc8dce47c9415fc6cbcac6658efab7"
integrity sha512-q+3gX6EHuM/AyOn8fkoANQxSzIHBeuNsrGgb7SPP0y7NuM+4ZHG/b9882+OfHcilaSqPDWUQoLbphcBpw/m/RA==
dependencies:
"@babel/runtime" "^7.16.3"
"@babel/runtime" "^7.17.0"
"@emotion/is-prop-valid" "^1.1.1"
"@mui/utils" "^5.2.2"
"@mui/utils" "^5.4.1"
"@popperjs/core" "^2.4.4"
clsx "^1.1.1"
prop-types "^15.7.2"
react-is "^17.0.2"

"@mui/icons-material@^5.2.0":
version "5.2.0"
resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.2.0.tgz#6c6135bb2d7891e29d6f9419df402b82dd663517"
integrity sha512-NvyrVaGKpP4R1yFw8BCnE0QcsQ67RtpgxPr4FtH8q60MDYPuPVczLOn5Ash5CFavoDWur/NfM/4DpT54yf3InA==
"@mui/icons-material@^5.4.1":
version "5.4.1"
resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.4.1.tgz#20901e9a09154355b7a832180a90717938c675c4"
integrity sha512-koiq9q2GfjXRUWcC5fEi1b+EA4vfJHgIaAdBHlkOrBx2cnmmazQcyib501eodPfaZGx9BikrhivODaNQYQq8hA==
dependencies:
"@babel/runtime" "^7.16.3"
"@babel/runtime" "^7.17.0"

"@mui/lab@^5.0.0-alpha.58":
version "5.0.0-alpha.58"
resolved "https://registry.yarnpkg.com/@mui/lab/-/lab-5.0.0-alpha.58.tgz#47c3b2976df066119fa040131a63139677ba5a66"
integrity sha512-Vn3bWlID2SgCb7KX3d29uSLWv3JDEHJ+QiApnaPuUqqymwHARbQUk+b2h6wfQCz/WqaR0MtmsRwA6OrrLsL3Eg==
"@mui/lab@^5.0.0-alpha.68":
version "5.0.0-alpha.68"
resolved "https://registry.yarnpkg.com/@mui/lab/-/lab-5.0.0-alpha.68.tgz#a5034a8f749f3f4f0a1b8613515bed4054ade3e6"
integrity sha512-wvszkLsgXgl3kMPVpHNm9pRYld9/2r0MYRlJUEh2GWwjBPE3dDTOIF2IHgZ3WqRBnJMitzUVt7v5Lu9/grjrIQ==
dependencies:
"@babel/runtime" "^7.16.3"
"@babel/runtime" "^7.17.0"
"@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/base" "5.0.0-alpha.58"
"@mui/system" "^5.2.2"
"@mui/utils" "^5.2.2"
"@mui/base" "5.0.0-alpha.68"
"@mui/system" "^5.4.1"
"@mui/utils" "^5.4.1"
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.2.2":
version "5.2.2"
resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.2.2.tgz#4dfbc9186a83e16a9dcdcc10e4a70ecaf641b1a3"
integrity sha512-vqmZq+v59CT4V84WcvYkYldnjC6uRddYx0TJqgl2h5YRbbPYCGVVywVvg9cBwxy4j5xI3F2WH6z7WGkHqkJIQA==
dependencies:
"@babel/runtime" "^7.16.3"
"@mui/base" "5.0.0-alpha.58"
"@mui/system" "^5.2.2"
"@mui/types" "^7.1.0"
"@mui/utils" "^5.2.2"
"@mui/material@^5.4.1":
version "5.4.1"
resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.4.1.tgz#05d3f726771c413dc430163d7c508edfcee04807"
integrity sha512-SxAT43UAjFTBBpJrN+oGrv40xP1uCa5Z49NfHt3m93xYeFzbxKOk0V9IKU7zlUjbsaVQ0i+o24yF5GULZmynlA==
dependencies:
"@babel/runtime" "^7.17.0"
"@mui/base" "5.0.0-alpha.68"
"@mui/system" "^5.4.1"
"@mui/types" "^7.1.1"
"@mui/utils" "^5.4.1"
"@types/react-transition-group" "^4.4.4"
clsx "^1.1.1"
csstype "^3.0.10"
Expand All @@ -2478,34 +2478,34 @@
react-is "^17.0.2"
react-transition-group "^4.4.2"

"@mui/private-theming@^5.2.2":
version "5.2.2"
resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.2.2.tgz#ede801bc4b6939aedf5900edcece981fde8fa210"
integrity sha512-BfTjZ5ao6KY4Sg11lgaVuQ9uUq8unaM2u9/RKDD12If0B2Vp/AhRSe7i5OTd+wErmK2guTX0kPSraGZzwDEIVg==
"@mui/private-theming@^5.4.1":
version "5.4.1"
resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.4.1.tgz#5fa6490f35e78781239f1944ae80a7006c5a7648"
integrity sha512-Xbc4MXFZxv0A3hoc4TSDBhzjhstppKfc+gQcTMqqBZQP7KjnmxF+wO7rEPQuYRBihjCqQBdrHIGMLsKWrhkZkQ==
dependencies:
"@babel/runtime" "^7.16.3"
"@mui/utils" "^5.2.2"
"@babel/runtime" "^7.17.0"
"@mui/utils" "^5.4.1"
prop-types "^15.7.2"

"@mui/styled-engine@^5.2.0":
version "5.2.0"
resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.2.0.tgz#5c97e2b1b6c4c2d9991f07517ed862972d362b85"
integrity sha512-NZ4pWYQcM5wreUfiXRd7IMFRF+Nq1vMzsIdXtXNjgctJTKHunrofasoBqv+cqevO+hqT75ezSbNHyaXzOXp6Mg==
"@mui/styled-engine@^5.4.1":
version "5.4.1"
resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.4.1.tgz#1427738e71c087f7005547e17d4a59de75597850"
integrity sha512-CFLNJkopRoAuShkgUZOTBVxdTlKu4w6L4kOwPi4r3QB2XXS6O5kyLHSsg9huUbtOYk5Dv5UZyUSc5pw4J7ezdg==
dependencies:
"@babel/runtime" "^7.16.3"
"@emotion/cache" "^11.6.0"
"@babel/runtime" "^7.17.0"
"@emotion/cache" "^11.7.1"
prop-types "^15.7.2"

"@mui/styles@^5.2.2":
version "5.2.2"
resolved "https://registry.yarnpkg.com/@mui/styles/-/styles-5.2.2.tgz#34c9ba1d6d5a0b9399fbd0c6e85b8f2dcfe54fbd"
integrity sha512-Hfg/3nAU+25RVzpgB0xyE1JjrOCI4rjujrJ0K4tS7M/U4NKZQrmtinc5ldvCaZUlxb51bZGs5V1MGn2dLKZVNQ==
"@mui/styles@^5.4.1":
version "5.4.1"
resolved "https://registry.yarnpkg.com/@mui/styles/-/styles-5.4.1.tgz#994171da902267184fffa19896ee5bbb07d4d783"
integrity sha512-ekw2NBC06re0H9SvCA1XgtFcghB8AQdGPXD3mjIz5ik+X+LvR+f2TeoCpJpkKp7UQdcNn6uuYi6BO6irTiQhdw==
dependencies:
"@babel/runtime" "^7.16.3"
"@babel/runtime" "^7.17.0"
"@emotion/hash" "^0.8.0"
"@mui/private-theming" "^5.2.2"
"@mui/types" "^7.1.0"
"@mui/utils" "^5.2.2"
"@mui/private-theming" "^5.4.1"
"@mui/types" "^7.1.1"
"@mui/utils" "^5.4.1"
clsx "^1.1.1"
csstype "^3.0.10"
hoist-non-react-statics "^3.3.2"
Expand All @@ -2519,31 +2519,31 @@
jss-plugin-vendor-prefixer "^10.8.2"
prop-types "^15.7.2"

"@mui/system@^5.2.2":
version "5.2.2"
resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.2.2.tgz#81ef74f0c269d18b99a2d0253833d6554bbf5198"
integrity sha512-221tPOcZC8A89GOt6LH9YPTj2Iqf880iqrHd7AHT/HznBKOlLrnWD83pCuLPyX2jeFz4OzhvmGbdt5a74UEgaA==
dependencies:
"@babel/runtime" "^7.16.3"
"@mui/private-theming" "^5.2.2"
"@mui/styled-engine" "^5.2.0"
"@mui/types" "^7.1.0"
"@mui/utils" "^5.2.2"
"@mui/system@^5.4.1":
version "5.4.1"
resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.4.1.tgz#cf253369fbf1d960c792f0ec068fa28af81be3d4"
integrity sha512-07JBYf9iQdxIHZU8cFOLoxBnkQDUPLb7UBhNxo4998yEqpWFJ00WKgEVYBKvPl0X+MRU/20wqFz6yGIuCx4AeA==
dependencies:
"@babel/runtime" "^7.17.0"
"@mui/private-theming" "^5.4.1"
"@mui/styled-engine" "^5.4.1"
"@mui/types" "^7.1.1"
"@mui/utils" "^5.4.1"
clsx "^1.1.1"
csstype "^3.0.10"
prop-types "^15.7.2"

"@mui/types@^7.1.0":
version "7.1.0"
resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.1.0.tgz#5ed928c5a41cfbf9a4be82ea3bbdc47bcc9610d5"
integrity sha512-Hh7ALdq/GjfIwLvqH3XftuY3bcKhupktTm+S6qRIDGOtPtRuq2L21VWzOK4p7kblirK0XgGVH5BLwa6u8z/6QQ==
"@mui/types@^7.1.1":
version "7.1.1"
resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.1.1.tgz#9cf159dc60a101ee336e6ec74193a4f5f97f6160"
integrity sha512-33hbHFLCwenTpS+T4m4Cz7cQ/ng5g+IgtINkw1uDBVvi1oM83VNt/IGzWIQNPK8H2pr0WIfkmboD501bVdYsPw==

"@mui/utils@^5.2.2":
version "5.2.2"
resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.2.2.tgz#972aab7d2564e77c06e0c3c11e7b1aec6e37c927"
integrity sha512-0u9ImUfpCfTxmvQTfUzTSS+jKWMX15MBZeZCRQZ0f7o9Yi8BlrLj33lMx0mFBkUSYdTXnqL4yfOn7RBzV01HMQ==
"@mui/utils@^5.4.1":
version "5.4.1"
resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.4.1.tgz#feb365ce9a4426587510f0943fd6d6e1889e06e6"
integrity sha512-5HzM+ZjlQqbSp7UTOvLlhAjkWB+o9Z4NzO0W+yhZ1KnxITr+zr/MBzYmmQ3kyvhui8pyhgRDoTcVgwb+02ZUZA==
dependencies:
"@babel/runtime" "^7.16.3"
"@babel/runtime" "^7.17.0"
"@types/prop-types" "^15.7.4"
"@types/react-is" "^16.7.1 || ^17.0.0"
prop-types "^15.7.2"
Expand Down Expand Up @@ -2713,10 +2713,10 @@
estree-walker "^1.0.1"
picomatch "^2.2.2"

"@rowy/form-builder@^0.5.2":
version "0.5.2"
resolved "https://registry.yarnpkg.com/@rowy/form-builder/-/form-builder-0.5.2.tgz#06963aca11ed577e3b6a815987f81fb0e5bbfd04"
integrity sha512-bIa/2pp7nH8hoCZQET97m8NoFQ4bFE0ztf6rjP+G2QmHy0lQL8s6LAoBevgdJS7cqV8LePg3aycdl1A1GW0N+g==
"@rowy/form-builder@^0.5.3":
version "0.5.3"
resolved "https://registry.yarnpkg.com/@rowy/form-builder/-/form-builder-0.5.3.tgz#aaa4ef948cd708e08e004e0b35b3a1fac0f628ce"
integrity sha512-WXUmZAL9F7ACMreFrlP+RRhvhH/KALO4ZHkOuw1P1BbQk3nHws0AspoG95WH9ttN2PuGEmAgP7jRhUMtfIVm6w==
dependencies:
"@hookform/resolvers" "^2.6.0"
"@mdi/js" "^5.9.55"
Expand Down Expand Up @@ -13666,7 +13666,7 @@ postcss-values-parser@^2.0.0, postcss-values-parser@^2.0.1:
indexes-of "^1.0.1"
uniq "^1.0.1"

[email protected], postcss@^7.0.32:
[email protected], postcss@^7, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6:
version "7.0.36"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.36.tgz#056f8cffa939662a8f5905950c07d5285644dfcb"
integrity sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==
Expand All @@ -13675,15 +13675,6 @@ [email protected], postcss@^7.0.32:
source-map "^0.6.1"
supports-color "^6.1.0"

postcss@^7, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.5, postcss@^7.0.6:
version "7.0.27"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.27.tgz#cc67cdc6b0daa375105b7c424a85567345fc54d9"
integrity sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==
dependencies:
chalk "^2.4.2"
source-map "^0.6.1"
supports-color "^6.1.0"

postcss@^8.1.0:
version "8.3.5"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.5.tgz#982216b113412bc20a86289e91eb994952a5b709"
Expand Down Expand Up @@ -16135,7 +16126,12 @@ stylehacks@^4.0.0:
postcss "^7.0.0"
postcss-selector-parser "^3.0.0"

stylis@^4.0.10, stylis@^4.0.3:
[email protected]:
version "4.0.13"
resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.13.tgz#f5db332e376d13cc84ecfe5dace9a2a51d954c91"
integrity sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag==

stylis@^4.0.3:
version "4.0.10"
resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.10.tgz#446512d1097197ab3f02fb3c258358c3f7a14240"
integrity sha512-m3k+dk7QeJw660eIKRRn3xPF6uuvHs/FFzjX3HQ5ove0qYsiygoAhwn5a3IYKaZPo5LrYD0rfVmtv1gNY1uYwg==
Expand Down

0 comments on commit 51acfc4

Please sign in to comment.