Skip to content

A continuation of HomeBox the inventory and organization system built for the Home User

chore: developer cleanup (#300)

Haydenbd321af29fb9
diff --git a/.github/workflows/partial-frontend.yaml b/.github/workflows/partial-frontend.yaml
index 4f36af59..9f851791 100644
--- a/.github/workflows/partial-frontend.yaml
+++ b/.github/workflows/partial-frontend.yaml
@@ -4,7 +4,33 @@ on:
workflow_call:
jobs:
- Frontend:
+ lint:
+ name: Lint
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
+
+ - uses: pnpm/[email protected]
+ with:
+ version: 6.0.2
+
+ - name: Install dependencies
+ run: pnpm install --shamefully-hoist
+ working-directory: frontend
+
+ - name: Run Lint
+ run: pnpm run lint:ci
+ working-directory: frontend
+
+ - name: Run Typecheck
+ run: pnpm run typecheck
+ working-directory: frontend
+
+ integration-tests:
+ name: Integration Tests
runs-on: ubuntu-latest
steps:
- name: Checkout
@@ -34,9 +60,5 @@ jobs:
run: pnpm install
working-directory: frontend
- - name: Run linter 👀
- run: pnpm lint
- working-directory: "frontend"
-
- name: Run Integration Tests
run: task test:ci
diff --git a/.vscode/settings.json b/.vscode/settings.json
index d0ae55d0..2383c215 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -9,7 +9,8 @@
"README.md": "LICENSE, SECURITY.md"
},
"cSpell.words": [
- "debughandlers"
+ "debughandlers",
+ "Homebox"
],
// use ESLint to format code on save
"editor.formatOnSave": false,
diff --git a/Taskfile.yml b/Taskfile.yml
index a16daa55..e6193955 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -108,6 +108,16 @@ tasks:
cmds:
- cd frontend && pnpm dev
+ ui:fix:
+ desc: Runs prettier and eslint on the frontend
+ cmds:
+ - cd frontend && pnpm run lint:fix
+
+ ui:check:
+ desc: Runs type checking
+ cmds:
+ - cd frontend && pnpm run typecheck
+
test:ci:
desc: Runs end-to-end test on a live server (only for use in CI)
cmds:
@@ -116,3 +126,12 @@ tasks:
- sleep 5
- cd frontend && pnpm run test:ci
silent: true
+
+ pr:
+ desc: Runs all tasks required for a PR
+ cmds:
+ - task: generate
+ - task: go:all
+ - task: ui:check
+ - task: ui:fix
+ - task: test:ci
\ No newline at end of file
diff --git a/backend/app/api/handlers/v1/v1_ctrl_assets.go b/backend/app/api/handlers/v1/v1_ctrl_assets.go
index 82653fee..f91a0098 100644
--- a/backend/app/api/handlers/v1/v1_ctrl_assets.go
+++ b/backend/app/api/handlers/v1/v1_ctrl_assets.go
@@ -49,7 +49,6 @@ func (ctrl *V1Controller) HandleAssetGet() server.HandlerFunc {
return server.Respond(w, http.StatusBadRequest, "Invalid page size")
}
}
-
items, err := ctrl.repo.Items.QueryByAssetID(r.Context(), ctx.GID, repo.AssetID(assetId), int(page), int(pageSize))
if err != nil {
diff --git a/backend/app/api/handlers/v1/v1_ctrl_auth.go b/backend/app/api/handlers/v1/v1_ctrl_auth.go
index 95a5cb28..a3dbc581 100644
--- a/backend/app/api/handlers/v1/v1_ctrl_auth.go
+++ b/backend/app/api/handlers/v1/v1_ctrl_auth.go
@@ -50,7 +50,6 @@ func (ctrl *V1Controller) HandleAuthLogin() server.HandlerFunc {
loginForm.Password = r.PostFormValue("password")
case server.ContentJSON:
err := server.Decode(r, loginForm)
-
if err != nil {
log.Err(err).Msg("failed to decode login form")
}
@@ -72,7 +71,6 @@ func (ctrl *V1Controller) HandleAuthLogin() server.HandlerFunc {
}
newToken, err := ctrl.svc.User.Login(r.Context(), strings.ToLower(loginForm.Username), loginForm.Password)
-
if err != nil {
return validate.NewRequestError(errors.New("authentication failed"), http.StatusInternalServerError)
}
diff --git a/backend/app/api/handlers/v1/v1_ctrl_items.go b/backend/app/api/handlers/v1/v1_ctrl_items.go
index ec8f5809..b82d2f32 100644
--- a/backend/app/api/handlers/v1/v1_ctrl_items.go
+++ b/backend/app/api/handlers/v1/v1_ctrl_items.go
@@ -26,7 +26,6 @@ import (
// @Router /v1/items [GET]
// @Security Bearer
func (ctrl *V1Controller) HandleItemsGetAll() server.HandlerFunc {
-
extractQuery := func(r *http.Request) repo.ItemQuery {
params := r.URL.Query()
@@ -244,7 +243,6 @@ func (ctrl *V1Controller) HandleGetAllCustomFieldValues() server.HandlerFunc {
// @Security Bearer
func (ctrl *V1Controller) HandleItemsImport() server.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) error {
-
err := r.ParseMultipartForm(ctrl.maxUploadSize << 20)
if err != nil {
log.Err(err).Msg("failed to parse multipart form")
diff --git a/backend/app/api/handlers/v1/v1_ctrl_items_attachments.go b/backend/app/api/handlers/v1/v1_ctrl_items_attachments.go
index 033f683e..00545a40 100644
--- a/backend/app/api/handlers/v1/v1_ctrl_items_attachments.go
+++ b/backend/app/api/handlers/v1/v1_ctrl_items_attachments.go
@@ -82,7 +82,6 @@ func (ctrl *V1Controller) HandleItemAttachmentCreate() server.HandlerFunc {
attachment.Type(attachmentType),
file,
)
-
if err != nil {
log.Err(err).Msg("failed to add attachment")
return validate.NewRequestError(err, http.StatusInternalServerError)
diff --git a/backend/app/api/handlers/v1/v1_ctrl_locations.go b/backend/app/api/handlers/v1/v1_ctrl_locations.go
index ee2785aa..8f71ab91 100644
--- a/backend/app/api/handlers/v1/v1_ctrl_locations.go
+++ b/backend/app/api/handlers/v1/v1_ctrl_locations.go
@@ -34,7 +34,6 @@ func (ctrl *V1Controller) HandleLocationTreeQuery() server.HandlerFunc {
WithItems: withItems,
},
)
-
if err != nil {
log.Err(err).Msg("failed to get locations tree")
return validate.NewRequestError(err, http.StatusInternalServerError)
diff --git a/backend/app/api/handlers/v1/v1_ctrl_user.go b/backend/app/api/handlers/v1/v1_ctrl_user.go
index 98bc75e9..0d034c2e 100644
--- a/backend/app/api/handlers/v1/v1_ctrl_user.go
+++ b/backend/app/api/handlers/v1/v1_ctrl_user.go
@@ -80,7 +80,6 @@ func (ctrl *V1Controller) HandleUserSelfUpdate() server.HandlerFunc {
actor := services.UseUserCtx(r.Context())
newData, err := ctrl.svc.User.UpdateSelf(r.Context(), actor.ID, updateData)
-
if err != nil {
return validate.NewRequestError(err, http.StatusInternalServerError)
}
diff --git a/backend/app/api/main.go b/backend/app/api/main.go
index c505eea4..b17b0faa 100644
--- a/backend/app/api/main.go
+++ b/backend/app/api/main.go
@@ -57,7 +57,7 @@ func run(cfg *config.Config) error {
// =========================================================================
// Initialize Database & Repos
- err := os.MkdirAll(cfg.Storage.Data, 0755)
+ err := os.MkdirAll(cfg.Storage.Data, 0o755)
if err != nil {
log.Fatal().Err(err).Msg("failed to create data directory")
}
diff --git a/backend/app/api/middleware.go b/backend/app/api/middleware.go
index 8baddfb8..b41c9134 100644
--- a/backend/app/api/middleware.go
+++ b/backend/app/api/middleware.go
@@ -15,9 +15,7 @@ type tokenHasKey struct {
key string
}
-var (
- hashedToken = tokenHasKey{key: "hashedToken"}
-)
+var hashedToken = tokenHasKey{key: "hashedToken"}
type RoleMode int
diff --git a/backend/app/api/static/docs/docs.go b/backend/app/api/static/docs/docs.go
index e24f1407..8ceb1cff 100644
--- a/backend/app/api/static/docs/docs.go
+++ b/backend/app/api/static/docs/docs.go
@@ -1722,9 +1722,6 @@ const docTemplate = `{
"textValue": {
"type": "string"
},
- "timeValue": {
- "type": "string"
- },
"type": {
"type": "string"
}
diff --git a/backend/app/api/static/docs/swagger.json b/backend/app/api/static/docs/swagger.json
index 6319ff90..3808fb55 100644
--- a/backend/app/api/static/docs/swagger.json
+++ b/backend/app/api/static/docs/swagger.json
@@ -1714,9 +1714,6 @@
"textValue": {
"type": "string"
},
- "timeValue": {
- "type": "string"
- },
"type": {
"type": "string"
}
diff --git a/backend/app/api/static/docs/swagger.yaml b/backend/app/api/static/docs/swagger.yaml
index 301dd3df..c461867f 100644
--- a/backend/app/api/static/docs/swagger.yaml
+++ b/backend/app/api/static/docs/swagger.yaml
@@ -93,8 +93,6 @@ definitions:
type: integer
textValue:
type: string
- timeValue:
- type: string
type:
type: string
type: object
diff --git a/backend/go.sum b/backend/go.sum
index a0b4a5a9..e0fca764 100644
--- a/backend/go.sum
+++ b/backend/go.sum
@@ -1,7 +1,5 @@
ariga.io/atlas v0.9.1-0.20230119145809-92243f7c55cb h1:mbsFtavDqGdYwdDpP50LGOOZ2hgyGoJcZeOpbgKMyu4=
ariga.io/atlas v0.9.1-0.20230119145809-92243f7c55cb/go.mod h1:T230JFcENj4ZZzMkZrXFDSkv+2kXkUgpJ5FQQ5hMcKU=
-entgo.io/ent v0.11.7 h1:V+wKFh0jhAbY/FoU+PPbdMOf2Ma5vh07R/IdF+N/nFg=
-entgo.io/ent v0.11.7/go.mod h1:ericBi6Q8l3wBH1wEIDfKxw7rcQEuRPyBfbIzjtxJ18=
entgo.io/ent v0.11.8 h1:M/M0QL1CYCUSdqGRXUrXhFYSDRJPsOOrr+RLEej/gyQ=
entgo.io/ent v0.11.8/go.mod h1:ericBi6Q8l3wBH1wEIDfKxw7rcQEuRPyBfbIzjtxJ18=
github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60=
@@ -11,8 +9,6 @@ github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7l
github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw=
github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo=
-github.com/ardanlabs/conf/v3 v3.1.3 h1:16+Nzfc4PBd/ERtYERUFL/75eVKNyW15Y+vn3W1XZzQ=
-github.com/ardanlabs/conf/v3 v3.1.3/go.mod h1:bIacyuGeZjkTdtszdbvOcuq49VhHpV3+IPZ2ewOAK4I=
github.com/ardanlabs/conf/v3 v3.1.4 h1:c0jJYbqHJcrR/uYImbGC1q7quH3DYxH49zGCT7WLJH4=
github.com/ardanlabs/conf/v3 v3.1.4/go.mod h1:bIacyuGeZjkTdtszdbvOcuq49VhHpV3+IPZ2ewOAK4I=
github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
diff --git a/backend/internal/core/services/service_items_attachments_test.go b/backend/internal/core/services/service_items_attachments_test.go
index 14e822e7..f9db0f60 100644
--- a/backend/internal/core/services/service_items_attachments_test.go
+++ b/backend/internal/core/services/service_items_attachments_test.go
@@ -58,5 +58,4 @@ func TestItemService_AddAttachment(t *testing.T) {
bts, err := os.ReadFile(storedPath)
assert.NoError(t, err)
assert.Equal(t, contents, string(bts))
-
}
diff --git a/backend/internal/core/services/service_user.go b/backend/internal/core/services/service_user.go
index 053087b6..bed3adb1 100644
--- a/backend/internal/core/services/service_user.go
+++ b/backend/internal/core/services/service_user.go
@@ -139,7 +139,6 @@ func (svc *UserService) UpdateSelf(ctx context.Context, ID uuid.UUID, data repo.
// User Authentication
func (svc *UserService) createSessionToken(ctx context.Context, userId uuid.UUID) (UserAuthTokenDetail, error) {
-
attachmentToken := hasher.GenerateToken()
attachmentData := repo.UserAuthTokenCreate{
UserID: userId,
@@ -173,7 +172,6 @@ func (svc *UserService) createSessionToken(ctx context.Context, userId uuid.UUID
func (svc *UserService) Login(ctx context.Context, username, password string) (UserAuthTokenDetail, error) {
usr, err := svc.repos.Users.GetOneEmail(ctx, username)
-
if err != nil {
// SECURITY: Perform hash to ensure response times are the same
hasher.CheckPasswordHash("not-a-real-password", "not-a-real-password")
@@ -197,7 +195,6 @@ func (svc *UserService) RenewToken(ctx context.Context, token string) (UserAuthT
hash := hasher.HashToken(token)
dbToken, err := svc.repos.AuthTokens.GetUserFromToken(ctx, hash)
-
if err != nil {
return UserAuthTokenDetail{}, ErrorInvalidToken
}
diff --git a/backend/internal/data/ent/attachment.go b/backend/internal/data/ent/attachment.go
index 897a0a39..25d2df42 100644
--- a/backend/internal/data/ent/attachment.go
+++ b/backend/internal/data/ent/attachment.go
@@ -189,9 +189,3 @@ func (a *Attachment) String() string {
// Attachments is a parsable slice of Attachment.
type Attachments []*Attachment
-
-func (a Attachments) config(cfg config) {
- for _i := range a {
- a[_i].config = cfg
- }
-}
diff --git a/backend/internal/data/ent/attachment_create.go b/backend/internal/data/ent/attachment_create.go
index 2be195ed..5ce7ef39 100644
--- a/backend/internal/data/ent/attachment_create.go
+++ b/backend/internal/data/ent/attachment_create.go
@@ -205,13 +205,7 @@ func (ac *AttachmentCreate) sqlSave(ctx context.Context) (*Attachment, error) {
func (ac *AttachmentCreate) createSpec() (*Attachment, *sqlgraph.CreateSpec) {
var (
_node = &Attachment{config: ac.config}
- _spec = &sqlgraph.CreateSpec{
- Table: attachment.Table,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: attachment.FieldID,
- },
- }
+ _spec = sqlgraph.NewCreateSpec(attachment.Table, sqlgraph.NewFieldSpec(attachment.FieldID, field.TypeUUID))
)
if id, ok := ac.mutation.ID(); ok {
_node.ID = id
diff --git a/backend/internal/data/ent/attachment_delete.go b/backend/internal/data/ent/attachment_delete.go
index 5b458014..8185ac14 100644
--- a/backend/internal/data/ent/attachment_delete.go
+++ b/backend/internal/data/ent/attachment_delete.go
@@ -40,15 +40,7 @@ func (ad *AttachmentDelete) ExecX(ctx context.Context) int {
}
func (ad *AttachmentDelete) sqlExec(ctx context.Context) (int, error) {
- _spec := &sqlgraph.DeleteSpec{
- Node: &sqlgraph.NodeSpec{
- Table: attachment.Table,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: attachment.FieldID,
- },
- },
- }
+ _spec := sqlgraph.NewDeleteSpec(attachment.Table, sqlgraph.NewFieldSpec(attachment.FieldID, field.TypeUUID))
if ps := ad.mutation.predicates; len(ps) > 0 {
_spec.Predicate = func(selector *sql.Selector) {
for i := range ps {
diff --git a/backend/internal/data/ent/attachment_query.go b/backend/internal/data/ent/attachment_query.go
index d631f7e4..de5821a4 100644
--- a/backend/internal/data/ent/attachment_query.go
+++ b/backend/internal/data/ent/attachment_query.go
@@ -227,10 +227,12 @@ func (aq *AttachmentQuery) AllX(ctx context.Context) []*Attachment {
}
// IDs executes the query and returns a list of Attachment IDs.
-func (aq *AttachmentQuery) IDs(ctx context.Context) ([]uuid.UUID, error) {
- var ids []uuid.UUID
+func (aq *AttachmentQuery) IDs(ctx context.Context) (ids []uuid.UUID, err error) {
+ if aq.ctx.Unique == nil && aq.path != nil {
+ aq.Unique(true)
+ }
ctx = setContextOp(ctx, aq.ctx, "IDs")
- if err := aq.Select(attachment.FieldID).Scan(ctx, &ids); err != nil {
+ if err = aq.Select(attachment.FieldID).Scan(ctx, &ids); err != nil {
return nil, err
}
return ids, nil
@@ -525,20 +527,12 @@ func (aq *AttachmentQuery) sqlCount(ctx context.Context) (int, error) {
}
func (aq *AttachmentQuery) querySpec() *sqlgraph.QuerySpec {
- _spec := &sqlgraph.QuerySpec{
- Node: &sqlgraph.NodeSpec{
- Table: attachment.Table,
- Columns: attachment.Columns,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: attachment.FieldID,
- },
- },
- From: aq.sql,
- Unique: true,
- }
+ _spec := sqlgraph.NewQuerySpec(attachment.Table, attachment.Columns, sqlgraph.NewFieldSpec(attachment.FieldID, field.TypeUUID))
+ _spec.From = aq.sql
if unique := aq.ctx.Unique; unique != nil {
_spec.Unique = *unique
+ } else if aq.path != nil {
+ _spec.Unique = true
}
if fields := aq.ctx.Fields; len(fields) > 0 {
_spec.Node.Columns = make([]string, 0, len(fields))
diff --git a/backend/internal/data/ent/attachment_update.go b/backend/internal/data/ent/attachment_update.go
index a54ad5a2..e4b747d9 100644
--- a/backend/internal/data/ent/attachment_update.go
+++ b/backend/internal/data/ent/attachment_update.go
@@ -146,16 +146,7 @@ func (au *AttachmentUpdate) sqlSave(ctx context.Context) (n int, err error) {
if err := au.check(); err != nil {
return n, err
}
- _spec := &sqlgraph.UpdateSpec{
- Node: &sqlgraph.NodeSpec{
- Table: attachment.Table,
- Columns: attachment.Columns,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: attachment.FieldID,
- },
- },
- }
+ _spec := sqlgraph.NewUpdateSpec(attachment.Table, attachment.Columns, sqlgraph.NewFieldSpec(attachment.FieldID, field.TypeUUID))
if ps := au.mutation.predicates; len(ps) > 0 {
_spec.Predicate = func(selector *sql.Selector) {
for i := range ps {
@@ -318,6 +309,12 @@ func (auo *AttachmentUpdateOne) ClearDocument() *AttachmentUpdateOne {
return auo
}
+// Where appends a list predicates to the AttachmentUpdate builder.
+func (auo *AttachmentUpdateOne) Where(ps ...predicate.Attachment) *AttachmentUpdateOne {
+ auo.mutation.Where(ps...)
+ return auo
+}
+
// Select allows selecting one or more fields (columns) of the returned entity.
// The default is selecting all fields defined in the entity schema.
func (auo *AttachmentUpdateOne) Select(field string, fields ...string) *AttachmentUpdateOne {
@@ -381,16 +378,7 @@ func (auo *AttachmentUpdateOne) sqlSave(ctx context.Context) (_node *Attachment,
if err := auo.check(); err != nil {
return _node, err
}
- _spec := &sqlgraph.UpdateSpec{
- Node: &sqlgraph.NodeSpec{
- Table: attachment.Table,
- Columns: attachment.Columns,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: attachment.FieldID,
- },
- },
- }
+ _spec := sqlgraph.NewUpdateSpec(attachment.Table, attachment.Columns, sqlgraph.NewFieldSpec(attachment.FieldID, field.TypeUUID))
id, ok := auo.mutation.ID()
if !ok {
return nil, &ValidationError{Name: "id", err: errors.New(`ent: missing "Attachment.id" for update`)}
diff --git a/backend/internal/data/ent/authroles.go b/backend/internal/data/ent/authroles.go
index 5e8ed408..4dcd733b 100644
--- a/backend/internal/data/ent/authroles.go
+++ b/backend/internal/data/ent/authroles.go
@@ -133,9 +133,3 @@ func (ar *AuthRoles) String() string {
// AuthRolesSlice is a parsable slice of AuthRoles.
type AuthRolesSlice []*AuthRoles
-
-func (ar AuthRolesSlice) config(cfg config) {
- for _i := range ar {
- ar[_i].config = cfg
- }
-}
diff --git a/backend/internal/data/ent/authroles_create.go b/backend/internal/data/ent/authroles_create.go
index 383b8c3b..566d107d 100644
--- a/backend/internal/data/ent/authroles_create.go
+++ b/backend/internal/data/ent/authroles_create.go
@@ -129,13 +129,7 @@ func (arc *AuthRolesCreate) sqlSave(ctx context.Context) (*AuthRoles, error) {
func (arc *AuthRolesCreate) createSpec() (*AuthRoles, *sqlgraph.CreateSpec) {
var (
_node = &AuthRoles{config: arc.config}
- _spec = &sqlgraph.CreateSpec{
- Table: authroles.Table,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeInt,
- Column: authroles.FieldID,
- },
- }
+ _spec = sqlgraph.NewCreateSpec(authroles.Table, sqlgraph.NewFieldSpec(authroles.FieldID, field.TypeInt))
)
if value, ok := arc.mutation.Role(); ok {
_spec.SetField(authroles.FieldRole, field.TypeEnum, value)
diff --git a/backend/internal/data/ent/authroles_delete.go b/backend/internal/data/ent/authroles_delete.go
index 3cc1faa8..13a25188 100644
--- a/backend/internal/data/ent/authroles_delete.go
+++ b/backend/internal/data/ent/authroles_delete.go
@@ -40,15 +40,7 @@ func (ard *AuthRolesDelete) ExecX(ctx context.Context) int {
}
func (ard *AuthRolesDelete) sqlExec(ctx context.Context) (int, error) {
- _spec := &sqlgraph.DeleteSpec{
- Node: &sqlgraph.NodeSpec{
- Table: authroles.Table,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeInt,
- Column: authroles.FieldID,
- },
- },
- }
+ _spec := sqlgraph.NewDeleteSpec(authroles.Table, sqlgraph.NewFieldSpec(authroles.FieldID, field.TypeInt))
if ps := ard.mutation.predicates; len(ps) > 0 {
_spec.Predicate = func(selector *sql.Selector) {
for i := range ps {
diff --git a/backend/internal/data/ent/authroles_query.go b/backend/internal/data/ent/authroles_query.go
index ed44fa92..14042ff6 100644
--- a/backend/internal/data/ent/authroles_query.go
+++ b/backend/internal/data/ent/authroles_query.go
@@ -203,10 +203,12 @@ func (arq *AuthRolesQuery) AllX(ctx context.Context) []*AuthRoles {
}
// IDs executes the query and returns a list of AuthRoles IDs.
-func (arq *AuthRolesQuery) IDs(ctx context.Context) ([]int, error) {
- var ids []int
+func (arq *AuthRolesQuery) IDs(ctx context.Context) (ids []int, err error) {
+ if arq.ctx.Unique == nil && arq.path != nil {
+ arq.Unique(true)
+ }
ctx = setContextOp(ctx, arq.ctx, "IDs")
- if err := arq.Select(authroles.FieldID).Scan(ctx, &ids); err != nil {
+ if err = arq.Select(authroles.FieldID).Scan(ctx, &ids); err != nil {
return nil, err
}
return ids, nil
@@ -450,20 +452,12 @@ func (arq *AuthRolesQuery) sqlCount(ctx context.Context) (int, error) {
}
func (arq *AuthRolesQuery) querySpec() *sqlgraph.QuerySpec {
- _spec := &sqlgraph.QuerySpec{
- Node: &sqlgraph.NodeSpec{
- Table: authroles.Table,
- Columns: authroles.Columns,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeInt,
- Column: authroles.FieldID,
- },
- },
- From: arq.sql,
- Unique: true,
- }
+ _spec := sqlgraph.NewQuerySpec(authroles.Table, authroles.Columns, sqlgraph.NewFieldSpec(authroles.FieldID, field.TypeInt))
+ _spec.From = arq.sql
if unique := arq.ctx.Unique; unique != nil {
_spec.Unique = *unique
+ } else if arq.path != nil {
+ _spec.Unique = true
}
if fields := arq.ctx.Fields; len(fields) > 0 {
_spec.Node.Columns = make([]string, 0, len(fields))
diff --git a/backend/internal/data/ent/authroles_update.go b/backend/internal/data/ent/authroles_update.go
index dea7b769..ca222e44 100644
--- a/backend/internal/data/ent/authroles_update.go
+++ b/backend/internal/data/ent/authroles_update.go
@@ -114,16 +114,7 @@ func (aru *AuthRolesUpdate) sqlSave(ctx context.Context) (n int, err error) {
if err := aru.check(); err != nil {
return n, err
}
- _spec := &sqlgraph.UpdateSpec{
- Node: &sqlgraph.NodeSpec{
- Table: authroles.Table,
- Columns: authroles.Columns,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeInt,
- Column: authroles.FieldID,
- },
- },
- }
+ _spec := sqlgraph.NewUpdateSpec(authroles.Table, authroles.Columns, sqlgraph.NewFieldSpec(authroles.FieldID, field.TypeInt))
if ps := aru.mutation.predicates; len(ps) > 0 {
_spec.Predicate = func(selector *sql.Selector) {
for i := range ps {
@@ -233,6 +224,12 @@ func (aruo *AuthRolesUpdateOne) ClearToken() *AuthRolesUpdateOne {
return aruo
}
+// Where appends a list predicates to the AuthRolesUpdate builder.
+func (aruo *AuthRolesUpdateOne) Where(ps ...predicate.AuthRoles) *AuthRolesUpdateOne {
+ aruo.mutation.Where(ps...)
+ return aruo
+}
+
// Select allows selecting one or more fields (columns) of the returned entity.
// The default is selecting all fields defined in the entity schema.
func (aruo *AuthRolesUpdateOne) Select(field string, fields ...string) *AuthRolesUpdateOne {
@@ -281,16 +278,7 @@ func (aruo *AuthRolesUpdateOne) sqlSave(ctx context.Context) (_node *AuthRoles,
if err := aruo.check(); err != nil {
return _node, err
}
- _spec := &sqlgraph.UpdateSpec{
- Node: &sqlgraph.NodeSpec{
- Table: authroles.Table,
- Columns: authroles.Columns,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeInt,
- Column: authroles.FieldID,
- },
- },
- }
+ _spec := sqlgraph.NewUpdateSpec(authroles.Table, authroles.Columns, sqlgraph.NewFieldSpec(authroles.FieldID, field.TypeInt))
id, ok := aruo.mutation.ID()
if !ok {
return nil, &ValidationError{Name: "id", err: errors.New(`ent: missing "AuthRoles.id" for update`)}
diff --git a/backend/internal/data/ent/authtokens.go b/backend/internal/data/ent/authtokens.go
index 14188386..a2b6589a 100644
--- a/backend/internal/data/ent/authtokens.go
+++ b/backend/internal/data/ent/authtokens.go
@@ -190,9 +190,3 @@ func (at *AuthTokens) String() string {
// AuthTokensSlice is a parsable slice of AuthTokens.
type AuthTokensSlice []*AuthTokens
-
-func (at AuthTokensSlice) config(cfg config) {
- for _i := range at {
- at[_i].config = cfg
- }
-}
diff --git a/backend/internal/data/ent/authtokens_create.go b/backend/internal/data/ent/authtokens_create.go
index d6632bbd..a8f29716 100644
--- a/backend/internal/data/ent/authtokens_create.go
+++ b/backend/internal/data/ent/authtokens_create.go
@@ -219,13 +219,7 @@ func (atc *AuthTokensCreate) sqlSave(ctx context.Context) (*AuthTokens, error) {
func (atc *AuthTokensCreate) createSpec() (*AuthTokens, *sqlgraph.CreateSpec) {
var (
_node = &AuthTokens{config: atc.config}
- _spec = &sqlgraph.CreateSpec{
- Table: authtokens.Table,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: authtokens.FieldID,
- },
- }
+ _spec = sqlgraph.NewCreateSpec(authtokens.Table, sqlgraph.NewFieldSpec(authtokens.FieldID, field.TypeUUID))
)
if id, ok := atc.mutation.ID(); ok {
_node.ID = id
diff --git a/backend/internal/data/ent/authtokens_delete.go b/backend/internal/data/ent/authtokens_delete.go
index 79c1a0c9..1d46fe33 100644
--- a/backend/internal/data/ent/authtokens_delete.go
+++ b/backend/internal/data/ent/authtokens_delete.go
@@ -40,15 +40,7 @@ func (atd *AuthTokensDelete) ExecX(ctx context.Context) int {
}
func (atd *AuthTokensDelete) sqlExec(ctx context.Context) (int, error) {
- _spec := &sqlgraph.DeleteSpec{
- Node: &sqlgraph.NodeSpec{
- Table: authtokens.Table,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: authtokens.FieldID,
- },
- },
- }
+ _spec := sqlgraph.NewDeleteSpec(authtokens.Table, sqlgraph.NewFieldSpec(authtokens.FieldID, field.TypeUUID))
if ps := atd.mutation.predicates; len(ps) > 0 {
_spec.Predicate = func(selector *sql.Selector) {
for i := range ps {
diff --git a/backend/internal/data/ent/authtokens_query.go b/backend/internal/data/ent/authtokens_query.go
index 56959423..5b4302ab 100644
--- a/backend/internal/data/ent/authtokens_query.go
+++ b/backend/internal/data/ent/authtokens_query.go
@@ -228,10 +228,12 @@ func (atq *AuthTokensQuery) AllX(ctx context.Context) []*AuthTokens {
}
// IDs executes the query and returns a list of AuthTokens IDs.
-func (atq *AuthTokensQuery) IDs(ctx context.Context) ([]uuid.UUID, error) {
- var ids []uuid.UUID
+func (atq *AuthTokensQuery) IDs(ctx context.Context) (ids []uuid.UUID, err error) {
+ if atq.ctx.Unique == nil && atq.path != nil {
+ atq.Unique(true)
+ }
ctx = setContextOp(ctx, atq.ctx, "IDs")
- if err := atq.Select(authtokens.FieldID).Scan(ctx, &ids); err != nil {
+ if err = atq.Select(authtokens.FieldID).Scan(ctx, &ids); err != nil {
return nil, err
}
return ids, nil
@@ -522,20 +524,12 @@ func (atq *AuthTokensQuery) sqlCount(ctx context.Context) (int, error) {
}
func (atq *AuthTokensQuery) querySpec() *sqlgraph.QuerySpec {
- _spec := &sqlgraph.QuerySpec{
- Node: &sqlgraph.NodeSpec{
- Table: authtokens.Table,
- Columns: authtokens.Columns,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: authtokens.FieldID,
- },
- },
- From: atq.sql,
- Unique: true,
- }
+ _spec := sqlgraph.NewQuerySpec(authtokens.Table, authtokens.Columns, sqlgraph.NewFieldSpec(authtokens.FieldID, field.TypeUUID))
+ _spec.From = atq.sql
if unique := atq.ctx.Unique; unique != nil {
_spec.Unique = *unique
+ } else if atq.path != nil {
+ _spec.Unique = true
}
if fields := atq.ctx.Fields; len(fields) > 0 {
_spec.Node.Columns = make([]string, 0, len(fields))
diff --git a/backend/internal/data/ent/authtokens_update.go b/backend/internal/data/ent/authtokens_update.go
index c058ee3e..11f34dba 100644
--- a/backend/internal/data/ent/authtokens_update.go
+++ b/backend/internal/data/ent/authtokens_update.go
@@ -149,16 +149,7 @@ func (atu *AuthTokensUpdate) defaults() {
}
func (atu *AuthTokensUpdate) sqlSave(ctx context.Context) (n int, err error) {
- _spec := &sqlgraph.UpdateSpec{
- Node: &sqlgraph.NodeSpec{
- Table: authtokens.Table,
- Columns: authtokens.Columns,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: authtokens.FieldID,
- },
- },
- }
+ _spec := sqlgraph.NewUpdateSpec(authtokens.Table, authtokens.Columns, sqlgraph.NewFieldSpec(authtokens.FieldID, field.TypeUUID))
if ps := atu.mutation.predicates; len(ps) > 0 {
_spec.Predicate = func(selector *sql.Selector) {
for i := range ps {
@@ -346,6 +337,12 @@ func (atuo *AuthTokensUpdateOne) ClearRoles() *AuthTokensUpdateOne {
return atuo
}
+// Where appends a list predicates to the AuthTokensUpdate builder.
+func (atuo *AuthTokensUpdateOne) Where(ps ...predicate.AuthTokens) *AuthTokensUpdateOne {
+ atuo.mutation.Where(ps...)
+ return atuo
+}
+
// Select allows selecting one or more fields (columns) of the returned entity.
// The default is selecting all fields defined in the entity schema.
func (atuo *AuthTokensUpdateOne) Select(field string, fields ...string) *AuthTokensUpdateOne {
@@ -390,16 +387,7 @@ func (atuo *AuthTokensUpdateOne) defaults() {
}
func (atuo *AuthTokensUpdateOne) sqlSave(ctx context.Context) (_node *AuthTokens, err error) {
- _spec := &sqlgraph.UpdateSpec{
- Node: &sqlgraph.NodeSpec{
- Table: authtokens.Table,
- Columns: authtokens.Columns,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: authtokens.FieldID,
- },
- },
- }
+ _spec := sqlgraph.NewUpdateSpec(authtokens.Table, authtokens.Columns, sqlgraph.NewFieldSpec(authtokens.FieldID, field.TypeUUID))
id, ok := atuo.mutation.ID()
if !ok {
return nil, &ValidationError{Name: "id", err: errors.New(`ent: missing "AuthTokens.id" for update`)}
diff --git a/backend/internal/data/ent/client.go b/backend/internal/data/ent/client.go
index f0215983..44755c89 100644
--- a/backend/internal/data/ent/client.go
+++ b/backend/internal/data/ent/client.go
@@ -266,7 +266,7 @@ func (c *AttachmentClient) Use(hooks ...Hook) {
c.hooks.Attachment = append(c.hooks.Attachment, hooks...)
}
-// Use adds a list of query interceptors to the interceptors stack.
+// Intercept adds a list of query interceptors to the interceptors stack.
// A call to `Intercept(f, g, h)` equals to `attachment.Intercept(f(g(h())))`.
func (c *AttachmentClient) Intercept(interceptors ...Interceptor) {
c.inters.Attachment = append(c.inters.Attachment, interceptors...)
@@ -416,7 +416,7 @@ func (c *AuthRolesClient) Use(hooks ...Hook) {
c.hooks.AuthRoles = append(c.hooks.AuthRoles, hooks...)
}
-// Use adds a list of query interceptors to the interceptors stack.
+// Intercept adds a list of query interceptors to the interceptors stack.
// A call to `Intercept(f, g, h)` equals to `authroles.Intercept(f(g(h())))`.
func (c *AuthRolesClient) Intercept(interceptors ...Interceptor) {
c.inters.AuthRoles = append(c.inters.AuthRoles, interceptors...)
@@ -550,7 +550,7 @@ func (c *AuthTokensClient) Use(hooks ...Hook) {
c.hooks.AuthTokens = append(c.hooks.AuthTokens, hooks...)
}
-// Use adds a list of query interceptors to the interceptors stack.
+// Intercept adds a list of query interceptors to the interceptors stack.
// A call to `Intercept(f, g, h)` equals to `authtokens.Intercept(f(g(h())))`.
func (c *AuthTokensClient) Intercept(interceptors ...Interceptor) {
c.inters.AuthTokens = append(c.inters.AuthTokens, interceptors...)
@@ -700,7 +700,7 @@ func (c *DocumentClient) Use(hooks ...Hook) {
c.hooks.Document = append(c.hooks.Document, hooks...)
}
-// Use adds a list of query interceptors to the interceptors stack.
+// Intercept adds a list of query interceptors to the interceptors stack.
// A call to `Intercept(f, g, h)` equals to `document.Intercept(f(g(h())))`.
func (c *DocumentClient) Intercept(interceptors ...Interceptor) {
c.inters.Document = append(c.inters.Document, interceptors...)
@@ -850,7 +850,7 @@ func (c *GroupClient) Use(hooks ...Hook) {
c.hooks.Group = append(c.hooks.Group, hooks...)
}
-// Use adds a list of query interceptors to the interceptors stack.
+// Intercept adds a list of query interceptors to the interceptors stack.
// A call to `Intercept(f, g, h)` equals to `group.Intercept(f(g(h())))`.
func (c *GroupClient) Intercept(interceptors ...Interceptor) {
c.inters.Group = append(c.inters.Group, interceptors...)
@@ -1064,7 +1064,7 @@ func (c *GroupInvitationTokenClient) Use(hooks ...Hook) {
c.hooks.GroupInvitationToken = append(c.hooks.GroupInvitationToken, hooks...)
}
-// Use adds a list of query interceptors to the interceptors stack.
+// Intercept adds a list of query interceptors to the interceptors stack.
// A call to `Intercept(f, g, h)` equals to `groupinvitationtoken.Intercept(f(g(h())))`.
func (c *GroupInvitationTokenClient) Intercept(interceptors ...Interceptor) {
c.inters.GroupInvitationToken = append(c.inters.GroupInvitationToken, interceptors...)
@@ -1198,7 +1198,7 @@ func (c *ItemClient) Use(hooks ...Hook) {
c.hooks.Item = append(c.hooks.Item, hooks...)
}
-// Use adds a list of query interceptors to the interceptors stack.
+// Intercept adds a list of query interceptors to the interceptors stack.
// A call to `Intercept(f, g, h)` equals to `item.Intercept(f(g(h())))`.
func (c *ItemClient) Intercept(interceptors ...Interceptor) {
c.inters.Item = append(c.inters.Item, interceptors...)
@@ -1444,7 +1444,7 @@ func (c *ItemFieldClient) Use(hooks ...Hook) {
c.hooks.ItemField = append(c.hooks.ItemField, hooks...)
}
-// Use adds a list of query interceptors to the interceptors stack.
+// Intercept adds a list of query interceptors to the interceptors stack.
// A call to `Intercept(f, g, h)` equals to `itemfield.Intercept(f(g(h())))`.
func (c *ItemFieldClient) Intercept(interceptors ...Interceptor) {
c.inters.ItemField = append(c.inters.ItemField, interceptors...)
@@ -1578,7 +1578,7 @@ func (c *LabelClient) Use(hooks ...Hook) {
c.hooks.Label = append(c.hooks.Label, hooks...)
}
-// Use adds a list of query interceptors to the interceptors stack.
+// Intercept adds a list of query interceptors to the interceptors stack.
// A call to `Intercept(f, g, h)` equals to `label.Intercept(f(g(h())))`.
func (c *LabelClient) Intercept(interceptors ...Interceptor) {
c.inters.Label = append(c.inters.Label, interceptors...)
@@ -1728,7 +1728,7 @@ func (c *LocationClient) Use(hooks ...Hook) {
c.hooks.Location = append(c.hooks.Location, hooks...)
}
-// Use adds a list of query interceptors to the interceptors stack.
+// Intercept adds a list of query interceptors to the interceptors stack.
// A call to `Intercept(f, g, h)` equals to `location.Intercept(f(g(h())))`.
func (c *LocationClient) Intercept(interceptors ...Interceptor) {
c.inters.Location = append(c.inters.Location, interceptors...)
@@ -1910,7 +1910,7 @@ func (c *MaintenanceEntryClient) Use(hooks ...Hook) {
c.hooks.MaintenanceEntry = append(c.hooks.MaintenanceEntry, hooks...)
}
-// Use adds a list of query interceptors to the interceptors stack.
+// Intercept adds a list of query interceptors to the interceptors stack.
// A call to `Intercept(f, g, h)` equals to `maintenanceentry.Intercept(f(g(h())))`.
func (c *MaintenanceEntryClient) Intercept(interceptors ...Interceptor) {
c.inters.MaintenanceEntry = append(c.inters.MaintenanceEntry, interceptors...)
@@ -2044,7 +2044,7 @@ func (c *UserClient) Use(hooks ...Hook) {
c.hooks.User = append(c.hooks.User, hooks...)
}
-// Use adds a list of query interceptors to the interceptors stack.
+// Intercept adds a list of query interceptors to the interceptors stack.
// A call to `Intercept(f, g, h)` equals to `user.Intercept(f(g(h())))`.
func (c *UserClient) Intercept(interceptors ...Interceptor) {
c.inters.User = append(c.inters.User, interceptors...)
diff --git a/backend/internal/data/ent/document.go b/backend/internal/data/ent/document.go
index 661a37e0..bcaae9ad 100644
--- a/backend/internal/data/ent/document.go
+++ b/backend/internal/data/ent/document.go
@@ -185,9 +185,3 @@ func (d *Document) String() string {
// Documents is a parsable slice of Document.
type Documents []*Document
-
-func (d Documents) config(cfg config) {
- for _i := range d {
- d[_i].config = cfg
- }
-}
diff --git a/backend/internal/data/ent/document_create.go b/backend/internal/data/ent/document_create.go
index 81f5e8c2..eabfc0fe 100644
--- a/backend/internal/data/ent/document_create.go
+++ b/backend/internal/data/ent/document_create.go
@@ -208,13 +208,7 @@ func (dc *DocumentCreate) sqlSave(ctx context.Context) (*Document, error) {
func (dc *DocumentCreate) createSpec() (*Document, *sqlgraph.CreateSpec) {
var (
_node = &Document{config: dc.config}
- _spec = &sqlgraph.CreateSpec{
- Table: document.Table,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: document.FieldID,
- },
- }
+ _spec = sqlgraph.NewCreateSpec(document.Table, sqlgraph.NewFieldSpec(document.FieldID, field.TypeUUID))
)
if id, ok := dc.mutation.ID(); ok {
_node.ID = id
diff --git a/backend/internal/data/ent/document_delete.go b/backend/internal/data/ent/document_delete.go
index 0096d8e0..d0481d3e 100644
--- a/backend/internal/data/ent/document_delete.go
+++ b/backend/internal/data/ent/document_delete.go
@@ -40,15 +40,7 @@ func (dd *DocumentDelete) ExecX(ctx context.Context) int {
}
func (dd *DocumentDelete) sqlExec(ctx context.Context) (int, error) {
- _spec := &sqlgraph.DeleteSpec{
- Node: &sqlgraph.NodeSpec{
- Table: document.Table,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: document.FieldID,
- },
- },
- }
+ _spec := sqlgraph.NewDeleteSpec(document.Table, sqlgraph.NewFieldSpec(document.FieldID, field.TypeUUID))
if ps := dd.mutation.predicates; len(ps) > 0 {
_spec.Predicate = func(selector *sql.Selector) {
for i := range ps {
diff --git a/backend/internal/data/ent/document_query.go b/backend/internal/data/ent/document_query.go
index d2bde65f..e22abe25 100644
--- a/backend/internal/data/ent/document_query.go
+++ b/backend/internal/data/ent/document_query.go
@@ -228,10 +228,12 @@ func (dq *DocumentQuery) AllX(ctx context.Context) []*Document {
}
// IDs executes the query and returns a list of Document IDs.
-func (dq *DocumentQuery) IDs(ctx context.Context) ([]uuid.UUID, error) {
- var ids []uuid.UUID
+func (dq *DocumentQuery) IDs(ctx context.Context) (ids []uuid.UUID, err error) {
+ if dq.ctx.Unique == nil && dq.path != nil {
+ dq.Unique(true)
+ }
ctx = setContextOp(ctx, dq.ctx, "IDs")
- if err := dq.Select(document.FieldID).Scan(ctx, &ids); err != nil {
+ if err = dq.Select(document.FieldID).Scan(ctx, &ids); err != nil {
return nil, err
}
return ids, nil
@@ -526,20 +528,12 @@ func (dq *DocumentQuery) sqlCount(ctx context.Context) (int, error) {
}
func (dq *DocumentQuery) querySpec() *sqlgraph.QuerySpec {
- _spec := &sqlgraph.QuerySpec{
- Node: &sqlgraph.NodeSpec{
- Table: document.Table,
- Columns: document.Columns,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: document.FieldID,
- },
- },
- From: dq.sql,
- Unique: true,
- }
+ _spec := sqlgraph.NewQuerySpec(document.Table, document.Columns, sqlgraph.NewFieldSpec(document.FieldID, field.TypeUUID))
+ _spec.From = dq.sql
if unique := dq.ctx.Unique; unique != nil {
_spec.Unique = *unique
+ } else if dq.path != nil {
+ _spec.Unique = true
}
if fields := dq.ctx.Fields; len(fields) > 0 {
_spec.Node.Columns = make([]string, 0, len(fields))
diff --git a/backend/internal/data/ent/document_update.go b/backend/internal/data/ent/document_update.go
index e685bdae..a172e5f8 100644
--- a/backend/internal/data/ent/document_update.go
+++ b/backend/internal/data/ent/document_update.go
@@ -165,16 +165,7 @@ func (du *DocumentUpdate) sqlSave(ctx context.Context) (n int, err error) {
if err := du.check(); err != nil {
return n, err
}
- _spec := &sqlgraph.UpdateSpec{
- Node: &sqlgraph.NodeSpec{
- Table: document.Table,
- Columns: document.Columns,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: document.FieldID,
- },
- },
- }
+ _spec := sqlgraph.NewUpdateSpec(document.Table, document.Columns, sqlgraph.NewFieldSpec(document.FieldID, field.TypeUUID))
if ps := du.mutation.predicates; len(ps) > 0 {
_spec.Predicate = func(selector *sql.Selector) {
for i := range ps {
@@ -376,6 +367,12 @@ func (duo *DocumentUpdateOne) RemoveAttachments(a ...*Attachment) *DocumentUpdat
return duo.RemoveAttachmentIDs(ids...)
}
+// Where appends a list predicates to the DocumentUpdate builder.
+func (duo *DocumentUpdateOne) Where(ps ...predicate.Document) *DocumentUpdateOne {
+ duo.mutation.Where(ps...)
+ return duo
+}
+
// Select allows selecting one or more fields (columns) of the returned entity.
// The default is selecting all fields defined in the entity schema.
func (duo *DocumentUpdateOne) Select(field string, fields ...string) *DocumentUpdateOne {
@@ -441,16 +438,7 @@ func (duo *DocumentUpdateOne) sqlSave(ctx context.Context) (_node *Document, err
if err := duo.check(); err != nil {
return _node, err
}
- _spec := &sqlgraph.UpdateSpec{
- Node: &sqlgraph.NodeSpec{
- Table: document.Table,
- Columns: document.Columns,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: document.FieldID,
- },
- },
- }
+ _spec := sqlgraph.NewUpdateSpec(document.Table, document.Columns, sqlgraph.NewFieldSpec(document.FieldID, field.TypeUUID))
id, ok := duo.mutation.ID()
if !ok {
return nil, &ValidationError{Name: "id", err: errors.New(`ent: missing "Document.id" for update`)}
diff --git a/backend/internal/data/ent/group.go b/backend/internal/data/ent/group.go
index 16dc988d..25e1ce4a 100644
--- a/backend/internal/data/ent/group.go
+++ b/backend/internal/data/ent/group.go
@@ -234,9 +234,3 @@ func (gr *Group) String() string {
// Groups is a parsable slice of Group.
type Groups []*Group
-
-func (gr Groups) config(cfg config) {
- for _i := range gr {
- gr[_i].config = cfg
- }
-}
diff --git a/backend/internal/data/ent/group_create.go b/backend/internal/data/ent/group_create.go
index b13c3581..9f0e90a9 100644
--- a/backend/internal/data/ent/group_create.go
+++ b/backend/internal/data/ent/group_create.go
@@ -285,13 +285,7 @@ func (gc *GroupCreate) sqlSave(ctx context.Context) (*Group, error) {
func (gc *GroupCreate) createSpec() (*Group, *sqlgraph.CreateSpec) {
var (
_node = &Group{config: gc.config}
- _spec = &sqlgraph.CreateSpec{
- Table: group.Table,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: group.FieldID,
- },
- }
+ _spec = sqlgraph.NewCreateSpec(group.Table, sqlgraph.NewFieldSpec(group.FieldID, field.TypeUUID))
)
if id, ok := gc.mutation.ID(); ok {
_node.ID = id
diff --git a/backend/internal/data/ent/group_delete.go b/backend/internal/data/ent/group_delete.go
index eae02e27..29e0ffc7 100644
--- a/backend/internal/data/ent/group_delete.go
+++ b/backend/internal/data/ent/group_delete.go
@@ -40,15 +40,7 @@ func (gd *GroupDelete) ExecX(ctx context.Context) int {
}
func (gd *GroupDelete) sqlExec(ctx context.Context) (int, error) {
- _spec := &sqlgraph.DeleteSpec{
- Node: &sqlgraph.NodeSpec{
- Table: group.Table,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: group.FieldID,
- },
- },
- }
+ _spec := sqlgraph.NewDeleteSpec(group.Table, sqlgraph.NewFieldSpec(group.FieldID, field.TypeUUID))
if ps := gd.mutation.predicates; len(ps) > 0 {
_spec.Predicate = func(selector *sql.Selector) {
for i := range ps {
diff --git a/backend/internal/data/ent/group_query.go b/backend/internal/data/ent/group_query.go
index a0f6d61e..c9bef5fc 100644
--- a/backend/internal/data/ent/group_query.go
+++ b/backend/internal/data/ent/group_query.go
@@ -323,10 +323,12 @@ func (gq *GroupQuery) AllX(ctx context.Context) []*Group {
}
// IDs executes the query and returns a list of Group IDs.
-func (gq *GroupQuery) IDs(ctx context.Context) ([]uuid.UUID, error) {
- var ids []uuid.UUID
+func (gq *GroupQuery) IDs(ctx context.Context) (ids []uuid.UUID, err error) {
+ if gq.ctx.Unique == nil && gq.path != nil {
+ gq.Unique(true)
+ }
ctx = setContextOp(ctx, gq.ctx, "IDs")
- if err := gq.Select(group.FieldID).Scan(ctx, &ids); err != nil {
+ if err = gq.Select(group.FieldID).Scan(ctx, &ids); err != nil {
return nil, err
}
return ids, nil
@@ -820,20 +822,12 @@ func (gq *GroupQuery) sqlCount(ctx context.Context) (int, error) {
}
func (gq *GroupQuery) querySpec() *sqlgraph.QuerySpec {
- _spec := &sqlgraph.QuerySpec{
- Node: &sqlgraph.NodeSpec{
- Table: group.Table,
- Columns: group.Columns,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: group.FieldID,
- },
- },
- From: gq.sql,
- Unique: true,
- }
+ _spec := sqlgraph.NewQuerySpec(group.Table, group.Columns, sqlgraph.NewFieldSpec(group.FieldID, field.TypeUUID))
+ _spec.From = gq.sql
if unique := gq.ctx.Unique; unique != nil {
_spec.Unique = *unique
+ } else if gq.path != nil {
+ _spec.Unique = true
}
if fields := gq.ctx.Fields; len(fields) > 0 {
_spec.Node.Columns = make([]string, 0, len(fields))
diff --git a/backend/internal/data/ent/group_update.go b/backend/internal/data/ent/group_update.go
index e4263bf8..1ff9cd6e 100644
--- a/backend/internal/data/ent/group_update.go
+++ b/backend/internal/data/ent/group_update.go
@@ -337,16 +337,7 @@ func (gu *GroupUpdate) sqlSave(ctx context.Context) (n int, err error) {
if err := gu.check(); err != nil {
return n, err
}
- _spec := &sqlgraph.UpdateSpec{
- Node: &sqlgraph.NodeSpec{
- Table: group.Table,
- Columns: group.Columns,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: group.FieldID,
- },
- },
- }
+ _spec := sqlgraph.NewUpdateSpec(group.Table, group.Columns, sqlgraph.NewFieldSpec(group.FieldID, field.TypeUUID))
if ps := gu.mutation.predicates; len(ps) > 0 {
_spec.Predicate = func(selector *sql.Selector) {
for i := range ps {
@@ -954,6 +945,12 @@ func (guo *GroupUpdateOne) RemoveInvitationTokens(g ...*GroupInvitationToken) *G
return guo.RemoveInvitationTokenIDs(ids...)
}
+// Where appends a list predicates to the GroupUpdate builder.
+func (guo *GroupUpdateOne) Where(ps ...predicate.Group) *GroupUpdateOne {
+ guo.mutation.Where(ps...)
+ return guo
+}
+
// Select allows selecting one or more fields (columns) of the returned entity.
// The default is selecting all fields defined in the entity schema.
func (guo *GroupUpdateOne) Select(field string, fields ...string) *GroupUpdateOne {
@@ -1016,16 +1013,7 @@ func (guo *GroupUpdateOne) sqlSave(ctx context.Context) (_node *Group, err error
if err := guo.check(); err != nil {
return _node, err
}
- _spec := &sqlgraph.UpdateSpec{
- Node: &sqlgraph.NodeSpec{
- Table: group.Table,
- Columns: group.Columns,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: group.FieldID,
- },
- },
- }
+ _spec := sqlgraph.NewUpdateSpec(group.Table, group.Columns, sqlgraph.NewFieldSpec(group.FieldID, field.TypeUUID))
id, ok := guo.mutation.ID()
if !ok {
return nil, &ValidationError{Name: "id", err: errors.New(`ent: missing "Group.id" for update`)}
diff --git a/backend/internal/data/ent/groupinvitationtoken.go b/backend/internal/data/ent/groupinvitationtoken.go
index 8f145d48..f8c2bb36 100644
--- a/backend/internal/data/ent/groupinvitationtoken.go
+++ b/backend/internal/data/ent/groupinvitationtoken.go
@@ -182,9 +182,3 @@ func (git *GroupInvitationToken) String() string {
// GroupInvitationTokens is a parsable slice of GroupInvitationToken.
type GroupInvitationTokens []*GroupInvitationToken
-
-func (git GroupInvitationTokens) config(cfg config) {
- for _i := range git {
- git[_i].config = cfg
- }
-}
diff --git a/backend/internal/data/ent/groupinvitationtoken_create.go b/backend/internal/data/ent/groupinvitationtoken_create.go
index 01cd1c8b..e45fb270 100644
--- a/backend/internal/data/ent/groupinvitationtoken_create.go
+++ b/backend/internal/data/ent/groupinvitationtoken_create.go
@@ -220,13 +220,7 @@ func (gitc *GroupInvitationTokenCreate) sqlSave(ctx context.Context) (*GroupInvi
func (gitc *GroupInvitationTokenCreate) createSpec() (*GroupInvitationToken, *sqlgraph.CreateSpec) {
var (
_node = &GroupInvitationToken{config: gitc.config}
- _spec = &sqlgraph.CreateSpec{
- Table: groupinvitationtoken.Table,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: groupinvitationtoken.FieldID,
- },
- }
+ _spec = sqlgraph.NewCreateSpec(groupinvitationtoken.Table, sqlgraph.NewFieldSpec(groupinvitationtoken.FieldID, field.TypeUUID))
)
if id, ok := gitc.mutation.ID(); ok {
_node.ID = id
diff --git a/backend/internal/data/ent/groupinvitationtoken_delete.go b/backend/internal/data/ent/groupinvitationtoken_delete.go
index 1896841c..1720383c 100644
--- a/backend/internal/data/ent/groupinvitationtoken_delete.go
+++ b/backend/internal/data/ent/groupinvitationtoken_delete.go
@@ -40,15 +40,7 @@ func (gitd *GroupInvitationTokenDelete) ExecX(ctx context.Context) int {
}
func (gitd *GroupInvitationTokenDelete) sqlExec(ctx context.Context) (int, error) {
- _spec := &sqlgraph.DeleteSpec{
- Node: &sqlgraph.NodeSpec{
- Table: groupinvitationtoken.Table,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: groupinvitationtoken.FieldID,
- },
- },
- }
+ _spec := sqlgraph.NewDeleteSpec(groupinvitationtoken.Table, sqlgraph.NewFieldSpec(groupinvitationtoken.FieldID, field.TypeUUID))
if ps := gitd.mutation.predicates; len(ps) > 0 {
_spec.Predicate = func(selector *sql.Selector) {
for i := range ps {
diff --git a/backend/internal/data/ent/groupinvitationtoken_query.go b/backend/internal/data/ent/groupinvitationtoken_query.go
index ac1fc92d..287b5093 100644
--- a/backend/internal/data/ent/groupinvitationtoken_query.go
+++ b/backend/internal/data/ent/groupinvitationtoken_query.go
@@ -203,10 +203,12 @@ func (gitq *GroupInvitationTokenQuery) AllX(ctx context.Context) []*GroupInvitat
}
// IDs executes the query and returns a list of GroupInvitationToken IDs.
-func (gitq *GroupInvitationTokenQuery) IDs(ctx context.Context) ([]uuid.UUID, error) {
- var ids []uuid.UUID
+func (gitq *GroupInvitationTokenQuery) IDs(ctx context.Context) (ids []uuid.UUID, err error) {
+ if gitq.ctx.Unique == nil && gitq.path != nil {
+ gitq.Unique(true)
+ }
ctx = setContextOp(ctx, gitq.ctx, "IDs")
- if err := gitq.Select(groupinvitationtoken.FieldID).Scan(ctx, &ids); err != nil {
+ if err = gitq.Select(groupinvitationtoken.FieldID).Scan(ctx, &ids); err != nil {
return nil, err
}
return ids, nil
@@ -450,20 +452,12 @@ func (gitq *GroupInvitationTokenQuery) sqlCount(ctx context.Context) (int, error
}
func (gitq *GroupInvitationTokenQuery) querySpec() *sqlgraph.QuerySpec {
- _spec := &sqlgraph.QuerySpec{
- Node: &sqlgraph.NodeSpec{
- Table: groupinvitationtoken.Table,
- Columns: groupinvitationtoken.Columns,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: groupinvitationtoken.FieldID,
- },
- },
- From: gitq.sql,
- Unique: true,
- }
+ _spec := sqlgraph.NewQuerySpec(groupinvitationtoken.Table, groupinvitationtoken.Columns, sqlgraph.NewFieldSpec(groupinvitationtoken.FieldID, field.TypeUUID))
+ _spec.From = gitq.sql
if unique := gitq.ctx.Unique; unique != nil {
_spec.Unique = *unique
+ } else if gitq.path != nil {
+ _spec.Unique = true
}
if fields := gitq.ctx.Fields; len(fields) > 0 {
_spec.Node.Columns = make([]string, 0, len(fields))
diff --git a/backend/internal/data/ent/groupinvitationtoken_update.go b/backend/internal/data/ent/groupinvitationtoken_update.go
index ac7cfd2e..7a4caaa2 100644
--- a/backend/internal/data/ent/groupinvitationtoken_update.go
+++ b/backend/internal/data/ent/groupinvitationtoken_update.go
@@ -144,16 +144,7 @@ func (gitu *GroupInvitationTokenUpdate) defaults() {
}
func (gitu *GroupInvitationTokenUpdate) sqlSave(ctx context.Context) (n int, err error) {
- _spec := &sqlgraph.UpdateSpec{
- Node: &sqlgraph.NodeSpec{
- Table: groupinvitationtoken.Table,
- Columns: groupinvitationtoken.Columns,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: groupinvitationtoken.FieldID,
- },
- },
- }
+ _spec := sqlgraph.NewUpdateSpec(groupinvitationtoken.Table, groupinvitationtoken.Columns, sqlgraph.NewFieldSpec(groupinvitationtoken.FieldID, field.TypeUUID))
if ps := gitu.mutation.predicates; len(ps) > 0 {
_spec.Predicate = func(selector *sql.Selector) {
for i := range ps {
@@ -308,6 +299,12 @@ func (gituo *GroupInvitationTokenUpdateOne) ClearGroup() *GroupInvitationTokenUp
return gituo
}
+// Where appends a list predicates to the GroupInvitationTokenUpdate builder.
+func (gituo *GroupInvitationTokenUpdateOne) Where(ps ...predicate.GroupInvitationToken) *GroupInvitationTokenUpdateOne {
+ gituo.mutation.Where(ps...)
+ return gituo
+}
+
// Select allows selecting one or more fields (columns) of the returned entity.
// The default is selecting all fields defined in the entity schema.
func (gituo *GroupInvitationTokenUpdateOne) Select(field string, fields ...string) *GroupInvitationTokenUpdateOne {
@@ -352,16 +349,7 @@ func (gituo *GroupInvitationTokenUpdateOne) defaults() {
}
func (gituo *GroupInvitationTokenUpdateOne) sqlSave(ctx context.Context) (_node *GroupInvitationToken, err error) {
- _spec := &sqlgraph.UpdateSpec{
- Node: &sqlgraph.NodeSpec{
- Table: groupinvitationtoken.Table,
- Columns: groupinvitationtoken.Columns,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: groupinvitationtoken.FieldID,
- },
- },
- }
+ _spec := sqlgraph.NewUpdateSpec(groupinvitationtoken.Table, groupinvitationtoken.Columns, sqlgraph.NewFieldSpec(groupinvitationtoken.FieldID, field.TypeUUID))
id, ok := gituo.mutation.ID()
if !ok {
return nil, &ValidationError{Name: "id", err: errors.New(`ent: missing "GroupInvitationToken.id" for update`)}
diff --git a/backend/internal/data/ent/item.go b/backend/internal/data/ent/item.go
index 415b8b91..3ad36f32 100644
--- a/backend/internal/data/ent/item.go
+++ b/backend/internal/data/ent/item.go
@@ -525,9 +525,3 @@ func (i *Item) String() string {
// Items is a parsable slice of Item.
type Items []*Item
-
-func (i Items) config(cfg config) {
- for _i := range i {
- i[_i].config = cfg
- }
-}
diff --git a/backend/internal/data/ent/item_create.go b/backend/internal/data/ent/item_create.go
index da36e66b..d1a446e5 100644
--- a/backend/internal/data/ent/item_create.go
+++ b/backend/internal/data/ent/item_create.go
@@ -665,13 +665,7 @@ func (ic *ItemCreate) sqlSave(ctx context.Context) (*Item, error) {
func (ic *ItemCreate) createSpec() (*Item, *sqlgraph.CreateSpec) {
var (
_node = &Item{config: ic.config}
- _spec = &sqlgraph.CreateSpec{
- Table: item.Table,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: item.FieldID,
- },
- }
+ _spec = sqlgraph.NewCreateSpec(item.Table, sqlgraph.NewFieldSpec(item.FieldID, field.TypeUUID))
)
if id, ok := ic.mutation.ID(); ok {
_node.ID = id
diff --git a/backend/internal/data/ent/item_delete.go b/backend/internal/data/ent/item_delete.go
index b6f0d47d..c2d00ff4 100644
--- a/backend/internal/data/ent/item_delete.go
+++ b/backend/internal/data/ent/item_delete.go
@@ -40,15 +40,7 @@ func (id *ItemDelete) ExecX(ctx context.Context) int {
}
func (id *ItemDelete) sqlExec(ctx context.Context) (int, error) {
- _spec := &sqlgraph.DeleteSpec{
- Node: &sqlgraph.NodeSpec{
- Table: item.Table,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: item.FieldID,
- },
- },
- }
+ _spec := sqlgraph.NewDeleteSpec(item.Table, sqlgraph.NewFieldSpec(item.FieldID, field.TypeUUID))
if ps := id.mutation.predicates; len(ps) > 0 {
_spec.Predicate = func(selector *sql.Selector) {
for i := range ps {
diff --git a/backend/internal/data/ent/item_query.go b/backend/internal/data/ent/item_query.go
index 045c31ff..c6af5536 100644
--- a/backend/internal/data/ent/item_query.go
+++ b/backend/internal/data/ent/item_query.go
@@ -370,10 +370,12 @@ func (iq *ItemQuery) AllX(ctx context.Context) []*Item {
}
// IDs executes the query and returns a list of Item IDs.
-func (iq *ItemQuery) IDs(ctx context.Context) ([]uuid.UUID, error) {
- var ids []uuid.UUID
+func (iq *ItemQuery) IDs(ctx context.Context) (ids []uuid.UUID, err error) {
+ if iq.ctx.Unique == nil && iq.path != nil {
+ iq.Unique(true)
+ }
ctx = setContextOp(ctx, iq.ctx, "IDs")
- if err := iq.Select(item.FieldID).Scan(ctx, &ids); err != nil {
+ if err = iq.Select(item.FieldID).Scan(ctx, &ids); err != nil {
return nil, err
}
return ids, nil
@@ -1000,20 +1002,12 @@ func (iq *ItemQuery) sqlCount(ctx context.Context) (int, error) {
}
func (iq *ItemQuery) querySpec() *sqlgraph.QuerySpec {
- _spec := &sqlgraph.QuerySpec{
- Node: &sqlgraph.NodeSpec{
- Table: item.Table,
- Columns: item.Columns,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: item.FieldID,
- },
- },
- From: iq.sql,
- Unique: true,
- }
+ _spec := sqlgraph.NewQuerySpec(item.Table, item.Columns, sqlgraph.NewFieldSpec(item.FieldID, field.TypeUUID))
+ _spec.From = iq.sql
if unique := iq.ctx.Unique; unique != nil {
_spec.Unique = *unique
+ } else if iq.path != nil {
+ _spec.Unique = true
}
if fields := iq.ctx.Fields; len(fields) > 0 {
_spec.Node.Columns = make([]string, 0, len(fields))
diff --git a/backend/internal/data/ent/item_update.go b/backend/internal/data/ent/item_update.go
index 1d5ec909..88796e44 100644
--- a/backend/internal/data/ent/item_update.go
+++ b/backend/internal/data/ent/item_update.go
@@ -753,16 +753,7 @@ func (iu *ItemUpdate) sqlSave(ctx context.Context) (n int, err error) {
if err := iu.check(); err != nil {
return n, err
}
- _spec := &sqlgraph.UpdateSpec{
- Node: &sqlgraph.NodeSpec{
- Table: item.Table,
- Columns: item.Columns,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: item.FieldID,
- },
- },
- }
+ _spec := sqlgraph.NewUpdateSpec(item.Table, item.Columns, sqlgraph.NewFieldSpec(item.FieldID, field.TypeUUID))
if ps := iu.mutation.predicates; len(ps) > 0 {
_spec.Predicate = func(selector *sql.Selector) {
for i := range ps {
@@ -1909,6 +1900,12 @@ func (iuo *ItemUpdateOne) RemoveAttachments(a ...*Attachment) *ItemUpdateOne {
return iuo.RemoveAttachmentIDs(ids...)
}
+// Where appends a list predicates to the ItemUpdate builder.
+func (iuo *ItemUpdateOne) Where(ps ...predicate.Item) *ItemUpdateOne {
+ iuo.mutation.Where(ps...)
+ return iuo
+}
+
// Select allows selecting one or more fields (columns) of the returned entity.
// The default is selecting all fields defined in the entity schema.
func (iuo *ItemUpdateOne) Select(field string, fields ...string) *ItemUpdateOne {
@@ -2004,16 +2001,7 @@ func (iuo *ItemUpdateOne) sqlSave(ctx context.Context) (_node *Item, err error)
if err := iuo.check(); err != nil {
return _node, err
}
- _spec := &sqlgraph.UpdateSpec{
- Node: &sqlgraph.NodeSpec{
- Table: item.Table,
- Columns: item.Columns,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: item.FieldID,
- },
- },
- }
+ _spec := sqlgraph.NewUpdateSpec(item.Table, item.Columns, sqlgraph.NewFieldSpec(item.FieldID, field.TypeUUID))
id, ok := iuo.mutation.ID()
if !ok {
return nil, &ValidationError{Name: "id", err: errors.New(`ent: missing "Item.id" for update`)}
diff --git a/backend/internal/data/ent/itemfield.go b/backend/internal/data/ent/itemfield.go
index 91b11958..cff67518 100644
--- a/backend/internal/data/ent/itemfield.go
+++ b/backend/internal/data/ent/itemfield.go
@@ -228,9 +228,3 @@ func (_if *ItemField) String() string {
// ItemFields is a parsable slice of ItemField.
type ItemFields []*ItemField
-
-func (_if ItemFields) config(cfg config) {
- for _i := range _if {
- _if[_i].config = cfg
- }
-}
diff --git a/backend/internal/data/ent/itemfield_create.go b/backend/internal/data/ent/itemfield_create.go
index 32c55787..c124c0ef 100644
--- a/backend/internal/data/ent/itemfield_create.go
+++ b/backend/internal/data/ent/itemfield_create.go
@@ -291,13 +291,7 @@ func (ifc *ItemFieldCreate) sqlSave(ctx context.Context) (*ItemField, error) {
func (ifc *ItemFieldCreate) createSpec() (*ItemField, *sqlgraph.CreateSpec) {
var (
_node = &ItemField{config: ifc.config}
- _spec = &sqlgraph.CreateSpec{
- Table: itemfield.Table,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: itemfield.FieldID,
- },
- }
+ _spec = sqlgraph.NewCreateSpec(itemfield.Table, sqlgraph.NewFieldSpec(itemfield.FieldID, field.TypeUUID))
)
if id, ok := ifc.mutation.ID(); ok {
_node.ID = id
diff --git a/backend/internal/data/ent/itemfield_delete.go b/backend/internal/data/ent/itemfield_delete.go
index 5b9c1398..181b7368 100644
--- a/backend/internal/data/ent/itemfield_delete.go
+++ b/backend/internal/data/ent/itemfield_delete.go
@@ -40,15 +40,7 @@ func (ifd *ItemFieldDelete) ExecX(ctx context.Context) int {
}
func (ifd *ItemFieldDelete) sqlExec(ctx context.Context) (int, error) {
- _spec := &sqlgraph.DeleteSpec{
- Node: &sqlgraph.NodeSpec{
- Table: itemfield.Table,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: itemfield.FieldID,
- },
- },
- }
+ _spec := sqlgraph.NewDeleteSpec(itemfield.Table, sqlgraph.NewFieldSpec(itemfield.FieldID, field.TypeUUID))
if ps := ifd.mutation.predicates; len(ps) > 0 {
_spec.Predicate = func(selector *sql.Selector) {
for i := range ps {
diff --git a/backend/internal/data/ent/itemfield_query.go b/backend/internal/data/ent/itemfield_query.go
index ef8ca944..c00e4220 100644
--- a/backend/internal/data/ent/itemfield_query.go
+++ b/backend/internal/data/ent/itemfield_query.go
@@ -203,10 +203,12 @@ func (ifq *ItemFieldQuery) AllX(ctx context.Context) []*ItemField {
}
// IDs executes the query and returns a list of ItemField IDs.
-func (ifq *ItemFieldQuery) IDs(ctx context.Context) ([]uuid.UUID, error) {
- var ids []uuid.UUID
+func (ifq *ItemFieldQuery) IDs(ctx context.Context) (ids []uuid.UUID, err error) {
+ if ifq.ctx.Unique == nil && ifq.path != nil {
+ ifq.Unique(true)
+ }
ctx = setContextOp(ctx, ifq.ctx, "IDs")
- if err := ifq.Select(itemfield.FieldID).Scan(ctx, &ids); err != nil {
+ if err = ifq.Select(itemfield.FieldID).Scan(ctx, &ids); err != nil {
return nil, err
}
return ids, nil
@@ -450,20 +452,12 @@ func (ifq *ItemFieldQuery) sqlCount(ctx context.Context) (int, error) {
}
func (ifq *ItemFieldQuery) querySpec() *sqlgraph.QuerySpec {
- _spec := &sqlgraph.QuerySpec{
- Node: &sqlgraph.NodeSpec{
- Table: itemfield.Table,
- Columns: itemfield.Columns,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: itemfield.FieldID,
- },
- },
- From: ifq.sql,
- Unique: true,
- }
+ _spec := sqlgraph.NewQuerySpec(itemfield.Table, itemfield.Columns, sqlgraph.NewFieldSpec(itemfield.FieldID, field.TypeUUID))
+ _spec.From = ifq.sql
if unique := ifq.ctx.Unique; unique != nil {
_spec.Unique = *unique
+ } else if ifq.path != nil {
+ _spec.Unique = true
}
if fields := ifq.ctx.Fields; len(fields) > 0 {
_spec.Node.Columns = make([]string, 0, len(fields))
diff --git a/backend/internal/data/ent/itemfield_update.go b/backend/internal/data/ent/itemfield_update.go
index ec93a558..b7ff3794 100644
--- a/backend/internal/data/ent/itemfield_update.go
+++ b/backend/internal/data/ent/itemfield_update.go
@@ -238,16 +238,7 @@ func (ifu *ItemFieldUpdate) sqlSave(ctx context.Context) (n int, err error) {
if err := ifu.check(); err != nil {
return n, err
}
- _spec := &sqlgraph.UpdateSpec{
- Node: &sqlgraph.NodeSpec{
- Table: itemfield.Table,
- Columns: itemfield.Columns,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: itemfield.FieldID,
- },
- },
- }
+ _spec := sqlgraph.NewUpdateSpec(itemfield.Table, itemfield.Columns, sqlgraph.NewFieldSpec(itemfield.FieldID, field.TypeUUID))
if ps := ifu.mutation.predicates; len(ps) > 0 {
_spec.Predicate = func(selector *sql.Selector) {
for i := range ps {
@@ -489,6 +480,12 @@ func (ifuo *ItemFieldUpdateOne) ClearItem() *ItemFieldUpdateOne {
return ifuo
}
+// Where appends a list predicates to the ItemFieldUpdate builder.
+func (ifuo *ItemFieldUpdateOne) Where(ps ...predicate.ItemField) *ItemFieldUpdateOne {
+ ifuo.mutation.Where(ps...)
+ return ifuo
+}
+
// Select allows selecting one or more fields (columns) of the returned entity.
// The default is selecting all fields defined in the entity schema.
func (ifuo *ItemFieldUpdateOne) Select(field string, fields ...string) *ItemFieldUpdateOne {
@@ -561,16 +558,7 @@ func (ifuo *ItemFieldUpdateOne) sqlSave(ctx context.Context) (_node *ItemField,
if err := ifuo.check(); err != nil {
return _node, err
}
- _spec := &sqlgraph.UpdateSpec{
- Node: &sqlgraph.NodeSpec{
- Table: itemfield.Table,
- Columns: itemfield.Columns,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: itemfield.FieldID,
- },
- },
- }
+ _spec := sqlgraph.NewUpdateSpec(itemfield.Table, itemfield.Columns, sqlgraph.NewFieldSpec(itemfield.FieldID, field.TypeUUID))
id, ok := ifuo.mutation.ID()
if !ok {
return nil, &ValidationError{Name: "id", err: errors.New(`ent: missing "ItemField.id" for update`)}
diff --git a/backend/internal/data/ent/label.go b/backend/internal/data/ent/label.go
index 22d53706..945b597b 100644
--- a/backend/internal/data/ent/label.go
+++ b/backend/internal/data/ent/label.go
@@ -196,9 +196,3 @@ func (l *Label) String() string {
// Labels is a parsable slice of Label.
type Labels []*Label
-
-func (l Labels) config(cfg config) {
- for _i := range l {
- l[_i].config = cfg
- }
-}
diff --git a/backend/internal/data/ent/label_create.go b/backend/internal/data/ent/label_create.go
index a9d8649e..8df29032 100644
--- a/backend/internal/data/ent/label_create.go
+++ b/backend/internal/data/ent/label_create.go
@@ -232,13 +232,7 @@ func (lc *LabelCreate) sqlSave(ctx context.Context) (*Label, error) {
func (lc *LabelCreate) createSpec() (*Label, *sqlgraph.CreateSpec) {
var (
_node = &Label{config: lc.config}
- _spec = &sqlgraph.CreateSpec{
- Table: label.Table,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: label.FieldID,
- },
- }
+ _spec = sqlgraph.NewCreateSpec(label.Table, sqlgraph.NewFieldSpec(label.FieldID, field.TypeUUID))
)
if id, ok := lc.mutation.ID(); ok {
_node.ID = id
diff --git a/backend/internal/data/ent/label_delete.go b/backend/internal/data/ent/label_delete.go
index bd869cd8..2f6e2512 100644
--- a/backend/internal/data/ent/label_delete.go
+++ b/backend/internal/data/ent/label_delete.go
@@ -40,15 +40,7 @@ func (ld *LabelDelete) ExecX(ctx context.Context) int {
}
func (ld *LabelDelete) sqlExec(ctx context.Context) (int, error) {
- _spec := &sqlgraph.DeleteSpec{
- Node: &sqlgraph.NodeSpec{
- Table: label.Table,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: label.FieldID,
- },
- },
- }
+ _spec := sqlgraph.NewDeleteSpec(label.Table, sqlgraph.NewFieldSpec(label.FieldID, field.TypeUUID))
if ps := ld.mutation.predicates; len(ps) > 0 {
_spec.Predicate = func(selector *sql.Selector) {
for i := range ps {
diff --git a/backend/internal/data/ent/label_query.go b/backend/internal/data/ent/label_query.go
index ec6165e1..925641b7 100644
--- a/backend/internal/data/ent/label_query.go
+++ b/backend/internal/data/ent/label_query.go
@@ -228,10 +228,12 @@ func (lq *LabelQuery) AllX(ctx context.Context) []*Label {
}
// IDs executes the query and returns a list of Label IDs.
-func (lq *LabelQuery) IDs(ctx context.Context) ([]uuid.UUID, error) {
- var ids []uuid.UUID
+func (lq *LabelQuery) IDs(ctx context.Context) (ids []uuid.UUID, err error) {
+ if lq.ctx.Unique == nil && lq.path != nil {
+ lq.Unique(true)
+ }
ctx = setContextOp(ctx, lq.ctx, "IDs")
- if err := lq.Select(label.FieldID).Scan(ctx, &ids); err != nil {
+ if err = lq.Select(label.FieldID).Scan(ctx, &ids); err != nil {
return nil, err
}
return ids, nil
@@ -556,20 +558,12 @@ func (lq *LabelQuery) sqlCount(ctx context.Context) (int, error) {
}
func (lq *LabelQuery) querySpec() *sqlgraph.QuerySpec {
- _spec := &sqlgraph.QuerySpec{
- Node: &sqlgraph.NodeSpec{
- Table: label.Table,
- Columns: label.Columns,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: label.FieldID,
- },
- },
- From: lq.sql,
- Unique: true,
- }
+ _spec := sqlgraph.NewQuerySpec(label.Table, label.Columns, sqlgraph.NewFieldSpec(label.FieldID, field.TypeUUID))
+ _spec.From = lq.sql
if unique := lq.ctx.Unique; unique != nil {
_spec.Unique = *unique
+ } else if lq.path != nil {
+ _spec.Unique = true
}
if fields := lq.ctx.Fields; len(fields) > 0 {
_spec.Node.Columns = make([]string, 0, len(fields))
diff --git a/backend/internal/data/ent/label_update.go b/backend/internal/data/ent/label_update.go
index 5b40eb2a..57464ff5 100644
--- a/backend/internal/data/ent/label_update.go
+++ b/backend/internal/data/ent/label_update.go
@@ -204,16 +204,7 @@ func (lu *LabelUpdate) sqlSave(ctx context.Context) (n int, err error) {
if err := lu.check(); err != nil {
return n, err
}
- _spec := &sqlgraph.UpdateSpec{
- Node: &sqlgraph.NodeSpec{
- Table: label.Table,
- Columns: label.Columns,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: label.FieldID,
- },
- },
- }
+ _spec := sqlgraph.NewUpdateSpec(label.Table, label.Columns, sqlgraph.NewFieldSpec(label.FieldID, field.TypeUUID))
if ps := lu.mutation.predicates; len(ps) > 0 {
_spec.Predicate = func(selector *sql.Selector) {
for i := range ps {
@@ -458,6 +449,12 @@ func (luo *LabelUpdateOne) RemoveItems(i ...*Item) *LabelUpdateOne {
return luo.RemoveItemIDs(ids...)
}
+// Where appends a list predicates to the LabelUpdate builder.
+func (luo *LabelUpdateOne) Where(ps ...predicate.Label) *LabelUpdateOne {
+ luo.mutation.Where(ps...)
+ return luo
+}
+
// Select allows selecting one or more fields (columns) of the returned entity.
// The default is selecting all fields defined in the entity schema.
func (luo *LabelUpdateOne) Select(field string, fields ...string) *LabelUpdateOne {
@@ -528,16 +525,7 @@ func (luo *LabelUpdateOne) sqlSave(ctx context.Context) (_node *Label, err error
if err := luo.check(); err != nil {
return _node, err
}
- _spec := &sqlgraph.UpdateSpec{
- Node: &sqlgraph.NodeSpec{
- Table: label.Table,
- Columns: label.Columns,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: label.FieldID,
- },
- },
- }
+ _spec := sqlgraph.NewUpdateSpec(label.Table, label.Columns, sqlgraph.NewFieldSpec(label.FieldID, field.TypeUUID))
id, ok := luo.mutation.ID()
if !ok {
return nil, &ValidationError{Name: "id", err: errors.New(`ent: missing "Label.id" for update`)}
diff --git a/backend/internal/data/ent/location.go b/backend/internal/data/ent/location.go
index 0ac5d004..002cfb25 100644
--- a/backend/internal/data/ent/location.go
+++ b/backend/internal/data/ent/location.go
@@ -231,9 +231,3 @@ func (l *Location) String() string {
// Locations is a parsable slice of Location.
type Locations []*Location
-
-func (l Locations) config(cfg config) {
- for _i := range l {
- l[_i].config = cfg
- }
-}
diff --git a/backend/internal/data/ent/location_create.go b/backend/internal/data/ent/location_create.go
index 72618cf0..2fade306 100644
--- a/backend/internal/data/ent/location_create.go
+++ b/backend/internal/data/ent/location_create.go
@@ -247,13 +247,7 @@ func (lc *LocationCreate) sqlSave(ctx context.Context) (*Location, error) {
func (lc *LocationCreate) createSpec() (*Location, *sqlgraph.CreateSpec) {
var (
_node = &Location{config: lc.config}
- _spec = &sqlgraph.CreateSpec{
- Table: location.Table,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: location.FieldID,
- },
- }
+ _spec = sqlgraph.NewCreateSpec(location.Table, sqlgraph.NewFieldSpec(location.FieldID, field.TypeUUID))
)
if id, ok := lc.mutation.ID(); ok {
_node.ID = id
diff --git a/backend/internal/data/ent/location_delete.go b/backend/internal/data/ent/location_delete.go
index 24e0ff50..67a2adc6 100644
--- a/backend/internal/data/ent/location_delete.go
+++ b/backend/internal/data/ent/location_delete.go
@@ -40,15 +40,7 @@ func (ld *LocationDelete) ExecX(ctx context.Context) int {
}
func (ld *LocationDelete) sqlExec(ctx context.Context) (int, error) {
- _spec := &sqlgraph.DeleteSpec{
- Node: &sqlgraph.NodeSpec{
- Table: location.Table,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: location.FieldID,
- },
- },
- }
+ _spec := sqlgraph.NewDeleteSpec(location.Table, sqlgraph.NewFieldSpec(location.FieldID, field.TypeUUID))
if ps := ld.mutation.predicates; len(ps) > 0 {
_spec.Predicate = func(selector *sql.Selector) {
for i := range ps {
diff --git a/backend/internal/data/ent/location_query.go b/backend/internal/data/ent/location_query.go
index 5b8647de..916215b8 100644
--- a/backend/internal/data/ent/location_query.go
+++ b/backend/internal/data/ent/location_query.go
@@ -274,10 +274,12 @@ func (lq *LocationQuery) AllX(ctx context.Context) []*Location {
}
// IDs executes the query and returns a list of Location IDs.
-func (lq *LocationQuery) IDs(ctx context.Context) ([]uuid.UUID, error) {
- var ids []uuid.UUID
+func (lq *LocationQuery) IDs(ctx context.Context) (ids []uuid.UUID, err error) {
+ if lq.ctx.Unique == nil && lq.path != nil {
+ lq.Unique(true)
+ }
ctx = setContextOp(ctx, lq.ctx, "IDs")
- if err := lq.Select(location.FieldID).Scan(ctx, &ids); err != nil {
+ if err = lq.Select(location.FieldID).Scan(ctx, &ids); err != nil {
return nil, err
}
return ids, nil
@@ -674,20 +676,12 @@ func (lq *LocationQuery) sqlCount(ctx context.Context) (int, error) {
}
func (lq *LocationQuery) querySpec() *sqlgraph.QuerySpec {
- _spec := &sqlgraph.QuerySpec{
- Node: &sqlgraph.NodeSpec{
- Table: location.Table,
- Columns: location.Columns,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: location.FieldID,
- },
- },
- From: lq.sql,
- Unique: true,
- }
+ _spec := sqlgraph.NewQuerySpec(location.Table, location.Columns, sqlgraph.NewFieldSpec(location.FieldID, field.TypeUUID))
+ _spec.From = lq.sql
if unique := lq.ctx.Unique; unique != nil {
_spec.Unique = *unique
+ } else if lq.path != nil {
+ _spec.Unique = true
}
if fields := lq.ctx.Fields; len(fields) > 0 {
_spec.Node.Columns = make([]string, 0, len(fields))
diff --git a/backend/internal/data/ent/location_update.go b/backend/internal/data/ent/location_update.go
index 6833208e..b67f7e4e 100644
--- a/backend/internal/data/ent/location_update.go
+++ b/backend/internal/data/ent/location_update.go
@@ -240,16 +240,7 @@ func (lu *LocationUpdate) sqlSave(ctx context.Context) (n int, err error) {
if err := lu.check(); err != nil {
return n, err
}
- _spec := &sqlgraph.UpdateSpec{
- Node: &sqlgraph.NodeSpec{
- Table: location.Table,
- Columns: location.Columns,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: location.FieldID,
- },
- },
- }
+ _spec := sqlgraph.NewUpdateSpec(location.Table, location.Columns, sqlgraph.NewFieldSpec(location.FieldID, field.TypeUUID))
if ps := lu.mutation.predicates; len(ps) > 0 {
_spec.Predicate = func(selector *sql.Selector) {
for i := range ps {
@@ -618,6 +609,12 @@ func (luo *LocationUpdateOne) RemoveItems(i ...*Item) *LocationUpdateOne {
return luo.RemoveItemIDs(ids...)
}
+// Where appends a list predicates to the LocationUpdate builder.
+func (luo *LocationUpdateOne) Where(ps ...predicate.Location) *LocationUpdateOne {
+ luo.mutation.Where(ps...)
+ return luo
+}
+
// Select allows selecting one or more fields (columns) of the returned entity.
// The default is selecting all fields defined in the entity schema.
func (luo *LocationUpdateOne) Select(field string, fields ...string) *LocationUpdateOne {
@@ -683,16 +680,7 @@ func (luo *LocationUpdateOne) sqlSave(ctx context.Context) (_node *Location, err
if err := luo.check(); err != nil {
return _node, err
}
- _spec := &sqlgraph.UpdateSpec{
- Node: &sqlgraph.NodeSpec{
- Table: location.Table,
- Columns: location.Columns,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: location.FieldID,
- },
- },
- }
+ _spec := sqlgraph.NewUpdateSpec(location.Table, location.Columns, sqlgraph.NewFieldSpec(location.FieldID, field.TypeUUID))
id, ok := luo.mutation.ID()
if !ok {
return nil, &ValidationError{Name: "id", err: errors.New(`ent: missing "Location.id" for update`)}
diff --git a/backend/internal/data/ent/maintenanceentry.go b/backend/internal/data/ent/maintenanceentry.go
index c0f6a4ef..b571bcef 100644
--- a/backend/internal/data/ent/maintenanceentry.go
+++ b/backend/internal/data/ent/maintenanceentry.go
@@ -194,9 +194,3 @@ func (me *MaintenanceEntry) String() string {
// MaintenanceEntries is a parsable slice of MaintenanceEntry.
type MaintenanceEntries []*MaintenanceEntry
-
-func (me MaintenanceEntries) config(cfg config) {
- for _i := range me {
- me[_i].config = cfg
- }
-}
diff --git a/backend/internal/data/ent/maintenanceentry_create.go b/backend/internal/data/ent/maintenanceentry_create.go
index a7a6a944..ef5602ba 100644
--- a/backend/internal/data/ent/maintenanceentry_create.go
+++ b/backend/internal/data/ent/maintenanceentry_create.go
@@ -242,13 +242,7 @@ func (mec *MaintenanceEntryCreate) sqlSave(ctx context.Context) (*MaintenanceEnt
func (mec *MaintenanceEntryCreate) createSpec() (*MaintenanceEntry, *sqlgraph.CreateSpec) {
var (
_node = &MaintenanceEntry{config: mec.config}
- _spec = &sqlgraph.CreateSpec{
- Table: maintenanceentry.Table,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: maintenanceentry.FieldID,
- },
- }
+ _spec = sqlgraph.NewCreateSpec(maintenanceentry.Table, sqlgraph.NewFieldSpec(maintenanceentry.FieldID, field.TypeUUID))
)
if id, ok := mec.mutation.ID(); ok {
_node.ID = id
diff --git a/backend/internal/data/ent/maintenanceentry_delete.go b/backend/internal/data/ent/maintenanceentry_delete.go
index cdfe4805..d65ed8b2 100644
--- a/backend/internal/data/ent/maintenanceentry_delete.go
+++ b/backend/internal/data/ent/maintenanceentry_delete.go
@@ -40,15 +40,7 @@ func (med *MaintenanceEntryDelete) ExecX(ctx context.Context) int {
}
func (med *MaintenanceEntryDelete) sqlExec(ctx context.Context) (int, error) {
- _spec := &sqlgraph.DeleteSpec{
- Node: &sqlgraph.NodeSpec{
- Table: maintenanceentry.Table,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: maintenanceentry.FieldID,
- },
- },
- }
+ _spec := sqlgraph.NewDeleteSpec(maintenanceentry.Table, sqlgraph.NewFieldSpec(maintenanceentry.FieldID, field.TypeUUID))
if ps := med.mutation.predicates; len(ps) > 0 {
_spec.Predicate = func(selector *sql.Selector) {
for i := range ps {
diff --git a/backend/internal/data/ent/maintenanceentry_query.go b/backend/internal/data/ent/maintenanceentry_query.go
index 114f8d94..52c85049 100644
--- a/backend/internal/data/ent/maintenanceentry_query.go
+++ b/backend/internal/data/ent/maintenanceentry_query.go
@@ -202,10 +202,12 @@ func (meq *MaintenanceEntryQuery) AllX(ctx context.Context) []*MaintenanceEntry
}
// IDs executes the query and returns a list of MaintenanceEntry IDs.
-func (meq *MaintenanceEntryQuery) IDs(ctx context.Context) ([]uuid.UUID, error) {
- var ids []uuid.UUID
+func (meq *MaintenanceEntryQuery) IDs(ctx context.Context) (ids []uuid.UUID, err error) {
+ if meq.ctx.Unique == nil && meq.path != nil {
+ meq.Unique(true)
+ }
ctx = setContextOp(ctx, meq.ctx, "IDs")
- if err := meq.Select(maintenanceentry.FieldID).Scan(ctx, &ids); err != nil {
+ if err = meq.Select(maintenanceentry.FieldID).Scan(ctx, &ids); err != nil {
return nil, err
}
return ids, nil
@@ -439,20 +441,12 @@ func (meq *MaintenanceEntryQuery) sqlCount(ctx context.Context) (int, error) {
}
func (meq *MaintenanceEntryQuery) querySpec() *sqlgraph.QuerySpec {
- _spec := &sqlgraph.QuerySpec{
- Node: &sqlgraph.NodeSpec{
- Table: maintenanceentry.Table,
- Columns: maintenanceentry.Columns,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: maintenanceentry.FieldID,
- },
- },
- From: meq.sql,
- Unique: true,
- }
+ _spec := sqlgraph.NewQuerySpec(maintenanceentry.Table, maintenanceentry.Columns, sqlgraph.NewFieldSpec(maintenanceentry.FieldID, field.TypeUUID))
+ _spec.From = meq.sql
if unique := meq.ctx.Unique; unique != nil {
_spec.Unique = *unique
+ } else if meq.path != nil {
+ _spec.Unique = true
}
if fields := meq.ctx.Fields; len(fields) > 0 {
_spec.Node.Columns = make([]string, 0, len(fields))
diff --git a/backend/internal/data/ent/maintenanceentry_update.go b/backend/internal/data/ent/maintenanceentry_update.go
index d4c3ee34..cade06ba 100644
--- a/backend/internal/data/ent/maintenanceentry_update.go
+++ b/backend/internal/data/ent/maintenanceentry_update.go
@@ -177,16 +177,7 @@ func (meu *MaintenanceEntryUpdate) sqlSave(ctx context.Context) (n int, err erro
if err := meu.check(); err != nil {
return n, err
}
- _spec := &sqlgraph.UpdateSpec{
- Node: &sqlgraph.NodeSpec{
- Table: maintenanceentry.Table,
- Columns: maintenanceentry.Columns,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: maintenanceentry.FieldID,
- },
- },
- }
+ _spec := sqlgraph.NewUpdateSpec(maintenanceentry.Table, maintenanceentry.Columns, sqlgraph.NewFieldSpec(maintenanceentry.FieldID, field.TypeUUID))
if ps := meu.mutation.predicates; len(ps) > 0 {
_spec.Predicate = func(selector *sql.Selector) {
for i := range ps {
@@ -359,6 +350,12 @@ func (meuo *MaintenanceEntryUpdateOne) ClearItem() *MaintenanceEntryUpdateOne {
return meuo
}
+// Where appends a list predicates to the MaintenanceEntryUpdate builder.
+func (meuo *MaintenanceEntryUpdateOne) Where(ps ...predicate.MaintenanceEntry) *MaintenanceEntryUpdateOne {
+ meuo.mutation.Where(ps...)
+ return meuo
+}
+
// Select allows selecting one or more fields (columns) of the returned entity.
// The default is selecting all fields defined in the entity schema.
func (meuo *MaintenanceEntryUpdateOne) Select(field string, fields ...string) *MaintenanceEntryUpdateOne {
@@ -424,16 +421,7 @@ func (meuo *MaintenanceEntryUpdateOne) sqlSave(ctx context.Context) (_node *Main
if err := meuo.check(); err != nil {
return _node, err
}
- _spec := &sqlgraph.UpdateSpec{
- Node: &sqlgraph.NodeSpec{
- Table: maintenanceentry.Table,
- Columns: maintenanceentry.Columns,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: maintenanceentry.FieldID,
- },
- },
- }
+ _spec := sqlgraph.NewUpdateSpec(maintenanceentry.Table, maintenanceentry.Columns, sqlgraph.NewFieldSpec(maintenanceentry.FieldID, field.TypeUUID))
id, ok := meuo.mutation.ID()
if !ok {
return nil, &ValidationError{Name: "id", err: errors.New(`ent: missing "MaintenanceEntry.id" for update`)}
diff --git a/backend/internal/data/ent/runtime/runtime.go b/backend/internal/data/ent/runtime/runtime.go
index 84a815f1..f6cb4c1a 100644
--- a/backend/internal/data/ent/runtime/runtime.go
+++ b/backend/internal/data/ent/runtime/runtime.go
@@ -5,6 +5,6 @@ package runtime
// The schema-stitching logic is generated in github.com/hay-kot/homebox/backend/internal/data/ent/runtime.go
const (
- Version = "v0.11.7" // Version of ent codegen.
- Sum = "h1:V+wKFh0jhAbY/FoU+PPbdMOf2Ma5vh07R/IdF+N/nFg=" // Sum of ent codegen.
+ Version = "v0.11.8" // Version of ent codegen.
+ Sum = "h1:M/M0QL1CYCUSdqGRXUrXhFYSDRJPsOOrr+RLEej/gyQ=" // Sum of ent codegen.
)
diff --git a/backend/internal/data/ent/user.go b/backend/internal/data/ent/user.go
index cd4709b7..97a92793 100644
--- a/backend/internal/data/ent/user.go
+++ b/backend/internal/data/ent/user.go
@@ -241,9 +241,3 @@ func (u *User) String() string {
// Users is a parsable slice of User.
type Users []*User
-
-func (u Users) config(cfg config) {
- for _i := range u {
- u[_i].config = cfg
- }
-}
diff --git a/backend/internal/data/ent/user_create.go b/backend/internal/data/ent/user_create.go
index 367ff07b..3dc703dc 100644
--- a/backend/internal/data/ent/user_create.go
+++ b/backend/internal/data/ent/user_create.go
@@ -304,13 +304,7 @@ func (uc *UserCreate) sqlSave(ctx context.Context) (*User, error) {
func (uc *UserCreate) createSpec() (*User, *sqlgraph.CreateSpec) {
var (
_node = &User{config: uc.config}
- _spec = &sqlgraph.CreateSpec{
- Table: user.Table,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: user.FieldID,
- },
- }
+ _spec = sqlgraph.NewCreateSpec(user.Table, sqlgraph.NewFieldSpec(user.FieldID, field.TypeUUID))
)
if id, ok := uc.mutation.ID(); ok {
_node.ID = id
diff --git a/backend/internal/data/ent/user_delete.go b/backend/internal/data/ent/user_delete.go
index 0f2d0661..4e38aab8 100644
--- a/backend/internal/data/ent/user_delete.go
+++ b/backend/internal/data/ent/user_delete.go
@@ -40,15 +40,7 @@ func (ud *UserDelete) ExecX(ctx context.Context) int {
}
func (ud *UserDelete) sqlExec(ctx context.Context) (int, error) {
- _spec := &sqlgraph.DeleteSpec{
- Node: &sqlgraph.NodeSpec{
- Table: user.Table,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: user.FieldID,
- },
- },
- }
+ _spec := sqlgraph.NewDeleteSpec(user.Table, sqlgraph.NewFieldSpec(user.FieldID, field.TypeUUID))
if ps := ud.mutation.predicates; len(ps) > 0 {
_spec.Predicate = func(selector *sql.Selector) {
for i := range ps {
diff --git a/backend/internal/data/ent/user_query.go b/backend/internal/data/ent/user_query.go
index 151b5cbe..a722f2e5 100644
--- a/backend/internal/data/ent/user_query.go
+++ b/backend/internal/data/ent/user_query.go
@@ -228,10 +228,12 @@ func (uq *UserQuery) AllX(ctx context.Context) []*User {
}
// IDs executes the query and returns a list of User IDs.
-func (uq *UserQuery) IDs(ctx context.Context) ([]uuid.UUID, error) {
- var ids []uuid.UUID
+func (uq *UserQuery) IDs(ctx context.Context) (ids []uuid.UUID, err error) {
+ if uq.ctx.Unique == nil && uq.path != nil {
+ uq.Unique(true)
+ }
ctx = setContextOp(ctx, uq.ctx, "IDs")
- if err := uq.Select(user.FieldID).Scan(ctx, &ids); err != nil {
+ if err = uq.Select(user.FieldID).Scan(ctx, &ids); err != nil {
return nil, err
}
return ids, nil
@@ -526,20 +528,12 @@ func (uq *UserQuery) sqlCount(ctx context.Context) (int, error) {
}
func (uq *UserQuery) querySpec() *sqlgraph.QuerySpec {
- _spec := &sqlgraph.QuerySpec{
- Node: &sqlgraph.NodeSpec{
- Table: user.Table,
- Columns: user.Columns,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: user.FieldID,
- },
- },
- From: uq.sql,
- Unique: true,
- }
+ _spec := sqlgraph.NewQuerySpec(user.Table, user.Columns, sqlgraph.NewFieldSpec(user.FieldID, field.TypeUUID))
+ _spec.From = uq.sql
if unique := uq.ctx.Unique; unique != nil {
_spec.Unique = *unique
+ } else if uq.path != nil {
+ _spec.Unique = true
}
if fields := uq.ctx.Fields; len(fields) > 0 {
_spec.Node.Columns = make([]string, 0, len(fields))
diff --git a/backend/internal/data/ent/user_update.go b/backend/internal/data/ent/user_update.go
index f453d371..4bb0296e 100644
--- a/backend/internal/data/ent/user_update.go
+++ b/backend/internal/data/ent/user_update.go
@@ -243,16 +243,7 @@ func (uu *UserUpdate) sqlSave(ctx context.Context) (n int, err error) {
if err := uu.check(); err != nil {
return n, err
}
- _spec := &sqlgraph.UpdateSpec{
- Node: &sqlgraph.NodeSpec{
- Table: user.Table,
- Columns: user.Columns,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: user.FieldID,
- },
- },
- }
+ _spec := sqlgraph.NewUpdateSpec(user.Table, user.Columns, sqlgraph.NewFieldSpec(user.FieldID, field.TypeUUID))
if ps := uu.mutation.predicates; len(ps) > 0 {
_spec.Predicate = func(selector *sql.Selector) {
for i := range ps {
@@ -540,6 +531,12 @@ func (uuo *UserUpdateOne) RemoveAuthTokens(a ...*AuthTokens) *UserUpdateOne {
return uuo.RemoveAuthTokenIDs(ids...)
}
+// Where appends a list predicates to the UserUpdate builder.
+func (uuo *UserUpdateOne) Where(ps ...predicate.User) *UserUpdateOne {
+ uuo.mutation.Where(ps...)
+ return uuo
+}
+
// Select allows selecting one or more fields (columns) of the returned entity.
// The default is selecting all fields defined in the entity schema.
func (uuo *UserUpdateOne) Select(field string, fields ...string) *UserUpdateOne {
@@ -615,16 +612,7 @@ func (uuo *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error)
if err := uuo.check(); err != nil {
return _node, err
}
- _spec := &sqlgraph.UpdateSpec{
- Node: &sqlgraph.NodeSpec{
- Table: user.Table,
- Columns: user.Columns,
- ID: &sqlgraph.FieldSpec{
- Type: field.TypeUUID,
- Column: user.FieldID,
- },
- },
- }
+ _spec := sqlgraph.NewUpdateSpec(user.Table, user.Columns, sqlgraph.NewFieldSpec(user.FieldID, field.TypeUUID))
id, ok := uuo.mutation.ID()
if !ok {
return nil, &ValidationError{Name: "id", err: errors.New(`ent: missing "User.id" for update`)}
diff --git a/backend/internal/data/migrations/migrations.go b/backend/internal/data/migrations/migrations.go
index fba84c59..d477df9a 100644
--- a/backend/internal/data/migrations/migrations.go
+++ b/backend/internal/data/migrations/migrations.go
@@ -13,7 +13,7 @@ var Files embed.FS
// It returns an error and a cleanup function. The cleanup function
// should be called when the migrations are no longer needed.
func Write(temp string) error {
- err := os.MkdirAll(temp, 0755)
+ err := os.MkdirAll(temp, 0o755)
if err != nil {
return err
}
@@ -33,7 +33,7 @@ func Write(temp string) error {
return err
}
- err = os.WriteFile(filepath.Join(temp, f.Name()), b, 0644)
+ err = os.WriteFile(filepath.Join(temp, f.Name()), b, 0o644)
if err != nil {
return err
}
diff --git a/backend/internal/data/repo/repo_documents.go b/backend/internal/data/repo/repo_documents.go
index abe340d9..587a4f19 100644
--- a/backend/internal/data/repo/repo_documents.go
+++ b/backend/internal/data/repo/repo_documents.go
@@ -14,9 +14,7 @@ import (
"github.com/hay-kot/homebox/backend/pkgs/pathlib"
)
-var (
- ErrInvalidDocExtension = errors.New("invalid document extension")
-)
+var ErrInvalidDocExtension = errors.New("invalid document extension")
type DocumentRepository struct {
db *ent.Client
@@ -74,7 +72,7 @@ func (r *DocumentRepository) Create(ctx context.Context, gid uuid.UUID, doc Docu
path := r.path(gid, ext)
parent := filepath.Dir(path)
- err := os.MkdirAll(parent, 0755)
+ err := os.MkdirAll(parent, 0o755)
if err != nil {
return DocumentOut{}, err
}
diff --git a/backend/internal/data/repo/repo_documents_test.go b/backend/internal/data/repo/repo_documents_test.go
index b58b3bb0..2a22facc 100644
--- a/backend/internal/data/repo/repo_documents_test.go
+++ b/backend/internal/data/repo/repo_documents_test.go
@@ -34,7 +34,6 @@ func useDocs(t *testing.T, num int) []DocumentOut {
t.Cleanup(func() {
for _, id := range ids {
err := tRepos.Docs.Delete(context.Background(), id)
-
if err != nil {
assert.True(t, ent.IsNotFound(err))
}
diff --git a/backend/internal/data/repo/repo_group.go b/backend/internal/data/repo/repo_group.go
index 8e5ea148..678130c0 100644
--- a/backend/internal/data/repo/repo_group.go
+++ b/backend/internal/data/repo/repo_group.go
@@ -76,9 +76,7 @@ type (
}
)
-var (
- mapToGroupErr = mapTErrFunc(mapToGroup)
-)
+var mapToGroupErr = mapTErrFunc(mapToGroup)
func mapToGroup(g *ent.Group) Group {
return Group{
@@ -90,9 +88,7 @@ func mapToGroup(g *ent.Group) Group {
}
}
-var (
- mapToGroupInvitationErr = mapTErrFunc(mapToGroupInvitation)
-)
+var mapToGroupInvitationErr = mapTErrFunc(mapToGroupInvitation)
func mapToGroupInvitation(g *ent.GroupInvitationToken) GroupInvitation {
return GroupInvitation{
@@ -118,7 +114,6 @@ func (r *GroupRepository) StatsLocationsByPurchasePrice(ctx context.Context, GID
return sql.As(sql.Sum(t.C(item.FieldPurchasePrice)), "total")
}).
Scan(ctx, &v)
-
if err != nil {
return nil, err
}
@@ -145,7 +140,6 @@ func (r *GroupRepository) StatsLabelsByPurchasePrice(ctx context.Context, GID uu
return sql.As(sql.Sum(itemTable.C(item.FieldPurchasePrice)), "total")
}).
Scan(ctx, &v)
-
if err != nil {
return nil, err
}
@@ -283,7 +277,6 @@ func (r *GroupRepository) InvitationCreate(ctx context.Context, groupID uuid.UUI
SetExpiresAt(invite.ExpiresAt).
SetUses(invite.Uses).
Save(ctx)
-
if err != nil {
return GroupInvitation{}, err
}
diff --git a/backend/internal/data/repo/repo_item_attachments.go b/backend/internal/data/repo/repo_item_attachments.go
index 1e2ef7b0..a034369c 100644
--- a/backend/internal/data/repo/repo_item_attachments.go
+++ b/backend/internal/data/repo/repo_item_attachments.go
@@ -68,7 +68,6 @@ func (r *AttachmentRepo) Update(ctx context.Context, itemId uuid.UUID, typ attac
itm, err := r.db.Attachment.UpdateOneID(itemId).
SetType(typ).
Save(ctx)
-
if err != nil {
return nil, err
}
diff --git a/backend/internal/data/repo/repo_item_attachments_test.go b/backend/internal/data/repo/repo_item_attachments_test.go
index 15f70c8e..4c9d77d2 100644
--- a/backend/internal/data/repo/repo_item_attachments_test.go
+++ b/backend/internal/data/repo/repo_item_attachments_test.go
@@ -58,7 +58,6 @@ func TestAttachmentRepo_Create(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
-
got, err := tRepos.Attachments.Create(tt.args.ctx, tt.args.itemId, tt.args.docId, tt.args.typ)
if (err != nil) != tt.wantErr {
t.Errorf("AttachmentRepo.Create() error = %v, wantErr %v", err, tt.wantErr)
@@ -119,7 +118,6 @@ func TestAttachmentRepo_Update(t *testing.T) {
assert.Equal(t, typ, updated.Type)
})
}
-
}
func TestAttachmentRepo_Delete(t *testing.T) {
diff --git a/backend/internal/data/repo/repo_items.go b/backend/internal/data/repo/repo_items.go
index 4b67b970..5e735650 100644
--- a/backend/internal/data/repo/repo_items.go
+++ b/backend/internal/data/repo/repo_items.go
@@ -45,7 +45,7 @@ type (
TextValue string `json:"textValue"`
NumberValue int `json:"numberValue"`
BooleanValue bool `json:"booleanValue"`
- TimeValue time.Time `json:"timeValue,omitempty"`
+ // TimeValue time.Time `json:"timeValue,omitempty"`
}
ItemCreate struct {
@@ -150,9 +150,7 @@ type (
}
)
-var (
- mapItemsSummaryErr = mapTEachErrFunc(mapItemSummary)
-)
+var mapItemsSummaryErr = mapTEachErrFunc(mapItemSummary)
func mapItemSummary(item *ent.Item) ItemSummary {
var location *LocationSummary
@@ -200,7 +198,7 @@ func mapFields(fields []*ent.ItemField) []ItemField {
TextValue: f.TextValue,
NumberValue: f.NumberValue,
BooleanValue: f.BooleanValue,
- TimeValue: f.TimeValue,
+ // TimeValue: f.TimeValue,
}
}
return result
@@ -371,7 +369,6 @@ func (e *ItemsRepository) QueryByGroup(ctx context.Context, gid uuid.UUID, q Ite
}
count, err := qb.Count(ctx)
-
if err != nil {
return PaginationResult[ItemSummary]{}, err
}
@@ -387,7 +384,6 @@ func (e *ItemsRepository) QueryByGroup(ctx context.Context, gid uuid.UUID, q Ite
}
items, err := mapItemsSummaryErr(qb.All(ctx))
-
if err != nil {
return PaginationResult[ItemSummary]{}, err
}
@@ -398,7 +394,6 @@ func (e *ItemsRepository) QueryByGroup(ctx context.Context, gid uuid.UUID, q Ite
Total: count,
Items: items,
}, nil
-
}
// QueryByAssetID returns items by asset ID. If the item does not exist, an error is returned.
@@ -422,7 +417,6 @@ func (e *ItemsRepository) QueryByAssetID(ctx context.Context, gid uuid.UUID, ass
WithLocation().
All(ctx),
)
-
if err != nil {
return PaginationResult[ItemSummary]{}, err
}
@@ -441,6 +435,7 @@ func (e *ItemsRepository) GetAll(ctx context.Context, gid uuid.UUID) ([]ItemOut,
Where(item.HasGroupWith(group.ID(gid))).
WithLabel().
WithLocation().
+ WithFields().
All(ctx))
}
@@ -590,7 +585,7 @@ func (e *ItemsRepository) UpdateByGroup(ctx context.Context, GID uuid.UUID, data
SetTextValue(f.TextValue).
SetNumberValue(f.NumberValue).
SetBooleanValue(f.BooleanValue).
- SetTimeValue(f.TimeValue).
+ // SetTimeValue(f.TimeValue).
Save(ctx)
if err != nil {
return ItemOut{}, err
@@ -606,8 +601,8 @@ func (e *ItemsRepository) UpdateByGroup(ctx context.Context, GID uuid.UUID, data
SetName(f.Name).
SetTextValue(f.TextValue).
SetNumberValue(f.NumberValue).
- SetBooleanValue(f.BooleanValue).
- SetTimeValue(f.TimeValue)
+ SetBooleanValue(f.BooleanValue)
+ // SetTimeValue(f.TimeValue)
_, err = opt.Save(ctx)
if err != nil {
@@ -651,7 +646,6 @@ func (e *ItemsRepository) GetAllCustomFieldValues(ctx context.Context, GID uuid.
Unique(true).
Select(itemfield.FieldTextValue).
Scan(ctx, &values)
-
if err != nil {
return nil, fmt.Errorf("failed to get field values: %w", err)
}
@@ -679,7 +673,6 @@ func (e *ItemsRepository) GetAllCustomFieldNames(ctx context.Context, GID uuid.U
Unique(true).
Select(itemfield.FieldName).
Scan(ctx, &fields)
-
if err != nil {
return nil, fmt.Errorf("failed to get custom fields: %w", err)
}
diff --git a/backend/internal/data/repo/repo_items_test.go b/backend/internal/data/repo/repo_items_test.go
index 32365375..ac2814d8 100644
--- a/backend/internal/data/repo/repo_items_test.go
+++ b/backend/internal/data/repo/repo_items_test.go
@@ -125,7 +125,6 @@ func TestItemsRepository_Create(t *testing.T) {
// Cleanup - Also deletes item
err = tRepos.Locations.Delete(context.Background(), location.ID)
assert.NoError(t, err)
-
}
func TestItemsRepository_Create_Location(t *testing.T) {
@@ -222,7 +221,6 @@ func TestItemsRepository_Update_Labels(t *testing.T) {
}
})
}
-
}
func TestItemsRepository_Update(t *testing.T) {
diff --git a/backend/internal/data/repo/repo_labels.go b/backend/internal/data/repo/repo_labels.go
index 9d5b11aa..a761ef89 100644
--- a/backend/internal/data/repo/repo_labels.go
+++ b/backend/internal/data/repo/repo_labels.go
@@ -100,7 +100,6 @@ func (r *LabelRepository) Create(ctx context.Context, groupdId uuid.UUID, data L
SetColor(data.Color).
SetGroupID(groupdId).
Save(ctx)
-
if err != nil {
return LabelOut{}, err
}
diff --git a/backend/internal/data/repo/repo_locations.go b/backend/internal/data/repo/repo_locations.go
index 4e720084..2d3ea568 100644
--- a/backend/internal/data/repo/repo_locations.go
+++ b/backend/internal/data/repo/repo_locations.go
@@ -62,9 +62,7 @@ func mapLocationSummary(location *ent.Location) LocationSummary {
}
}
-var (
- mapLocationOutErr = mapTErrFunc(mapLocationOut)
-)
+var mapLocationOutErr = mapTErrFunc(mapLocationOut)
func mapLocationOut(location *ent.Location) LocationOut {
var parent *LocationSummary
@@ -181,7 +179,6 @@ func (r *LocationRepository) Create(ctx context.Context, GID uuid.UUID, data Loc
}
location, err := q.Save(ctx)
-
if err != nil {
return LocationOut{}, err
}
@@ -322,7 +319,7 @@ func (lr *LocationRepository) Tree(ctx context.Context, GID uuid.UUID, tq TreeQu
}
func ConvertLocationsToTree(locations []FlatTreeItem) []TreeItem {
- var locationMap = make(map[uuid.UUID]*TreeItem, len(locations))
+ locationMap := make(map[uuid.UUID]*TreeItem, len(locations))
var rootIds []uuid.UUID
diff --git a/backend/internal/data/repo/repo_locations_test.go b/backend/internal/data/repo/repo_locations_test.go
index 1ef22959..0334a42f 100644
--- a/backend/internal/data/repo/repo_locations_test.go
+++ b/backend/internal/data/repo/repo_locations_test.go
@@ -31,7 +31,6 @@ func useLocations(t *testing.T, len int) []LocationOut {
t.Cleanup(func() {
for _, loc := range out {
err := tRepos.Locations.Delete(context.Background(), loc.ID)
-
if err != nil {
assert.True(t, ent.IsNotFound(err))
}
@@ -74,7 +73,6 @@ func TestLocationRepositoryGetAllWithCount(t *testing.T) {
assert.Equal(t, 1, loc.ItemCount)
}
}
-
}
func TestLocationRepository_Create(t *testing.T) {
diff --git a/backend/internal/data/repo/repo_maintenance_entry.go b/backend/internal/data/repo/repo_maintenance_entry.go
index 175bd7e3..5f95e503 100644
--- a/backend/internal/data/repo/repo_maintenance_entry.go
+++ b/backend/internal/data/repo/repo_maintenance_entry.go
@@ -93,7 +93,6 @@ func (r *MaintenanceEntryRepository) GetLog(ctx context.Context, itemID uuid.UUI
Where(maintenanceentry.ItemID(itemID)).
Order(ent.Desc(maintenanceentry.FieldDate)).
All(ctx)
-
if err != nil {
return MaintenanceLog{}, err
}
diff --git a/backend/internal/data/repo/repo_maintenance_entry_test.go b/backend/internal/data/repo/repo_maintenance_entry_test.go
index e3df3d03..bc9f6af4 100644
--- a/backend/internal/data/repo/repo_maintenance_entry_test.go
+++ b/backend/internal/data/repo/repo_maintenance_entry_test.go
@@ -61,7 +61,6 @@ func TestMaintenanceEntryRepository_GetLog(t *testing.T) {
// Get the log for the item
log, err := tRepos.MaintEntry.GetLog(context.Background(), item.ID)
-
if err != nil {
t.Fatalf("failed to get maintenance log: %v", err)
}
diff --git a/backend/internal/data/repo/repo_tokens.go b/backend/internal/data/repo/repo_tokens.go
index 5820227c..7ba982e9 100644
--- a/backend/internal/data/repo/repo_tokens.go
+++ b/backend/internal/data/repo/repo_tokens.go
@@ -42,7 +42,6 @@ func (r *TokenRepository) GetUserFromToken(ctx context.Context, token []byte) (U
QueryUser().
WithGroup().
Only(ctx)
-
if err != nil {
return UserOut{}, err
}
@@ -59,7 +58,6 @@ func (r *TokenRepository) GetRoles(ctx context.Context, token string) (*set.Set[
authtokens.Token(tokenHash),
)).
All(ctx)
-
if err != nil {
return nil, err
}
@@ -80,7 +78,6 @@ func (r *TokenRepository) CreateToken(ctx context.Context, createToken UserAuthT
SetUserID(createToken.UserID).
SetExpiresAt(createToken.ExpiresAt).
Save(ctx)
-
if err != nil {
return UserAuthToken{}, err
}
@@ -90,7 +87,6 @@ func (r *TokenRepository) CreateToken(ctx context.Context, createToken UserAuthT
SetRole(role).
SetToken(dbToken).
Save(ctx)
-
if err != nil {
return UserAuthToken{}, err
}
@@ -115,7 +111,6 @@ func (r *TokenRepository) DeleteToken(ctx context.Context, token []byte) error {
// PurgeExpiredTokens removes all expired tokens from the database
func (r *TokenRepository) PurgeExpiredTokens(ctx context.Context) (int, error) {
tokensDeleted, err := r.db.AuthTokens.Delete().Where(authtokens.ExpiresAtLTE(time.Now())).Exec(ctx)
-
if err != nil {
return 0, err
}
diff --git a/backend/internal/data/repo/repo_users.go b/backend/internal/data/repo/repo_users.go
index 28407f18..03850d69 100644
--- a/backend/internal/data/repo/repo_users.go
+++ b/backend/internal/data/repo/repo_users.go
@@ -123,7 +123,6 @@ func (e *UserRepository) DeleteAll(ctx context.Context) error {
func (e *UserRepository) GetSuperusers(ctx context.Context) ([]*ent.User, error) {
users, err := e.db.User.Query().Where(user.IsSuperuser(true)).All(ctx)
-
if err != nil {
return nil, err
}
diff --git a/backend/internal/data/repo/repo_users_test.go b/backend/internal/data/repo/repo_users_test.go
index 882de1c2..31d27370 100644
--- a/backend/internal/data/repo/repo_users_test.go
+++ b/backend/internal/data/repo/repo_users_test.go
@@ -139,7 +139,6 @@ func TestUserRepo_Delete(t *testing.T) {
allUsers, _ = tRepos.Users.GetAll(ctx)
assert.Equal(t, len(allUsers), 0)
-
}
func TestUserRepo_GetSuperusers(t *testing.T) {
diff --git a/backend/internal/data/types/date.go b/backend/internal/data/types/date.go
index 6aff82f9..0dc09db6 100644
--- a/backend/internal/data/types/date.go
+++ b/backend/internal/data/types/date.go
@@ -1,6 +1,11 @@
package types
-import "time"
+import (
+ "errors"
+ "fmt"
+ "strings"
+ "time"
+)
// Date is a custom type that implements the MarshalJSON interface
// that applies date only formatting to the time.Time fields in order
@@ -34,17 +39,20 @@ func DateFromString(s string) Date {
return Date{}
}
- t, err := time.Parse("2006-01-02", s)
- if err != nil {
- // TODO: Remove - used by legacy importer
- t, err = time.Parse("01/02/2006", s)
+ try := [...]string{
+ "2006-01-02",
+ "01/02/2006",
+ time.RFC3339,
+ }
- if err != nil {
- return Date{}
+ for _, format := range try {
+ t, err := time.Parse(format, s)
+ if err == nil {
+ return DateFromTime(t)
}
}
- return DateFromTime(t)
+ return Date{}
}
func (d Date) String() string {
@@ -63,24 +71,37 @@ func (d Date) MarshalJSON() ([]byte, error) {
return []byte(`"` + d.String() + `"`), nil
}
-func (d *Date) UnmarshalJSON(data []byte) error {
- str := string(data)
- if str == `""` {
+func (d *Date) UnmarshalJSON(data []byte) (err error) {
+ // unescape the string if necessary `\"` -> `"`
+ str := strings.Trim(string(data), "\"")
+ fmt.Printf("str: %q\n", str)
+ if str == "" || str == "null" || str == `""` {
+ println("empty date")
*d = Date{}
return nil
}
- // Try YYYY-MM-DD format
+ try := [...]string{
+ "2006-01-02",
+ "01/02/2006",
+ time.RFC3339,
+ }
+
+ set := false
var t time.Time
- t, err := time.Parse("2006-01-02", str)
- if err != nil {
- // Try default interface
- err = t.UnmarshalJSON(data)
- if err != nil {
- return err
+
+ for _, format := range try {
+ t, err = time.Parse(format, str)
+ if err == nil {
+ set = true
+ break
}
}
+ if !set {
+ return errors.New("invalid date format")
+ }
+
// strip the time and timezone information
*d = DateFromTime(t)
diff --git a/backend/internal/sys/config/conf.go b/backend/internal/sys/config/conf.go
index a7a17f06..c1655c2c 100644
--- a/backend/internal/sys/config/conf.go
+++ b/backend/internal/sys/config/conf.go
@@ -4,10 +4,9 @@ import (
"encoding/json"
"errors"
"fmt"
+ "os"
"github.com/ardanlabs/conf/v3"
-
- "os"
)
const (
@@ -55,7 +54,6 @@ func New() (*Config, error) {
const prefix = "HBOX"
help, err := conf.Parse(prefix, &cfg)
-
if err != nil {
if errors.Is(err, conf.ErrHelpWanted) {
fmt.Println(help)
@@ -71,11 +69,9 @@ func New() (*Config, error) {
// This is useful for debugging. If the marshaller errors out, it will panic.
func (c *Config) Print() {
res, err := json.MarshalIndent(c, "", " ")
-
if err != nil {
panic(err)
}
fmt.Println(string(res))
-
}
diff --git a/backend/internal/sys/config/conf_mailer_test.go b/backend/internal/sys/config/conf_mailer_test.go
index 86567556..6bf7c74f 100644
--- a/backend/internal/sys/config/conf_mailer_test.go
+++ b/backend/internal/sys/config/conf_mailer_test.go
@@ -36,5 +36,4 @@ func Test_MailerReady_Failure(t *testing.T) {
mc.From = "from"
assert.True(t, mc.Ready())
-
}
diff --git a/backend/internal/sys/validate/errors.go b/backend/internal/sys/validate/errors.go
index d08a4480..b5c101ab 100644
--- a/backend/internal/sys/validate/errors.go
+++ b/backend/internal/sys/validate/errors.go
@@ -5,8 +5,7 @@ import (
"errors"
)
-type UnauthorizedError struct {
-}
+type UnauthorizedError struct{}
func (err *UnauthorizedError) Error() string {
return "unauthorized"
diff --git a/backend/internal/sys/validate/validate.go b/backend/internal/sys/validate/validate.go
index ed22c0f5..4a4b7a9a 100644
--- a/backend/internal/sys/validate/validate.go
+++ b/backend/internal/sys/validate/validate.go
@@ -14,7 +14,6 @@ func init() {
// FieldErrors array and returned.
func Check(val any) error {
err := validate.Struct(val)
-
if err != nil {
verrors, ok := err.(validator.ValidationErrors)
if !ok {
diff --git a/backend/internal/web/mid/errors.go b/backend/internal/web/mid/errors.go
index 7aa659c0..dc716c96 100644
--- a/backend/internal/web/mid/errors.go
+++ b/backend/internal/web/mid/errors.go
@@ -13,7 +13,6 @@ func Errors(log zerolog.Logger) server.Middleware {
return func(h server.Handler) server.Handler {
return server.HandlerFunc(func(w http.ResponseWriter, r *http.Request) error {
err := h.ServeHTTP(w, r)
-
if err != nil {
var resp server.ErrorResponse
var code int
diff --git a/backend/internal/web/mid/logger.go b/backend/internal/web/mid/logger.go
index 86b8cdbf..fb39c670 100644
--- a/backend/internal/web/mid/logger.go
+++ b/backend/internal/web/mid/logger.go
@@ -76,7 +76,6 @@ func SugarLogger(log zerolog.Logger) server.Middleware {
return func(next server.Handler) server.Handler {
return server.HandlerFunc(func(w http.ResponseWriter, r *http.Request) error {
-
record := &statusRecorder{ResponseWriter: w, Status: http.StatusOK}
err := next.ServeHTTP(record, r) // Blocks until the next handler returns.
diff --git a/backend/pkgs/faker/random.go b/backend/pkgs/faker/random.go
index 67c71147..e7b51b96 100644
--- a/backend/pkgs/faker/random.go
+++ b/backend/pkgs/faker/random.go
@@ -7,8 +7,7 @@ import (
var letters = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
-type Faker struct {
-}
+type Faker struct{}
func NewFaker() *Faker {
rand.Seed(time.Now().UnixNano())
@@ -20,7 +19,6 @@ func (f *Faker) Time() time.Time {
}
func (f *Faker) Str(length int) string {
-
b := make([]rune, length)
for i := range b {
b[i] = letters[rand.Intn(len(letters))]
diff --git a/backend/pkgs/faker/randoms_test.go b/backend/pkgs/faker/randoms_test.go
index 07732056..c03c5644 100644
--- a/backend/pkgs/faker/randoms_test.go
+++ b/backend/pkgs/faker/randoms_test.go
@@ -20,7 +20,7 @@ func ValidateUnique(values []string) bool {
func Test_GetRandomString(t *testing.T) {
t.Parallel()
// Test that the function returns a string of the correct length
- var generated = make([]string, Loops)
+ generated := make([]string, Loops)
faker := NewFaker()
@@ -36,7 +36,7 @@ func Test_GetRandomString(t *testing.T) {
func Test_GetRandomEmail(t *testing.T) {
t.Parallel()
// Test that the function returns a string of the correct length
- var generated = make([]string, Loops)
+ generated := make([]string, Loops)
faker := NewFaker()
@@ -52,8 +52,8 @@ func Test_GetRandomEmail(t *testing.T) {
func Test_GetRandomBool(t *testing.T) {
t.Parallel()
- var trues = 0
- var falses = 0
+ trues := 0
+ falses := 0
faker := NewFaker()
@@ -91,5 +91,4 @@ func Test_RandomNumber(t *testing.T) {
t.Errorf("RandomNumber() failed to generate a number between %v and %v", MIN, MAX)
}
}
-
}
diff --git a/backend/pkgs/mailer/mailer_test.go b/backend/pkgs/mailer/mailer_test.go
index 87a0b60e..3e67a68f 100644
--- a/backend/pkgs/mailer/mailer_test.go
+++ b/backend/pkgs/mailer/mailer_test.go
@@ -30,14 +30,12 @@ func GetTestMailer() (*Mailer, error) {
}
return mailer, nil
-
}
func Test_Mailer(t *testing.T) {
t.Parallel()
mailer, err := GetTestMailer()
-
if err != nil {
t.Skip("Error Reading Test Mailer Config - Skipping")
}
@@ -47,7 +45,6 @@ func Test_Mailer(t *testing.T) {
}
message, err := RenderWelcome()
-
if err != nil {
t.Error(err)
}
diff --git a/backend/pkgs/mailer/templates.go b/backend/pkgs/mailer/templates.go
index b7984c0f..cc5049f7 100644
--- a/backend/pkgs/mailer/templates.go
+++ b/backend/pkgs/mailer/templates.go
@@ -41,7 +41,6 @@ func DefaultTemplateData() TemplateProps {
func render(tpl string, data TemplateProps) (string, error) {
tmpl, err := template.New("name").Parse(tpl)
-
if err != nil {
return "", err
}
diff --git a/backend/pkgs/server/middleware.go b/backend/pkgs/server/middleware.go
index f24f06bf..8e3bb234 100644
--- a/backend/pkgs/server/middleware.go
+++ b/backend/pkgs/server/middleware.go
@@ -11,7 +11,6 @@ type Middleware func(Handler) Handler
// handler. The middlewares' Handlers will be executed by requests in the order
// they are provided.
func wrapMiddleware(mw []Middleware, handler Handler) Handler {
-
// Loop backwards through the middleware invoking each one. Replace the
// handler with the new wrapped handler. Looping backwards ensures that the
// first middleware of the slice is the first to be executed by requests.
diff --git a/backend/pkgs/server/mux.go b/backend/pkgs/server/mux.go
index 9e77e323..7f62ab73 100644
--- a/backend/pkgs/server/mux.go
+++ b/backend/pkgs/server/mux.go
@@ -40,7 +40,6 @@ func (s *Server) toHttpHandler(handler Handler, mw ...Middleware) http.HandlerFu
})
err := handler.ServeHTTP(w, r.WithContext(ctx))
-
if err != nil {
if IsShutdownError(err) {
_ = s.Shutdown("SIGTERM")
diff --git a/backend/pkgs/server/response_test.go b/backend/pkgs/server/response_test.go
index ef23d602..14e7a378 100644
--- a/backend/pkgs/server/response_test.go
+++ b/backend/pkgs/server/response_test.go
@@ -37,5 +37,4 @@ func Test_Respond_JSON(t *testing.T) {
assert.Equal(t, http.StatusCreated, recorder.Code)
assert.JSONEq(t, recorder.Body.String(), `{"name":"dummy"}`)
assert.Equal(t, "application/json", recorder.Header().Get("Content-Type"))
-
}
diff --git a/backend/pkgs/server/server.go b/backend/pkgs/server/server.go
index 921c5769..d021b315 100644
--- a/backend/pkgs/server/server.go
+++ b/backend/pkgs/server/server.go
@@ -79,7 +79,6 @@ func (s *Server) Shutdown(sig string) error {
s.wg.Wait()
return nil
-
}
func (s *Server) Start() error {
diff --git a/backend/pkgs/server/server_test.go b/backend/pkgs/server/server_test.go
index 95a93fe0..a5cb2183 100644
--- a/backend/pkgs/server/server_test.go
+++ b/backend/pkgs/server/server_test.go
@@ -72,7 +72,6 @@ func Test_GracefulServerShutdownWithWorkers(t *testing.T) {
assert.NoError(t, err)
assert.True(t, isFinished)
-
}
func Test_GracefulServerShutdownWithRequests(t *testing.T) {
diff --git a/backend/pkgs/server/worker.go b/backend/pkgs/server/worker.go
index acd6e25c..9cf1cc78 100644
--- a/backend/pkgs/server/worker.go
+++ b/backend/pkgs/server/worker.go
@@ -10,8 +10,7 @@ type Worker interface {
// the Worker interface and runs all tasks in a go routine without
// a pool or que or limits. It's useful for simple or small applications
// with minimal/short background tasks
-type SimpleWorker struct {
-}
+type SimpleWorker struct{}
func NewSimpleWorker() *SimpleWorker {
return &SimpleWorker{}
diff --git a/backend/pkgs/set/funcs.go b/backend/pkgs/set/funcs.go
index 0d9a261c..d13cdcd7 100644
--- a/backend/pkgs/set/funcs.go
+++ b/backend/pkgs/set/funcs.go
@@ -97,5 +97,4 @@ func Disjoint[T key](a, b Set[T]) bool {
}
}
return true
-
}
diff --git a/backend/pkgs/set/funcs_test.go b/backend/pkgs/set/funcs_test.go
index ab3aa0ec..cd49ef73 100644
--- a/backend/pkgs/set/funcs_test.go
+++ b/backend/pkgs/set/funcs_test.go
@@ -28,7 +28,6 @@ var (
)
func TestDiff(t *testing.T) {
-
tests := []struct {
name string
args args
diff --git a/frontend/components/Form/Autocomplete.vue b/frontend/components/Form/Autocomplete.vue
index b2e2d448..9d7c8bb1 100644
--- a/frontend/components/Form/Autocomplete.vue
+++ b/frontend/components/Form/Autocomplete.vue
@@ -28,7 +28,7 @@
<li v-for="(obj, idx) in filtered" :key="idx">
<div type="button" @click="select(obj)">
<slot name="display" v-bind="{ item: obj }">
- {{ usingObjects ? obj[itemText] : obj }}
+ {{ extractor(obj, itemText) }}
</slot>
</div>
</li>
@@ -94,6 +94,14 @@
}
);
+ function extractor(obj: string | ItemsObject, key: string | number): string {
+ if (typeof obj === "string") {
+ return obj;
+ }
+
+ return obj[key] as string;
+ }
+
const value = useVModel(props, "modelValue", emit);
const usingObjects = computed(() => {
@@ -135,6 +143,7 @@
value.value = "";
return;
}
+ // @ts-ignore
value.value = obj;
} else {
if (obj === value.value) {
@@ -142,6 +151,7 @@
return;
}
+ // @ts-ignore
value.value = obj;
}
}
diff --git a/frontend/components/Form/Multiselect.vue b/frontend/components/Form/Multiselect.vue
index 52cf2c5c..e961f7f3 100644
--- a/frontend/components/Form/Multiselect.vue
+++ b/frontend/components/Form/Multiselect.vue
@@ -38,12 +38,10 @@
default: "",
},
modelValue: {
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
type: Array as () => any[],
default: null,
},
items: {
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
type: Array as () => any[],
required: true,
},
diff --git a/frontend/components/Form/Select.vue b/frontend/components/Form/Select.vue
index 09faed92..919720f0 100644
--- a/frontend/components/Form/Select.vue
+++ b/frontend/components/Form/Select.vue
@@ -24,12 +24,10 @@
default: "",
},
modelValue: {
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
type: [Object, String] as any,
default: null,
},
items: {
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
type: Array as () => any[],
required: true,
},
@@ -86,7 +84,6 @@
{ immediate: true }
);
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
function compare(a: any, b: any): boolean {
if (a === b) {
return true;
diff --git a/frontend/components/Item/CreateModal.vue b/frontend/components/Item/CreateModal.vue
index 5dfdc2ad..1b9bec53 100644
--- a/frontend/components/Item/CreateModal.vue
+++ b/frontend/components/Item/CreateModal.vue
@@ -36,7 +36,7 @@
</template>
<script setup lang="ts">
- import { ItemCreate, LocationOut } from "~~/lib/api/types/data-contracts";
+ import { ItemCreate, LabelOut, LocationOut } from "~~/lib/api/types/data-contracts";
import { useLabelStore } from "~~/stores/labels";
import { useLocationStore } from "~~/stores/locations";
@@ -82,7 +82,7 @@
name: "",
description: "",
color: "", // Future!
- labels: [],
+ labels: [] as LabelOut[],
});
whenever(
@@ -91,7 +91,10 @@
focused.value = true;
if (locationId.value) {
- form.location = locations.value.find(l => l.id === locationId.value);
+ const found = locations.value.find(l => l.id === locationId.value);
+ if (found) {
+ form.location = found;
+ }
}
if (labelId.value) {
@@ -106,7 +109,7 @@
}
const out: ItemCreate = {
- parentId: undefined,
+ parentId: null,
name: form.name,
description: form.description,
locationId: form.location.id as string,
diff --git a/frontend/components/global/DropZone.vue b/frontend/components/global/DropZone.vue
index 786a0776..c0a21d82 100644
--- a/frontend/components/global/DropZone.vue
+++ b/frontend/components/global/DropZone.vue
@@ -18,7 +18,7 @@
const emit = defineEmits(["update:modelValue", "drop"]);
- const el = ref<HTMLDivElement>(null);
+ const el = ref<HTMLDivElement>();
const { isOverDropZone } = useDropZone(el, files => {
emit("drop", files);
});
diff --git a/frontend/composables/use-confirm.ts b/frontend/composables/use-confirm.ts
index 1ae1067a..ddf9924f 100644
--- a/frontend/composables/use-confirm.ts
+++ b/frontend/composables/use-confirm.ts
@@ -1,7 +1,6 @@
import { UseConfirmDialogRevealResult, UseConfirmDialogReturn } from "@vueuse/core";
import { Ref } from "vue";
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
type Store = UseConfirmDialogReturn<any, boolean, boolean> & {
text: Ref<string>;
setup: boolean;
@@ -23,7 +22,7 @@ const store: Partial<Store> = {
export function useConfirm(): Store {
if (!store.setup) {
store.setup = true;
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
const { isRevealed, reveal, confirm, cancel } = useConfirmDialog<any, boolean, boolean>();
store.isRevealed = isRevealed;
store.reveal = reveal;
diff --git a/frontend/composables/use-route-params.ts b/frontend/composables/use-route-params.ts
index 6708c38e..4687695f 100644
--- a/frontend/composables/use-route-params.ts
+++ b/frontend/composables/use-route-params.ts
@@ -7,7 +7,7 @@ export function useRouteQuery(q: string, def: string[]): WritableComputedRef<str
export function useRouteQuery(q: string, def: string): WritableComputedRef<string>;
export function useRouteQuery(q: string, def: boolean): WritableComputedRef<boolean>;
export function useRouteQuery(q: string, def: number): WritableComputedRef<number>;
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
+
export function useRouteQuery(q: string, def: any): WritableComputedRef<any> {
const route = useRoute();
const router = useRouter();
diff --git a/frontend/composables/use-theme.ts b/frontend/composables/use-theme.ts
index fb3641f7..cbd26d35 100644
--- a/frontend/composables/use-theme.ts
+++ b/frontend/composables/use-theme.ts
@@ -16,13 +16,13 @@ export function useTheme(): UseTheme {
preferences.value.theme = newTheme;
if (htmlEl) {
- htmlEl.value.setAttribute("data-theme", newTheme);
+ htmlEl.value?.setAttribute("data-theme", newTheme);
}
themeRef.value = newTheme;
};
- const htmlEl = ref<HTMLElement>(null);
+ const htmlEl = ref<HTMLElement | null>();
onMounted(() => {
if (htmlEl.value) {
diff --git a/frontend/lib/api/__test__/factories/index.ts b/frontend/lib/api/__test__/factories/index.ts
index cebfb5fb..ff821f98 100644
--- a/frontend/lib/api/__test__/factories/index.ts
+++ b/frontend/lib/api/__test__/factories/index.ts
@@ -9,13 +9,14 @@ import { Requests } from "../../../requests";
function itemField(id = null): ItemField {
return {
+ // @ts-expect-error
id,
name: faker.lorem.word(),
type: "text",
textValue: faker.lorem.sentence(),
booleanValue: false,
numberValue: faker.datatype.number(),
- timeValue: null,
+ timeValue: "",
};
}
@@ -32,8 +33,9 @@ function user(): UserRegistration {
};
}
-function location(): LocationCreate {
+function location(parentId: string | null = null): LocationCreate {
return {
+ parentId,
name: faker.address.city(),
description: faker.lorem.sentence(),
};
@@ -56,7 +58,7 @@ function publicClient(): PublicApi {
function userClient(token: string): UserClient {
overrideParts(config.BASE_URL, "/api/v1");
const requests = new Requests("", token);
- return new UserClient(requests);
+ return new UserClient(requests, "");
}
type TestUser = {
@@ -75,7 +77,7 @@ async function userSingleUse(): Promise<TestUser> {
expect(result.status).toBe(200);
return {
- client: new UserClient(new Requests("", result.data.token)),
+ client: new UserClient(new Requests("", result.data.token), result.data.attachmentToken),
user: usr,
};
}
diff --git a/frontend/lib/api/__test__/user/items.test.ts b/frontend/lib/api/__test__/user/items.test.ts
index 1a5f94e9..79c7f794 100644
--- a/frontend/lib/api/__test__/user/items.test.ts
+++ b/frontend/lib/api/__test__/user/items.test.ts
@@ -1,6 +1,6 @@
import { faker } from "@faker-js/faker";
import { describe, test, expect } from "vitest";
-import { ItemField, LocationOut } from "../../types/data-contracts";
+import { ItemField, ItemUpdate, LocationOut } from "../../types/data-contracts";
import { AttachmentTypes } from "../../types/non-generated";
import { UserClient } from "../../user";
import { factories } from "../factories";
@@ -14,6 +14,7 @@ describe("user should be able to create an item and add an attachment", () => {
*/
async function useLocation(api: UserClient): Promise<[LocationOut, () => Promise<void>]> {
const { response, data } = await api.locations.create({
+ parentId: null,
name: `__test__.location.name_${increment}`,
description: `__test__.location.description_${increment}`,
});
@@ -86,12 +87,12 @@ describe("user should be able to create an item and add an attachment", () => {
const itemUpdate = {
parentId: null,
...item,
- locationId: item.location.id,
+ locationId: item.location?.id || null,
labelIds: item.labels.map(l => l.id),
fields,
};
- const { response: updateResponse, data: item2 } = await api.items.update(item.id, itemUpdate);
+ const { response: updateResponse, data: item2 } = await api.items.update(item.id, itemUpdate as ItemUpdate);
expect(updateResponse.status).toBe(200);
expect(item2.fields).toHaveLength(fields.length);
@@ -104,7 +105,7 @@ describe("user should be able to create an item and add an attachment", () => {
itemUpdate.fields = [fields[0], fields[1]];
- const { response: updateResponse2, data: item3 } = await api.items.update(item.id, itemUpdate);
+ const { response: updateResponse2, data: item3 } = await api.items.update(item.id, itemUpdate as ItemUpdate);
expect(updateResponse2.status).toBe(200);
expect(item3.fields).toHaveLength(2);
diff --git a/frontend/lib/api/__test__/user/locations.test.ts b/frontend/lib/api/__test__/user/locations.test.ts
index eb7765ec..3012faf7 100644
--- a/frontend/lib/api/__test__/user/locations.test.ts
+++ b/frontend/lib/api/__test__/user/locations.test.ts
@@ -49,6 +49,8 @@ describe("locations lifecycle (create, update, delete)", () => {
const [location, cleanup] = await useLocation(api);
const updateData = {
+ id: location.id,
+ parentId: location.parent?.id,
name: "test-location-updated",
description: "test-description-updated",
};
diff --git a/frontend/lib/api/__test__/user/stats.test.ts b/frontend/lib/api/__test__/user/stats.test.ts
index 247b024f..719f14f6 100644
--- a/frontend/lib/api/__test__/user/stats.test.ts
+++ b/frontend/lib/api/__test__/user/stats.test.ts
@@ -77,13 +77,20 @@ function importFileGenerator(entries: number): ImportObj[] {
describe("group related statistics tests", () => {
const TOTAL_ITEMS = 30;
- let api: UserClient | undefined;
+ let tAPI: UserClient | undefined;
const imports = importFileGenerator(TOTAL_ITEMS);
+ const api = (): UserClient => {
+ if (!tAPI) {
+ throw new Error("API not initialized");
+ }
+ return tAPI;
+ };
+
beforeAll(async () => {
// -- Setup --
const { client } = await factories.client.singleUse();
- api = client;
+ tAPI = client;
const csv = toCsv(imports);
@@ -95,7 +102,7 @@ describe("group related statistics tests", () => {
// Write to file system for debugging
// fs.writeFileSync("test.csv", csv);
test("Validate Group Statistics", async () => {
- const { status, data } = await api.stats.group();
+ const { status, data } = await api().stats.group();
expect(status).toBe(200);
expect(data.totalItems).toEqual(TOTAL_ITEMS);
@@ -117,7 +124,7 @@ describe("group related statistics tests", () => {
}
test("Validate Labels Statistics", async () => {
- const { status, data } = await api.stats.labels();
+ const { status, data } = await api().stats.labels();
expect(status).toBe(200);
for (const label of data) {
@@ -126,7 +133,7 @@ describe("group related statistics tests", () => {
});
test("Validate Locations Statistics", async () => {
- const { status, data } = await api.stats.locations();
+ const { status, data } = await api().stats.locations();
expect(status).toBe(200);
for (const location of data) {
@@ -135,7 +142,7 @@ describe("group related statistics tests", () => {
});
test("Validate Purchase Over Time", async () => {
- const { status, data } = await api.stats.totalPriceOverTime();
+ const { status, data } = await api().stats.totalPriceOverTime();
expect(status).toBe(200);
expect(data.entries.length).toEqual(TOTAL_ITEMS);
});
diff --git a/frontend/lib/api/base/base-api.ts b/frontend/lib/api/base/base-api.ts
index cc6dd1e7..3847a4bf 100644
--- a/frontend/lib/api/base/base-api.ts
+++ b/frontend/lib/api/base/base-api.ts
@@ -9,8 +9,8 @@ type BaseApiType = {
[key: string]: any;
};
-export function hasKey(obj: object, key: string): obj is Required<BaseApiType> {
- return typeof obj[key] === "string";
+export function hasKey(obj: Record<string, any>, key: string): obj is Required<BaseApiType> {
+ return key in obj ? typeof obj[key] === "string" : false;
}
export function parseDate<T>(obj: T, keys: Array<keyof T> = []): T {
diff --git a/frontend/lib/api/classes/items.ts b/frontend/lib/api/classes/items.ts
index 0a45e62b..88df5abe 100644
--- a/frontend/lib/api/classes/items.ts
+++ b/frontend/lib/api/classes/items.ts
@@ -141,4 +141,8 @@ export class ItemsApi extends BaseAPI {
data: formData,
});
}
+
+ exportURL() {
+ return route("/items/export");
+ }
}
diff --git a/frontend/lib/api/classes/reports.ts b/frontend/lib/api/classes/reports.ts
index 03890cb1..eeae22b6 100644
--- a/frontend/lib/api/classes/reports.ts
+++ b/frontend/lib/api/classes/reports.ts
@@ -1,27 +1,7 @@
import { BaseAPI, route } from "../base";
export class ReportsAPI extends BaseAPI {
- async billOfMaterials(): Promise<void> {
- const { data: stream, error } = await this.http.get<ReadableStream>({ url: route("/reporting/bill-of-materials") });
-
- if (error) {
- return;
- }
-
- const reader = stream.getReader();
- let data = "";
- while (true) {
- const { done, value } = await reader.read();
- if (done) {
- break;
- }
- data += new TextDecoder("utf-8").decode(value);
- }
-
- const blob = new Blob([data], { type: "text/tsv" });
- const link = document.createElement("a");
- link.href = window.URL.createObjectURL(blob);
- link.download = "bill-of-materials.tsv";
- link.click();
+ billOfMaterialsURL(): string {
+ return route("/reporting/bill-of-materials");
}
}
diff --git a/frontend/lib/api/types/data-contracts.ts b/frontend/lib/api/types/data-contracts.ts
index 949a287f..d8ce9472 100644
--- a/frontend/lib/api/types/data-contracts.ts
+++ b/frontend/lib/api/types/data-contracts.ts
@@ -66,7 +66,6 @@ export interface ItemField {
name: string;
numberValue: number;
textValue: string;
- timeValue: string;
type: string;
}
diff --git a/frontend/lib/requests/requests.ts b/frontend/lib/requests/requests.ts
index f8ed3552..32b79bc6 100644
--- a/frontend/lib/requests/requests.ts
+++ b/frontend/lib/requests/requests.ts
@@ -76,6 +76,7 @@ export class Requests {
const token = this.token();
if (token !== "" && payload.headers !== undefined) {
+ // @ts-expect-error - we know that the header is there
payload.headers["Authorization"] = token; // eslint-disable-line dot-notation
}
@@ -83,6 +84,7 @@ export class Requests {
if (rargs.data) {
payload.body = rargs.data;
} else {
+ // @ts-expect-error - we know that the header is there
payload.headers["Content-Type"] = "application/json";
payload.body = JSON.stringify(rargs.body);
}
diff --git a/frontend/package.json b/frontend/package.json
index 69a8d34f..1f1d0b38 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -7,6 +7,8 @@
"postinstall": "nuxt prepare",
"lint": "eslint --ext \".ts,.js,.vue\" --ignore-path ../.gitignore .",
"lint:fix": "eslint --ext \".ts,.js,.vue\" --ignore-path ../.gitignore . --fix",
+ "lint:ci": "eslint --ext \".ts,.js,.vue\" --ignore-path ../.gitignore . --max-warnings 1",
+ "typecheck": "nuxi typecheck",
"test:ci": "TEST_SHUTDOWN_API_SERVER=true vitest --run --config ./test/vitest.config.ts",
"test:local": "TEST_SHUTDOWN_API_SERVER=false && vitest --run --config ./test/vitest.config.ts",
"test:watch": " TEST_SHUTDOWN_API_SERVER=false vitest --config ./test/vitest.config.ts"
@@ -14,6 +16,8 @@
"devDependencies": {
"@faker-js/faker": "^7.5.0",
"@nuxtjs/eslint-config-typescript": "^12.0.0",
+ "@types/dompurify": "^2.4.0",
+ "@types/markdown-it": "^12.2.3",
"@typescript-eslint/eslint-plugin": "^5.36.2",
"@typescript-eslint/parser": "^5.36.2",
"eslint": "^8.23.0",
@@ -45,7 +49,7 @@
"pinia": "^2.0.21",
"postcss": "^8.4.16",
"tailwindcss": "^3.1.8",
- "vue": "^3.2.38",
+ "vue": "^3.2.45",
"vue-chartjs": "^4.1.2",
"vue-router": "4"
}
diff --git a/frontend/pages/index.vue b/frontend/pages/index.vue
index 46fee876..bbbb7720 100644
--- a/frontend/pages/index.vue
+++ b/frontend/pages/index.vue
@@ -101,6 +101,7 @@
toast.success("Logged in successfully");
+ // @ts-ignore
authStore.$patch({
token: data.token,
expires: data.expiresAt,
diff --git a/frontend/pages/item/[id]/index.vue b/frontend/pages/item/[id]/index.vue
index 052c6bec..e0bac4e7 100644
--- a/frontend/pages/item/[id]/index.vue
+++ b/frontend/pages/item/[id]/index.vue
@@ -408,7 +408,7 @@
<template #description>
<Markdown :source="item.description"> </Markdown>
<div class="flex flex-wrap gap-2 mt-3">
- <NuxtLink ref="badge" class="badge p-3" :to="`/location/${item.location.id}`">
+ <NuxtLink v-if="item.location" ref="badge" class="badge p-3" :to="`/location/${item.location.id}`">
<Icon name="heroicons-map-pin" class="mr-2 swap-on"></Icon>
{{ item.location.name }}
</NuxtLink>
diff --git a/frontend/pages/items.vue b/frontend/pages/items.vue
index 86e99183..92a35b1d 100644
--- a/frontend/pages/items.vue
+++ b/frontend/pages/items.vue
@@ -392,7 +392,7 @@
:items="allFields ?? []"
@change="fetchValues(f[0])"
>
- <option v-for="fv in allFields" :key="fv" :value="fv">{{ fv }}</option>
+ <option v-for="(fv, _, i) in allFields" :key="i" :value="fv">{{ fv }}</option>
</select>
</div>
<div class="form-control w-full max-w-xs">
diff --git a/frontend/pages/label/[id].vue b/frontend/pages/label/[id].vue
index de87a4d0..fe344a22 100644
--- a/frontend/pages/label/[id].vue
+++ b/frontend/pages/label/[id].vue
@@ -28,7 +28,7 @@
{
name: "Name",
text: label.value?.name,
- },
+ } as AnyDetail,
{
name: "Description",
type: "markdown",
@@ -43,16 +43,16 @@
name: "Created",
text: label.value?.createdAt,
type: "date",
- },
+ } as AnyDetail,
{
name: "Updated",
text: label.value?.updatedAt,
type: "date",
- },
+ } as AnyDetail,
{
name: "Database ID",
text: label.value?.id,
- },
+ } as AnyDetail,
];
}
diff --git a/frontend/pages/location/[id].vue b/frontend/pages/location/[id].vue
index cafac66b..5a1b3892 100644
--- a/frontend/pages/location/[id].vue
+++ b/frontend/pages/location/[id].vue
@@ -50,16 +50,16 @@
name: "Created",
text: location.value?.createdAt,
type: "date",
- },
+ } as AnyDetail,
{
name: "Updated",
text: location.value?.updatedAt,
type: "date",
- },
+ } as AnyDetail,
{
name: "Database ID",
text: location.value?.id,
- },
+ } as AnyDetail,
];
}
@@ -120,7 +120,6 @@
const locationStore = useLocationStore();
const locations = computed(() => locationStore.allLocations);
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
const parent = ref<LocationSummary | any>({});
</script>
diff --git a/frontend/pages/tools.vue b/frontend/pages/tools.vue
index 181c3083..8606e9b4 100644
--- a/frontend/pages/tools.vue
+++ b/frontend/pages/tools.vue
@@ -102,8 +102,8 @@
const confirm = useConfirm();
const notify = useNotifier();
- async function getBillOfMaterials() {
- await api.reports.billOfMaterials();
+ function getBillOfMaterials() {
+ api.reports.billOfMaterialsURL();
}
async function ensureAssetIDs() {
diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml
index 2ccc2ac6..8e38f011 100644
--- a/frontend/pnpm-lock.yaml
+++ b/frontend/pnpm-lock.yaml
@@ -10,6 +10,8 @@ specifiers:
'@tailwindcss/aspect-ratio': ^0.4.0
'@tailwindcss/forms': ^0.5.2
'@tailwindcss/typography': ^0.5.4
+ '@types/dompurify': ^2.4.0
+ '@types/markdown-it': ^12.2.3
'@typescript-eslint/eslint-plugin': ^5.36.2
'@typescript-eslint/parser': ^5.36.2
'@vueuse/nuxt': ^9.1.1
@@ -32,35 +34,37 @@ specifiers:
typescript: ^4.8.3
vite-plugin-eslint: ^1.8.1
vitest: ^0.28.0
- vue: ^3.2.38
+ vue: ^3.2.45
vue-chartjs: ^4.1.2
vue-router: '4'
dependencies:
- '@headlessui/vue': [email protected]
- '@iconify/vue': [email protected]
+ '@headlessui/vue': [email protected]
+ '@iconify/vue': [email protected]
'@nuxtjs/tailwindcss': 6.1.3
- '@pinia/nuxt': 0.4.6_prq2uz4lho2pwp6irk4cfkrxwu
+ '@pinia/nuxt': 0.4.6_yq2pyqi2yjztetnx45sawcgrle
'@tailwindcss/aspect-ratio': [email protected]
'@tailwindcss/forms': [email protected]
'@tailwindcss/typography': [email protected]
- '@vueuse/router': 9.9.0_xsxatmlnmmg5bcuv3xdnj6fj7y
+ '@vueuse/router': 9.9.0_lavcef455lp3wtm2mcdrwhgymm
autoprefixer: [email protected]
chart.js: 4.0.1
daisyui: 2.43.0_2lwn2upnx27dqeg6hqdu7sq75m
dompurify: 3.0.0
markdown-it: 13.0.1
- pinia: 2.0.28_prq2uz4lho2pwp6irk4cfkrxwu
+ pinia: 2.0.28_yq2pyqi2yjztetnx45sawcgrle
postcss: 8.4.19
tailwindcss: [email protected]
- vue: 3.2.45
- vue-router: [email protected]
+ vue: 3.2.47
+ vue-router: [email protected]
devDependencies:
'@faker-js/faker': 7.6.0
'@nuxtjs/eslint-config-typescript': 12.0.0_ha6vam6werchizxrnqvarmz2zu
+ '@types/dompurify': 2.4.0
+ '@types/markdown-it': 12.2.3
'@typescript-eslint/eslint-plugin': 5.46.0_5mle7isnkfgjmrghnnczirv6iy
'@typescript-eslint/parser': 5.46.0_ha6vam6werchizxrnqvarmz2zu
eslint: 8.29.0
@@ -274,14 +278,6 @@ packages:
dependencies:
'@babel/types': 7.20.7
- /@babel/parser/7.20.5:
- resolution: {integrity: sha512-r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA==}
- engines: {node: '>=6.0.0'}
- hasBin: true
- dependencies:
- '@babel/types': 7.20.7
- dev: false
-
/@babel/plugin-syntax-jsx/7.18.6_@[email protected]:
resolution: {integrity: sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==}
engines: {node: '>=6.9.0'}
@@ -374,8 +370,8 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/android-arm/0.17.6:
- resolution: {integrity: sha512-bSC9YVUjADDy1gae8RrioINU6e1lCkg3VGVwm0QQ2E1CWcC4gnMce9+B6RpxuSsrsXsk1yojn7sp1fnG8erE2g==}
+ /@esbuild/android-arm/0.17.8:
+ resolution: {integrity: sha512-0/rb91GYKhrtbeglJXOhAv9RuYimgI8h623TplY2X+vA4EXnk3Zj1fXZreJ0J3OJJu1bwmb0W7g+2cT/d8/l/w==}
engines: {node: '>=12'}
cpu: [arm]
os: [android]
@@ -390,8 +386,8 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/android-arm64/0.17.6:
- resolution: {integrity: sha512-YnYSCceN/dUzUr5kdtUzB+wZprCafuD89Hs0Aqv9QSdwhYQybhXTaSTcrl6X/aWThn1a/j0eEpUBGOE7269REg==}
+ /@esbuild/android-arm64/0.17.8:
+ resolution: {integrity: sha512-oa/N5j6v1svZQs7EIRPqR8f+Bf8g6HBDjD/xHC02radE/NjKHK7oQmtmLxPs1iVwYyvE+Kolo6lbpfEQ9xnhxQ==}
engines: {node: '>=12'}
cpu: [arm64]
os: [android]
@@ -406,8 +402,8 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/android-x64/0.17.6:
- resolution: {integrity: sha512-MVcYcgSO7pfu/x34uX9u2QIZHmXAB7dEiLQC5bBl5Ryqtpj9lT2sg3gNDEsrPEmimSJW2FXIaxqSQ501YLDsZQ==}
+ /@esbuild/android-x64/0.17.8:
+ resolution: {integrity: sha512-bTliMLqD7pTOoPg4zZkXqCDuzIUguEWLpeqkNfC41ODBHwoUgZ2w5JBeYimv4oP6TDVocoYmEhZrCLQTrH89bg==}
engines: {node: '>=12'}
cpu: [x64]
os: [android]
@@ -422,8 +418,8 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/darwin-arm64/0.17.6:
- resolution: {integrity: sha512-bsDRvlbKMQMt6Wl08nHtFz++yoZHsyTOxnjfB2Q95gato+Yi4WnRl13oC2/PJJA9yLCoRv9gqT/EYX0/zDsyMA==}
+ /@esbuild/darwin-arm64/0.17.8:
+ resolution: {integrity: sha512-ghAbV3ia2zybEefXRRm7+lx8J/rnupZT0gp9CaGy/3iolEXkJ6LYRq4IpQVI9zR97ID80KJVoUlo3LSeA/sMAg==}
engines: {node: '>=12'}
cpu: [arm64]
os: [darwin]
@@ -438,8 +434,8 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/darwin-x64/0.17.6:
- resolution: {integrity: sha512-xh2A5oPrYRfMFz74QXIQTQo8uA+hYzGWJFoeTE8EvoZGHb+idyV4ATaukaUvnnxJiauhs/fPx3vYhU4wiGfosg==}
+ /@esbuild/darwin-x64/0.17.8:
+ resolution: {integrity: sha512-n5WOpyvZ9TIdv2V1K3/iIkkJeKmUpKaCTdun9buhGRWfH//osmUjlv4Z5mmWdPWind/VGcVxTHtLfLCOohsOXw==}
engines: {node: '>=12'}
cpu: [x64]
os: [darwin]
@@ -454,8 +450,8 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/freebsd-arm64/0.17.6:
- resolution: {integrity: sha512-EnUwjRc1inT4ccZh4pB3v1cIhohE2S4YXlt1OvI7sw/+pD+dIE4smwekZlEPIwY6PhU6oDWwITrQQm5S2/iZgg==}
+ /@esbuild/freebsd-arm64/0.17.8:
+ resolution: {integrity: sha512-a/SATTaOhPIPFWvHZDoZYgxaZRVHn0/LX1fHLGfZ6C13JqFUZ3K6SMD6/HCtwOQ8HnsNaEeokdiDSFLuizqv5A==}
engines: {node: '>=12'}
cpu: [arm64]
os: [freebsd]
@@ -470,8 +466,8 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/freebsd-x64/0.17.6:
- resolution: {integrity: sha512-Uh3HLWGzH6FwpviUcLMKPCbZUAFzv67Wj5MTwK6jn89b576SR2IbEp+tqUHTr8DIl0iDmBAf51MVaP7pw6PY5Q==}
+ /@esbuild/freebsd-x64/0.17.8:
+ resolution: {integrity: sha512-xpFJb08dfXr5+rZc4E+ooZmayBW6R3q59daCpKZ/cDU96/kvDM+vkYzNeTJCGd8rtO6fHWMq5Rcv/1cY6p6/0Q==}
engines: {node: '>=12'}
cpu: [x64]
os: [freebsd]
@@ -486,8 +482,8 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/linux-arm/0.17.6:
- resolution: {integrity: sha512-7YdGiurNt7lqO0Bf/U9/arrPWPqdPqcV6JCZda4LZgEn+PTQ5SMEI4MGR52Bfn3+d6bNEGcWFzlIxiQdS48YUw==}
+ /@esbuild/linux-arm/0.17.8:
+ resolution: {integrity: sha512-6Ij8gfuGszcEwZpi5jQIJCVIACLS8Tz2chnEBfYjlmMzVsfqBP1iGmHQPp7JSnZg5xxK9tjCc+pJ2WtAmPRFVA==}
engines: {node: '>=12'}
cpu: [arm]
os: [linux]
@@ -502,8 +498,8 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/linux-arm64/0.17.6:
- resolution: {integrity: sha512-bUR58IFOMJX523aDVozswnlp5yry7+0cRLCXDsxnUeQYJik1DukMY+apBsLOZJblpH+K7ox7YrKrHmJoWqVR9w==}
+ /@esbuild/linux-arm64/0.17.8:
+ resolution: {integrity: sha512-v3iwDQuDljLTxpsqQDl3fl/yihjPAyOguxuloON9kFHYwopeJEf1BkDXODzYyXEI19gisEsQlG1bM65YqKSIww==}
engines: {node: '>=12'}
cpu: [arm64]
os: [linux]
@@ -518,8 +514,8 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/linux-ia32/0.17.6:
- resolution: {integrity: sha512-ujp8uoQCM9FRcbDfkqECoARsLnLfCUhKARTP56TFPog8ie9JG83D5GVKjQ6yVrEVdMie1djH86fm98eY3quQkQ==}
+ /@esbuild/linux-ia32/0.17.8:
+ resolution: {integrity: sha512-8svILYKhE5XetuFk/B6raFYIyIqydQi+GngEXJgdPdI7OMKUbSd7uzR02wSY4kb53xBrClLkhH4Xs8P61Q2BaA==}
engines: {node: '>=12'}
cpu: [ia32]
os: [linux]
@@ -534,8 +530,8 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/linux-loong64/0.17.6:
- resolution: {integrity: sha512-y2NX1+X/Nt+izj9bLoiaYB9YXT/LoaQFYvCkVD77G/4F+/yuVXYCWz4SE9yr5CBMbOxOfBcy/xFL4LlOeNlzYQ==}
+ /@esbuild/linux-loong64/0.17.8:
+ resolution: {integrity: sha512-B6FyMeRJeV0NpyEOYlm5qtQfxbdlgmiGdD+QsipzKfFky0K5HW5Td6dyK3L3ypu1eY4kOmo7wW0o94SBqlqBSA==}
engines: {node: '>=12'}
cpu: [loong64]
os: [linux]
@@ -550,8 +546,8 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/linux-mips64el/0.17.6:
- resolution: {integrity: sha512-09AXKB1HDOzXD+j3FdXCiL/MWmZP0Ex9eR8DLMBVcHorrWJxWmY8Nms2Nm41iRM64WVx7bA/JVHMv081iP2kUA==}
+ /@esbuild/linux-mips64el/0.17.8:
+ resolution: {integrity: sha512-CCb67RKahNobjm/eeEqeD/oJfJlrWyw29fgiyB6vcgyq97YAf3gCOuP6qMShYSPXgnlZe/i4a8WFHBw6N8bYAA==}
engines: {node: '>=12'}
cpu: [mips64el]
os: [linux]
@@ -566,8 +562,8 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/linux-ppc64/0.17.6:
- resolution: {integrity: sha512-AmLhMzkM8JuqTIOhxnX4ubh0XWJIznEynRnZAVdA2mMKE6FAfwT2TWKTwdqMG+qEaeyDPtfNoZRpJbD4ZBv0Tg==}
+ /@esbuild/linux-ppc64/0.17.8:
+ resolution: {integrity: sha512-bytLJOi55y55+mGSdgwZ5qBm0K9WOCh0rx+vavVPx+gqLLhxtSFU0XbeYy/dsAAD6xECGEv4IQeFILaSS2auXw==}
engines: {node: '>=12'}
cpu: [ppc64]
os: [linux]
@@ -582,8 +578,8 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/linux-riscv64/0.17.6:
- resolution: {integrity: sha512-Y4Ri62PfavhLQhFbqucysHOmRamlTVK10zPWlqjNbj2XMea+BOs4w6ASKwQwAiqf9ZqcY9Ab7NOU4wIgpxwoSQ==}
+ /@esbuild/linux-riscv64/0.17.8:
+ resolution: {integrity: sha512-2YpRyQJmKVBEHSBLa8kBAtbhucaclb6ex4wchfY0Tj3Kg39kpjeJ9vhRU7x4mUpq8ISLXRXH1L0dBYjAeqzZAw==}
engines: {node: '>=12'}
cpu: [riscv64]
os: [linux]
@@ -598,8 +594,8 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/linux-s390x/0.17.6:
- resolution: {integrity: sha512-SPUiz4fDbnNEm3JSdUW8pBJ/vkop3M1YwZAVwvdwlFLoJwKEZ9L98l3tzeyMzq27CyepDQ3Qgoba44StgbiN5Q==}
+ /@esbuild/linux-s390x/0.17.8:
+ resolution: {integrity: sha512-QgbNY/V3IFXvNf11SS6exkpVcX0LJcob+0RWCgV9OiDAmVElnxciHIisoSix9uzYzScPmS6dJFbZULdSAEkQVw==}
engines: {node: '>=12'}
cpu: [s390x]
os: [linux]
@@ -614,8 +610,8 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/linux-x64/0.17.6:
- resolution: {integrity: sha512-a3yHLmOodHrzuNgdpB7peFGPx1iJ2x6m+uDvhP2CKdr2CwOaqEFMeSqYAHU7hG+RjCq8r2NFujcd/YsEsFgTGw==}
+ /@esbuild/linux-x64/0.17.8:
+ resolution: {integrity: sha512-mM/9S0SbAFDBc4OPoyP6SEOo5324LpUxdpeIUUSrSTOfhHU9hEfqRngmKgqILqwx/0DVJBzeNW7HmLEWp9vcOA==}
engines: {node: '>=12'}
cpu: [x64]
os: [linux]
@@ -630,8 +626,8 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/netbsd-x64/0.17.6:
- resolution: {integrity: sha512-EanJqcU/4uZIBreTrnbnre2DXgXSa+Gjap7ifRfllpmyAU7YMvaXmljdArptTHmjrkkKm9BK6GH5D5Yo+p6y5A==}
+ /@esbuild/netbsd-x64/0.17.8:
+ resolution: {integrity: sha512-eKUYcWaWTaYr9zbj8GertdVtlt1DTS1gNBWov+iQfWuWyuu59YN6gSEJvFzC5ESJ4kMcKR0uqWThKUn5o8We6Q==}
engines: {node: '>=12'}
cpu: [x64]
os: [netbsd]
@@ -646,8 +642,8 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/openbsd-x64/0.17.6:
- resolution: {integrity: sha512-xaxeSunhQRsTNGFanoOkkLtnmMn5QbA0qBhNet/XLVsc+OVkpIWPHcr3zTW2gxVU5YOHFbIHR9ODuaUdNza2Vw==}
+ /@esbuild/openbsd-x64/0.17.8:
+ resolution: {integrity: sha512-Vc9J4dXOboDyMXKD0eCeW0SIeEzr8K9oTHJU+Ci1mZc5njPfhKAqkRt3B/fUNU7dP+mRyralPu8QUkiaQn7iIg==}
engines: {node: '>=12'}
cpu: [x64]
os: [openbsd]
@@ -662,8 +658,8 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/sunos-x64/0.17.6:
- resolution: {integrity: sha512-gnMnMPg5pfMkZvhHee21KbKdc6W3GR8/JuE0Da1kjwpK6oiFU3nqfHuVPgUX2rsOx9N2SadSQTIYV1CIjYG+xw==}
+ /@esbuild/sunos-x64/0.17.8:
+ resolution: {integrity: sha512-0xvOTNuPXI7ft1LYUgiaXtpCEjp90RuBBYovdd2lqAFxje4sEucurg30M1WIm03+3jxByd3mfo+VUmPtRSVuOw==}
engines: {node: '>=12'}
cpu: [x64]
os: [sunos]
@@ -678,8 +674,8 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/win32-arm64/0.17.6:
- resolution: {integrity: sha512-G95n7vP1UnGJPsVdKXllAJPtqjMvFYbN20e8RK8LVLhlTiSOH1sd7+Gt7rm70xiG+I5tM58nYgwWrLs6I1jHqg==}
+ /@esbuild/win32-arm64/0.17.8:
+ resolution: {integrity: sha512-G0JQwUI5WdEFEnYNKzklxtBheCPkuDdu1YrtRrjuQv30WsYbkkoixKxLLv8qhJmNI+ATEWquZe/N0d0rpr55Mg==}
engines: {node: '>=12'}
cpu: [arm64]
os: [win32]
@@ -694,8 +690,8 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/win32-ia32/0.17.6:
- resolution: {integrity: sha512-96yEFzLhq5bv9jJo5JhTs1gI+1cKQ83cUpyxHuGqXVwQtY5Eq54ZEsKs8veKtiKwlrNimtckHEkj4mRh4pPjsg==}
+ /@esbuild/win32-ia32/0.17.8:
+ resolution: {integrity: sha512-Fqy63515xl20OHGFykjJsMnoIWS+38fqfg88ClvPXyDbLtgXal2DTlhb1TfTX34qWi3u4I7Cq563QcHpqgLx8w==}
engines: {node: '>=12'}
cpu: [ia32]
os: [win32]
@@ -710,8 +706,8 @@ packages:
requiresBuild: true
optional: true
- /@esbuild/win32-x64/0.17.6:
- resolution: {integrity: sha512-n6d8MOyUrNp6G4VSpRcgjs5xj4A91svJSaiwLIDWVWEsZtpN5FA9NlBbZHDmAJc2e8e6SF4tkBD3HAvPF+7igA==}
+ /@esbuild/win32-x64/0.17.8:
+ resolution: {integrity: sha512-1iuezdyDNngPnz8rLRDO2C/ZZ/emJLb72OsZeqQ6gL6Avko/XCXZw+NuxBSNhBAP13Hie418V7VMt9et1FMvpg==}
engines: {node: '>=12'}
cpu: [x64]
os: [win32]
@@ -739,13 +735,13 @@ packages:
engines: {node: '>=14.0.0', npm: '>=6.0.0'}
dev: true
- /@headlessui/vue/[email protected]:
+ /@headlessui/vue/[email protected]:
resolution: {integrity: sha512-vgLBKszj+m2ozaPOnjWMGnspoLJcU/06vygdEAyAS4nDjp72yA7AYbOIEgdaspUhaMs585ApyiSm3jPTuIxAzg==}
engines: {node: '>=10'}
peerDependencies:
vue: ^3.2.0
dependencies:
- vue: 3.2.45
+ vue: 3.2.47
dev: false
/@humanwhocodes/config-array/0.11.7:
@@ -765,12 +761,12 @@ packages:
/@humanwhocodes/object-schema/1.2.1:
resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==}
- /@iconify/vue/[email protected]:
+ /@iconify/vue/[email protected]:
resolution: {integrity: sha512-c4R6ZgFo1JrJ8aPMMgOPgfU7lBswihMGR+yWe/P4ZukC3kTkeT4+lkt9Pc/itVFMkwva/S/7u9YofmYv57fnNQ==}
peerDependencies:
vue: 3.x
dependencies:
- vue: 3.2.45
+ vue: 3.2.47
dev: false
/@ioredis/commands/1.2.0:
@@ -882,7 +878,7 @@ packages:
globby: 13.1.3
hash-sum: 2.0.0
ignore: 5.2.4
- jiti: 1.16.2
+ jiti: 1.17.0
knitwork: 1.0.0
lodash.template: 4.5.0
mlly: 1.1.0
@@ -1073,7 +1069,7 @@ packages:
chokidar: 3.5.3
defu: 6.1.2
- esbuild: 0.17.6
+ esbuild: 0.17.8
escape-string-regexp: 5.0.0
estree-walker: 3.0.3
externality: 1.0.0
@@ -1095,7 +1091,7 @@ packages:
ufo: 1.0.1
unplugin: 1.0.1
vite: 4.1.1
- vite-node: 0.28.4
+ vite-node: 0.28.5
vite-plugin-checker: 0.5.5_nhe6iuwn2ihgtysqxnaozji7om
vue: 3.2.47
vue-bundle-renderer: 1.0.1
@@ -1179,11 +1175,11 @@ packages:
- webpack
dev: false
- /@pinia/nuxt/0.4.6_prq2uz4lho2pwp6irk4cfkrxwu:
+ /@pinia/nuxt/0.4.6_yq2pyqi2yjztetnx45sawcgrle:
resolution: {integrity: sha512-HjrYEfLdFpmsjhicPJgL36jVhzHWukIQPFFHGTSF84Cplu+f2nY2XHKqe9ToHzE9rLee2RjLOwAzOnXa/I/u6A==}
dependencies:
'@nuxt/kit': 3.0.0
- pinia: 2.0.28_prq2uz4lho2pwp6irk4cfkrxwu
+ pinia: 2.0.28_yq2pyqi2yjztetnx45sawcgrle
transitivePeerDependencies:
- '@vue/composition-api'
- rollup
@@ -1210,7 +1206,7 @@ packages:
requiresBuild: true
optional: true
- /@rollup/plugin-alias/[email protected]:
+ /@rollup/plugin-alias/[email protected]:
resolution: {integrity: sha512-ZuDWE1q4PQDhvm/zc5Prun8sBpLJy41DMptYrS6MhAy9s9kL/doN1613BWfEchGVfKxzliJ3BjbOPizXX38DbQ==}
engines: {node: '>=14.0.0'}
peerDependencies:
@@ -1219,10 +1215,10 @@ packages:
rollup:
optional: true
dependencies:
- rollup: 3.14.0
+ rollup: 3.17.0
slash: 4.0.0
- /@rollup/plugin-commonjs/[email protected]:
+ /@rollup/plugin-commonjs/[email protected]:
resolution: {integrity: sha512-15LsiWRZk4eOGqvrJyu3z3DaBu5BhXIMeWnijSRvd8irrrg9SHpQ1pH+BUK4H6Z9wL9yOxZJMTLU+Au86XHxow==}
engines: {node: '>=14.0.0'}
peerDependencies:
@@ -1231,15 +1227,15 @@ packages:
rollup:
optional: true
dependencies:
- '@rollup/pluginutils': [email protected]
+ '@rollup/pluginutils': [email protected]
commondir: 1.0.1
estree-walker: 2.0.2
glob: 8.0.3
is-reference: 1.2.1
magic-string: 0.27.0
- rollup: 3.14.0
+ rollup: 3.17.0
- /@rollup/plugin-inject/[email protected]:
+ /@rollup/plugin-inject/[email protected]:
resolution: {integrity: sha512-411QlbL+z2yXpRWFXSmw/teQRMkXcAAC8aYTemc15gwJRpvEVDQwoe+N/HTFD8RFG8+88Bme9DK2V9CVm7hJdA==}
engines: {node: '>=14.0.0'}
peerDependencies:
@@ -1248,12 +1244,12 @@ packages:
rollup:
optional: true
dependencies:
- '@rollup/pluginutils': [email protected]
+ '@rollup/pluginutils': [email protected]
estree-walker: 2.0.2
magic-string: 0.27.0
- rollup: 3.14.0
+ rollup: 3.17.0
- /@rollup/plugin-json/[email protected]:
+ /@rollup/plugin-json/[email protected]:
resolution: {integrity: sha512-i/4C5Jrdr1XUarRhVu27EEwjt4GObltD7c+MkCIpO2QIbojw8MUs+CCTqOphQi3Qtg1FLmYt+l+6YeoIf51J7w==}
engines: {node: '>=14.0.0'}
peerDependencies:
@@ -1262,10 +1258,10 @@ packages:
rollup:
optional: true
dependencies:
- '@rollup/pluginutils': [email protected]
- rollup: 3.14.0
+ '@rollup/pluginutils': [email protected]
+ rollup: 3.17.0
- /@rollup/plugin-node-resolve/[email protected]:
+ /@rollup/plugin-node-resolve/[email protected]:
resolution: {integrity: sha512-ReY88T7JhJjeRVbfCyNj+NXAG3IIsVMsX9b5/9jC98dRP8/yxlZdz7mHZbHk5zHr24wZZICS5AcXsFZAXYUQEg==}
engines: {node: '>=14.0.0'}
peerDependencies:
@@ -1274,13 +1270,13 @@ packages:
rollup:
optional: true
dependencies:
- '@rollup/pluginutils': [email protected]
+ '@rollup/pluginutils': [email protected]
'@types/resolve': 1.20.2
deepmerge: 4.2.2
is-builtin-module: 3.2.0
is-module: 1.0.0
resolve: 1.22.1
- rollup: 3.14.0
+ rollup: 3.17.0
/@rollup/plugin-replace/[email protected]:
resolution: {integrity: sha512-M9YXNekv/C/iHHK+cvORzfRYfPbq0RDD8r0G+bMiTXjNGKulPnCT9O3Ss46WfhI6ZOCgApOP7xAdmCQJ+U2LAA==}
@@ -1295,7 +1291,20 @@ packages:
magic-string: 0.27.0
rollup: 3.14.0
- /@rollup/plugin-terser/[email protected]:
+ /@rollup/plugin-replace/[email protected]:
+ resolution: {integrity: sha512-M9YXNekv/C/iHHK+cvORzfRYfPbq0RDD8r0G+bMiTXjNGKulPnCT9O3Ss46WfhI6ZOCgApOP7xAdmCQJ+U2LAA==}
+ engines: {node: '>=14.0.0'}
+ peerDependencies:
+ rollup: ^1.20.0||^2.0.0||^3.0.0
+ peerDependenciesMeta:
+ rollup:
+ optional: true
+ dependencies:
+ '@rollup/pluginutils': [email protected]
+ magic-string: 0.27.0
+ rollup: 3.17.0
+
+ /@rollup/plugin-terser/[email protected]:
resolution: {integrity: sha512-Ipcf3LPNerey1q9ZMjiaWHlNPEHNU/B5/uh9zXLltfEQ1lVSLLeZSgAtTPWGyw8Ip1guOeq+mDtdOlEj/wNxQw==}
engines: {node: '>=14.0.0'}
peerDependencies:
@@ -1304,12 +1313,12 @@ packages:
rollup:
optional: true
dependencies:
- rollup: 3.14.0
+ rollup: 3.17.0
serialize-javascript: 6.0.1
smob: 0.0.6
terser: 5.16.1
- /@rollup/plugin-wasm/[email protected]:
+ /@rollup/plugin-wasm/[email protected]:
resolution: {integrity: sha512-YdrQ7zfnZ54Y+6raCev3tR1PrhQGxYKSTajGylhyP0oBacouuNo6KcNCk+pYKw9M98jxRWLFFca/udi76IDXzg==}
engines: {node: '>=14.0.0'}
peerDependencies:
@@ -1318,7 +1327,7 @@ packages:
rollup:
optional: true
dependencies:
- rollup: 3.14.0
+ rollup: 3.17.0
/@rollup/pluginutils/4.2.1:
resolution: {integrity: sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==}
@@ -1354,6 +1363,20 @@ packages:
picomatch: 2.3.1
rollup: 3.14.0
+ /@rollup/pluginutils/[email protected]:
+ resolution: {integrity: sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==}
+ engines: {node: '>=14.0.0'}
+ peerDependencies:
+ rollup: ^1.20.0||^2.0.0||^3.0.0
+ peerDependenciesMeta:
+ rollup:
+ optional: true
+ dependencies:
+ '@types/estree': 1.0.0
+ estree-walker: 2.0.2
+ picomatch: 2.3.1
+ rollup: 3.17.0
+
/@tailwindcss/aspect-ratio/[email protected]:
resolution: {integrity: sha512-8QPrypskfBa7QIMuKHg2TA7BqES6vhBrDLOv8Unb6FcFyd3TjKbc6lcmb9UPQHxfl24sXoJ41ux/H7qQQvfaSQ==}
peerDependencies:
@@ -1397,6 +1420,12 @@ packages:
resolution: {integrity: sha512-KnRanxnpfpjUTqTCXslZSEdLfXExwgNxYPdiO2WGUj8+HDjFi8R3k5RVKPeSCzLjCcshCAtVO2QBbVuAV4kTnw==}
dev: true
+ /@types/dompurify/2.4.0:
+ resolution: {integrity: sha512-IDBwO5IZhrKvHFUl+clZxgf3hn2b/lU6H1KaBShPkQyGJUQ0xwebezIPSuiyGwfz1UzJWQl4M7BDxtHtCCPlTg==}
+ dependencies:
+ '@types/trusted-types': 2.0.3
+ dev: true
+
/@types/eslint/8.4.10:
resolution: {integrity: sha512-Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw==}
dependencies:
@@ -1414,6 +1443,21 @@ packages:
resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==}
dev: true
+ /@types/linkify-it/3.0.2:
+ resolution: {integrity: sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==}
+ dev: true
+
+ /@types/markdown-it/12.2.3:
+ resolution: {integrity: sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==}
+ dependencies:
+ '@types/linkify-it': 3.0.2
+ '@types/mdurl': 1.0.2
+ dev: true
+
+ /@types/mdurl/1.0.2:
+ resolution: {integrity: sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==}
+ dev: true
+
/@types/node/18.11.12:
resolution: {integrity: sha512-FgD3NtTAKvyMmD44T07zz2fEf+OKwutgBCEVM8GcvMGVGaDktiLNTDvPwC/LUe3PinMW+X6CuLOF2Ui1mAlSXg==}
dev: true
@@ -1433,6 +1477,10 @@ packages:
resolution: {integrity: sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==}
dev: true
+ /@types/trusted-types/2.0.3:
+ resolution: {integrity: sha512-NfQ4gyz38SL8sDNrSixxU2Os1a5xcdFxipAFxYEuLUlvU2uDwS4NUpsImcf1//SlWItCVMMLiylsxbmNMToV/g==}
+ dev: true
+
/@types/web-bluetooth/0.0.16:
resolution: {integrity: sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==}
dev: false
@@ -1687,15 +1735,6 @@ packages:
- '@babel/core'
- supports-color
- /@vue/compiler-core/3.2.45:
- resolution: {integrity: sha512-rcMj7H+PYe5wBV3iYeUgbCglC+pbpN8hBLTJvRiK2eKQiWqu+fG9F+8sW99JdL4LQi7Re178UOxn09puSXvn4A==}
- dependencies:
- '@babel/parser': 7.20.5
- '@vue/shared': 3.2.45
- estree-walker: 2.0.2
- source-map: 0.6.1
- dev: false
-
/@vue/compiler-core/3.2.47:
resolution: {integrity: sha512-p4D7FDnQb7+YJmO2iPEv0SQNeNzcbHdGByJDsT4lynf63AFkOTFN07HsiRSvjGo0QrxR/o3d0hUyNCUnBU2Tig==}
dependencies:
@@ -1704,34 +1743,12 @@ packages:
estree-walker: 2.0.2
source-map: 0.6.1
- /@vue/compiler-dom/3.2.45:
- resolution: {integrity: sha512-tyYeUEuKqqZO137WrZkpwfPCdiiIeXYCcJ8L4gWz9vqaxzIQRccTSwSWZ/Axx5YR2z+LvpUbmPNXxuBU45lyRw==}
- dependencies:
- '@vue/compiler-core': 3.2.45
- '@vue/shared': 3.2.45
- dev: false
-
/@vue/compiler-dom/3.2.47:
resolution: {integrity: sha512-dBBnEHEPoftUiS03a4ggEig74J2YBZ2UIeyfpcRM2tavgMWo4bsEfgCGsu+uJIL/vax9S+JztH8NmQerUo7shQ==}
dependencies:
'@vue/compiler-core': 3.2.47
'@vue/shared': 3.2.47
- /@vue/compiler-sfc/3.2.45:
- resolution: {integrity: sha512-1jXDuWah1ggsnSAOGsec8cFjT/K6TMZ0sPL3o3d84Ft2AYZi2jWJgRMjw4iaK0rBfA89L5gw427H4n1RZQBu6Q==}
- dependencies:
- '@babel/parser': 7.20.5
- '@vue/compiler-core': 3.2.45
- '@vue/compiler-dom': 3.2.45
- '@vue/compiler-ssr': 3.2.45
- '@vue/reactivity-transform': 3.2.45
- '@vue/shared': 3.2.45
- estree-walker: 2.0.2
- magic-string: 0.25.9
- postcss: 8.4.21
- source-map: 0.6.1
- dev: false
-
/@vue/compiler-sfc/3.2.47:
resolution: {integrity: sha512-rog05W+2IFfxjMcFw10tM9+f7i/+FFpZJJ5XHX72NP9eC2uRD+42M3pYcQqDXVYoj74kHMSEdQ/WmCjt8JFksQ==}
dependencies:
@@ -1746,13 +1763,6 @@ packages:
postcss: 8.4.21
source-map: 0.6.1
- /@vue/compiler-ssr/3.2.45:
- resolution: {integrity: sha512-6BRaggEGqhWht3lt24CrIbQSRD5O07MTmd+LjAn5fJj568+R9eUD2F7wMQJjX859seSlrYog7sUtrZSd7feqrQ==}
- dependencies:
- '@vue/compiler-dom': 3.2.45
- '@vue/shared': 3.2.45
- dev: false
-
/@vue/compiler-ssr/3.2.47:
resolution: {integrity: sha512-wVXC+gszhulcMD8wpxMsqSOpvDZ6xKXSVWkf50Guf/S+28hTAXPDYRTbLQ3EDkOP5Xz/+SY37YiwDquKbJOgZw==}
dependencies:
@@ -1762,16 +1772,6 @@ packages:
/@vue/devtools-api/6.4.5:
resolution: {integrity: sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ==}
- /@vue/reactivity-transform/3.2.45:
- resolution: {integrity: sha512-BHVmzYAvM7vcU5WmuYqXpwaBHjsS8T63jlKGWVtHxAHIoMIlmaMyurUSEs1Zcg46M4AYT5MtB1U274/2aNzjJQ==}
- dependencies:
- '@babel/parser': 7.20.13
- '@vue/compiler-core': 3.2.45
- '@vue/shared': 3.2.45
- estree-walker: 2.0.2
- magic-string: 0.25.9
- dev: false
-
/@vue/reactivity-transform/3.2.47:
resolution: {integrity: sha512-m8lGXw8rdnPVVIdIFhf0LeQ/ixyHkH5plYuS83yop5n7ggVJU+z5v0zecwEnX7fa7HNLBhh2qngJJkxpwEEmYA==}
dependencies:
@@ -1781,38 +1781,17 @@ packages:
estree-walker: 2.0.2
magic-string: 0.25.9
- /@vue/reactivity/3.2.45:
- resolution: {integrity: sha512-PRvhCcQcyEVohW0P8iQ7HDcIOXRjZfAsOds3N99X/Dzewy8TVhTCT4uXpAHfoKjVTJRA0O0K+6QNkDIZAxNi3A==}
- dependencies:
- '@vue/shared': 3.2.45
- dev: false
-
/@vue/reactivity/3.2.47:
resolution: {integrity: sha512-7khqQ/75oyyg+N/e+iwV6lpy1f5wq759NdlS1fpAhFXa8VeAIKGgk2E/C4VF59lx5b+Ezs5fpp/5WsRYXQiKxQ==}
dependencies:
'@vue/shared': 3.2.47
- /@vue/runtime-core/3.2.45:
- resolution: {integrity: sha512-gzJiTA3f74cgARptqzYswmoQx0fIA+gGYBfokYVhF8YSXjWTUA2SngRzZRku2HbGbjzB6LBYSbKGIaK8IW+s0A==}
- dependencies:
- '@vue/reactivity': 3.2.45
- '@vue/shared': 3.2.45
- dev: false
-
/@vue/runtime-core/3.2.47:
resolution: {integrity: sha512-RZxbLQIRB/K0ev0K9FXhNbBzT32H9iRtYbaXb0ZIz2usLms/D55dJR2t6cIEUn6vyhS3ALNvNthI+Q95C+NOpA==}
dependencies:
'@vue/reactivity': 3.2.47
'@vue/shared': 3.2.47
- /@vue/runtime-dom/3.2.45:
- resolution: {integrity: sha512-cy88YpfP5Ue2bDBbj75Cb4bIEZUMM/mAkDMfqDTpUYVgTf/kuQ2VQ8LebuZ8k6EudgH8pYhsGWHlY0lcxlvTwA==}
- dependencies:
- '@vue/runtime-core': 3.2.45
- '@vue/shared': 3.2.45
- csstype: 2.6.21
- dev: false
-
/@vue/runtime-dom/3.2.47:
resolution: {integrity: sha512-ArXrFTjS6TsDei4qwNvgrdmHtD930KgSKGhS5M+j8QxXrDJYLqYw4RRcDy1bz1m1wMmb6j+zGLifdVHtkXA7gA==}
dependencies:
@@ -1820,16 +1799,6 @@ packages:
'@vue/shared': 3.2.47
csstype: 2.6.21
- /@vue/server-renderer/[email protected]:
- resolution: {integrity: sha512-ebiMq7q24WBU1D6uhPK//2OTR1iRIyxjF5iVq/1a5I1SDMDyDu4Ts6fJaMnjrvD3MqnaiFkKQj+LKAgz5WIK3g==}
- peerDependencies:
- vue: 3.2.45
- dependencies:
- '@vue/compiler-ssr': 3.2.45
- '@vue/shared': 3.2.45
- vue: 3.2.45
- dev: false
-
/@vue/server-renderer/[email protected]:
resolution: {integrity: sha512-dN9gc1i8EvmP9RCzvneONXsKfBRgqFeFZLurmHOveL7oH6HiFXJw5OGu294n1nHc/HMgTy6LulU/tv5/A7f/LA==}
peerDependencies:
@@ -1839,20 +1808,16 @@ packages:
'@vue/shared': 3.2.47
vue: 3.2.47
- /@vue/shared/3.2.45:
- resolution: {integrity: sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg==}
- dev: false
-
/@vue/shared/3.2.47:
resolution: {integrity: sha512-BHGyyGN3Q97EZx0taMQ+OLNuZcW3d37ZEVmEAyeoA9ERdGvm9Irc/0Fua8SNyOtV1w6BS4q25wbMzJujO9HIfQ==}
- /@vueuse/core/[email protected]:
+ /@vueuse/core/[email protected]:
resolution: {integrity: sha512-qGUcjKQXHgN+jqXEgpeZGoxdCbIDCdVPz3QiF1uyecVGbMuM63o96I1GjYx5zskKgRI0FKSNsVWM7rwrRMTf6A==}
dependencies:
'@types/web-bluetooth': 0.0.16
'@vueuse/metadata': 9.6.0
- '@vueuse/shared': [email protected]
- vue-demi: [email protected]
+ '@vueuse/shared': [email protected]
+ vue-demi: [email protected]
transitivePeerDependencies:
- '@vue/composition-api'
- vue
@@ -1873,17 +1838,17 @@ packages:
resolution: {integrity: sha512-sIC8R+kWkIdpi5X2z2Gk8TRYzmczDwHRhEFfCu2P+XW2JdPoXrziqsGpDDsN7ykBx4ilwieS7JUIweVGhvZ93w==}
dev: false
resolution: {integrity: sha512-r+ngzHijvrfn89KnwlFCSe/xzFCiuskwmxbDdzFtpcZ57RHqLPdUS34YYrDxt7XasM0vlD3dmLIKEH//btf7sw==}
peerDependencies:
nuxt: ^3.0.0-rc.9
dependencies:
'@nuxt/kit': 3.0.0
- '@vueuse/core': [email protected]
+ '@vueuse/core': [email protected]
'@vueuse/metadata': 9.6.0
local-pkg: 0.4.2
nuxt: 3.2.0_ha6vam6werchizxrnqvarmz2zu
- vue-demi: [email protected]
+ vue-demi: [email protected]
transitivePeerDependencies:
- '@vue/composition-api'
- rollup
@@ -1891,32 +1856,32 @@ packages:
- vue
dev: false
- /@vueuse/router/9.9.0_xsxatmlnmmg5bcuv3xdnj6fj7y:
+ /@vueuse/router/9.9.0_lavcef455lp3wtm2mcdrwhgymm:
resolution: {integrity: sha512-C6w3HZrU3aLde8t3cjcMfFVnw722Is9FtBNJH2wwUPUv7Fc0bKsqcOEq1yFM0f6K5QktHxlp2vcuV4/nA3xPQw==}
peerDependencies:
vue-router: '>=4.0.0-rc.1'
dependencies:
- '@vueuse/shared': [email protected]
- vue-demi: [email protected]
- vue-router: [email protected]
+ '@vueuse/shared': [email protected]
+ vue-demi: [email protected]
+ vue-router: [email protected]
transitivePeerDependencies:
- '@vue/composition-api'
- vue
dev: false
- /@vueuse/shared/[email protected]:
+ /@vueuse/shared/[email protected]:
resolution: {integrity: sha512-/eDchxYYhkHnFyrb00t90UfjCx94kRHxc7J1GtBCqCG4HyPMX+krV9XJgVtWIsAMaxKVU4fC8NSUviG1JkwhUQ==}
dependencies:
- vue-demi: [email protected]
+ vue-demi: [email protected]
transitivePeerDependencies:
- '@vue/composition-api'
- vue
dev: false
- /@vueuse/shared/[email protected]:
+ /@vueuse/shared/[email protected]:
resolution: {integrity: sha512-+D0XFwHG0T+uaIbCSlROBwm1wzs71B7n3KyDOxnvfEMMHDOzl09rYKwaE2AENmYwYPXfHPbSBRDD2gBVHbvTcg==}
dependencies:
- vue-demi: [email protected]
+ vue-demi: [email protected]
transitivePeerDependencies:
- '@vue/composition-api'
- vue
@@ -2280,6 +2245,20 @@ packages:
transitivePeerDependencies:
- supports-color
+ /c12/1.1.2:
+ resolution: {integrity: sha512-fHT5HDEHNMb2oImnqJ88/UlpEOkY/chdyYxSd3YCpvBqBvU0IDlHTkNc7GnjObDMxdis2lL+rwlQcNq8VeZESA==}
+ dependencies:
+ defu: 6.1.2
+ dotenv: 16.0.3
+ giget: 1.1.2
+ jiti: 1.17.1
+ mlly: 1.1.1
+ pathe: 1.1.0
+ pkg-types: 1.0.2
+ rc9: 2.0.1
+ transitivePeerDependencies:
+ - supports-color
+
/cac/6.7.14:
resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==}
engines: {node: '>=8'}
@@ -3076,34 +3055,34 @@ packages:
'@esbuild/win32-ia32': 0.16.17
'@esbuild/win32-x64': 0.16.17
- /esbuild/0.17.6:
- resolution: {integrity: sha512-TKFRp9TxrJDdRWfSsSERKEovm6v30iHnrjlcGhLBOtReE28Yp1VSBRfO3GTaOFMoxsNerx4TjrhzSuma9ha83Q==}
+ /esbuild/0.17.8:
+ resolution: {integrity: sha512-g24ybC3fWhZddZK6R3uD2iF/RIPnRpwJAqLov6ouX3hMbY4+tKolP0VMF3zuIYCaXun+yHwS5IPQ91N2BT191g==}
engines: {node: '>=12'}
hasBin: true
requiresBuild: true
optionalDependencies:
- '@esbuild/android-arm': 0.17.6
- '@esbuild/android-arm64': 0.17.6
- '@esbuild/android-x64': 0.17.6
- '@esbuild/darwin-arm64': 0.17.6
- '@esbuild/darwin-x64': 0.17.6
- '@esbuild/freebsd-arm64': 0.17.6
- '@esbuild/freebsd-x64': 0.17.6
- '@esbuild/linux-arm': 0.17.6
- '@esbuild/linux-arm64': 0.17.6
- '@esbuild/linux-ia32': 0.17.6
- '@esbuild/linux-loong64': 0.17.6
- '@esbuild/linux-mips64el': 0.17.6
- '@esbuild/linux-ppc64': 0.17.6
- '@esbuild/linux-riscv64': 0.17.6
- '@esbuild/linux-s390x': 0.17.6
- '@esbuild/linux-x64': 0.17.6
- '@esbuild/netbsd-x64': 0.17.6
- '@esbuild/openbsd-x64': 0.17.6
- '@esbuild/sunos-x64': 0.17.6
- '@esbuild/win32-arm64': 0.17.6
- '@esbuild/win32-ia32': 0.17.6
- '@esbuild/win32-x64': 0.17.6
+ '@esbuild/android-arm': 0.17.8
+ '@esbuild/android-arm64': 0.17.8
+ '@esbuild/android-x64': 0.17.8
+ '@esbuild/darwin-arm64': 0.17.8
+ '@esbuild/darwin-x64': 0.17.8
+ '@esbuild/freebsd-arm64': 0.17.8
+ '@esbuild/freebsd-x64': 0.17.8
+ '@esbuild/linux-arm': 0.17.8
+ '@esbuild/linux-arm64': 0.17.8
+ '@esbuild/linux-ia32': 0.17.8
+ '@esbuild/linux-loong64': 0.17.8
+ '@esbuild/linux-mips64el': 0.17.8
+ '@esbuild/linux-ppc64': 0.17.8
+ '@esbuild/linux-riscv64': 0.17.8
+ '@esbuild/linux-s390x': 0.17.8
+ '@esbuild/linux-x64': 0.17.8
+ '@esbuild/netbsd-x64': 0.17.8
+ '@esbuild/openbsd-x64': 0.17.8
+ '@esbuild/sunos-x64': 0.17.8
+ '@esbuild/win32-arm64': 0.17.8
+ '@esbuild/win32-ia32': 0.17.8
+ '@esbuild/win32-x64': 0.17.8
/escalade/3.1.1:
resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==}
@@ -3523,9 +3502,9 @@ packages:
resolution: {integrity: sha512-MAU9ci3XdpqOX1aoIoyL2DMzW97P8LYeJxIUkfXhOfsrkH4KLHFaYDwKN0B2l6tqedVJWiTIJtWmxmZfa05vOQ==}
dependencies:
enhanced-resolve: 5.12.0
- mlly: 1.1.0
+ mlly: 1.1.1
pathe: 1.1.0
- ufo: 1.0.1
+ ufo: 1.1.0
/fast-deep-equal/3.1.3:
resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
@@ -3768,6 +3747,20 @@ packages:
transitivePeerDependencies:
- supports-color
+ /giget/1.1.2:
+ resolution: {integrity: sha512-HsLoS07HiQ5oqvObOI+Qb2tyZH4Gj5nYGfF9qQcZNrPw+uEFhdXtgJr01aO2pWadGHucajYDLxxbtQkm97ON2A==}
+ hasBin: true
+ dependencies:
+ colorette: 2.0.19
+ defu: 6.1.2
+ https-proxy-agent: 5.0.1
+ mri: 1.2.0
+ node-fetch-native: 1.0.2
+ pathe: 1.1.0
+ tar: 6.1.13
+ transitivePeerDependencies:
+ - supports-color
+
/git-config-path/2.0.0:
resolution: {integrity: sha512-qc8h1KIQbJpp+241id3GuAtkdyJ+IK+LIVtkiFTRKRrmddDzs3SI9CvP1QYmWBFvm1I/PWRwj//of8bgAc0ltA==}
engines: {node: '>=4'}
@@ -3903,6 +3896,17 @@ packages:
ufo: 1.0.1
uncrypto: 0.1.2
+ /h3/1.5.0:
+ resolution: {integrity: sha512-M+T6P4iOB0ipkC/ZCdw2w8iTF7yY6phmkILOwlrtcPuVv+KW9BilOspYlvnblpKx1nnNl+3iBsZIvZ8pvKM8Nw==}
+ dependencies:
+ cookie-es: 0.5.0
+ defu: 6.1.2
+ destr: 1.2.2
+ iron-webcrypto: 0.5.0
+ radix3: 1.0.0
+ ufo: 1.1.0
+ uncrypto: 0.1.2
+
/has-bigints/1.0.2:
resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==}
dev: true
@@ -4107,8 +4111,8 @@ packages:
side-channel: 1.0.4
dev: true
- /ioredis/5.3.0:
- resolution: {integrity: sha512-Id9jKHhsILuIZpHc61QkagfVdUj2Rag5GzG1TGEvRNeM7dtTOjICgjC+tvqYxi//PuX2wjQ+Xjva2ONBuf92Pw==}
+ /ioredis/5.3.1:
+ resolution: {integrity: sha512-C+IBcMysM6v52pTLItYMeV4Hz7uriGtoJdz7SSBDX6u+zwSYGirLdQh3L7t/OItWITcw3gTFMjJReYUwS4zihg==}
engines: {node: '>=12.22.0'}
dependencies:
'@ioredis/commands': 1.2.0
@@ -4130,6 +4134,9 @@ packages:
/iron-webcrypto/0.4.0:
resolution: {integrity: sha512-5OG53gJ4dBTq4y3IJqK7MEG9CPZRsYn9EP9J4jjgH4TcP/ywdsSMAmqj9VTSzdXu0/xfUrqjGHU7WLUme2+k5Q==}
+ /iron-webcrypto/0.5.0:
+ resolution: {integrity: sha512-9m0tDUIo+GPwDYi1CNlAW3ToIFTS9y88lf41KsEwbBsL4PKNjhrNDGoA0WlB6WWaJ6pgp+FOP1+6ls0YftivyA==}
+
/is-arrayish/0.2.1:
resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}
@@ -4323,15 +4330,14 @@ packages:
- encoding
dev: true
- /jiti/1.16.2:
- resolution: {integrity: sha512-OKBOVWmU3FxDt/UH4zSwiKPuc1nihFZiOD722FuJlngvLz2glX1v2/TJIgoA4+mrpnXxHV6dSAoCvPcYQtoG5A==}
- hasBin: true
- dev: false
-
/jiti/1.17.0:
resolution: {integrity: sha512-CByzPgFqYoB9odEeef7GNmQ3S5THIBOtzRYoSCya2Sv27AuQxy2jgoFjQ6VTF53xsq1MXRm+YWNvOoDHUAteOw==}
hasBin: true
+ /jiti/1.17.1:
+ resolution: {integrity: sha512-NZIITw8uZQFuzQimqjUxIrIcEdxYDFIe/0xYfIlVXTkiBjjyBEvgasj5bb0/cHtPRD/NziPbT312sFrkI5ALpw==}
+ hasBin: true
+
/js-sdsl/4.2.0:
resolution: {integrity: sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==}
@@ -4494,7 +4500,7 @@ packages:
http-shutdown: 1.2.2
ip-regex: 5.0.0
node-forge: 1.3.1
- ufo: 1.0.1
+ ufo: 1.1.0
/loader-utils/2.0.4:
resolution: {integrity: sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==}
@@ -4604,8 +4610,8 @@ packages:
dependencies:
yallist: 4.0.0
- /lru-cache/7.14.1:
- resolution: {integrity: sha512-ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA==}
+ /lru-cache/7.16.1:
+ resolution: {integrity: sha512-9kkuMZHnLH/8qXARvYSjNvq8S1GYFFzynQTAfKeaJ0sIrR3PUPuu37Z+EiIANiZBvpfTf2B5y8ecDLSMWlLv+w==}
engines: {node: '>=12'}
/magic-string/0.25.9:
@@ -4783,6 +4789,14 @@ packages:
pkg-types: 1.0.1
ufo: 1.0.1
+ /mlly/1.1.1:
+ resolution: {integrity: sha512-Jnlh4W/aI4GySPo6+DyTN17Q75KKbLTyFK8BrGhjNP4rxuUjbRWhE6gHg3bs33URWAF44FRm7gdQA348i3XxRw==}
+ dependencies:
+ acorn: 8.8.2
+ pathe: 1.1.0
+ pkg-types: 1.0.2
+ ufo: 1.1.0
+
/mri/1.2.0:
resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==}
engines: {node: '>=4'}
@@ -4821,25 +4835,25 @@ packages:
engines: {node: '>= 0.6'}
dev: false
- /nitropack/2.2.1:
- resolution: {integrity: sha512-V7sYOqyNZFQ+Yp3S2Ks9VUiLDp7Fz3vdc4ULTAK+E0R5nMSq5MuoQZqH4BT0x8UHC30lo+fd3gXk2fCYzUft1g==}
+ /nitropack/2.2.2:
+ resolution: {integrity: sha512-bsFz+a2tn/rG6fZ9RgJVB9P7KuZBTgl3m2DugkagdbXQT/GsmMyvNZbaE+JH8tXOqV8tw9qpJWyaBLALPN9aFQ==}
engines: {node: ^14.16.0 || ^16.11.0 || ^17.0.0 || ^18.0.0 || ^19.0.0}
hasBin: true
dependencies:
'@cloudflare/kv-asset-handler': 0.3.0
'@netlify/functions': 1.4.0
- '@rollup/plugin-alias': [email protected]
- '@rollup/plugin-commonjs': [email protected]
- '@rollup/plugin-inject': [email protected]
- '@rollup/plugin-json': [email protected]
- '@rollup/plugin-node-resolve': [email protected]
- '@rollup/plugin-replace': [email protected]
- '@rollup/plugin-terser': [email protected]
- '@rollup/plugin-wasm': [email protected]
- '@rollup/pluginutils': [email protected]
+ '@rollup/plugin-alias': [email protected]
+ '@rollup/plugin-commonjs': [email protected]
+ '@rollup/plugin-inject': [email protected]
+ '@rollup/plugin-json': [email protected]
+ '@rollup/plugin-node-resolve': [email protected]
+ '@rollup/plugin-replace': [email protected]
+ '@rollup/plugin-terser': [email protected]
+ '@rollup/plugin-wasm': [email protected]
+ '@rollup/pluginutils': [email protected]
'@vercel/nft': 0.22.6
archiver: 5.3.1
- c12: 1.1.0
+ c12: 1.1.2
chalk: 5.2.0
chokidar: 3.5.3
consola: 2.15.3
@@ -4847,43 +4861,43 @@ packages:
defu: 6.1.2
destr: 1.2.2
dot-prop: 7.2.0
- esbuild: 0.17.6
+ esbuild: 0.17.8
escape-string-regexp: 5.0.0
etag: 1.8.1
fs-extra: 11.1.0
globby: 13.1.3
gzip-size: 7.0.0
- h3: 1.4.0
+ h3: 1.5.0
hookable: 5.4.2
http-proxy: 1.18.1
is-primitive: 3.0.1
- jiti: 1.17.0
+ jiti: 1.17.1
klona: 2.0.6
knitwork: 1.0.0
listhen: 1.0.2
mime: 3.0.0
- mlly: 1.1.0
+ mlly: 1.1.1
mri: 1.2.0
- node-fetch-native: 1.0.1
- ofetch: 1.0.0
+ node-fetch-native: 1.0.2
+ ofetch: 1.0.1
ohash: 1.0.0
pathe: 1.1.0
perfect-debounce: 0.1.3
- pkg-types: 1.0.1
+ pkg-types: 1.0.2
pretty-bytes: 6.1.0
radix3: 1.0.0
- rollup: 3.14.0
- rollup-plugin-visualizer: [email protected]
+ rollup: 3.17.0
+ rollup-plugin-visualizer: [email protected]
scule: 1.0.0
semver: 7.3.8
serve-placeholder: 2.0.1
serve-static: 1.15.0
source-map-support: 0.5.21
std-env: 3.3.2
- ufo: 1.0.1
- unenv: 1.1.1
- unimport: [email protected]
- unstorage: 1.1.4
+ ufo: 1.1.0
+ unenv: 1.2.0
+ unimport: [email protected]
+ unstorage: 1.1.5
transitivePeerDependencies:
- bufferutil
- debug
@@ -4898,6 +4912,9 @@ packages:
/node-fetch-native/1.0.1:
resolution: {integrity: sha512-VzW+TAk2wE4X9maiKMlT+GsPU4OMmR1U9CrHSmd3DFLn2IcZ9VJ6M6BBugGfYUnPCLSYxXdZy17M0BEJyhUTwg==}
+ /node-fetch-native/1.0.2:
+ resolution: {integrity: sha512-KIkvH1jl6b3O7es/0ShyCgWLcfXxlBrLBbP3rOr23WArC66IMcU4DeZEeYEOwnopYhawLTn7/y+YtmASe8DFVQ==}
+
/node-fetch/2.6.7:
resolution: {integrity: sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==}
engines: {node: 4.x || >=6.0.0}
@@ -5012,7 +5029,7 @@ packages:
knitwork: 1.0.0
magic-string: 0.27.0
mlly: 1.1.0
- nitropack: 2.2.1
+ nitropack: 2.2.2
nuxi: 3.2.0
ofetch: 1.0.0
ohash: 1.0.0
@@ -5097,6 +5114,13 @@ packages:
node-fetch-native: 1.0.1
ufo: 1.0.1
+ /ofetch/1.0.1:
+ resolution: {integrity: sha512-icBz2JYfEpt+wZz1FRoGcrMigjNKjzvufE26m9+yUiacRQRHwnNlGRPiDnW4op7WX/MR6aniwS8xw8jyVelF2g==}
+ dependencies:
+ destr: 1.2.2
+ node-fetch-native: 1.0.2
+ ufo: 1.1.0
+
/ohash/1.0.0:
resolution: {integrity: sha512-kxSyzq6tt+6EE/xCnD1XaFhCCjUNUaz3X30rJp6mnjGLXAAvuPFqohMdv0aScWzajR45C29HyBaXZ8jXBwnh9A==}
@@ -5291,7 +5315,7 @@ packages:
resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==}
engines: {node: '>=0.10.0'}
- /pinia/2.0.28_prq2uz4lho2pwp6irk4cfkrxwu:
+ /pinia/2.0.28_yq2pyqi2yjztetnx45sawcgrle:
resolution: {integrity: sha512-YClq9DkqCblq9rlyUual7ezMu/iICWdBtfJrDt4oWU9Zxpijyz7xB2xTwx57DaBQ96UGvvTMORzALr+iO5PVMw==}
peerDependencies:
'@vue/composition-api': ^1.4.0
@@ -5305,8 +5329,8 @@ packages:
dependencies:
'@vue/devtools-api': 6.4.5
typescript: 4.9.4
- vue: 3.2.45
- vue-demi: [email protected]
+ vue: 3.2.47
+ vue-demi: [email protected]
dev: false
/pkg-types/1.0.1:
@@ -5316,6 +5340,13 @@ packages:
mlly: 1.1.0
pathe: 1.1.0
+ /pkg-types/1.0.2:
+ resolution: {integrity: sha512-hM58GKXOcj8WTqUXnsQyJYXdeAPbythQgEF3nTcEo+nkD49chjQ9IKm/QJy9xf6JakXptz86h7ecP2024rrLaQ==}
+ dependencies:
+ jsonc-parser: 3.2.0
+ mlly: 1.1.1
+ pathe: 1.1.0
+
/pluralize/8.0.0:
resolution: {integrity: sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==}
engines: {node: '>=4'}
@@ -5862,6 +5893,13 @@ packages:
destr: 1.2.2
flat: 5.0.2
+ /rc9/2.0.1:
+ resolution: {integrity: sha512-9EfjLgNmzP9255YX8bGnILQcmdtOXKtUlFTu8bOZPJVtaUDZ2imswcUdpK51tMjTRQyB7r5RebNijrzuyGXcVA==}
+ dependencies:
+ defu: 6.1.2
+ destr: 1.2.2
+ flat: 5.0.2
+
/react-is/17.0.2:
resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==}
dev: true
@@ -6022,6 +6060,22 @@ packages:
source-map: 0.7.4
yargs: 17.6.2
+ /rollup-plugin-visualizer/[email protected]:
+ resolution: {integrity: sha512-bbDOv47+Bw4C/cgs0czZqfm8L82xOZssk4ayZjG40y9zbXclNk7YikrZTDao6p7+HDiGxrN0b65SgZiVm9k1Cg==}
+ engines: {node: '>=14'}
+ hasBin: true
+ peerDependencies:
+ rollup: 2.x || 3.x
+ peerDependenciesMeta:
+ rollup:
+ optional: true
+ dependencies:
+ open: 8.4.0
+ picomatch: 2.3.1
+ rollup: 3.17.0
+ source-map: 0.7.4
+ yargs: 17.6.2
+
/rollup/2.79.1:
resolution: {integrity: sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==}
engines: {node: '>=10.0.0'}
@@ -6037,6 +6091,13 @@ packages:
optionalDependencies:
fsevents: 2.3.2
+ /rollup/3.17.0:
+ resolution: {integrity: sha512-0zZQ0J4p0ZtTla6l8sheDTUyNfGZQDpU5h0nPHf6xtUXIzKK70LmB2IRR0wLnzaL8a02fjmsJy+XCncbSwOpjg==}
+ engines: {node: '>=14.18.0', npm: '>=8.0.0'}
+ hasBin: true
+ optionalDependencies:
+ fsevents: 2.3.2
+
/run-async/2.4.1:
resolution: {integrity: sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==}
engines: {node: '>=0.12.0'}
@@ -6648,6 +6709,9 @@ packages:
/ufo/1.0.1:
resolution: {integrity: sha512-boAm74ubXHY7KJQZLlXrtMz52qFvpsbOxDcZOnw/Wf+LS4Mmyu7JxmzD4tDLtUQtmZECypJ0FrCz4QIe6dvKRA==}
+ /ufo/1.1.0:
+ resolution: {integrity: sha512-LQc2s/ZDMaCN3QLpa+uzHUOQ7SdV0qgv3VBXOolQGXTaaZpIur6PwUclF5nN2hNkiTRcUugXd1zFOW3FLJ135Q==}
+
/unbox-primitive/1.0.2:
resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==}
dependencies:
@@ -6676,6 +6740,14 @@ packages:
node-fetch-native: 1.0.1
pathe: 1.1.0
+ /unenv/1.2.0:
+ resolution: {integrity: sha512-8AcXA+xAz/C8ZVlIv+voD/uCe6V/LkQgZtQYOBjuKYNXhBitsOiy+QYrUPelLRDY2WB86Njw/qLawYNh8iDsvQ==}
+ dependencies:
+ defu: 6.1.2
+ mime: 3.0.0
+ node-fetch-native: 1.0.2
+ pathe: 1.1.0
+
/unhead/1.0.21:
resolution: {integrity: sha512-vHXnozOkoSkCYIpGTWkW4JJbWMlY2I737sbBGxPj6maa9gEDMC50gwhCCVMnIvvMsJ6OxgNE5asEfSkSopfO+A==}
dependencies:
@@ -6735,6 +6807,23 @@ packages:
transitivePeerDependencies:
- rollup
+ /unimport/[email protected]:
+ resolution: {integrity: sha512-qMgmeEGqqrrmEtm0dqxMG37J6xBtrriqxq9hILvDb+e6l2F0yTnJomLoCCp0eghLR7bYGeBsUU5Y0oyiUYhViw==}
+ dependencies:
+ '@rollup/pluginutils': [email protected]
+ escape-string-regexp: 5.0.0
+ fast-glob: 3.2.12
+ local-pkg: 0.4.3
+ magic-string: 0.27.0
+ mlly: 1.1.0
+ pathe: 1.1.0
+ pkg-types: 1.0.1
+ scule: 1.0.0
+ strip-literal: 1.0.1
+ unplugin: 1.0.1
+ transitivePeerDependencies:
+ - rollup
+
/universalify/2.0.0:
resolution: {integrity: sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==}
engines: {node: '>= 10.0.0'}
@@ -6747,22 +6836,22 @@ packages:
webpack-sources: 3.2.3
webpack-virtual-modules: 0.5.0
- /unstorage/1.1.4:
- resolution: {integrity: sha512-nrnCoWN8ewaZrwz5yf7QGkMn0FDoVer6yGIR56wvocNzAmZi1vXOnCaBxueB3Uu/SqNSH5N/ww41t6jNT8XccA==}
+ /unstorage/1.1.5:
+ resolution: {integrity: sha512-6TZilI4JlubD/uGjhfP8rS8mcxVGVn+RIt1dQG0xJrFvbSqa5UeNpFQ8+g0zktm4laztVvFU/pAnBn8MF0ip3A==}
dependencies:
anymatch: 3.1.3
chokidar: 3.5.3
destr: 1.2.2
- h3: 1.4.0
- ioredis: 5.3.0
+ h3: 1.5.0
+ ioredis: 5.3.1
listhen: 1.0.2
- lru-cache: 7.14.1
+ lru-cache: 7.16.1
mkdir: 0.0.2
mri: 1.2.0
- node-fetch-native: 1.0.1
- ofetch: 1.0.0
- ufo: 1.0.1
- ws: 8.12.0
+ node-fetch-native: 1.0.2
+ ofetch: 1.0.1
+ ufo: 1.1.0
+ ws: 8.12.1
optionalDependencies:
'@planetscale/database': 1.5.0
transitivePeerDependencies:
@@ -6833,14 +6922,14 @@ packages:
- terser
dev: true
- /vite-node/0.28.4:
- resolution: {integrity: sha512-KM0Q0uSG/xHHKOJvVHc5xDBabgt0l70y7/lWTR7Q0pR5/MrYxadT+y32cJOE65FfjGmJgxpVEEY+69btJgcXOQ==}
+ /vite-node/0.28.5:
+ resolution: {integrity: sha512-LmXb9saMGlrMZbXTvOveJKwMTBTNUH66c8rJnQ0ZPNX+myPEol64+szRzXtV5ORb0Hb/91yq+/D3oERoyAt6LA==}
engines: {node: '>=v14.16.0'}
hasBin: true
dependencies:
cac: 6.7.14
debug: 4.3.4
- mlly: 1.1.0
+ mlly: 1.1.1
pathe: 1.1.0
picocolors: 1.0.0
source-map: 0.6.1
@@ -7111,17 +7200,17 @@ packages:
dependencies:
ufo: 1.0.1
resolution: {integrity: sha512-QSggYjeFv/L4jFSBQpX8NzrAvX0B+Ha6nDgxkTG8tEXxYOOTwKI4phRLe+B4f+REnkmg7hgPY24R0cixZJyXBg==}
peerDependencies:
chart.js: ^3.7.0
vue: ^3.0.0-0 || ^2.6.0
dependencies:
chart.js: 4.0.1
- vue: 3.2.45
+ vue: 3.2.47
dev: false
- /vue-demi/[email protected]:
+ /vue-demi/[email protected]:
resolution: {integrity: sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==}
engines: {node: '>=12'}
hasBin: true
@@ -7133,7 +7222,7 @@ packages:
'@vue/composition-api':
optional: true
dependencies:
- vue: 3.2.45
+ vue: 3.2.47
dev: false
/vue-devtools-stub/0.1.0:
@@ -7157,15 +7246,6 @@ packages:
- supports-color
dev: true
- /vue-router/[email protected]:
- resolution: {integrity: sha512-DYWYwsG6xNPmLq/FmZn8Ip+qrhFEzA14EI12MsMgVxvHFDYvlr4NXpVF5hrRH1wVcDP8fGi5F4rxuJSl8/r+EQ==}
- peerDependencies:
- vue: ^3.2.0
- dependencies:
- '@vue/devtools-api': 6.4.5
- vue: 3.2.45
- dev: false
-
/vue-router/[email protected]:
resolution: {integrity: sha512-DYWYwsG6xNPmLq/FmZn8Ip+qrhFEzA14EI12MsMgVxvHFDYvlr4NXpVF5hrRH1wVcDP8fGi5F4rxuJSl8/r+EQ==}
peerDependencies:
@@ -7174,16 +7254,6 @@ packages:
'@vue/devtools-api': 6.4.5
vue: 3.2.47
- /vue/3.2.45:
- resolution: {integrity: sha512-9Nx/Mg2b2xWlXykmCwiTUCWHbWIj53bnkizBxKai1g61f2Xit700A1ljowpTIM11e3uipOeiPcSqnmBg6gyiaA==}
- dependencies:
- '@vue/compiler-dom': 3.2.45
- '@vue/compiler-sfc': 3.2.45
- '@vue/runtime-dom': 3.2.45
- '@vue/server-renderer': [email protected]
- '@vue/shared': 3.2.45
- dev: false
-
/vue/3.2.47:
resolution: {integrity: sha512-60188y/9Dc9WVrAZeUVSDxRQOZ+z+y5nO2ts9jWXSTkMvayiWxCWOWtBQoYjLeccfXkiiPZWAHcV+WTPhkqJHQ==}
dependencies:
@@ -7276,8 +7346,8 @@ packages:
/wrappy/1.0.2:
resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
- /ws/8.12.0:
- resolution: {integrity: sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==}
+ /ws/8.12.1:
+ resolution: {integrity: sha512-1qo+M9Ba+xNhPB+YTWUlK6M17brTut5EXbcBaMRN5pH5dFrXz7lzz1ChFSUq3bOUl8yEvSenhHmYUNJxFzdJew==}
engines: {node: '>=10.0.0'}
peerDependencies:
bufferutil: ^4.0.1
diff --git a/frontend/stores/labels.ts b/frontend/stores/labels.ts
index 651bb49b..acddf2c0 100644
--- a/frontend/stores/labels.ts
+++ b/frontend/stores/labels.ts
@@ -14,13 +14,17 @@ export const useLabelStore = defineStore("labels", {
*/
labels(state): LabelOut[] {
if (state.allLabels === null) {
- Promise.resolve(this.refresh());
+ this.client.labels.getAll().then(result => {
+ if (result.error) {
+ console.error(result.error);
+ }
+ });
}
- return state.allLabels;
+ return state.allLabels ?? [];
},
},
actions: {
- async refresh(): Promise<LabelOut[]> {
+ async refresh() {
const result = await this.client.labels.getAll();
if (result.error) {
return result;
diff --git a/frontend/stores/locations.ts b/frontend/stores/locations.ts
index 68295f6f..c3130409 100644
--- a/frontend/stores/locations.ts
+++ b/frontend/stores/locations.ts
@@ -1,4 +1,5 @@
import { defineStore } from "pinia";
+import { LocationsApi } from "~~/lib/api/classes/locations";
import { LocationOutCount } from "~~/lib/api/types/data-contracts";
export const useLocationStore = defineStore("locations", {
@@ -15,19 +16,33 @@ export const useLocationStore = defineStore("locations", {
*/
parentLocations(state): LocationOutCount[] {
if (state.parents === null) {
- Promise.resolve(this.refreshParents());
+ this.client.locations.getAll({ filterChildren: true }).then(result => {
+ if (result.error) {
+ console.error(result.error);
+ return;
+ }
+
+ this.parents = result.data.items;
+ });
}
- return state.parents;
+ return state.parents ?? [];
},
allLocations(state): LocationOutCount[] {
if (state.Locations === null) {
- Promise.resolve(this.refreshChildren());
+ this.client.locations.getAll({ filterChildren: false }).then(result => {
+ if (result.error) {
+ console.error(result.error);
+ return;
+ }
+
+ this.Locations = result.data.items;
+ });
}
- return state.Locations;
+ return state.Locations ?? [];
},
},
actions: {
- async refreshParents(): Promise<LocationOutCount[]> {
+ async refreshParents(): ReturnType<LocationsApi["getAll"]> {
const result = await this.client.locations.getAll({ filterChildren: true });
if (result.error) {
return result;
@@ -36,7 +51,7 @@ export const useLocationStore = defineStore("locations", {
this.parents = result.data.items;
return result;
},
- async refreshChildren(): Promise<LocationOutCount[]> {
+ async refreshChildren(): ReturnType<LocationsApi["getAll"]> {
const result = await this.client.locations.getAll({ filterChildren: false });
if (result.error) {
return result;
diff --git a/frontend/test/setup.ts b/frontend/test/setup.ts
index 7ad8bc09..d77dafa1 100644
--- a/frontend/test/setup.ts
+++ b/frontend/test/setup.ts
@@ -13,7 +13,7 @@ export const setup = () => {
export const teardown = () => {
if (process.env.TEST_SHUTDOWN_API_SERVER) {
const pc = exec("pkill -SIGTERM api"); // Kill background API process
- pc.stdout.on("data", data => {
+ pc.stdout?.on("data", data => {
console.log(`stdout: ${data}`);
});
}