Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions backend/helpers/pluginhelper/api/api_collector.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ func NewApiCollector(args ApiCollectorArgs) (*ApiCollector, errors.Error) {

var rawTableAutoMigrateLock sync.Mutex

func (collector *ApiCollector) ensureRawTable(table string) errors.Error {
func (collector *ApiCollector) ensureRawTable() errors.Error {
db := collector.args.Ctx.GetDal()
rawTableAutoMigrateLock.Lock()
defer rawTableAutoMigrateLock.Unlock()
Expand All @@ -155,7 +155,7 @@ func (collector *ApiCollector) Execute() errors.Error {

// make sure table is created
db := collector.args.Ctx.GetDal()
err := collector.ensureRawTable(collector.table)
err := collector.ensureRawTable()
if err != nil {
return errors.Default.Wrap(err, "error auto-migrating collector")
}
Expand Down
5 changes: 1 addition & 4 deletions backend/helpers/pluginhelper/api/graphql_collector.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,7 @@ func NewGraphqlCollector(args GraphqlCollectorArgs) (*GraphqlCollector, errors.E
// process args
rawDataSubTask, err := NewRawDataSubTask(args.RawDataSubTaskArgs)
if err != nil {
return nil, errors.Default.Wrap(err, "error processing raw subtask args")
}
if err != nil {
return nil, errors.Default.Wrap(err, "Failed to compile UrlTemplate")
return nil, err
}
if args.GraphqlClient == nil {
return nil, errors.Default.New("ApiClient is required")
Expand Down
2 changes: 1 addition & 1 deletion backend/helpers/pluginhelper/api/model_api_helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ func (self *ModelApiHelper[M]) PutMultipleCb(input *plugin.ApiResourceInput, bef
}, nil
}

func parsePagination[P any](input *plugin.ApiResourceInput, query ...dal.Clause) (*P, errors.Error) {
func parsePagination[P any](input *plugin.ApiResourceInput) (*P, errors.Error) {
if !input.Query.Has("page") {
input.Query.Set("page", "1")
}
Expand Down
2 changes: 1 addition & 1 deletion backend/helpers/pluginhelper/api/remote_api_helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ func (r *RemoteApiHelper[Conn, Scope, ApiScope, Group]) SearchRemoteScopes(input
p = 1
} else {
p, err1 = strconv.Atoi(page[0])
if err != nil {
if err1 != nil {
return nil, errors.BadInput.Wrap(err1, fmt.Sprintf("failed to Atoi page:%s", page[0]))
}
}
Expand Down