From 0a9714181d65239609846104e7fcfa29c21736ef Mon Sep 17 00:00:00 2001 From: Koustav Date: Fri, 13 Sep 2024 18:20:19 +0530 Subject: [PATCH 1/3] Filters api update --- cmd/queryList.go | 2 +- pkg/model/savedQueries.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/queryList.go b/cmd/queryList.go index 7bff80c..9af5bad 100644 --- a/cmd/queryList.go +++ b/cmd/queryList.go @@ -53,7 +53,7 @@ var SavedQueryList = &cobra.Command{ // Delete a saved query from the list. func deleteSavedQuery(client *HTTPClient, savedQueryID, title string) { fmt.Printf("\nAttempting to delete '%s'", title) - deleteURL := `filters/filter/` + savedQueryID + deleteURL := `filters/` + savedQueryID req, err := client.NewRequest("DELETE", deleteURL, nil) if err != nil { fmt.Println("Failed to delete the saved query with error: ", err) diff --git a/pkg/model/savedQueries.go b/pkg/model/savedQueries.go index c5e757c..064bf24 100644 --- a/pkg/model/savedQueries.go +++ b/pkg/model/savedQueries.go @@ -227,7 +227,7 @@ func SavedQueriesMenu() *tea.Program { // fetchFilters fetches saved SQL queries for the active user from the server func fetchFilters(client *http.Client, profile *config.Profile) []list.Item { - endpoint := fmt.Sprintf("%s/%s/%s", profile.URL, "api/v1/filters", profile.Username) + endpoint := fmt.Sprintf("%s/%s", profile.URL, "api/v1/filters") req, err := http.NewRequest("GET", endpoint, nil) if err != nil { fmt.Println("Error creating request:", err) From 07ae10f4e77cfc6c800488a17acd16b70d3b8abe Mon Sep 17 00:00:00 2001 From: Koustav Date: Wed, 18 Sep 2024 14:25:29 +0530 Subject: [PATCH 2/3] removed user id from filter api endpoint --- main.go | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/main.go b/main.go index 7237226..0ad8e47 100644 --- a/main.go +++ b/main.go @@ -135,22 +135,12 @@ func main() { cli.CompletionOptions.HiddenDefaultCmd = true // create a default profile if file does not exist - if previousConfig, err := config.ReadConfigFromFile(); os.IsNotExist(err) { + if _, err := config.ReadConfigFromFile(); os.IsNotExist(err) { conf := config.Config{ Profiles: map[string]config.Profile{"demo": defaultInitialProfile()}, DefaultProfile: "demo", } config.WriteConfigToFile(&conf) - } else { - // updates the demo profile for existing users - _, exists := previousConfig.Profiles["demo"] - if exists { - conf := config.Config{ - Profiles: map[string]config.Profile{"demo": defaultInitialProfile()}, - DefaultProfile: "demo", - } - config.WriteConfigToFile(&conf) - } } err := cli.Execute() From 51f6cc3b8832934bbea2839cffb6c6b36b16adf3 Mon Sep 17 00:00:00 2001 From: Koustav Date: Sun, 6 Oct 2024 15:30:53 +0530 Subject: [PATCH 3/3] clean up --- main.go | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/main.go b/main.go index 0ad8e47..a3767aa 100644 --- a/main.go +++ b/main.go @@ -134,13 +134,25 @@ func main() { cli.CompletionOptions.HiddenDefaultCmd = true - // create a default profile if file does not exist - if _, err := config.ReadConfigFromFile(); os.IsNotExist(err) { + // create a default profile if file does not exist + if previousConfig, err := config.ReadConfigFromFile(); os.IsNotExist(err) { conf := config.Config{ Profiles: map[string]config.Profile{"demo": defaultInitialProfile()}, DefaultProfile: "demo", } config.WriteConfigToFile(&conf) + } else { + // updates the demo profile for existing users + _, exists := previousConfig.Profiles["demo"] + if exists { + conf := config.Profile{ + URL: "http://demo.parseable.com", + Username: "admin", + Password: "admin", + } + previousConfig.Profiles["demo"] = conf + config.WriteConfigToFile(previousConfig) + } } err := cli.Execute()