diff --git a/api/openapi.yaml b/api/openapi.yaml index f43b6a6..0748bd7 100644 --- a/api/openapi.yaml +++ b/api/openapi.yaml @@ -272,6 +272,39 @@ paths: $ref: '#/components/schemas/failure' description: "[Not found](https://jsonapi.org/format/#fetching-resources-responses-404)" summary: Get a job by id + /v0/analytics/results/{result_metadata_key}: + get: + description: get result statistics by key + parameters: + - description: size of page for paginated results + in: query + name: "page[size]" + required: false + schema: + format: int32 + type: integer + - in: path + name: result_metadata_key + required: true + schema: + type: string + responses: + "200": + content: + application/vnd.api+json: + schema: + $ref: '#/components/schemas/ResultCollection' + text/html: + schema: + example: Body text + type: string + description: "[OK](https://jsonapi.org/format/#fetching-resources-responses-200)" + "404": + content: + application/vnd.api+json: + schema: + $ref: '#/components/schemas/failure' + description: "[Not found](https://jsonapi.org/format/#fetching-resources-responses-404)" components: parameters: sort: @@ -978,6 +1011,65 @@ components: properties: data: $ref: '#/components/schemas/JobSpec' + ResultCollection: + additionalProperties: false + properties: + data: + items: + $ref: '#/components/schemas/ResultDatum' + type: array + uniqueItems: true + meta: + additionalProperties: true + description: Non-standard meta-information that can not be represented as + an attribute or relationship. + type: object + links: + $ref: '#/components/schemas/PaginationLinks' + jsonapi: + $ref: '#/components/schemas/jsonapi' + required: + - data + type: object + ResultCollectionData: + items: + $ref: '#/components/schemas/ResultDatum' + type: array + uniqueItems: true + ResultDatum: + additionalProperties: false + properties: + type: + description: "[resource object type](https://jsonapi.org/format/#document-resource-object-identification)" + type: string + id: + description: "[resource object identifier](https://jsonapi.org/format/#document-resource-object-identification)" + type: string + attributes: + additionalProperties: false + description: Members of the attributes object (`attributes`) represent information + about the resource object in which it's defined. + type: object + relationships: + additionalProperties: + $ref: '#/components/schemas/relationship' + description: "Members of the relationships object represent references from\ + \ the resource object in which it's defined to other resource objects.\ + \ N.B. this is validation, not useful for inclusion." + type: object + links: + additionalProperties: + $ref: '#/components/schemas/link' + type: object + meta: + additionalProperties: true + description: Non-standard meta-information that can not be represented as + an attribute or relationship. + type: object + required: + - id + - type + type: object PaginationLinks: allOf: - $ref: '#/components/schemas/links' diff --git a/cmd/serve.go b/cmd/serve.go index a81a28d..53f23a7 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -7,6 +7,7 @@ import ( "strings" "time" + "github.com/bacalhau-project/amplify/pkg/analytics" "github.com/bacalhau-project/amplify/pkg/api" "github.com/bacalhau-project/amplify/pkg/cli" "github.com/bacalhau-project/amplify/pkg/dag" @@ -118,8 +119,11 @@ func executeServeCommand(appContext cli.AppContext) runEFunc { return err } + // AnalyticsRepository manages amplify analytics + analyticsRepository := analytics.NewAnalyticsRepository(persistenceImpl.(db.Analytics)) + // AmplifyAPI provides the REST API - amplifyAPI, err := api.NewAmplifyAPI(queueRepository, taskFactory) + amplifyAPI, err := api.NewAmplifyAPI(queueRepository, taskFactory, analyticsRepository) if err != nil { return err } diff --git a/go.mod b/go.mod index 873743c..57584b9 100644 --- a/go.mod +++ b/go.mod @@ -147,7 +147,7 @@ require ( github.com/multiformats/go-varint v0.0.7 // indirect github.com/pelletier/go-toml/v2 v2.0.7 // indirect github.com/perimeterx/marshmallow v1.1.4 // indirect - github.com/pkg/errors v0.9.1 // indirect + github.com/pkg/errors v0.9.1 github.com/polydawn/refmt v0.89.0 // indirect github.com/ricochet2200/go-disk-usage/du v0.0.0-20210707232629-ac9918953285 // indirect github.com/rubenv/sql-migrate v1.4.0 diff --git a/pkg/analytics/analytics.go b/pkg/analytics/analytics.go new file mode 100644 index 0000000..2e17e93 --- /dev/null +++ b/pkg/analytics/analytics.go @@ -0,0 +1,54 @@ +package analytics + +import ( + "context" + "fmt" + + "github.com/bacalhau-project/amplify/pkg/db" + "github.com/pkg/errors" +) + +var ( + ErrAnalyticsErr = fmt.Errorf("analytics error") + ErrInvalidPageSize = errors.Wrap(ErrAnalyticsErr, "invalid page size") + ErrInvalidKey = errors.Wrap(ErrAnalyticsErr, "invalid key") +) + +type analyticsRepository struct { + database db.Analytics +} +type AnalyticsRepository interface { + QueryTopResultsByKey(ctx context.Context, params QueryTopResultsByKeyParams) (map[string]interface{}, error) +} + +func NewAnalyticsRepository(d db.Analytics) AnalyticsRepository { + return &analyticsRepository{ + database: d, + } +} + +type QueryTopResultsByKeyParams struct { + Key string + PageSize int +} + +func (r *analyticsRepository) QueryTopResultsByKey(ctx context.Context, params QueryTopResultsByKeyParams) (map[string]interface{}, error) { + if params.PageSize <= 0 { + return nil, ErrInvalidPageSize + } + if params.Key == "" { + return nil, ErrInvalidKey + } + rows, err := r.database.QueryTopResultsByKey(ctx, db.QueryTopResultsByKeyParams{ + Key: params.Key, + PageSize: int32(params.PageSize), + }) + if err != nil { + return nil, err + } + results := make(map[string]interface{}, params.PageSize) + for _, row := range rows { + results[row.Value] = row.Count + } + return results, nil +} diff --git a/pkg/api/api.gen.go b/pkg/api/api.gen.go index 0724ed4..62072e4 100644 --- a/pkg/api/api.gen.go +++ b/pkg/api/api.gen.go @@ -273,6 +273,42 @@ type QueuePutResource struct { Attributes QueuePutAttributes `json:"attributes"` } +// ResultCollection defines model for ResultCollection. +type ResultCollection struct { + Data []ResultDatum `json:"data"` + + // Jsonapi An object describing the server's implementation + Jsonapi *Jsonapi `json:"jsonapi,omitempty"` + + // Links Link members related to the primary data. + Links *PaginationLinks `json:"links,omitempty"` + + // Meta Non-standard meta-information that can not be represented as an attribute or relationship. + Meta *map[string]interface{} `json:"meta,omitempty"` +} + +// ResultCollectionData defines model for ResultCollectionData. +type ResultCollectionData = []ResultDatum + +// ResultDatum defines model for ResultDatum. +type ResultDatum struct { + // Attributes Members of the attributes object (`attributes`) represent information about the resource object in which it's defined. + Attributes *map[string]interface{} `json:"attributes,omitempty"` + + // Id [resource object identifier](https://jsonapi.org/format/#document-resource-object-identification) + Id string `json:"id"` + Links *map[string]Link `json:"links,omitempty"` + + // Meta Non-standard meta-information that can not be represented as an attribute or relationship. + Meta *map[string]interface{} `json:"meta,omitempty"` + + // Relationships Members of the relationships object represent references from the resource object in which it's defined to other resource objects. N.B. this is validation, not useful for inclusion. + Relationships *map[string]Relationship `json:"relationships,omitempty"` + + // Type [resource object type](https://jsonapi.org/format/#document-resource-object-identification) + Type string `json:"type"` +} + // Attributes Members of the attributes object (`attributes`) represent information about the resource object in which it's defined. type Attributes = map[string]interface{} @@ -464,6 +500,12 @@ type PageSize = int32 // Sort defines model for sort. type Sort = string +// GetV0AnalyticsResultsResultMetadataKeyParams defines parameters for GetV0AnalyticsResultsResultMetadataKey. +type GetV0AnalyticsResultsResultMetadataKeyParams struct { + // PageSize size of page for paginated results + PageSize *int32 `form:"page[size],omitempty" json:"page[size],omitempty"` +} + // GetV0GraphParams defines parameters for GetV0Graph. type GetV0GraphParams struct { // PageSize size of page for paginated results @@ -975,6 +1017,9 @@ type ServerInterface interface { // Amplify home // (GET /v0) GetV0(w http.ResponseWriter, r *http.Request) + + // (GET /v0/analytics/results/{result_metadata_key}) + GetV0AnalyticsResultsResultMetadataKey(w http.ResponseWriter, r *http.Request, resultMetadataKey string, params GetV0AnalyticsResultsResultMetadataKeyParams) // Amplify graph // (GET /v0/graph) GetV0Graph(w http.ResponseWriter, r *http.Request, params GetV0GraphParams) @@ -1022,6 +1067,43 @@ func (siw *ServerInterfaceWrapper) GetV0(w http.ResponseWriter, r *http.Request) handler(w, r.WithContext(ctx)) } +// GetV0AnalyticsResultsResultMetadataKey operation middleware +func (siw *ServerInterfaceWrapper) GetV0AnalyticsResultsResultMetadataKey(w http.ResponseWriter, r *http.Request) { + ctx := r.Context() + + var err error + + // ------------- Path parameter "result_metadata_key" ------------- + var resultMetadataKey string + + err = runtime.BindStyledParameter("simple", false, "result_metadata_key", mux.Vars(r)["result_metadata_key"], &resultMetadataKey) + if err != nil { + siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "result_metadata_key", Err: err}) + return + } + + // Parameter object where we will unmarshal all parameters from the context + var params GetV0AnalyticsResultsResultMetadataKeyParams + + // ------------- Optional query parameter "page[size]" ------------- + + err = runtime.BindQueryParameter("form", true, false, "page[size]", r.URL.Query(), ¶ms.PageSize) + if err != nil { + siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "page[size]", Err: err}) + return + } + + var handler = func(w http.ResponseWriter, r *http.Request) { + siw.Handler.GetV0AnalyticsResultsResultMetadataKey(w, r, resultMetadataKey, params) + } + + for _, middleware := range siw.HandlerMiddlewares { + handler = middleware(handler) + } + + handler(w, r.WithContext(ctx)) +} + // GetV0Graph operation middleware func (siw *ServerInterfaceWrapper) GetV0Graph(w http.ResponseWriter, r *http.Request) { ctx := r.Context() @@ -1346,6 +1428,8 @@ func HandlerWithOptions(si ServerInterface, options GorillaServerOptions) http.H r.HandleFunc(options.BaseURL+"/v0", wrapper.GetV0).Methods("GET") + r.HandleFunc(options.BaseURL+"/v0/analytics/results/{result_metadata_key}", wrapper.GetV0AnalyticsResultsResultMetadataKey).Methods("GET") + r.HandleFunc(options.BaseURL+"/v0/graph", wrapper.GetV0Graph).Methods("GET") r.HandleFunc(options.BaseURL+"/v0/jobs", wrapper.GetV0Jobs).Methods("GET") @@ -1366,64 +1450,66 @@ func HandlerWithOptions(si ServerInterface, options GorillaServerOptions) http.H // Base64 encoded, gzipped, json marshaled Swagger object var swaggerSpec = []string{ - "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", - "/mQAAA==", + "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", + "VVcXoiBvAAA=", } // GetSwagger returns the content of the embedded swagger specification file diff --git a/pkg/api/api.go b/pkg/api/api.go index b077c16..33ad7ab 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -13,6 +13,7 @@ import ( "sync" "time" + "github.com/bacalhau-project/amplify/pkg/analytics" "github.com/bacalhau-project/amplify/pkg/dag" "github.com/bacalhau-project/amplify/pkg/db" "github.com/bacalhau-project/amplify/pkg/item" @@ -22,6 +23,7 @@ import ( openapi_types "github.com/deepmap/oapi-codegen/pkg/types" "github.com/google/uuid" "github.com/rs/zerolog/log" + "golang.org/x/exp/slices" ) var ( @@ -39,26 +41,76 @@ var content embed.FS type amplifyAPI struct { *sync.Mutex - er item.QueueRepository - tf task.TaskFactory - tmpl *template.Template + er item.QueueRepository + tf task.TaskFactory + tmpl *template.Template + analytics analytics.AnalyticsRepository } var _ ServerInterface = (*amplifyAPI)(nil) -func NewAmplifyAPI(er item.QueueRepository, tf task.TaskFactory) (*amplifyAPI, error) { +func NewAmplifyAPI(er item.QueueRepository, tf task.TaskFactory, analytics analytics.AnalyticsRepository) (*amplifyAPI, error) { tmpl := template.New("master").Funcs(funcs) tmpl, err := tmpl.ParseFS(content, "templates/*.html.tmpl") if err != nil { return nil, err } return &lifyAPI{ - er: er, - tf: tf, - tmpl: tmpl, + er: er, + tf: tf, + tmpl: tmpl, + analytics: analytics, }, nil } +// GetV0AnalyticsResultsResultMetadataKey implements ServerInterface +func (a *amplifyAPI) GetV0AnalyticsResultsResultMetadataKey(w http.ResponseWriter, r *http.Request, resultMetadataKey string, params GetV0AnalyticsResultsResultMetadataKeyParams) { + log.Ctx(r.Context()).Trace().Str("key", resultMetadataKey).Msg("GetV0AnalyticsResultsResultMetadataKey") + if params.PageSize == nil { + params.PageSize = util.Int32P(10) + } + results, err := a.analytics.QueryTopResultsByKey(r.Context(), analytics.QueryTopResultsByKeyParams{ + Key: resultMetadataKey, + PageSize: int(*params.PageSize), + }) + if err != nil { + if errors.Is(err, analytics.ErrAnalyticsErr) { + sendError(r.Context(), w, http.StatusBadRequest, "Could not query analytics", err.Error()) + return + } + sendError(r.Context(), w, http.StatusInternalServerError, "Could not query analytics", err.Error()) + return + } + resultDatum := make([]ResultDatum, len(results)) + index := 0 + for k, v := range results { + resultDatum[index] = ResultDatum{ + Type: "ResultDatum", + Id: k, + Meta: &map[string]interface{}{ + "count": v, + }, + } + index++ + } + slices.SortFunc(resultDatum, func(i, j ResultDatum) bool { + return (*i.Meta)["count"].(int64) > (*j.Meta)["count"].(int64) + }) + response := &ResultCollection{ + Data: resultDatum, + Links: &PaginationLinks{ + AdditionalProperties: map[string]string{ + "self": "/api/v0/analytics/results/" + resultMetadataKey, + "analytics": "/api/v0/analytics", + }, + }, + Meta: &map[string]interface{}{ + "count": len(resultDatum), + }, + } + a.renderResponse(w, r, response, "results.html.tmpl") +} + // Amplify home // (GET /v0) func (a *amplifyAPI) GetV0(w http.ResponseWriter, r *http.Request) { @@ -74,23 +126,7 @@ func (a *amplifyAPI) GetV0(w http.ResponseWriter, r *http.Request) { "graph": "/api/v0/graph", }, } - switch r.Header.Get("Accept") { - case "application/json": - fallthrough - case "application/vnd.api+json": - w.Header().Set("Content-Type", "application/vnd.api+json") - err := json.NewEncoder(w).Encode(home) - if err != nil { - sendError(r.Context(), w, http.StatusInternalServerError, "Could not render JSON", err.Error()) - return - } - default: - err := a.writeHTML(w, "home.html.tmpl", home) - if err != nil { - sendError(r.Context(), w, http.StatusInternalServerError, "Could not render HTML", err.Error()) - return - } - } + a.renderResponse(w, r, home, "home.html.tmpl") } // List all Amplify jobs diff --git a/pkg/api/api_test.go b/pkg/api/api_test.go index 59dcc61..a914c04 100644 --- a/pkg/api/api_test.go +++ b/pkg/api/api_test.go @@ -5,6 +5,7 @@ import ( "net/http/httptest" "testing" + "github.com/bacalhau-project/amplify/pkg/analytics" "github.com/bacalhau-project/amplify/pkg/db" "github.com/bacalhau-project/amplify/pkg/item" "github.com/bacalhau-project/amplify/pkg/task" @@ -15,7 +16,7 @@ import ( func TestAPI_TemplatesSuccessfullyRender(t *testing.T) { w := httptest.NewRecorder() persistence := db.NewInMemDB() - api, err := NewAmplifyAPI(&mockQueueRepository{}, task.NewMockTaskFactory(persistence)) + api, err := NewAmplifyAPI(&mockQueueRepository{}, task.NewMockTaskFactory(persistence), analytics.NewAnalyticsRepository(persistence)) assert.NilError(t, err) tests := []struct { template string diff --git a/pkg/api/templates/results.html.tmpl b/pkg/api/templates/results.html.tmpl new file mode 100644 index 0000000..d974d82 --- /dev/null +++ b/pkg/api/templates/results.html.tmpl @@ -0,0 +1,33 @@ + + + +Results + + +

