Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
0991935
Test Jan 17 2023.
juan-rivera-2020 Jan 17, 2023
956007e
Testing more Bitbucket commits.
juan-rivera-2020 Jan 17, 2023
e18725a
fixes title validation on dataSet form
zachegnermh Jan 18, 2023
547798d
changes add report form to modal
zachegnermh Jan 18, 2023
bee2494
Merge branch 'reportModal' of github.com:MicroHealthLLC/chart-app-fro…
zachegnermh Jan 19, 2023
2cde83e
add basic guage frontend + backend structure
zachegnermh Jan 19, 2023
a9016f5
able to save gauge
zachegnermh Jan 19, 2023
acac563
fetch guages and display
zachegnermh Jan 19, 2023
3d20864
WIP
zachegnermh Jan 20, 2023
07017c9
adds backend values for KPI gauge
zachegnermh Jan 20, 2023
8ac591e
adds KPI gauge edit and more chart customization
zachegnermh Jan 20, 2023
3ba0d71
Create node.js.yml
zachegnermh Jan 20, 2023
87d704e
Test git upgrade.
juan-rivera-2020 Jan 23, 2023
e8dd821
Test git upgrade.
juan-rivera-2020 Jan 23, 2023
8a4883a
adds ability to change stops on gauge
zachegnermh Jan 24, 2023
8c0b61e
Merge branch 'gauge' of github.com:MicroHealthLLC/chart-app-frontend …
zachegnermh Jan 24, 2023
b4e8258
adds left gauge, new breakpoints, deicmal values
zachegnermh Jan 25, 2023
11409bf
fix fetchgauge on reload, adjust brkpoints, ringWidth
zachegnermh Jan 25, 2023
b8280b5
adds gauge notes component
zachegnermh Jan 25, 2023
02df6eb
adds Dashboard to schema, refactor code
zachegnermh Jan 26, 2023
b0acebf
WIP-adds KPI heat map table frontend
zachegnermh Jan 27, 2023
edb7dcb
WIP-KPIHeatMap
zachegnermh Jan 30, 2023
bdc1e1c
WIP-KPITable
zachegnermh Jan 31, 2023
f57b637
adds heatmap route and create/fetch functionality
zachegnermh Feb 1, 2023
929eaff
changes backend for proper heatmap structure
zachegnermh Feb 1, 2023
2b200da
fetching dataSets from heatmap
zachegnermh Feb 1, 2023
196a0d2
adds dataset table to heatmap with basic color function
zachegnermh Feb 2, 2023
9e8e855
fixes table on new heatmap
zachegnermh Feb 2, 2023
5a1dbab
adds color function to all columns, col selection in heatmap
zachegnermh Feb 3, 2023
494b9ec
adds input fields for heatmap
zachegnermh Feb 3, 2023
4bc5525
updates heat map to save filtered color forms
zachegnermh Feb 6, 2023
56e71a4
adds more color/format to UI heatmap
zachegnermh Feb 6, 2023
9caceae
Merge branch 'gauge' of https://github.com/MicroHealthLLC/chart-app-f…
katelyn-gomez Feb 7, 2023
6e71fb0
Fixes new heat map
zachegnermh Feb 7, 2023
57e9157
fixes sorting for Abs val heat map
zachegnermh Feb 7, 2023
aeccbb6
adds heatamp to dahsboard and clean up console.log
zachegnermh Feb 7, 2023
a5d3770
Test commit
katelyn-gomez Feb 9, 2023
e95fc79
T
katelyn-gomez Feb 9, 2023
57a2a50
fixes new Heat Map data table fetcing
zachegnermh Feb 9, 2023
d53009b
fixes column color on new heat map
zachegnermh Feb 10, 2023
0336729
fixes date sorting in reports
zachegnermh Feb 10, 2023
0cec70a
fixes date sort on heat map
zachegnermh Feb 10, 2023
e0ecd46
adds MH colors to scheme for charts
zachegnermh Feb 10, 2023
5e949d9
adds heat map to dashboard
zachegnermh Feb 13, 2023
1a530dc
adds dashboard store
zachegnermh Feb 14, 2023
1480061
WIP- dashboards
zachegnermh Feb 16, 2023
761658e
WIP-manyToMany not working
zachegnermh Feb 16, 2023
5d44cae
adds UI for dashboard page
zachegnermh Feb 17, 2023
8715dde
adds components to Dashboard page via drag and dro
zachegnermh Feb 21, 2023
95c8817
able to save and update dashboards and charts
zachegnermh Feb 21, 2023
a1aa2b7
fixes render issues with dashboard
zachegnermh Feb 23, 2023
e0d6b05
WIP
zachegnermh Feb 24, 2023
4fecfcd
Merge branch 'gauge' of https://github.com/MicroHealthLLC/chart-app-f…
katelyn-gomez Feb 24, 2023
bfcdeea
Cypress testing on KPI Gauges CRUD; created new testing backend env
katelyn-gomez Apr 3, 2023
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
31 changes: 31 additions & 0 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs

