Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: packages updates #14

Merged
merged 74 commits into from
Oct 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
fb22746
chore: bump dayjs from 1.11.11 to 1.11.12
dependabot[bot] Jul 19, 2024
0518e5b
chore: bump react-day-picker from 8.10.1 to 9.0.1
dependabot[bot] Jul 22, 2024
28eaf4b
chore: bump @emotion/css from 11.11.2 to 11.13.0
dependabot[bot] Jul 22, 2024
57f89ae
chore: bump @emotion/is-prop-valid from 1.2.2 to 1.3.0
dependabot[bot] Jul 22, 2024
82c2cc3
chore: bump react-cookie from 7.1.4 to 7.2.0
dependabot[bot] Jul 22, 2024
1246de1
chore: bump @emotion/react from 11.11.4 to 11.13.0
dependabot[bot] Jul 22, 2024
65e6bc5
chore: bump jsdom from 24.1.0 to 24.1.1
dependabot[bot] Jul 22, 2024
1c111ae
chore: bump @emotion/babel-plugin from 11.11.0 to 11.12.0
dependabot[bot] Jul 22, 2024
b6a4f80
Merge pull request #500 from metrico/dependabot/npm_and_yarn/dayjs-1.…
jacovinus Jul 22, 2024
8e6c28f
Merge branch 'chore/packages_updates_22_07' into dependabot/npm_and_y…
jacovinus Jul 22, 2024
fc86e21
Merge pull request #502 from metrico/dependabot/npm_and_yarn/react-da…
jacovinus Jul 22, 2024
6ab47d8
Merge pull request #503 from metrico/dependabot/npm_and_yarn/emotion/…
jacovinus Jul 22, 2024
fc875fa
Merge branch 'chore/packages_updates_22_07' into dependabot/npm_and_y…
jacovinus Jul 22, 2024
ba9e2cd
Merge pull request #509 from metrico/dependabot/npm_and_yarn/emotion/…
jacovinus Jul 22, 2024
b271deb
Merge branch 'chore/packages_updates_22_07' into dependabot/npm_and_y…
jacovinus Jul 22, 2024
5121303
Merge pull request #504 from metrico/dependabot/npm_and_yarn/emotion/…
jacovinus Jul 22, 2024
07a2714
Merge pull request #508 from metrico/dependabot/npm_and_yarn/jsdom-24…
jacovinus Jul 22, 2024
1b6c925
Merge branch 'chore/packages_updates_22_07' into dependabot/npm_and_y…
jacovinus Jul 22, 2024
303cad2
Merge pull request #506 from metrico/dependabot/npm_and_yarn/react-co…
jacovinus Jul 22, 2024
d2f8243
Merge branch 'chore/packages_updates_22_07' into dependabot/npm_and_y…
jacovinus Jul 22, 2024
7c4dba2
fix: pnpm lock packages
jacovinus Jul 22, 2024
34acb4a
Merge branch 'chore/packages_updates_22_07' into dependabot/npm_and_y…
jacovinus Jul 22, 2024
d9f77c5
Merge pull request #507 from metrico/dependabot/npm_and_yarn/emotion/…
jacovinus Jul 22, 2024
05e6e63
fix: pnpm lock file
jacovinus Jul 22, 2024
12e1176
chore: bump @typescript-eslint/eslint-plugin from 7.14.1 to 7.17.0
dependabot[bot] Jul 23, 2024
99ea204
chore: bump @typescript-eslint/parser from 7.14.1 to 7.17.0
dependabot[bot] Jul 23, 2024
34fa234
Merge pull request #517 from metrico/dependabot/npm_and_yarn/typescri…
jacovinus Jul 23, 2024
6561fe7
Merge branch 'chore/packages_updates_22_07' into dependabot/npm_and_y…
jacovinus Jul 23, 2024
ab56a29
Merge pull request #511 from metrico/dependabot/npm_and_yarn/typescri…
jacovinus Jul 23, 2024
0eff8f0
Merge pull request #510 from metrico/chore/packages_updates_22_07
jacovinus Jul 23, 2024
2b26398
ci: version bump to v3.3.1
gh-action-bump-version Jul 23, 2024
be66a65
ci: version bump to v3.3.1
gh-action-bump-version Jul 23, 2024
9bef801
feat: web vitals
jacovinus Sep 3, 2024
e613df3
fix: add codeql-analysis
jacovinus Sep 3, 2024
4155601
Merge pull request #521 from metrico/fix/security_issues_9_24
jacovinus Sep 3, 2024
5829018
fix: codeql scanner file name
jacovinus Sep 3, 2024
b59b4bb
Merge pull request #523 from metrico/fix/security_scanner
jacovinus Sep 3, 2024
d246f2f
Merge branch 'main' into feat/faro-logs
jacovinus Sep 3, 2024
b6c1aef
fix: remove codeql scanner file
jacovinus Sep 3, 2024
fea4e82
Merge pull request #524 from metrico/fix/remove_codeql_file
jacovinus Sep 3, 2024
ebab655
Merge branch 'main' into feat/faro-logs
jacovinus Sep 3, 2024
02f8e8f
restore workflow to unblock codeql
lmangani Sep 3, 2024
ac025bd
Build before Scan
lmangani Sep 3, 2024
b8d5932
Update codeql-scanner.yml
lmangani Sep 3, 2024
ab664e5
fix: Incomplete HTML attribute sanitization
jacovinus Sep 4, 2024
d9e96e5
Remove Mothership branching
lmangani Sep 5, 2024
538f497
fix: bundle name
jacovinus Sep 5, 2024
85eaba7
Merge branch 'main' into fix/security_issues_4_9
jacovinus Sep 5, 2024
a2a6bd1
Merge pull request #525 from metrico/fix/security_issues_4_9
jacovinus Sep 5, 2024
864b21c
ci: version bump to v3.3.2
gh-action-bump-version Sep 5, 2024
f857561
ci: version bump to v3.3.2
gh-action-bump-version Sep 5, 2024
cfa6dde
Merge branch 'main' into feat/faro-logs
jacovinus Sep 6, 2024
92ca07a
fix: web vitals hook
jacovinus Sep 6, 2024
1329d21
fix: web vitals as a plugin
jacovinus Sep 11, 2024
56c3436
fix: INP traces and initWebVitals
jacovinus Sep 13, 2024
bb3cadc
feat: add metric charts
jacovinus Sep 20, 2024
79837d0
fix: connect http logs with traces
jacovinus Sep 23, 2024
28fcac3
fix: add instance fingerprint
jacovinus Sep 23, 2024
d485381
feat: traces timerange lookup
jacovinus Oct 18, 2024
e47daeb
fix: set default time range to last 5 minutes
jacovinus Oct 21, 2024
eced1ec
fix: truthy expressions
jacovinus Oct 21, 2024
4711ec7
fix: default start time at new tab
jacovinus Oct 22, 2024
0166433
fix: comment webVitals
jacovinus Oct 23, 2024
36367fc
Merge pull request #522 from metrico/feat/faro-logs
jacovinus Oct 23, 2024
5a7c8c9
ci: version bump to v3.4.0
gh-action-bump-version Oct 23, 2024
2564339
ci: version bump to v3.4.0
gh-action-bump-version Oct 23, 2024
0efc64d
chore: bump the npm_and_yarn group with 3 updates
dependabot[bot] Oct 23, 2024
25dbab3
Merge pull request #527 from metrico/dependabot/npm_and_yarn/npm_and_…
jacovinus Oct 23, 2024
681091b
ci: version bump to v3.4.1
gh-action-bump-version Oct 23, 2024
ce1a0a2
ci: version bump to v3.4.1
gh-action-bump-version Oct 23, 2024
7774f63
fix: micromatch package update
jacovinus Oct 23, 2024
b99c6a2
Merge pull request #528 from metrico/fix/security_issues
jacovinus Oct 23, 2024
02b70f1
ci: version bump to v3.4.2
gh-action-bump-version Oct 23, 2024
e36d1d9
ci: version bump to v3.4.2
gh-action-bump-version Oct 23, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 0 additions & 23 deletions .github/workflows/ci-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,29 +99,6 @@ jobs:
draft: false
prerelease: false
overwrite: true
- name: Prepare for Mothership
if: github.event_name != 'pull_request'
uses: GuillaumeFalourd/[email protected]
with:
repository_owner: metrico
repository_name: qryn
new_branch_name: view_${{steps.version.outputs.newTag}}
new_branch_ref: master
access_token: ${{ secrets.GH_PUSH }}
- name: Push to Mothership
if: github.event_name != 'pull_request'
uses: cpina/github-action-push-to-another-repository@main
env:
API_TOKEN_GITHUB: ${{ secrets.GH_PUSH }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
source-directory: "packages/main/dist"
target-directory: "view"
target-branch: view_${{steps.version.outputs.newTag}}
destination-github-username: "metrico"
destination-repository-name: "qryn"
user-email: [email protected]
commit-message: Upgrade view to ${{steps.version.outputs.newTag}}
- name: Deploy to gh-pages 🚀
if: github.event_name != 'pull_request'
uses: JamesIves/[email protected]
Expand Down
105 changes: 105 additions & 0 deletions .github/workflows/codeql-scanner.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL Advanced"

on:
push:
branches: [ "main", "protected" ]
pull_request:
branches: [ "main", "protected" ]
schedule:
- cron: '16 23 * * 2'

jobs:
analyze:
name: Analyze (${{ matrix.language }})
# Runner size impacts CodeQL analysis time. To learn more, please see:
# - https://gh.io/recommended-hardware-resources-for-running-codeql
# - https://gh.io/supported-runners-and-hardware-resources
# - https://gh.io/using-larger-runners (GitHub.com only)
# Consider using larger runners or machines with greater resources for possible analysis time improvements.
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
permissions:
# required for all workflows
security-events: write

# required to fetch internal or private CodeQL packs
packages: read

# only required for workflows in private repositories
actions: read
contents: read

strategy:
fail-fast: false
matrix:
include:
- language: javascript-typescript
build-mode: none
# CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
# Use `c-cpp` to analyze code written in C, C++ or both
# Use 'java-kotlin' to analyze code written in Java, Kotlin or both
# Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
# To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
# see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
# If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
steps:
- name: Checkout repository
uses: actions/checkout@v4

- uses: pnpm/[email protected]
with:
version: 8
- name: Setup Node.js environment
uses: actions/setup-node@v4
with:
node-version: 20
cache: "pnpm"
- name: Install dependencies
run: pnpm install
- name: Build
run: pnpm build

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
build-mode: ${{ matrix.build-mode }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.

# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality

# If the analyze step fails for one of the languages you are analyzing with
# "We were unable to automatically build your code", modify the matrix above
# to set the build mode to "manual" for that language. Then modify this step
# to build your code.
# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
- if: matrix.build-mode == 'manual'
shell: bash
run: |
echo 'If you are using a "manual" build mode for one or more of the' \
'languages you are analyzing, replace this with the commands to build' \
'your code, for example:'
echo ' make bootstrap'
echo ' make release'
exit 1

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ server
.env
*.cookie
packages/main/.env
codeql-results
codeqldb
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,12 @@ _JSON stringifyed and URL encoded_

------------

### Local Proxy for headeless qryn-view (for experimentation purposes only):

Add to you .env file:

`VITE_API_BASE_URL= { your local qryn api }`
should we with same protocol as your qryn-view instance

### About qryn

Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "qryn-view",
"version": "3.3.0",
"version": "3.4.2",
"description": "Data Explorer UI for qryn",
"repository": {
"type": "git",
Expand All @@ -16,14 +16,14 @@
"author": "",
"license": "ISC",
"devDependencies": {
"@types/node": "^20.14.8",
"@types/react": "^18.3.3",
"jsdom": "24.1.0",
"@types/node": "^20.16.15",
"@types/react": "^18.3.12",
"jsdom": "24.1.1",
"turbo": "^1.13.4",
"typescript": "^5.4.5"
"typescript": "^5.6.3"
},
"dependencies": {
"jsdom": "24.1.0",
"jsdom": "24.1.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"ts-node": "^10.9.2"
Expand Down
5 changes: 3 additions & 2 deletions packages/main/helpers/stateFromQueryParams.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import setDebug from "./setDebug";
import moment from "moment";
import { nanoid } from "nanoid";
import DOMPurify from "isomorphic-dompurify";
import addMinutes from "date-fns/addMinutes";
const BOOLEAN_VALUES = ["isSubmit", "isSplit", "autoTheme", "isEmbed"];
export const initialUrlState: any = {
query: "",
Expand Down Expand Up @@ -35,7 +36,7 @@ export const initialUrlState: any = {
values: [], // label name selected
response: {}, // the target should be just the last one
open: true,
start: new Date(Date.now() - 5 * 60000),
start: addMinutes(new Date(Date.now()), -5),
time: "", // for instant queries
stop: new Date(Date.now()),
label: "",
Expand Down Expand Up @@ -66,7 +67,7 @@ export const initialUrlState: any = {
values: [], // label name selected
response: {}, // the target should be just the last one
open: false,
start: new Date(Date.now() - 5 * 60000),
start: addMinutes(new Date(Date.now()), -5),
time: "", // for instant queries
stop: new Date(Date.now()),
label: "",
Expand Down
79 changes: 42 additions & 37 deletions packages/main/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@ui/main",
"private": true,
"version": "3.3.0",
"version": "3.4.2",
"type": "module",
"scripts": {
"dev": "VITE_APP_VERSION=$npm_package_version vite",
Expand All @@ -10,82 +10,87 @@
"preview": "vite preview"
},
"dependencies": {
"@emotion/css": "^11.11.2",
"@emotion/is-prop-valid": "^1.2.2",
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.5",
"@emotion/css": "^11.13.4",
"@emotion/is-prop-valid": "^1.3.1",
"@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0",
"@fingerprintjs/fingerprintjs": "^4.5.1",
"@microlink/react-json-view": "latest",
"@mui/base": "5.0.0-beta.5",
"@mui/icons-material": "^5.15.20",
"@mui/material": "^5.15.20",
"@mui/styles": "^5.15.20",
"@mui/icons-material": "^5.16.7",
"@mui/material": "^5.16.7",
"@mui/styles": "^5.16.7",
"@mui/x-charts": "7.7.1",
"@szhsin/react-menu": "^4.1.0",
"@tanstack/match-sorter-utils": "^8.15.1",
"@tanstack/react-table": "^8.17.3",
"axios": "^1.7.2",
"@szhsin/react-menu": "^4.2.2",
"@tanstack/match-sorter-utils": "^8.19.4",
"@tanstack/react-table": "^8.20.5",
"axios": "^1.7.7",
"classnames": "^2.5.1",
"combokeys": "^3.0.1",
"date-fns": "^2.30.0",
"dayjs": "^1.11.11",
"dayjs": "^1.11.13",
"deep-freeze": "^0.0.1",
"dnd-core": "^16.0.1",
"echarts": "^5.5.1",
"fuzzy": "^0.1.3",
"immutability-helper": "^3.1.1",
"isomorphic-dompurify": "^1.13.0",
"javascript-time-ago": "^2.5.10",
"javascript-time-ago": "^2.5.11",
"jquery": "^3.7.1",
"jsdom": "24.1.0",
"json-markup": "^1.1.4",
"jsdom": "24.1.1",
"lodash": "^4.17.21",
"lru-memoize": "^1.1.0",
"memoize-one": "^6.0.0",
"moment": "^2.30.1",
"moment-timezone": "^0.5.45",
"moment-timezone": "^0.5.46",
"nanoid": "^5.0.7",
"papaparse": "^5.4.1",
"prismjs": "^1.29.0",
"react": "^18.3.1",
"react-cookie": "^7.1.4",
"react-day-picker": "^8.10.1",
"react-cookie": "^7.2.1",
"react-day-picker": "^9.1.4",
"react-dnd": "^16.0.1",
"react-dnd-html5-backend": "^16.0.1",
"react-dom": "^18.3.1",
"react-flot": "^1.3.0",
"react-redux": "^8.1.3",
"react-responsive": "^9.0.2",
"react-router-dom": "^6.24.0",
"react-select": "^5.8.0",
"react-router-dom": "^6.27.0",
"react-select": "^5.8.1",
"redux": "^4.2.1",
"redux-thunk": "^2.4.2",
"reselect": "^5.1.1",
"slate": "^0.103.0",
"slate-history": "^0.100.0",
"slate-react": "^0.105.0",
"tss-react": "^4.9.10",
"tss-react": "^4.9.13",
"uuid": "^10.0.0",
"web-vitals": "^4.2.4",
"zod": "^3.23.8",
"zustand": "^4.5.2"
"zustand": "^4.5.5"
},
"devDependencies": {
"@emotion/babel-plugin": "^11.11.0",
"@emotion/babel-plugin": "^11.12.0",
"@testing-library/react": "^14.3.1",
"@types/jest": "^29.5.12",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@typescript-eslint/eslint-plugin": "^7.14.1",
"@typescript-eslint/parser": "^7.14.1",
"@types/fingerprintjs": "^0.5.28",
"@types/jest": "^29.5.14",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"@typescript-eslint/eslint-plugin": "^7.18.0",
"@typescript-eslint/parser": "^7.18.0",
"@vitejs/plugin-basic-ssl": "^1.1.0",
"@vitejs/plugin-react": "^4.3.1",
"eslint": "^8.57.0",
"@vitejs/plugin-react": "^4.3.3",
"dayjs-plugin-utc": "^0.1.2",
"eslint": "^8.57.1",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-react-refresh": "^0.4.7",
"eslint-plugin-react-refresh": "^0.4.13",
"happy-dom": "^14.12.3",
"jsdom": "24.1.0",
"prettier": "^3.3.2",
"sass": "^1.77.5",
"jsdom": "24.1.1",
"prettier": "^3.3.3",
"sass": "^1.80.3",
"scss": "^0.2.4",
"typescript": "^5.4.5",
"vite": "^5.3.1",
"typescript": "^5.6.3",
"vite": "^5.4.10",
"vitest": "^1.6.0"
}
}
2 changes: 1 addition & 1 deletion packages/main/plugins/PluginCards.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export const PluginCards: React.FC<{
const theme = useTheme();

return (
<div>
<div style={{ display: "flex", gap: ".5em" }}>
{filteredComponentList?.length > 0 &&
filteredComponentList?.map((component: any, k: number) => (
<PluginCard
Expand Down
Loading