From 2efc7655f4258d9c2dd507a32b3343c1bd829feb Mon Sep 17 00:00:00 2001 From: Gibson Han <66423127+gibsonliketheguitar@users.noreply.github.com> Date: Thu, 10 Feb 2022 17:55:10 +0700 Subject: [PATCH 1/2] add function correct fcn express to sort in accending order --- src/hooks/useTable/useTableConfig.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/hooks/useTable/useTableConfig.ts b/src/hooks/useTable/useTableConfig.ts index a2fa953d..76e40cdc 100644 --- a/src/hooks/useTable/useTableConfig.ts +++ b/src/hooks/useTable/useTableConfig.ts @@ -157,7 +157,6 @@ const useTableConfig = (tableId?: string) => { */ const remove = (key: string) => { const { columns } = tableConfigState; - /** * Filter column, and remove key index * Sort and reorder column @@ -165,7 +164,7 @@ const useTableConfig = (tableId?: string) => { */ 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; From 88b79432ed124955b55fd7cfaf554bc830775ee2 Mon Sep 17 00:00:00 2001 From: Shams Date: Fri, 11 Feb 2022 15:50:39 +1100 Subject: [PATCH 2/2] Update deploy-preview.yml --- .github/workflows/deploy-preview.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy-preview.yml b/.github/workflows/deploy-preview.yml index 311b205d..ed7b8fd7 100644 --- a/.github/workflows/deploy-preview.yml +++ b/.github/workflows/deploy-preview.yml @@ -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: @@ -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