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

V3 #114

Merged
merged 279 commits into from
Aug 10, 2024
Merged

V3 #114

Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
279 commits
Select commit Hold shift + click to select a range
d64d1d6
notifications!
followynne Feb 11, 2024
3bd4bd9
review url creation
followynne Feb 11, 2024
e78ce5f
improve pagination
followynne Feb 11, 2024
b65ad56
continue
followynne Feb 11, 2024
1baa259
fix isutc
followynne Feb 12, 2024
60b4268
refactor towards columns configuration
followynne Feb 12, 2024
5cdff32
review auth
followynne Feb 12, 2024
4365f4b
improve check on resize
followynne Feb 12, 2024
2133b82
update name
followynne Feb 12, 2024
c91807d
change file name and pos
followynne Feb 12, 2024
1d161cd
bumps
followynne Feb 12, 2024
fea6289
create basic modal
followynne Feb 12, 2024
516591a
to loadable
followynne Feb 12, 2024
3adf1c3
improve basic
followynne Feb 12, 2024
df28db1
small fixes
followynne Feb 12, 2024
21532c0
other fixes
followynne Feb 12, 2024
9aaceac
other color
followynne Feb 12, 2024
be02607
some cleaning
followynne Feb 12, 2024
2d00fc0
test running
followynne Feb 12, 2024
e34a53c
update tests
followynne Feb 13, 2024
9e6cccd
clean installation
followynne Feb 13, 2024
3b577a1
other tests
followynne Feb 13, 2024
8085f56
test date format
followynne Feb 13, 2024
012361b
fix setup
followynne Feb 13, 2024
188acdc
small broken test
followynne Feb 13, 2024
f89d9bb
remove code highlights
followynne Feb 14, 2024
390377f
small improvements
followynne Feb 14, 2024
6930905
review table views
followynne Feb 14, 2024
9ed49ec
wip
followynne Feb 14, 2024
bb15af5
ups
followynne Feb 15, 2024
7dd842f
change shiki use to tree shake
followynne Feb 15, 2024
76378ec
test example for modal
followynne Feb 15, 2024
88e3407
move favicon
followynne Feb 16, 2024
4268d24
small improvements
followynne Feb 16, 2024
7285c07
Add sorting options to log data retrieval
followynne Feb 16, 2024
335f3b7
Refactor SerilogUiAppRoutes and SerilogUiEndpointsDecorator
followynne Feb 16, 2024
c9bb3e7
setup the new properties
followynne Feb 16, 2024
34203a7
review and mock the sorting
followynne Feb 16, 2024
932d7ff
fixine
followynne Feb 16, 2024
b2cd969
restore
followynne Feb 16, 2024
47f43e7
cleaned
followynne Feb 16, 2024
f50097e
small fix and a reminder
followynne Feb 17, 2024
65470e9
fix sql server sorting query
followynne Feb 17, 2024
ebebd17
cleanup
followynne Feb 17, 2024
0e7606f
wip on removing index.html from url...
followynne Feb 18, 2024
bc255fe
add warning on basic auth modal
followynne Feb 19, 2024
88a3f97
bump and cleanup
followynne Feb 19, 2024
9fc5d67
cleaned
followynne Feb 19, 2024
b25823c
small fix
followynne Feb 24, 2024
b23f98c
write sort tests
followynne Feb 24, 2024
a7204bc
make mongodb sort work
followynne Feb 24, 2024
1665822
stabilize mongodb test
followynne Feb 24, 2024
36d73d9
small clean
followynne Feb 24, 2024
40e050e
review mongo and elastic
followynne Feb 26, 2024
1c2e6c0
small fix
followynne Mar 2, 2024
aeaed00
fix elastic and mongo
followynne Mar 3, 2024
6d3d054
add missing fix
followynne Mar 3, 2024
193150b
ms sql updates
followynne Mar 4, 2024
f7bde16
extends sink faker and change sql server to use sink
followynne Mar 4, 2024
9d159b6
postgres fix
followynne Mar 4, 2024
3b98484
small fix
followynne Mar 4, 2024
f5956fb
fix ms sql queries
followynne Mar 4, 2024
faceda0
reviewing mysql
followynne Mar 4, 2024
3c4cf11
fix readme link
followynne Mar 4, 2024
1a5c5cb
refactor mysql provider to support both items
followynne Mar 4, 2024
0136246
add tests for mysql refactor
followynne Mar 4, 2024
528774b
upgrade shared pkgs
followynne Mar 4, 2024
2bff5df
fix missing AS
followynne Mar 4, 2024
1e53c0c
forgotten bump
followynne Mar 4, 2024
4bd9932
some upgds
followynne Mar 4, 2024
1eeacce
small fixes
followynne Mar 5, 2024
3970900
review postgres
followynne Mar 5, 2024
17add55
cleanup
followynne Mar 5, 2024
915bedd
rename
followynne Mar 6, 2024
d6067fd
cleanup
followynne Mar 6, 2024
5ac4b9e
fix change
followynne Mar 6, 2024
263c067
cleanup
followynne Mar 9, 2024
3da8908
unify test projects
followynne Mar 9, 2024
ebb956d
upgrade to new versions
followynne Mar 9, 2024
3f3c4a5
bump all except nuke
followynne Mar 9, 2024
d105fe4
change prop
followynne Mar 9, 2024
61c7b2a
fix
followynne Mar 9, 2024
35cf521
update tests
followynne Mar 10, 2024
4a9de23
start converting timestamps to utc to unify for ui
followynne Mar 10, 2024
4d799eb
convert to utc elastic
followynne Mar 10, 2024
c78df0b
register mariadb sink provider
followynne Mar 10, 2024
781a866
fix for mariadb provider
followynne Mar 10, 2024
3ba09b7
bump
followynne Mar 10, 2024
a70f51e
bump nuke to 8
followynne Mar 10, 2024
6387df7
refactor authentication filters to use DI
followynne Mar 16, 2024
2ff6e7f
rewrite tests, add missing file
followynne Mar 16, 2024
c49090d
clean and review tests
followynne Mar 17, 2024
f6f490b
update sample
followynne Mar 17, 2024
d20d6f9
invert code following change in routing
followynne Mar 17, 2024
9b1ecee
clean and improve fluent registration on providers
followynne Mar 19, 2024
48e7a9c
small fix
followynne Mar 19, 2024
1d38c81
bump npm pkgs
followynne Mar 20, 2024
c159aa9
improve middleware interceptions
followynne Mar 20, 2024
060898a
add on filters
followynne Mar 20, 2024
4b396b4
fix: namespaces
followynne Mar 21, 2024
7f01c77
Update main.tsx
followynne Mar 22, 2024
9330862
Merge branch 'master' into feat/react-ui-interface
followynne Mar 26, 2024
e0029cb
review: raven w sort
followynne Mar 26, 2024
652bf05
fluent interface on DI
followynne Mar 20, 2024
8cac736
fix fetch fe when options not ready
followynne Mar 20, 2024
de9de30
replace sample with new net 8 template and self-hosted db
followynne Apr 1, 2024
5694275
small ui fixes
followynne Apr 1, 2024
f00bca4
feat: review basic authentication
followynne Apr 2, 2024
effed3b
validate jwt token each minute
followynne Apr 2, 2024
c01d760
fix solution
followynne Apr 2, 2024
2eb69b2
try yarn task
followynne Apr 2, 2024
a5705ba
temporary
followynne Apr 2, 2024
e63c9cd
fixing fe tests
followynne Apr 2, 2024
3e807a3
temp
followynne Apr 2, 2024
bb5c1ff
update build prj and run some sonar tests
followynne Apr 2, 2024
8405b43
try updating refs
followynne Apr 2, 2024
7bc8f55
test
followynne Apr 2, 2024
63cbf1a
update actions
followynne Apr 2, 2024
c4316bc
refactor query provider signature
followynne Apr 3, 2024
5695c0c
refactor tests
followynne Apr 3, 2024
4200f4e
fix query parsing
followynne Apr 3, 2024
1b740a5
fix providers
followynne Apr 3, 2024
ed2d663
try fixing reporting
followynne Apr 3, 2024
41d9ec9
rollback action version
followynne Apr 3, 2024
e7fcdb5
fix sonar smells
followynne Apr 3, 2024
0c12968
add tests, fix error
followynne Apr 3, 2024
08237f5
to-be-deleted
followynne Apr 3, 2024
64e7d14
to-be-deleted
followynne Apr 3, 2024
f562abf
write junit report
followynne Apr 3, 2024
4329f2e
temp
followynne Apr 3, 2024
680986f
Merge branch 'master' into feat/react-ui-interface
followynne Apr 3, 2024
69ad1ca
remove smells
followynne Apr 3, 2024
541f80b
fix ui smells
followynne Apr 3, 2024
eb1244a
forgotten file
followynne Apr 3, 2024
b53b274
fix smells
followynne Apr 3, 2024
a663369
disable sort on certain providers
followynne Apr 3, 2024
ed4434a
bump packages
followynne Apr 3, 2024
53ffa4d
restore sonar disabled, remove smell
followynne Apr 3, 2024
220fb8d
feat(additional-cols): implemented new features, moved options-builde…
followynne Apr 5, 2024
516a47c
chore(samples): convert WebApp to multi-frameworks support
followynne Apr 5, 2024
f84bdd2
chore(tests): run in all supported frameworks
followynne Apr 5, 2024
393e77e
fix(route): add new property in ui options
followynne Apr 5, 2024
55ec2f5
chore: set v3-beta.1, upgrade nuspecs
followynne Apr 5, 2024
6a33990
feat(fe): additional columns implementation, added hide brand option
followynne Apr 5, 2024
6791b94
feat(additional-cols): fixed implementation after testing, added samp…
followynne Apr 5, 2024
df40dae
fix: correct test cases
followynne Apr 5, 2024
8a54c75
fix(mongodb): kind in utc timestamp
followynne Apr 6, 2024
79c9062
chore: move attribute to separate namespace
followynne Apr 6, 2024
e353cdb
chore: move options builder interface to correct namespace
followynne Apr 6, 2024
bdaddc1
chore: move LogModel namespace
followynne Apr 6, 2024
8d39d19
chore: fix remaining wrong namespaces
followynne Apr 6, 2024
7a863f5
refactor(provider-opts): from static class to singleton instance conf…
followynne Apr 6, 2024
d29898a
refactory: postgres class names to prevent static conflicts
followynne Apr 6, 2024
e73909f
tests: multiple sql providers registration
followynne Apr 6, 2024
9749a6b
feat: multiple registration for all providers
followynne Apr 6, 2024
8673cd9
Fix: provider test
followynne Apr 6, 2024
824b02c
missing test
followynne Apr 6, 2024
19b1aa8
feat(mariadb): additional columns for maria db sink
followynne Apr 7, 2024
58eaa8d
Update SerilogUiOptionBuilderExtensions.cs
followynne Apr 8, 2024
5e74cef
Update SerilogUiOptionBuilderExtensions.cs
followynne Apr 8, 2024
1d9b945
refactor: use custom attribute to identify removed column
followynne Apr 11, 2024
34d48d4
feat: implement postgres additional columns
followynne Apr 11, 2024
dbc10bd
chore: cleanup usings
followynne Apr 11, 2024
b714ac0
chore: cleanup, bump .net packages
followynne Apr 11, 2024
bed2048
feat: remove newtonsoft, add default properties to all test logging
followynne Apr 11, 2024
ea03ca6
fix: missing properties info in Postgres custom column, add check on …
followynne Apr 11, 2024
42519cd
fix: elastic log model, add in WebApi conditional Elastic sample with…
followynne Apr 11, 2024
d5428d7
chore: update readme, add contributors
followynne Apr 11, 2024
1fb3966
improve
followynne Apr 11, 2024
c15e282
first implementation of error routing
followynne Apr 11, 2024
dc19986
refactor(ui-options): move to Fluent interface, change home access au…
followynne Apr 12, 2024
b886e05
refactor block flag position
followynne Apr 12, 2024
2f2519b
first blocked home implementation, review auth
followynne Apr 13, 2024
813bd0c
simplify state management in auth
followynne Apr 13, 2024
4e606ea
complete refactoring
followynne Apr 13, 2024
3e47fef
small review
followynne Apr 16, 2024
0a811d8
replace loadable with lazy, split Search
followynne Apr 20, 2024
0a37707
safe bumps
followynne Apr 20, 2024
4bce30f
bumps
followynne Apr 20, 2024
bf69f6d
remove unused deps
followynne Apr 20, 2024
0831dd6
add some tests
followynne Apr 20, 2024
fe321ba
small fixes
followynne Apr 20, 2024
f08e05e
tests: ui
followynne Apr 28, 2024
18d0626
exclude files from coverage, fix smells
followynne Apr 28, 2024
1daff32
add tests
followynne Apr 28, 2024
46cb477
some tests wip
followynne Apr 30, 2024
bd70141
chore: bumps
followynne May 1, 2024
3b343c1
tests: Search, custom matcher
followynne May 1, 2024
a22a503
tests: shellstructure, util, error pages
followynne May 1, 2024
995fd1c
restore eslint, fix warns
followynne May 4, 2024
ef39335
other tests
followynne May 4, 2024
42a35bf
tests
followynne May 4, 2024
44c4d84
appbody
followynne May 4, 2024
f44757f
bump
followynne May 4, 2024
521bb49
test vanillaserializer, bump nuget
followynne May 4, 2024
11d24b2
remove unuseful test
followynne May 4, 2024
4d43882
add remaining tests
followynne May 5, 2024
0c5d674
improve test
followynne May 5, 2024
b48bb37
test
followynne May 5, 2024
cf0fe89
Update Build.Backend.Tests.cs
followynne May 5, 2024
5df2d45
Update Build.Backend.Tests.cs
followynne May 5, 2024
3283735
Update Build.Backend.Tests.cs
followynne May 5, 2024
1e46a54
Update Build.Backend.Tests.cs
followynne May 5, 2024
029ab2b
test report generator
followynne May 5, 2024
2ede0f6
change dll path
followynne May 5, 2024
a14ce3c
try other path
followynne May 5, 2024
6c2aebd
fix name
followynne May 5, 2024
064fd17
remove paths
followynne May 5, 2024
fda2c9d
remove comment
followynne May 5, 2024
ba2a321
small improvements
followynne May 7, 2024
ced8edd
improve readme
followynne May 9, 2024
50e38a5
clean old
followynne May 9, 2024
1b4304f
bump npm pkgs
followynne May 9, 2024
8c0f9fc
move license and readme in directory props, replace nuspec with cspro…
followynne May 10, 2024
62dba9c
fix version
followynne May 10, 2024
5c1f208
bump vulnerabilities, fix raven version
followynne May 10, 2024
146810d
upgrade samples to reference actual nuget projects
followynne May 10, 2024
7c36dd6
missing trait
followynne May 11, 2024
02eff18
restore pr constraint
followynne May 11, 2024
5649e82
bump pkgs
followynne May 11, 2024
c72ccbd
add images
followynne May 11, 2024
e925baa
bump deps
followynne May 22, 2024
b62932d
make provider name customizable
followynne May 24, 2024
82e4ea7
add tests, small fixes
followynne May 24, 2024
40aef15
add nullable enable
followynne May 24, 2024
b6219db
bump npm
followynne May 24, 2024
fbdd360
fix postgres properties conversion
followynne May 25, 2024
d7a6f2b
fix my sql default level value
followynne May 25, 2024
18103fb
update readme
followynne May 25, 2024
449308a
bump versions
followynne May 25, 2024
a9d8a63
fix npm
followynne May 25, 2024
80525cb
upgrade samples
followynne May 25, 2024
69d1def
bump raven db, build, fix warning
followynne May 25, 2024
f808ce3
bump
followynne May 25, 2024
38eb462
fix: move extensions to correct namespace and separate file
followynne Aug 6, 2024
20f2fb5
fix(options-builder): separate models in correct namespace
followynne Aug 6, 2024
d0ad122
safe packages bump
followynne Aug 6, 2024
dc20f3d
bump npm packages 1
followynne Aug 8, 2024
6e526d4
fix: replace typescript eslint, fix eslint suggestion
followynne Aug 8, 2024
3e888ac
upgrade vitest
followynne Aug 8, 2024
c6376b7
bump other pkgs
followynne Aug 8, 2024
2fbcc51
fix shijki bundle
followynne Aug 8, 2024
f2f68b6
bump others
followynne Aug 8, 2024
69ef3d7
Merge branch 'master' into feat/react-ui-interface
followynne Aug 8, 2024
49ceca4
Merge branch 'master' into feat/react-ui-interface
followynne Aug 9, 2024
51af08c
bump npm, set correct versions
followynne Aug 9, 2024
8031f94
fix sample, rename extension file
followynne Aug 9, 2024
bfcde90
cleanup
followynne Aug 9, 2024
42613bb
fix(codetype): move to separate file
followynne Aug 10, 2024
aae135c
bump
followynne Aug 10, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
126 changes: 126 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
{
"projectName": "serilog-ui",
"projectOwner": "serilog-contrib",
"repoType": "github",
"repoHost": "https://github.com",
"files": [
"README.md"
],
"imageSize": 60,
"commitConvention": "angular",
"contributors": [
{
"login": "mo-esmp",
"name": "Mohsen Esmailpour",
"avatar_url": "https://avatars.githubusercontent.com/u/1659032?v=4",
"profile": "https://stackoverflow.com/users/1385614/mohsen-esmailpour",
"contributions": [
"code",
"projectManagement",
"test"
]
},
{
"login": "followynne",
"name": "Matteo Gregoricchio",
"avatar_url": "https://avatars.githubusercontent.com/u/32459930?v=4",
"profile": "https://www.matteogregoricchio.com/",
"contributions": [
"code",
"doc",
"test"
]
},
{
"login": "sommmen",
"name": "sommmen",
"avatar_url": "https://avatars.githubusercontent.com/u/8641495?v=4",
"profile": "https://github.com/sommmen",
"contributions": [
"code"
]
},
{
"login": "igece",
"name": "Israel Gómez de Celis",
"avatar_url": "https://avatars.githubusercontent.com/u/2063980?v=4",
"profile": "http://igecelabs.net/",
"contributions": [
"code"
]
},
{
"login": "traien",
"name": "Osama Bashir",
"avatar_url": "https://avatars.githubusercontent.com/u/16708328?v=4",
"profile": "https://github.com/traien",
"contributions": [
"code"
]
},
{
"login": "ricardodemauro",
"name": "Ricardo",
"avatar_url": "https://avatars.githubusercontent.com/u/3687018?v=4",
"profile": "https://rmauro.dev/",
"contributions": [
"code"
]
},
{
"login": "hansoncaleb",
"name": "Caleb Hanson",
"avatar_url": "https://avatars.githubusercontent.com/u/8008108?v=4",
"profile": "https://github.com/hansoncaleb",
"contributions": [
"code"
]
},
{
"login": "Millarex",
"name": "Aleksei",
"avatar_url": "https://avatars.githubusercontent.com/u/55946676?v=4",
"profile": "https://github.com/Millarex",
"contributions": [
"code"
]
},
{
"login": "chaadfh",
"name": "chaadfh",
"avatar_url": "https://avatars.githubusercontent.com/u/133214342?v=4",
"profile": "https://github.com/chaadfh",
"contributions": [
"code"
]
},
{
"login": "phillduffy",
"name": "Phill Duffy",
"avatar_url": "https://avatars.githubusercontent.com/u/710550?v=4",
"profile": "https://github.com/phillduffy",
"contributions": [
"code"
]
},
{
"login": "uthmanrahimi",
"name": "Uthman",
"avatar_url": "https://avatars.githubusercontent.com/u/45357615?v=4",
"profile": "https://github.com/uthmanrahimi",
"contributions": [
"code"
]
},
{
"login": "jorgevp",
"name": "jorgevp",
"avatar_url": "https://avatars.githubusercontent.com/u/3268148?v=4",
"profile": "https://github.com/jorgevp",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 10
}
2 changes: 1 addition & 1 deletion .github/workflows/DotNET-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
runs-on: ubuntu-latest
steps:

- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/DotNET-reporting-on-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
upload:
runs-on: ubuntu-latest
steps:
- uses: phoenix-actions/test-reporting@v9
with:
artifact: test-results # artifact name
name: DotNET - Tests # Name of the check run which will be created
path: '**/test-results.trx' # Path to test results (inside artifact .zip)
reporter: dotnet-trx # Format of test results
output-to: checks
- uses: phoenix-actions/test-reporting@v14
with:
artifact: test-results # artifact name
name: DotNET - Tests # Name of the check run which will be created
path: '**/test-results.trx' # Path to test results (inside artifact .zip)
reporter: dotnet-trx # Format of test results
output-to: checks
150 changes: 75 additions & 75 deletions .github/workflows/JS-build.yml
Original file line number Diff line number Diff line change
@@ -1,75 +1,75 @@
# ------------------------------------------------------------------------------
# <auto-generated>
#
# This code was generated.
#
# - To turn off auto-generation set:
#
# [CustomGithubActions (AutoGenerate = false)]
#
# - To trigger manual generation invoke:
#
# nuke --generate-configuration GitHubActions_JS-build --host GitHubActions
#
# </auto-generated>
# ------------------------------------------------------------------------------
name: JS-build
on:
push:
branches:
- master
- dev
pull_request:
branches:
- master
- dev
jobs:
ubuntu-latest:
name: ubuntu-latest
runs-on: ubuntu-latest
steps:
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17'
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
uses: actions/cache@v3
with:
path: |
.nuke/temp
~/.nuget/packages
key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj', '**/Directory.Packages.props') }}
- name: 'Run: Frontend_Tests_Ci'
run: ./build.cmd Frontend_Tests_Ci
env:
SonarTokenUi: ${{ secrets.SONAR_TOKEN_UI }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: SonarCloud run
uses: SonarSource/sonarcloud-github-action@master
if: github.event_name != 'pull_request'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN_UI }}
with:
args: >
-Dsonar.organization=followynne
-Dsonar.projectKey=followynne_serilog-ui_assets
-Dsonar.sources=src/Serilog.Ui.Web/assets/
-Dsonar.tests=src/Serilog.Ui.Web/assets/
-Dsonar.exclusions=src/Serilog.Ui.Web/assets/__tests__/**/*
-Dsonar.test.inclusions=src/Serilog.Ui.Web/assets/__tests__/**/*
-Dsonar.javascript.lcov.reportPaths=./src/Serilog.Ui.Web/coverage/lcov.info
- uses: actions/upload-artifact@v3
if: always()
with:
name: test-results
path: '**/jest-*.xml'
# ------------------------------------------------------------------------------
# <auto-generated>
#
# This code was generated.
#
# - To turn off auto-generation set:
#
# [CustomGithubActions (AutoGenerate = false)]
#
# - To trigger manual generation invoke:
#
# nuke --generate-configuration GitHubActions_JS-build --host GitHubActions
#
# </auto-generated>
# ------------------------------------------------------------------------------

name: JS-build

on:
push:
branches:
- master
- dev
pull_request:
branches:
- master
- dev

jobs:
ubuntu-latest:
name: ubuntu-latest
runs-on: ubuntu-latest
steps:

- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
uses: actions/cache@v3
with:
path: |
.nuke/temp
~/.nuget/packages
key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj', '**/Directory.Packages.props') }}
- name: 'Run: Frontend_Tests_Ci'
run: ./build.cmd Frontend_Tests_Ci
env:
SonarTokenUi: ${{ secrets.SONAR_TOKEN_UI }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: SonarCloud run
uses: SonarSource/sonarcloud-github-action@master
if: github.event_name != 'pull_request'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN_UI }}
with:
args: >
-Dsonar.organization=followynne
-Dsonar.projectKey=followynne_serilog-ui_assets
-Dsonar.sources=src/Serilog.Ui.Web/src/
-Dsonar.tests=src/Serilog.Ui.Web/src/
-Dsonar.exclusions=src/Serilog.Ui.Web/src/__tests__/**/*,src/Serilog.Ui.Web/src/mockServiceWorker.*,src/Serilog.Ui.Web/src/style/**/*
-Dsonar.test.inclusions=src/Serilog.Ui.Web/src/__tests__/**/*
-Dsonar.javascript.lcov.reportPaths=./src/Serilog.Ui.Web/src/reports/coverage/lcov.info

- uses: actions/upload-artifact@v3
if: always()
with:
name: test-results
path: '**/test-junit-report.xml'
14 changes: 7 additions & 7 deletions .github/workflows/JS-reporting-on-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
upload:
runs-on: ubuntu-latest
steps:
- uses: phoenix-actions/test-reporting@v9
with:
artifact: test-results # artifact name
name: JS - Tests # Name of the check run which will be created
path: '**/jest-*.xml' # Path to test results (inside artifact .zip)
reporter: jest-junit # Format of test results
output-to: checks
- uses: phoenix-actions/test-reporting@v14
with:
artifact: test-results # artifact name
name: JS - Tests # Name of the check run which will be created
path: '**/test-junit-report.xml' # Path to test results (inside artifact .zip)
reporter: jest-junit # Format of test results
output-to: checks
Loading
Loading