{{ with .Links.AdditionalProperties.analytics }}Analytics > {{ end }}Results

+ + + + + + +{{ range $index, $datum := .Data }} + + + + +{{ end }} + +
ValueCount
{{ .Id }}{{ .Meta.count }}
+

Links

+ + + diff --git a/pkg/db/in_mem.go b/pkg/db/in_mem.go index 3db0afe..ee2ade3 100644 --- a/pkg/db/in_mem.go +++ b/pkg/db/in_mem.go @@ -261,6 +261,27 @@ func (r *inMemDB) CreateResultMetadata(ctx context.Context, arg CreateResultMeta return nil } +func (r *inMemDB) QueryTopResultsByKey(ctx context.Context, arg QueryTopResultsByKeyParams) ([]QueryTopResultsByKeyRow, error) { + results := make(map[string]int) + for _, v := range r.resultMeta { + if v.Type == arg.Key { + if _, ok := results[v.Value]; !ok { + results[v.Value] = 1 + } else { + results[v.Value] = results[v.Value] + 1 + } + } + } + rows := make([]QueryTopResultsByKeyRow, len(results)) + for k, v := range results { + rows = append(rows, QueryTopResultsByKeyRow{ + Value: k, + Count: int64(v), + }) + } + return rows, nil +} + func dedupAndSort(s []int32) []int32 { s = util.Dedup(s) util.SortSliceInt32(s) diff --git a/pkg/db/interfaces.go b/pkg/db/interfaces.go index 72e2f3f..a8ec037 100644 --- a/pkg/db/interfaces.go +++ b/pkg/db/interfaces.go @@ -9,6 +9,7 @@ import ( type Persistence interface { NodePersistence Queue + Analytics } type NodePersistence interface { @@ -29,3 +30,7 @@ type Queue interface { GetNodesByQueueItemID(ctx context.Context, queueItemID uuid.UUID) ([]Node, error) CreateResultMetadata(ctx context.Context, arg CreateResultMetadataParams) error } + +type Analytics interface { + QueryTopResultsByKey(ctx context.Context, arg QueryTopResultsByKeyParams) ([]QueryTopResultsByKeyRow, error) +} diff --git a/pkg/db/queries/query.sql b/pkg/db/queries/query.sql index 38449a0..6ba033d 100644 --- a/pkg/db/queries/query.sql +++ b/pkg/db/queries/query.sql @@ -85,4 +85,14 @@ VALUES ( (select id from result_metadata_type where value = sqlc.arg(type)::text) ), sqlc.arg(value)::text -); \ No newline at end of file +); + +-- name: QueryTopResultsByKey :many +SELECT result_metadata.value, count(result_metadata.value) as count +FROM result_metadata +WHERE result_metadata.type_id = ( + SELECT id FROM result_metadata_type WHERE LOWER(value) = LOWER(sqlc.arg(key)::text) +) +GROUP BY result_metadata.value +ORDER BY count DESC +LIMIT sqlc.arg(page_size)::int; \ No newline at end of file diff --git a/pkg/db/query.sql.go b/pkg/db/query.sql.go index 830ca07..905cb0d 100644 --- a/pkg/db/query.sql.go +++ b/pkg/db/query.sql.go @@ -352,3 +352,47 @@ func (q *Queries) ListQueueItems(ctx context.Context, arg ListQueueItemsParams) } return items, nil } + +const queryTopResultsByKey = `-- name: QueryTopResultsByKey :many +SELECT result_metadata.value, count(result_metadata.value) as count +FROM result_metadata +WHERE result_metadata.type_id = ( + SELECT id FROM result_metadata_type WHERE LOWER(value) = LOWER($1::text) +) +GROUP BY result_metadata.value +ORDER BY count DESC +LIMIT $2::int +` + +type QueryTopResultsByKeyParams struct { + Key string + PageSize int32 +} + +type QueryTopResultsByKeyRow struct { + Value string + Count int64 +} + +func (q *Queries) QueryTopResultsByKey(ctx context.Context, arg QueryTopResultsByKeyParams) ([]QueryTopResultsByKeyRow, error) { + rows, err := q.db.QueryContext(ctx, queryTopResultsByKey, arg.Key, arg.PageSize) + if err != nil { + return nil, err + } + defer rows.Close() + var items []QueryTopResultsByKeyRow + for rows.Next() { + var i QueryTopResultsByKeyRow + if err := rows.Scan(&i.Value, &i.Count); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Close(); err != nil { + return nil, err + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} diff --git a/pkg/util/pointers.go b/pkg/util/pointers.go index bfe5ea8..4d9cd12 100644 --- a/pkg/util/pointers.go +++ b/pkg/util/pointers.go @@ -20,3 +20,7 @@ func MapP(m map[string]interface{}) *map[string]interface{} { func TimeP(t time.Time) *time.Time { return &t } + +func Int32P(i int32) *int32 { + return &i +} diff --git a/spec/openapi.yaml b/spec/openapi.yaml index ec81bc1..11c7ffb 100644 --- a/spec/openapi.yaml +++ b/spec/openapi.yaml @@ -18,4 +18,7 @@ paths: $ref: "resources/jobs.yaml" /v0/jobs/{id}: $ref: "resources/jobs_id.yaml" + /v0/analytics/results/{result_metadata_key}: + $ref: "resources/analytics_results_key.yaml" + diff --git a/spec/resources/analytics_results_key.yaml b/spec/resources/analytics_results_key.yaml new file mode 100644 index 0000000..4d5e65d --- /dev/null +++ b/spec/resources/analytics_results_key.yaml @@ -0,0 +1,26 @@ +get: + description: get result statistics by key + parameters: + - $ref: '../jsonapi.yaml#/components/parameters/pageSize' + - in: path + name: result_metadata_key + schema: + type: string + required: true + responses: + '200': + description: "[OK](https://jsonapi.org/format/#fetching-resources-responses-200)" + content: + application/vnd.api+json: + schema: + $ref: '../schemas/analytics.yaml#/results/ResultCollection' + text/html: + schema: + type: string + example: Body text + '404': + description: "[Not found](https://jsonapi.org/format/#fetching-resources-responses-404)" + content: + application/vnd.api+json: + schema: + $ref: '../jsonapi.yaml#/components/schemas/failure' diff --git a/spec/schemas/analytics.yaml b/spec/schemas/analytics.yaml new file mode 100644 index 0000000..6eeb8ec --- /dev/null +++ b/spec/schemas/analytics.yaml @@ -0,0 +1,41 @@ +results: + ResultCollection: + type: object + required: + - data + properties: + data: + $ref: "#/results/ResultCollectionData" + meta: + $ref: "../jsonapi.yaml#/components/schemas/meta" + links: + $ref: "./common.yaml#/PaginationLinks" + jsonapi: + $ref: "../jsonapi.yaml#/components/schemas/jsonapi" + additionalProperties: false + + ResultCollectionData: + type: array + items: + $ref: "#/results/ResultDatum" + uniqueItems: true + + ResultDatum: + type: object + required: + - type + - id + properties: + type: + $ref: "../jsonapi.yaml#/components/schemas/type" + id: + $ref: "../jsonapi.yaml#/components/schemas/id" + attributes: + $ref: "../jsonapi.yaml#/components/schemas/attributes" + relationships: + $ref: "../jsonapi.yaml#/components/schemas/relationships" + links: + $ref: "../jsonapi.yaml#/components/schemas/links" + meta: + $ref: "../jsonapi.yaml#/components/schemas/meta" + additionalProperties: false diff --git a/ui/src/Dashboard.tsx b/ui/src/Dashboard.tsx index d657103..3ede968 100644 --- a/ui/src/Dashboard.tsx +++ b/ui/src/Dashboard.tsx @@ -1,12 +1,85 @@ -import * as React from "react"; +import Button from '@mui/material/Button'; import Card from '@mui/material/Card'; +import CardActions from '@mui/material/CardActions'; import CardContent from '@mui/material/CardContent'; -import { Title } from 'react-admin'; +import Grid from '@mui/material/Grid'; +import Typography from '@mui/material/Typography'; +import { Datagrid, List, NumberField, Resource, TextField, Title } from 'react-admin'; + export default () => ( - - - <CardContent> - <h1>Bacalhau Amplify</h1> - </CardContent> - </Card> -); \ No newline at end of file + <Grid container spacing={2}> + + <Grid item xs={12}> + <Card sx={{ minWidth: 275 }}> + <CardContent> + <h1> + <Typography variant="h3" component="div"> + Bacalhau Amplify + </Typography> + </h1> + <Typography variant="body2"> + Bacalhau Amplify is a decentralized, open-source, and community-driven project to automatically enrich, enhance, and explain data. + <br /> + <br /> + This is the administrative interface for the Bacalhau Amplify project. + </Typography> + </CardContent> + <CardActions> + <a href="https://github.com/bacalhau-project/amplify/"> + <Button size="small">Learn More</Button> + </a> + </CardActions> + </Card> + </Grid> + <Grid item sm={12} md={6} lg={4}> + <Card> + <CardContent> + <h3> + <Typography variant="h5" > + Top 10 Content-Type + </Typography> + </h3> + <Typography variant="body2"> + This table shows the top 10 mime-types of all files flowing through Amplify. This data is produced by the metadata-job and stored in the database. + </Typography> + <Resource name="analytics/results/content-type" list={ResultList} hasEdit={false} hasShow={false} hasCreate={false} options={{ label: 'Content-Type' }} /> + </CardContent> + </Card> + </Grid> + </Grid> +); + +const ResultList = () => ( + <List pagination={false} bulkActionButtons={false} actions={false}> + <Datagrid rowClick={false} bulkActionButtons={false} > + <TextField source="id" label="Content-Type" sortable={false} /> + <NumberField source="meta.count" label="Count" sortable={false} /> + </Datagrid> + </List> +); + +// const ContentTypeBarChart = ({ }) => { +// const { data, total, isLoading, error, refetch } = useGetList( +// 'analytics/results/content-type', +// { pagination: { perPage: 10, page: 1 } }, +// ); + +// if (!data) return null; + + +// let plotData = data.map((item: any) => ({ +// "total": item.meta.count, +// "group": item.id, +// })); + +// return ( +// <ResponsiveBar +// data={plotData} +// keys={['total']} +// indexBy="group" +// layers={['grid', 'axes', 'bars', 'markers', 'legends']} +// margin={{ top: 50, right: 130, bottom: 50, left: 60 }} +// padding={0.05} +// /> +// ); +// };