name: Node.js CI

on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]

jobs:
build:

runs-on: ubuntu-latest

strategy:
matrix:
node-version: [14.x, 16.x, 18.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
- run: npm ci
- run: npm run build --if-present
- run: npm test
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ node_modules
# local env files
.env.local
.env.*.local
.env.json

# Log files
npm-debug.log*
Expand Down Expand Up @@ -42,3 +43,6 @@ amplifytools.xcconfig
.secret-*
**.sample
#amplify-do-not-edit-end

C:/Users/ZachEgner/Documents/MicroHealthRepo/chart-app-frontend/amplify/mock-data
amplify/mock-api-resources
11 changes: 11 additions & 0 deletions amplify/backend/api/mrms/resolvers/Channel.gauges.auth.1.req.vtl
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
## [Start] Authorization Steps. **
$util.qr($ctx.stash.put("hasAuth", true))
#set( $isAuthorized = false )
#if( $util.authType() == "API Key Authorization" )
#set( $isAuthorized = true )
#end
#if( !$isAuthorized && $util.isNull($ctx.stash.authFilter) )
$util.unauthorized()
#end
$util.toJson({"version":"2018-05-29","payload":{}})
## [End] Authorization Steps. **
68 changes: 68 additions & 0 deletions amplify/backend/api/mrms/resolvers/Channel.gauges.req.vtl
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
#if( $ctx.source.deniedField )
#return($util.toJson(null))
#end
#if( $util.isNull($ctx.source.id) )
#set( $result = {
"items": []
} )
#return($result)
#else
#set( $limit = $util.defaultIfNull($context.args.limit, 100) )
#set( $query = {
"expression": "#partitionKey = :partitionKey",
"expressionNames": {
"#partitionKey": "channelId"
},
"expressionValues": {
":partitionKey": $util.dynamodb.toDynamoDB($context.source.id)
}
} )
#set( $args = $util.defaultIfNull($ctx.stash.transformedArgs, $ctx.args) )
#if( !$util.isNullOrEmpty($ctx.stash.authFilter) )
#set( $filter = $ctx.stash.authFilter )
#if( !$util.isNullOrEmpty($args.filter) )
#set( $filter = {
"and": [$filter, $args.filter]
} )
#end
#else
#if( !$util.isNullOrEmpty($args.filter) )
#set( $filter = $args.filter )
#end
#end
#if( !$util.isNullOrEmpty($filter) )
#set( $filterExpression = $util.parseJson($util.transform.toDynamoDBFilterExpression($filter)) )
#if( !$util.isNullOrBlank($filterExpression.expression) )
#if( $filterExpression.expressionValues.size() == 0 )
$util.qr($filterExpression.remove("expressionValues"))
#end
#set( $filter = $filterExpression )
#end
#end
{
"version": "2018-05-29",
"operation": "Query",
"query": $util.toJson($query),
"scanIndexForward": #if( $context.args.sortDirection )
#if( $context.args.sortDirection == "ASC" )
true
#else
false
#end
#else
true
#end,
"filter": #if( $filter )
$util.toJson($filter)
#else
null
#end,
"limit": $limit,
"nextToken": #if( $context.args.nextToken )
$util.toJson($context.args.nextToken)
#else
null
#end,
"index": "byChannel"
}
#end
8 changes: 8 additions & 0 deletions amplify/backend/api/mrms/resolvers/Channel.gauges.res.vtl
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#if( $ctx.error )
$util.error($ctx.error.message, $ctx.error.type)
#else
#if( !$result )
#set( $result = $ctx.result )
#end
$util.toJson($result)
#end
11 changes: 11 additions & 0 deletions amplify/backend/api/mrms/resolvers/Dashboard.gauges.auth.1.req.vtl
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
## [Start] Authorization Steps. **
$util.qr($ctx.stash.put("hasAuth", true))
#set( $isAuthorized = false )
#if( $util.authType() == "API Key Authorization" )
#set( $isAuthorized = true )
#end
#if( !$isAuthorized && $util.isNull($ctx.stash.authFilter) )
$util.unauthorized()
#end
$util.toJson({"version":"2018-05-29","payload":{}})
## [End] Authorization Steps. **
68 changes: 68 additions & 0 deletions amplify/backend/api/mrms/resolvers/Dashboard.gauges.req.vtl
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
#if( $ctx.source.deniedField )
#return($util.toJson(null))
#end
#if( $util.isNull($ctx.source.id) )
#set( $result = {
"items": []
} )
#return($result)
#else
#set( $limit = $util.defaultIfNull($context.args.limit, 100) )
#set( $query = {
"expression": "#partitionKey = :partitionKey",
"expressionNames": {
"#partitionKey": "channelId"
},
"expressionValues": {
":partitionKey": $util.dynamodb.toDynamoDB($context.source.id)
}
} )
#set( $args = $util.defaultIfNull($ctx.stash.transformedArgs, $ctx.args) )
#if( !$util.isNullOrEmpty($ctx.stash.authFilter) )
#set( $filter = $ctx.stash.authFilter )
#if( !$util.isNullOrEmpty($args.filter) )
#set( $filter = {
"and": [$filter, $args.filter]
} )
#end
#else
#if( !$util.isNullOrEmpty($args.filter) )
#set( $filter = $args.filter )
#end
#end
#if( !$util.isNullOrEmpty($filter) )
#set( $filterExpression = $util.parseJson($util.transform.toDynamoDBFilterExpression($filter)) )
#if( !$util.isNullOrBlank($filterExpression.expression) )
#if( $filterExpression.expressionValues.size() == 0 )
$util.qr($filterExpression.remove("expressionValues"))
#end
#set( $filter = $filterExpression )
#end
#end
{
"version": "2018-05-29",
"operation": "Query",
"query": $util.toJson($query),
"scanIndexForward": #if( $context.args.sortDirection )
#if( $context.args.sortDirection == "ASC" )
true
#else
false
#end
#else
true
#end,
"filter": #if( $filter )
$util.toJson($filter)
#else
null
#end,
"limit": $limit,
"nextToken": #if( $context.args.nextToken )
$util.toJson($context.args.nextToken)
#else
null
#end,
"index": "byChannel"
}
#end
8 changes: 8 additions & 0 deletions amplify/backend/api/mrms/resolvers/Dashboard.gauges.res.vtl
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#if( $ctx.error )
$util.error($ctx.error.message, $ctx.error.type)
#else
#if( !$result )
#set( $result = $ctx.result )
#end
$util.toJson($result)
#end
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
## [Start] Authorization Steps. **
$util.qr($ctx.stash.put("hasAuth", true))
#set( $isAuthorized = false )
#if( $util.authType() == "API Key Authorization" )
#set( $isAuthorized = true )
#end
#if( !$isAuthorized && $util.isNull($ctx.stash.authFilter) )
$util.unauthorized()
#end
$util.toJson({"version":"2018-05-29","payload":{}})
## [End] Authorization Steps. **
68 changes: 68 additions & 0 deletions amplify/backend/api/mrms/resolvers/Dashboard.reports.req.vtl
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
#if( $ctx.source.deniedField )
#return($util.toJson(null))
#end
#if( $util.isNull($ctx.source.id) )
#set( $result = {
"items": []
} )
#return($result)
#else
#set( $limit = $util.defaultIfNull($context.args.limit, 100) )
#set( $query = {
"expression": "#partitionKey = :partitionKey",
"expressionNames": {
"#partitionKey": "channelId"
},
"expressionValues": {
":partitionKey": $util.dynamodb.toDynamoDB($context.source.id)
}
} )
#set( $args = $util.defaultIfNull($ctx.stash.transformedArgs, $ctx.args) )
#if( !$util.isNullOrEmpty($ctx.stash.authFilter) )
#set( $filter = $ctx.stash.authFilter )
#if( !$util.isNullOrEmpty($args.filter) )
#set( $filter = {
"and": [$filter, $args.filter]
} )
#end
#else
#if( !$util.isNullOrEmpty($args.filter) )
#set( $filter = $args.filter )
#end
#end
#if( !$util.isNullOrEmpty($filter) )
#set( $filterExpression = $util.parseJson($util.transform.toDynamoDBFilterExpression($filter)) )
#if( !$util.isNullOrBlank($filterExpression.expression) )
#if( $filterExpression.expressionValues.size() == 0 )
$util.qr($filterExpression.remove("expressionValues"))
#end
#set( $filter = $filterExpression )
#end
#end
{
"version": "2018-05-29",
"operation": "Query",
"query": $util.toJson($query),
"scanIndexForward": #if( $context.args.sortDirection )
#if( $context.args.sortDirection == "ASC" )
true
#else
false
#end
#else
true
#end,
"filter": #if( $filter )
$util.toJson($filter)
#else
null
#end,
"limit": $limit,
"nextToken": #if( $context.args.nextToken )
$util.toJson($context.args.nextToken)
#else
null
#end,
"index": "byChannel"
}
#end
8 changes: 8 additions & 0 deletions amplify/backend/api/mrms/resolvers/Dashboard.reports.res.vtl
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#if( $ctx.error )
$util.error($ctx.error.message, $ctx.error.type)
#else
#if( !$result )
#set( $result = $ctx.result )
#end
$util.toJson($result)
#end
11 changes: 11 additions & 0 deletions amplify/backend/api/mrms/resolvers/Gauge.channel.auth.1.req.vtl
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
## [Start] Authorization Steps. **
$util.qr($ctx.stash.put("hasAuth", true))
#set( $isAuthorized = false )
#if( $util.authType() == "API Key Authorization" )
#set( $isAuthorized = true )
#end
#if( !$isAuthorized && $util.isNull($ctx.stash.authFilter) )
$util.unauthorized()
#end
$util.toJson({"version":"2018-05-29","payload":{}})
## [End] Authorization Steps. **
11 changes: 11 additions & 0 deletions amplify/backend/api/mrms/resolvers/Gauge.dashboard.auth.1.req.vtl
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
## [Start] Authorization Steps. **
$util.qr($ctx.stash.put("hasAuth", true))
#set( $isAuthorized = false )
#if( $util.authType() == "API Key Authorization" )
#set( $isAuthorized = true )
#end
#if( !$isAuthorized && $util.isNull($ctx.stash.authFilter) )
$util.unauthorized()
#end
$util.toJson({"version":"2018-05-29","payload":{}})
## [End] Authorization Steps. **
24 changes: 24 additions & 0 deletions amplify/backend/api/mrms/resolvers/Gauge.dashboard.req.vtl
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#if( $ctx.source.deniedField )
#return($util.toJson(null))
#end
#if( $util.isNull($ctx.source.dashboardId) )
#return
#else
#set( $GetRequest = {
"version": "2018-05-29",
"operation": "Query"
} )
$util.qr($GetRequest.put("query", {
"expression": "#partitionKey = :partitionValue",
"expressionNames": {
"#partitionKey": "id"
},
"expressionValues": {
":partitionValue": $util.parseJson($util.dynamodb.toDynamoDBJson($util.defaultIfNullOrBlank($ctx.source.dashboardId, "___xamznone____")))
}
}))
#if( !$util.isNullOrEmpty($ctx.stash.authFilter) )
$util.qr($GetRequest.put("filter", $util.parseJson($util.transform.toDynamoDBFilterExpression($ctx.stash.authFilter))))
#end
$util.toJson($GetRequest)
#end
12 changes: 12 additions & 0 deletions amplify/backend/api/mrms/resolvers/Gauge.dashboard.res.vtl
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#if( $ctx.error )
$util.error($ctx.error.message, $ctx.error.type)
#else
#if( !$ctx.result.items.isEmpty() && $ctx.result.scannedCount == 1 )
$util.toJson($ctx.result.items[0])
#else
#if( $ctx.result.items.isEmpty() && $ctx.result.scannedCount == 1 )
$util.unauthorized()
#end
$util.toJson(null)
#end
#end
Loading