rohit/probo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some lint error + change error handling

Browse Source 
Signed-off-by: Émile Ré <emile@getprobo.com>
This commit is contained in:
Émile Ré
2026-04-21 11:06:54 +04:00
parent d3333fd137
commit 937a0079fc
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/console/src/pages/organizations/cookie-banners/configuration/cookies/_components/CategorySection.tsx
View File

@@ -154,8 +154,8 @@ export function CategorySection({ categoryKey, onDelete }: CategorySectionProps)
const [updateCategory, isUpdating] const [updateCategory, isUpdating]
= useMutation<CategorySectionUpdateMutation>(updateCategoryMutation); = useMutation<CategorySectionUpdateMutation>(updateCategoryMutation);
const [moveCookie] = const [moveCookie]
useMutation<CategorySectionMoveCookieMutation>(moveCookieMutation); = useMutation<CategorySectionMoveCookieMutation>(moveCookieMutation);
const [isEditingCategory, setIsEditingCategory] = useState(false); const [isEditingCategory, setIsEditingCategory] = useState(false);
const [editingCookieIndex, setEditingCookieIndex] = useState<number | null>(null); const [editingCookieIndex, setEditingCookieIndex] = useState<number | null>(null);

3
pkg/cookiebanner/service.go
View File

@@ -920,13 +920,14 @@ type MoveCookieToCategoryResult struct {
func (s *Service) MoveCookieToCategory( func (s *Service) MoveCookieToCategory(
ctx context.Context, ctx context.Context,
scope coredata.Scoper,
req MoveCookieToCategoryRequest, req MoveCookieToCategoryRequest,
) (*MoveCookieToCategoryResult, error) { ) (*MoveCookieToCategoryResult, error) {
if err := req.Validate(); err != nil { if err := req.Validate(); err != nil {
return nil, fmt.Errorf("invalid request: %w", err) return nil, fmt.Errorf("invalid request: %w", err)
} }
scope := coredata.NewScopeFromObjectID(req.SourceCookieCategoryID)
var result MoveCookieToCategoryResult var result MoveCookieToCategoryResult
err := s.pg.WithTx( err := s.pg.WithTx(

5
pkg/server/api/console/v1/cookie_banner_resolvers.go
View File

@@ -522,11 +522,8 @@ func (r *mutationResolver) MoveCookieToCategory(ctx context.Context, input types
return nil, err return nil, err
} }
scope := coredata.NewScopeFromObjectID(input.SourceCookieCategoryID)
result, err := r.cookieBanner.MoveCookieToCategory( result, err := r.cookieBanner.MoveCookieToCategory(
ctx, ctx,
scope,
cookiebanner.MoveCookieToCategoryRequest{ cookiebanner.MoveCookieToCategoryRequest{
SourceCookieCategoryID: input.SourceCookieCategoryID, SourceCookieCategoryID: input.SourceCookieCategoryID,
TargetCookieCategoryID: input.TargetCookieCategoryID, TargetCookieCategoryID: input.TargetCookieCategoryID,
@@ -540,7 +537,7 @@ func (r *mutationResolver) MoveCookieToCategory(ctx context.Context, input types
case errors.Is(err, cookiebanner.ErrCookieNotFound): case errors.Is(err, cookiebanner.ErrCookieNotFound):
return nil, gqlutils.NotFound(ctx, err) return nil, gqlutils.NotFound(ctx, err)
case errors.Is(err, cookiebanner.ErrCategoriesBannerMismatch): case errors.Is(err, cookiebanner.ErrCategoriesBannerMismatch):
return nil, gqlutils.Invalidf(ctx, "source and target categories must belong to the same banner") return nil, gqlutils.NotFoundf(ctx, "source or target category not found")
default: default:
if validationErrors, ok := errors.AsType[validator.ValidationErrors](err); ok { if validationErrors, ok := errors.AsType[validator.ValidationErrors](err); ok {
return nil, gqlutils.InvalidValidationErrors(ctx, validationErrors) return nil, gqlutils.InvalidValidationErrors(ctx, validationErrors)