Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit a9c69b3
Author: mirkan-samsung-wsl <[email protected]>
Date:   Thu Jul 11 01:52:17 2024 +0300

    //

commit 9ab3cd5
Author: mirkan-samsung-wsl <[email protected]>
Date:   Thu Jul 11 01:14:10 2024 +0300

    revert: Update Redash models to use PseudoJSON for settings column

commit f50a58f
Author: mirkan-samsung-wsl <[email protected]>
Date:   Wed Jul 10 12:33:25 2024 +0300

    //

commit 455be1b
Author: mirkan-samsung-wsl <[email protected]>
Date:   Mon Jul 8 16:53:52 2024 +0300

    chore: Update Redis Docker image to version 7-alpine

commit cb8973e
Author: mirkan-samsung-wsl <[email protected]>
Date:   Mon Jul 8 16:27:38 2024 +0300

    The Redis Docker image has been updated to version 7-alpine.

commit 769f752
Author: mirkan1 <[email protected]>
Date:   Mon Jul 8 15:32:04 2024 +0300

    Python3.8 (#341)

    * initial commit
    * Update Dockerfile and requirements to python3.8
    * formatted using black
    * format 2
    * REDASH_THROTTLE_PASS_RESET_PATTERN is configured
    * python3.8-slim-buster is added into the Dockerfile
    * requirements file deleted instead implemented poetry files
    * [Add toggle to disable public URLs](getredash/redash@205915e#diff-bb1f48a9370bdc825649c5ddeffa7ae697c7015dc58d2c3511b752b84b7df8feL178)
    * [upgrade flask](getredash/redash@73f49cb)
    * various implementations into settings such as `CSRF_TIME_LIMIT`
    * [Remove extensions mechanism](getredash/redash#5895)
    * authentication updates
    * my dashboards section is implemented
    * formatted some files using `black`
    * dev server doesnt accept parameter of group
    * big_query.py revert back into previous version
    * client package-lock sha512 to sha1 convertion
    * chore: Update dependencies and remove unused files
    * Update Python version to 3.8 and use poetry for dev dependencies
    * Update Node version to 14 and use nodenv or nvm for managing Node versions
    * poetry dependency addded into unit tests
    * dependency changes for unit tests
    * [Removed unneeded PseudoJSON and DBPersistence classes, migrated all json contained column's type to JSONB](getredash/redash#6687)
    * enhanced SETUP documentation
    * postgres docker image version from 12 to latest
    * [Add default limit (1000) to SQL queries](getredash/redash#5088)
    * new settings are implemented
    * chore: Update test_cli.py to use dynamic dbpath in test
    * [Redis replace hmset -> hset](getredash/redash#6331)
    * typos are fixed
    * more changes for should_apply_auto_limit
    * databrick query runner is enhanced
    * cast_int_or_default is intruduced
    * pytest lines are cleaned from test_refresh_queries

commit b9fef43
Author: Jarek Heród <[email protected]>
Date:   Sun Jun 30 17:39:17 2024 +0200

    Feature/GitHub actions docker image build (#343)

    * chore: build and publish docker images to artifact registry via github actions

commit de4a6d2
Author: Jarek Heród <[email protected]>
Date:   Sun Jun 30 10:38:43 2024 +0200

    chore: test docker build (#342)

    * chore: push new image via github actions

commit cf96f43
Merge: c7c72e6 477c3b4
Author: mirkan-samsung-wsl <[email protected]>
Date:   Sat Jun 29 17:41:50 2024 +0300

    Merge branch 'jaro-backup', remote-tracking branch 'origin' into develop

commit c7c72e6
Author: mirkan-samsung-wsl <[email protected]>
Date:   Sat Jun 29 17:33:57 2024 +0300

    //

commit fd98e04
Author: mirkan-samsung-wsl <[email protected]>
Date:   Sat Jun 29 17:23:53 2024 +0300

    //

commit 477c3b4
Author: jaro <[email protected]>
Date:   Sat Jun 29 09:38:11 2024 +0200

    chore: add missing checkout

commit b2d0397
Author: jaro <[email protected]>
Date:   Sat Jun 29 09:37:19 2024 +0200

    chore: correct path

commit 053f332
Author: jaro <[email protected]>
Date:   Sat Jun 29 09:34:42 2024 +0200

    chore: temporarily disable test execution before release

commit 1b9fe8c
Author: jaro <[email protected]>
Date:   Sat Jun 29 09:32:33 2024 +0200

    chore: disable pre-merge on push to develop

commit cc45b8d
Author: jaro <[email protected]>
Date:   Sat Jun 29 09:31:52 2024 +0200

    chore: correct path

commit 28b6b77
Author: jaro <[email protected]>
Date:   Sat Jun 29 09:30:34 2024 +0200

    chore: push new image via github actions and run unit tests before

commit d10ed1b
Author: jaro <[email protected]>
Date:   Sat Jun 29 09:04:39 2024 +0200

    chore: push new image via github actions

commit 36cd15b
Author: mirkan-samsung-wsl <[email protected]>
Date:   Fri Jun 21 14:27:43 2024 +0300

    chore: grammer mistakes were fixed

commit 8c72be6
Merge: 396aa78 80853a2
Author: mirkan1 <[email protected]>
Date:   Fri Jun 21 00:36:55 2024 +0300

    Merge pull request #334 from dataminelab/dependabot/npm_and_yarn/plywood/server/braces-3.0.3

    Bump braces from 3.0.2 to 3.0.3 in /plywood/server

commit 80853a2
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu Jun 20 21:13:18 2024 +0000

    Bump braces from 3.0.2 to 3.0.3 in /plywood/server

    Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3.
    - [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md)
    - [Commits](micromatch/braces@3.0.2...3.0.3)

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

    Signed-off-by: dependabot[bot] <[email protected]>

commit 396aa78
Merge: c4e65a3 d924ca3
Author: mirkan1 <[email protected]>
Date:   Fri Jun 21 00:11:52 2024 +0300

    Merge pull request #312 from dataminelab/dependabot/npm_and_yarn/client/develop/types/nopt-3.0.32

    client npm upgrade: bump @types/nopt from 3.0.29 to 3.0.32 in /client

commit c4e65a3
Author: mirkan-samsung-wsl <[email protected]>
Date:   Wed Jun 19 01:03:43 2024 +0300

    client package.json rerun

commit 82f3750
Author: mirkan-samsung-wsl <[email protected]>
Date:   Wed Jun 19 01:03:24 2024 +0300

    refactor: Update logger configuration for pretty logs and error templates

commit abe385b
Merge: 6dd786b 7076f9c
Author: mirkan-samsung-wsl <[email protected]>
Date:   Wed Jun 19 00:18:30 2024 +0300

    Merge branch 'dependabot/npm_and_yarn/plywood/server/develop/tslog-4.9.3' into develop

commit 6dd786b
Author: mirkan-samsung-wsl <[email protected]>
Date:   Tue Jun 18 20:47:26 2024 +0300

    chore: Update tslib dependency to version 2.6.3

commit bbf019d
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Tue Jun 18 17:38:09 2024 +0000

    plywood-client package upgrade: bump tslib in /plywood/server/client

    Bumps [tslib](https://github.com/Microsoft/tslib) from 1.10.0 to 2.6.3.
    - [Release notes](https://github.com/Microsoft/tslib/releases)
    - [Commits](microsoft/tslib@1.10.0...v2.6.3)

    ---
    updated-dependencies:
    - dependency-name: tslib
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 2cb508d
Merge: bfed319 cdf2c86
Author: mirkan1 <[email protected]>
Date:   Tue Jun 18 20:36:32 2024 +0300

    Merge pull request #332 from dataminelab/dependabot/npm_and_yarn/plywood/server/client/braces-3.0.3

    Bump braces from 3.0.2 to 3.0.3 in /plywood/server/client

commit bfed319
Author: mirkan-samsung-wsl <[email protected]>
Date:   Tue Jun 18 20:19:09 2024 +0300

commit 5320c35
Merge: 32a79ee 73b1677
Author: mirkan1 <[email protected]>
Date:   Tue Jun 18 18:58:32 2024 +0300

    Merge pull request #333 from dataminelab/dependabot/npm_and_yarn/viz-lib/ws-5.2.4

    Bump ws from 5.2.3 to 5.2.4 in /viz-lib

commit 73b1677
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Tue Jun 18 06:50:54 2024 +0000

    Bump ws from 5.2.3 to 5.2.4 in /viz-lib

    Bumps [ws](https://github.com/websockets/ws) from 5.2.3 to 5.2.4.
    - [Release notes](https://github.com/websockets/ws/releases)
    - [Commits](websockets/ws@5.2.3...5.2.4)

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

    Signed-off-by: dependabot[bot] <[email protected]>

commit cdf2c86
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Jun 17 14:07:30 2024 +0000

    Bump braces from 3.0.2 to 3.0.3 in /plywood/server/client

    Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3.
    - [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md)
    - [Commits](micromatch/braces@3.0.2...3.0.3)

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

    Signed-off-by: dependabot[bot] <[email protected]>

commit 32a79ee
Merge: 95e72f7 5f98884
Author: mirkan1 <[email protected]>
Date:   Mon Jun 17 17:06:32 2024 +0300

    Merge pull request #327 from dataminelab/dependabot/npm_and_yarn/viz-lib/develop/plotly.js-2.33.0

    vizlib npm upgrade: bump plotly.js from 1.58.5 to 2.33.0 in /viz-lib

commit 7076f9c
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Sat Jun 8 15:34:26 2024 +0000

    plywood-server package upgrade: bump tslog in /plywood/server

    Bumps [tslog](https://github.com/fullstack-build/tslog) from 3.2.0 to 4.9.3.
    - [Release notes](https://github.com/fullstack-build/tslog/releases)
    - [Commits](fullstack-build/tslog@v3.2.0...v4.9.3)

    ---
    updated-dependencies:
    - dependency-name: tslog
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 5f98884
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Sat Jun 1 15:12:26 2024 +0000

    vizlib npm upgrade: bump plotly.js from 1.58.5 to 2.33.0 in /viz-lib

    Bumps [plotly.js](https://github.com/plotly/plotly.js) from 1.58.5 to 2.33.0.
    - [Release notes](https://github.com/plotly/plotly.js/releases)
    - [Changelog](https://github.com/plotly/plotly.js/blob/master/CHANGELOG.md)
    - [Commits](plotly/plotly.js@v1.58.5...v2.33.0)

    ---
    updated-dependencies:
    - dependency-name: plotly.js
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 95e72f7
Author: mirkan-samsung-wsl <[email protected]>
Date:   Fri May 10 21:02:54 2024 +0300

    Refactor validate method in ParameterizedQuery class

commit a899a3d
Author: mirkan-samsung-wsl <[email protected]>
Date:   Tue May 7 23:02:24 2024 +0300

    Refactor className in DateRangeParameter.jsx to remove unnecessary class

commit 5704770
Author: mirkan-samsung-wsl <[email protected]>
Date:   Tue May 7 23:02:15 2024 +0300

    Fix disabled checkbox in DashboardPage.jsx

commit 7e9e0a4
Author: mirkan-samsung-wsl <[email protected]>
Date:   Tue May 7 23:02:06 2024 +0300

    Refactor code to ensure dataCube has a timeAttribute

commit 0db6564
Author: mirkan-samsung-wsl <[email protected]>
Date:   Mon May 6 11:20:23 2024 +0300

    Fix JSONbig import and usage in query-result.js

commit 868d4fb
Merge: f172dea 7aea73b
Author: mirkan1 <[email protected]>
Date:   Sun May 5 00:55:13 2024 +0300

    Merge pull request #319 from dataminelab/sql-view-expection-for-big-integers

    Query view expection for big integers

commit 7aea73b
Author: mirkan-samsung-wsl <[email protected]>
Date:   Sun May 5 00:53:48 2024 +0300

    Add numeral package and neccessary changes written into axios

commit d924ca3
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Sat May 4 15:06:49 2024 +0000

    client npm upgrade: bump @types/nopt from 3.0.29 to 3.0.32 in /client

    Bumps [@types/nopt](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/nopt) from 3.0.29 to 3.0.32.
    - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
    - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/nopt)

    ---
    updated-dependencies:
    - dependency-name: "@types/nopt"
      dependency-type: direct:development
      update-type: version-update:semver-patch
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit f172dea
Merge: 9fade3c 17c1e7b
Author: mirkan1 <[email protected]>
Date:   Fri May 3 17:49:06 2024 +0300

    Merge pull request #185 from dataminelab/dependabot/npm_and_yarn/viz-lib/semver-5.7.2

    Bump semver from 5.7.1 to 5.7.2 in /viz-lib

commit 9fade3c
Author: mirkan-samsung-wsl <[email protected]>
Date:   Fri May 3 13:01:04 2024 +0300

    DR-137 | Add a loading when reading the tables from the connection

commit fd4a964
Author: mirkan-samsung-wsl <[email protected]>
Date:   Wed May 1 16:57:55 2024 +0300

    Update .dockerignore to ignore additional files and directories

commit 7c97b57
Merge: 640891e a2e5f13
Author: mirkan-samsung-wsl <[email protected]>
Date:   Tue Apr 30 20:03:51 2024 +0300

    Merge branch 'dependabot/npm_and_yarn/plywood/server/client/develop/druid.d.ts-0.12.2' into develop

commit 640891e
Author: mirkan-samsung-wsl <[email protected]>
Date:   Tue Apr 30 19:33:44 2024 +0300

    DR-187 | Fix updateReport function to handle error messages properly

commit 29c5b2e
Merge: 858c321 f0219aa
Author: mirkan1 <[email protected]>
Date:   Mon Apr 29 02:28:55 2024 +0300

    Merge pull request #296 from dataminelab/dependabot/npm_and_yarn/plywood/server/immer-9.0.6

    Bump immer from 9.0.5 to 9.0.6 in /plywood/server

commit 858c321
Author: mirkan-samsung-wsl <[email protected]>
Date:   Mon Apr 29 01:47:34 2024 +0300

    Add password reset throttling to forgot_password endpoint

commit 6f1dfcb
Merge: f071921 74f815d
Author: mirkan1 <[email protected]>
Date:   Sun Apr 28 09:35:40 2024 +0300

    Merge pull request #301 from dataminelab/dependabot/npm_and_yarn/client/develop/react-virtualized-9.22.5

    client npm upgrade: bump react-virtualized from 9.21.2 to 9.22.5 in /client

commit f071921
Merge: 3b45e17 2269751
Author: mirkan1 <[email protected]>
Date:   Sun Apr 28 09:34:59 2024 +0300

    Merge pull request #305 from dataminelab/revert-304-dependabot/npm_and_yarn/client/develop/sass-loader-14.2.1

    Revert "client npm upgrade: bump sass-loader from 9.0.3 to 14.2.1 in /client"

commit 2269751
Author: mirkan1 <[email protected]>
Date:   Sun Apr 28 09:34:49 2024 +0300

    Revert "client npm upgrade: bump sass-loader from 9.0.3 to 14.2.1 in /client"

commit 3b45e17
Merge: e69f515 4bfeeb8
Author: mirkan1 <[email protected]>
Date:   Sun Apr 28 09:20:04 2024 +0300

    Merge pull request #304 from dataminelab/dependabot/npm_and_yarn/client/develop/sass-loader-14.2.1

    client npm upgrade: bump sass-loader from 9.0.3 to 14.2.1 in /client

commit 4bfeeb8
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Sat Apr 27 15:51:29 2024 +0000

    client npm upgrade: bump sass-loader from 9.0.3 to 14.2.1 in /client

    Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 9.0.3 to 14.2.1.
    - [Release notes](https://github.com/webpack-contrib/sass-loader/releases)
    - [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md)
    - [Commits](webpack-contrib/sass-loader@v9.0.3...v14.2.1)

    ---
    updated-dependencies:
    - dependency-name: sass-loader
      dependency-type: direct:development
      update-type: version-update:semver-major
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 74f815d
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Sat Apr 27 15:20:28 2024 +0000

    client npm upgrade: bump react-virtualized in /client

    Bumps [react-virtualized](https://github.com/bvaughn/react-virtualized) from 9.21.2 to 9.22.5.
    - [Release notes](https://github.com/bvaughn/react-virtualized/releases)
    - [Changelog](https://github.com/bvaughn/react-virtualized/blob/master/CHANGELOG.md)
    - [Commits](https://github.com/bvaughn/react-virtualized/commits)

    ---
    updated-dependencies:
    - dependency-name: react-virtualized
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit e69f515
Merge: e4adbed 970e8df
Author: mirkan1 <[email protected]>
Date:   Sat Apr 27 12:07:31 2024 +0300

    Merge pull request #297 from dataminelab/revert-290-dependabot/npm_and_yarn/client/develop/typescript-3.9.10

    Revert "client npm upgrade: bump typescript from 3.3.1 to 3.9.10 in /client"

commit 970e8df
Author: mirkan1 <[email protected]>
Date:   Sat Apr 27 12:07:12 2024 +0300

    Revert "client npm upgrade: bump typescript from 3.3.1 to 3.9.10 in /client"

commit e4adbed
Merge: 085aa49 d7f5734
Author: mirkan1 <[email protected]>
Date:   Sat Apr 27 10:39:28 2024 +0300

    Merge pull request #291 from dataminelab/dependabot/npm_and_yarn/plywood/server/client/develop/immutable-class-tester-0.7.4

    plywood-client package upgrade: bump immutable-class-tester from 0.7.2 to 0.7.4 in /plywood/server/client

commit 085aa49
Merge: 5219331 9173091
Author: mirkan1 <[email protected]>
Date:   Sat Apr 27 10:38:47 2024 +0300

    Merge pull request #290 from dataminelab/dependabot/npm_and_yarn/client/develop/typescript-3.9.10

    client npm upgrade: bump typescript from 3.3.1 to 3.9.10 in /client

commit 5219331
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Sat Apr 27 10:35:48 2024 +0300

    client npm upgrade: bump @types/webpack-env from 1.14.1 to 1.18.4 in /client (#289)

    * made changes for Big Integers front-end readability

    * client npm upgrade: bump @types/webpack-env in /client

    Bumps [@types/webpack-env](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/webpack-env) from 1.14.1 to 1.18.4.
    - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
    - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/webpack-env)

    ---
    updated-dependencies:
    - dependency-name: "@types/webpack-env"
      dependency-type: direct:development
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

    ---------

    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: mirkan-samsung-wsl <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit f0219aa
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Apr 26 03:20:53 2024 +0000

    Bump immer from 9.0.5 to 9.0.6 in /plywood/server

    Bumps [immer](https://github.com/immerjs/immer) from 9.0.5 to 9.0.6.
    - [Release notes](https://github.com/immerjs/immer/releases)
    - [Commits](immerjs/immer@v9.0.5...v9.0.6)

    ---
    updated-dependencies:
    - dependency-name: immer
      dependency-type: direct:production
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit d7f5734
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Sat Apr 20 15:21:24 2024 +0000

    plywood-client package upgrade: bump immutable-class-tester

    Bumps [immutable-class-tester](https://github.com/implydata/immutable-class-tester/tree/HEAD/packages/immutable-class-tester) from 0.7.2 to 0.7.4.
    - [Commits](https://github.com/implydata/immutable-class-tester/commits/HEAD/packages/immutable-class-tester)

    ---
    updated-dependencies:
    - dependency-name: immutable-class-tester
      dependency-type: direct:development
      update-type: version-update:semver-patch
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 9173091
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Sat Apr 20 15:09:45 2024 +0000

    client npm upgrade: bump typescript from 3.3.1 to 3.9.10 in /client

    Bumps [typescript](https://github.com/Microsoft/TypeScript) from 3.3.1 to 3.9.10.
    - [Release notes](https://github.com/Microsoft/TypeScript/releases)
    - [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml)
    - [Commits](microsoft/TypeScript@v3.3.1...v3.9.10)

    ---
    updated-dependencies:
    - dependency-name: typescript
      dependency-type: direct:development
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 7c07bed
Author: mirkan-samsung-wsl <[email protected]>
Date:   Wed Apr 17 12:25:23 2024 +0300

    made changes for Big Integers front-end readability

commit aa20732
Author: mirkan-samsung-wsl <[email protected]>
Date:   Tue Apr 16 11:18:11 2024 +0300

commit dab317c
Merge: 5237fe7 b2b1839
Author: mirkan-samsung-wsl <[email protected]>
Date:   Mon Apr 15 16:20:25 2024 +0300

    Merge branch 'dependabot/npm_and_yarn/client/develop/typescript-eslint/eslint-plugin-2.34.0' into develop

commit 5237fe7
Merge: d1b4e66 dafcbb4
Author: mirkan-samsung-wsl <[email protected]>
Date:   Mon Apr 15 16:10:40 2024 +0300

    Merge branch 'dependabot/pip/develop/cassandra-driver-3.29.1' into develop

commit d1b4e66
Merge: 5fff3b5 b1f36dd
Author: mirkan-samsung-wsl <[email protected]>
Date:   Sun Apr 14 23:10:45 2024 +0300

    Merge branch 'dependabot/npm_and_yarn/viz-lib/browserify-sign-4.2.2' into develop

commit 5fff3b5
Merge: 23c4aa4 8aeb410
Author: mirkan-samsung-wsl <[email protected]>
Date:   Sun Apr 14 22:45:11 2024 +0300

    Merge branch 'dependabot/npm_and_yarn/plywood/server/express-4.19.2' into develop

commit 23c4aa4
Merge: 03dd661 9291b48
Author: mirkan-samsung-wsl <[email protected]>
Date:   Sun Apr 14 21:40:04 2024 +0300

    Merge remote-tracking branch 'origin/HEAD' into develop

commit 03dd661
Author: mirkan-samsung-wsl <[email protected]>
Date:   Sun Apr 14 21:36:41 2024 +0300

    DR-184 | checkbox for filters are disabled now and text fix

commit 9291b48
Author: jaro <[email protected]>
Date:   Sun Apr 14 19:20:45 2024 +0200

    chore: increase test execution timeout to 1h

commit a0851c5
Author: jaro <[email protected]>
Date:   Sun Apr 14 19:15:41 2024 +0200

    chore: restore test coverage report

commit 9b2bd4e
Author: mirkan-samsung-wsl <[email protected]>
Date:   Sun Apr 14 18:51:39 2024 +0300

    report dashboard error is fixed and better error handling

commit 8420a29
Author: mirkan-samsung-wsl <[email protected]>
Date:   Sat Apr 13 22:27:26 2024 +0300

    Front end data type display exception

commit 25a4e25
Author: mirkan-samsung-wsl <[email protected]>
Date:   Sun Apr 7 23:20:56 2024 +0300

    coverage.xml error fixing try 1

commit 0d8747e
Merge: 33536d4 783bfc1
Author: mirkan-samsung-wsl <[email protected]>
Date:   Sun Apr 7 21:14:56 2024 +0300

    Merge branch 'dependabot/npm_and_yarn/client/develop/eslint-6.8.0' into develop

commit a2e5f13
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Sat Apr 6 15:56:57 2024 +0000

    plywood-client package upgrade: bump druid.d.ts

    Bumps [druid.d.ts](https://github.com/implydata/druid.d.ts) from 0.12.1 to 0.12.2.
    - [Commits](implydata/druid.d.ts@v0.12.1...v0.12.2)

    ---
    updated-dependencies:
    - dependency-name: druid.d.ts
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 33536d4
Author: mirkan1 <[email protected]>
Date:   Wed Apr 3 20:37:28 2024 +0300

    Revert "plywood-client package upgrade: bump druid-query-toolkit from 0.8.0 to 0.19.1 in /plywood/server/client"

commit 8547676
Author: mirkan-samsung-wsl <[email protected]>
Date:   Wed Apr 3 17:17:00 2024 +0300

    DR-184 | Update dialog titles and button labels

commit 783bfc1
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Sat Mar 30 15:26:19 2024 +0000

    client npm upgrade: bump eslint from 6.7.2 to 6.8.0 in /client

    Bumps [eslint](https://github.com/eslint/eslint) from 6.7.2 to 6.8.0.
    - [Release notes](https://github.com/eslint/eslint/releases)
    - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
    - [Commits](eslint/eslint@v6.7.2...v6.8.0)

    ---
    updated-dependencies:
    - dependency-name: eslint
      dependency-type: direct:development
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit b2b1839
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Sat Mar 30 15:22:23 2024 +0000

    client npm upgrade: bump @typescript-eslint/eslint-plugin in /client

    Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 2.10.0 to 2.34.0.
    - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
    - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
    - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v2.34.0/packages/eslint-plugin)

    ---
    updated-dependencies:
    - dependency-name: "@typescript-eslint/eslint-plugin"
      dependency-type: direct:development
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit dafcbb4
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Sat Mar 30 15:22:16 2024 +0000

    python package upgrade: bump cassandra-driver from 3.21.0 to 3.29.1

    Bumps [cassandra-driver](https://github.com/datastax/python-driver) from 3.21.0 to 3.29.1.
    - [Changelog](https://github.com/datastax/python-driver/blob/master/CHANGELOG.rst)
    - [Commits](datastax/python-driver@3.21.0...3.29.1)

    ---
    updated-dependencies:
    - dependency-name: cassandra-driver
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit da012ab
Merge: 160c076 0503053
Author: mirkan-samsung-wsl <[email protected]>
Date:   Sat Mar 30 12:12:18 2024 +0300

    Merge branch 'dependabot/npm_and_yarn/plywood/server/client/develop/druid-query-toolkit-0.19.1' into develop

commit 160c076
Author: mirkan-samsung-wsl <[email protected]>
Date:   Sat Mar 30 12:12:09 2024 +0300

    word-wrap package for client is needed afte rinstallation so commiting it in

commit 0503053
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Tue Mar 26 13:56:43 2024 +0000

    plywood-client package upgrade: bump druid-query-toolkit

    Bumps [druid-query-toolkit](https://github.com/implydata/druid-query-toolkit) from 0.8.0 to 0.19.1.
    - [Release notes](https://github.com/implydata/druid-query-toolkit/releases)
    - [Commits](implydata/druid-query-toolkit@v0.8.0...v0.19.1)

    ---
    updated-dependencies:
    - dependency-name: druid-query-toolkit
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 8aeb410
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Tue Mar 26 10:12:07 2024 +0000

    Bump express from 4.18.2 to 4.19.2 in /plywood/server

    Bumps [express](https://github.com/expressjs/express) from 4.18.2 to 4.19.2.
    - [Release notes](https://github.com/expressjs/express/releases)
    - [Changelog](https://github.com/expressjs/express/blob/master/History.md)
    - [Commits](expressjs/express@4.18.2...4.19.2)

    ---
    updated-dependencies:
    - dependency-name: express
      dependency-type: direct:production
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit b1f36dd
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Oct 27 08:46:42 2023 +0000

    Bump browserify-sign from 4.0.4 to 4.2.2 in /viz-lib

    Bumps [browserify-sign](https://github.com/crypto-browserify/browserify-sign) from 4.0.4 to 4.2.2.
    - [Changelog](https://github.com/browserify/browserify-sign/blob/main/CHANGELOG.md)
    - [Commits](browserify/browserify-sign@v4.0.4...v4.2.2)

    ---
    updated-dependencies:
    - dependency-name: browserify-sign
      dependency-type: indirect
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 17c1e7b
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Tue Jul 11 06:22:16 2023 +0000

    Bump semver from 5.7.1 to 5.7.2 in /viz-lib

    Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2.
    - [Release notes](https://github.com/npm/node-semver/releases)
    - [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md)
    - [Commits](npm/node-semver@v5.7.1...v5.7.2)

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

    Signed-off-by: dependabot[bot] <[email protected]>
  • Loading branch information
@mirkan1
mirkan1 committed Jul 11, 2024
1 parent 41ed19c commit 901d988
Show file tree
Hide file tree
Showing 231 changed files with 13,474 additions and 11,365 deletions.
6 changes: 1 addition & 5 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,12 @@ build-docker-image-job: &build-docker-image-job
- checkout
- run: sudo apt update
- run: sudo apt install python3-pip
- run: sudo pip3 install -r requirements_bundles.txt
- run: .circleci/update_version
- run: npm run bundle
- run: .circleci/docker_build
jobs:
backend-lint:
docker:
- image: circleci/python:3.7.0
- image: circleci/python:3.8
steps:
- checkout
- run: sudo pip install flake8
Expand Down Expand Up @@ -73,9 +71,7 @@ jobs:
- checkout
- run: sudo apt update
- run: sudo apt install python3-pip
- run: sudo pip3 install -r requirements_bundles.txt
- run: npm ci
- run: npm run bundle
- run:
name: Run App Tests
command: npm test
Expand Down
2 changes: 1 addition & 1 deletion .circleci/docker-compose.circle.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ services:
REDASH_REDIS_URL: "redis://redis:6379/0"
REDASH_DATABASE_URL: "postgresql://postgres@postgres/postgres"
redis:
image: redis:3.0-alpine
image: redis:7-alpine
restart: unless-stopped
postgres:
image: postgres:9.5.6-alpine
Expand Down
2 changes: 1 addition & 1 deletion .circleci/docker-compose.cypress.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ services:
CYPRESS_PROJECT_ID: ${CYPRESS_PROJECT_ID}
CYPRESS_RECORD_KEY: ${CYPRESS_RECORD_KEY}
redis:
image: redis:3.0-alpine
image: redis:7-alpine
restart: unless-stopped
postgres:
image: postgres:9.5.6-alpine
Expand Down
5 changes: 5 additions & 0 deletions .dockerignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ venv/
coverage.xml
.circleci/
.github/
*.md
LICENSE*
Dockerfile
docker-compose.*
.codeclimate.yml
docker-compose*.yml
netlify.toml
Expand All @@ -19,6 +23,7 @@ setup
# Ignore client-specific files and directories
client/.tmp/
client/dist/
client/cypress/

# Ignore Plywood server files and directories
plywood/server/node_modules/
Expand Down
2 changes: 1 addition & 1 deletion .gcloud/docker-compose.server.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ services:
volumes:
- .:/app
redis:
image: redis:6-alpine
image: redis:7-alpine
restart: unless-stopped
ports:
- "6379:6379"
Expand Down
6 changes: 0 additions & 6 deletions .github/dependabot.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,6 @@ updates:
schedule:
interval: 'weekly'
day: 'saturday'
- directory: "/bin"
package-ecosystem: "pip"
schedule:
interval: "monthly"
ignore:
- dependency-name: "*"
- directory: "/"
target-branch: "develop"
package-ecosystem: "pip"
Expand Down
16 changes: 16 additions & 0 deletions .github/scripts/next_version.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/bin/bash
set -e

GIT_COMMIT=`git rev-parse --short=8 HEAD`

if [[ "${GITHUB_REF_TYPE-""}" == "tag" ]]; then
PREFIX="stable"
elif [[ "${BRANCH-""}" == "master" ]]; then
PREFIX="stable"
else
PREFIX="develop"
fi

#create version
NEW_TAG="$PREFIX-$(date '+%Y.%-m.%-d-%H%M')-$GIT_COMMIT"
echo $NEW_TAG
98 changes: 4 additions & 94 deletions .github/workflows/pre-merge.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,105 +1,15 @@
name: Pre-merge CI
on:
workflow_call:
pull_request:
branches:
- develop
push:
branches:
- develop
- main

concurrency:
cancel-in-progress: true
group: ${{ github.workflow }}-${{ github.ref }}

jobs:
PythonLint:
timeout-minutes: 5
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-python@v5
with:
python-version: '3.7'
- shell: bash
run: |-
python -m pip install -r requirements_bundles.txt flake8 --user
- shell: bash
run: |-
export PATH=$PATH:/builder/home/.local/bin
./bin/flake8_tests.sh
PythonUnitTests:
timeout-minutes: 30

runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
with:
version: v0.12.1
- name: Build docker compose
uses: docker/bake-action@v4
with:
files: docker-compose.yml, docker-compose.ci.yml
load: true
- name: "Prepare test environment"
shell: bash
run: |-
docker compose -f docker-compose.ci.yml up -d postgres redis
- name: "Wait for postgres to start"
shell: bash
run: |-
for i in 1 2 3 4 5; do docker compose -f docker-compose.ci.yml run --rm postgres psql -h postgres -U postgres -c "SELECT 1 FROM pg_database WHERE datname = 'tests'" && break || sleep 2; done
- name: "Create tests database"
shell: bash
run: |-
docker compose -f docker-compose.ci.yml run --rm postgres psql -h postgres -U postgres -c "create database tests;"
- name: "List Enabled Query Runners"
shell: bash
run: |-
docker compose -f docker-compose.ci.yml run --rm server manage ds list_types
- name: "Execute unit tests"
shell: bash
run: |-
docker compose -f docker-compose.ci.yml run --user 0 --name tests server tests --junitxml=junit.xml --cov-report xml --cov=redash --cov-config .coveragerc tests/
- name: "Extract test results"
shell: bash
if: always()
run: |
docker cp tests:/app/coverage.xml ./coverage.xml
docker cp tests:/app/junit.xml ./results.xml
ls -l
- name: "Publish unit test report"
uses: mikepenz/action-junit-report@v4
if: always()
with:
fail_on_failure: true
report_paths: results.xml
require_tests: true
include_passed: true
summary: true
job_summary: true
check_name: "Unit Tests Report"
- name: Code Coverage Report
uses: irongut/[email protected]
with:
filename: coverage.xml
badge: true
fail_below_min: true
format: markdown
hide_branch_rate: false
hide_complexity: true
indicators: true
output: both
thresholds: '60 80'
- name: Add Coverage PR Comment
uses: marocchino/sticky-pull-request-comment@v2
if: github.event_name == 'pull_request'
with:
recreate: true
path: code-coverage-results.md
unit_tests:
uses: ./.github/workflows/test-unit.yaml
secrets: inherit
49 changes: 49 additions & 0 deletions .github/workflows/release.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Release docker Image
on:
push:
branches:
- develop
- main

concurrency:
cancel-in-progress: true
group: ${{ github.workflow }}-${{ github.ref }}

jobs:
unit_tests:
uses: ./.github/workflows/test-unit.yaml
secrets: inherit
release_image:
runs-on: ubuntu-latest
needs:
- unit_tests
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- id: get-version
name: "Get next version"
run: |
#!/bin/bash
next_version=$(./.github/scripts/next_version.sh)
echo "Next version: $next_version"
echo "version=$next_version" >> $GITHUB_OUTPUT
- name: Docker login
uses: docker/login-action@v3
with:
registry: ${{ secrets.GCR_URL }}
username: ${{ secrets.GCR_USERNAME }}
password: ${{ secrets.GCR_PASSWORD }}
- name: Build and push datareporter
uses: docker/build-push-action@v6
with:
push: true
tags: europe-west1-docker.pkg.dev/datareporter/datareporter/datareporter:${{ steps.get-version.outputs.version }}

- name: Build and push plywood
uses: docker/build-push-action@v6
with:
push: true
context: plywood/server
tags: europe-west1-docker.pkg.dev/datareporter/datareporter/plywood:${{ steps.get-version.outputs.version }}

99 changes: 99 additions & 0 deletions .github/workflows/test-unit.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
name: "Unit tests"
on:
workflow_call:


jobs:
PythonLint:
timeout-minutes: 5
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-python@v5
with:
python-version: '3.8'
- name: Install pip
run: |
python -m ensurepip --upgrade
- shell: bash
run: |-
pip3 install flake8
- shell: bash
run: |-
export PATH=$PATH:/builder/home/.local/bin
./bin/flake8_tests.sh
PythonUnitTests:
timeout-minutes: 60

runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
with:
version: v0.12.1
- name: Build docker compose
uses: docker/bake-action@v4
with:
files: docker-compose.yml, docker-compose.ci.yml
load: true
- name: "Prepare test environment"
shell: bash
run: |-
docker compose -f docker-compose.ci.yml up -d postgres redis
- name: "Wait for postgres to start"
shell: bash
run: |-
for i in 1 2 3 4 5; do docker compose -f docker-compose.ci.yml run --rm postgres psql -h postgres -U postgres -c "SELECT 1 FROM pg_database WHERE datname = 'tests'" && break || sleep 2; done
- name: "Create tests database"
shell: bash
run: |-
docker compose -f docker-compose.ci.yml run --rm postgres psql -h postgres -U postgres -c "create database tests;"
- name: "List Enabled Query Runners"
shell: bash
run: |-
docker compose -f docker-compose.ci.yml run --rm server manage ds list_types
- name: "Execute unit tests"
shell: bash
run: |-
docker compose -f docker-compose.ci.yml run --user 0 --name tests server tests --junitxml=junit.xml --cov-report xml --cov=redash --cov-config .coveragerc tests/
- name: "Extract test results"
shell: bash
if: always()
run: |
docker cp tests:/app/coverage.xml ./coverage.xml
docker cp tests:/app/junit.xml ./results.xml
ls -l
- name: "Publish unit test report"
uses: mikepenz/action-junit-report@v4
if: always()
with:
fail_on_failure: true
report_paths: results.xml
require_tests: true
include_passed: true
summary: true
job_summary: true
check_name: "Unit Tests Report"
- name: Code Coverage Report
uses: irongut/[email protected]
with:
filename: coverage.xml
badge: true
fail_below_min: true
format: markdown
hide_branch_rate: false
hide_complexity: true
indicators: true
output: both
thresholds: '60 80'
- name: Add Coverage PR Comment
uses: marocchino/sticky-pull-request-comment@v2
if: github.event_name == 'pull_request'
with:
recreate: true
path: code-coverage-results.md
Loading

0 comments on commit 901d988

Please sign in to comment.