Explorer extending - gitopssets #3267

ranatrk · 2023-08-30T11:39:01Z

Closes #2957

What changed?
Add gitopssets to explorer filters

Why was this change made?
Extending the explorer to be compatible to filter based on the kind Gitopssets

How was this change implemented?
Add gitopsset to compatible objects used in the explorer filter

How did you validate the change?

Explain how a reviewer can verify the change themselves
manual test: Add gitopsset, then through the explorer view tab, enable the gitopssets filter to only show the gitopsset

Release notes
Add gitopssets to explorer filters

Documentation Changes
N/A

Other follow ups

bigkevmcd

I think we should fix the category.

pkg/query/configuration/objectkind.go

enekofb

lgtm, just suggesting adding an integration test case

pkg/query/configuration/objectkind.go

enekofb · 2023-09-04T14:48:47Z

pkg/query/configuration/objectkind.go

+		AddToSchemeFunc: gitopssets.AddToScheme,
+		StatusFunc:      defaultFluxObjectStatusFunc,
+		MessageFunc:     defaultFluxObjectMessageFunc,
+		Category:        CategoryAutomation,


@jpellizzari do we expect to use this category?

I would think no. This will put the GitOpsSets objects into the Applications table. I would give them their own category, so that they show up in their own table.

tested and i could see gitopsssets with applications UI as you mentioned

@ranatrk please lets change the category

https://github.com/weaveworks/weave-gitops-enterprise/pull/3290/files

enekofb

thanks for adding the test case! i think there is a small change required. ptal

enekofb · 2023-09-04T15:34:20Z

pkg/query/server/server_integration_test.go

@@ -169,6 +170,36 @@ func TestQueryServer(t *testing.T) {
 			query:              fmt.Sprintf("kind:%s", sourcev1beta2.BucketKind),
 			expectedNumObjects: 1, // should allow only on default namespace,
 		},
+		{
+			name:   "should support gitopssets",
+			access: allowHelmReleaseAnyOnDefaultNamespace(principal.ID),


you might want to change this for allowGitOpsSetsAnyOnDefaultNamespace

enekofb

e2e tested with the following:

I could see the gitopssets showing in explorer view

However when i click through brings me to the generic view not the gitopssets details one.

@ranatrk
I believe you want to be redirected to gitopsset view, isn't?

Suggestions added for the routing here #3267 (review)

enekofb

suggestions added to make the routing work

ui-cra/src/utils/nav.ts

ranatrk · 2023-09-04T15:56:42Z

@enekofb yes, i'll try to fix it with these updates! thank you

pkg/query/server/server_integration_test.go

enekofb · 2023-09-04T16:49:26Z

@enekofb yes, i'll try to fix it with these updates! thank you

Super, happy to approve once tests are green .. thanks you 🙏

…server test

jpellizzari

Code LGTM. I would expect an Explorer UI component to be used somewhere with the corresponding category= prop set. But maybe that will be a follow up PR?

enekofb

added follow-up on the category, see comment above

enekofb · 2023-09-05T15:51:32Z

pkg/query/configuration/objectkind.go

+		AddToSchemeFunc: gitopssets.AddToScheme,
+		StatusFunc:      defaultFluxObjectStatusFunc,
+		MessageFunc:     defaultFluxObjectMessageFunc,
+		Category:        CategoryAutomation,


tested and i could see gitopsssets with applications UI as you mentioned

@ranatrk please lets change the category

enekofb · 2023-09-05T15:57:21Z

pkg/query/configuration/objectkind.go

+		AddToSchemeFunc: gitopssets.AddToScheme,
+		StatusFunc:      defaultFluxObjectStatusFunc,
+		MessageFunc:     defaultFluxObjectMessageFunc,
+		Category:        CategoryAutomation,


https://github.com/weaveworks/weave-gitops-enterprise/pull/3290/files

enekofb

Please merge this https://github.com/weaveworks/weave-gitops-enterprise/pull/3290/files or similar one before merging to main

awesome one @ranatrk 👏

* Add gitopsset kind to supported objects in explorer query * add gitopssets to rbac rules * Add gitopssets to ToFluxObject * Add gitopssets to getKindRoute fn in ui * Add gitopssets query server testcase to server integration tests * Use allowGitOpsSetsAnyOnDefaultNamespace for gitopsset support query server test * Add gitopssets crd to query suite test * changed category gitopsset (#3290) --------- Co-authored-by: Eneko Fernández <[email protected]>

* fix button spaces * remove unused imports * update snaps * remove unused styled components * Rename ui-cra -> ui and move package.json to root (#3263) * Search replace all the ui-cra to ui * and move package.json to root * run eject * Update fields in cluster-service API to be snake_case (#3237) * Update fields in cluster-service API to be snake_case * Make sure all network requests in the UI use the protobuf types * And remove all a lot of unused code in the FE too --------- Co-authored-by: Simon Howe <[email protected]> Co-authored-by: Simon <[email protected]> * Bump @adobe/css-tools from 4.2.0 to 4.3.1 (#3284) Bumps [@adobe/css-tools](https://github.com/adobe/css-tools) from 4.2.0 to 4.3.1. - [Changelog](https://github.com/adobe/css-tools/blob/main/History.md) - [Commits](https://github.com/adobe/css-tools/commits) --- updated-dependencies: - dependency-name: "@adobe/css-tools" dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Simon <[email protected]> * Bump async from 2.6.3 to 2.6.4 (#3285) Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4. - [Release notes](https://github.com/caolan/async/releases) - [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md) - [Commits](caolan/async@v2.6.3...v2.6.4) --- updated-dependencies: - dependency-name: async dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Simon <[email protected]> * Explorer extending - gitopssets (#3267) * Add gitopsset kind to supported objects in explorer query * add gitopssets to rbac rules * Add gitopssets to ToFluxObject * Add gitopssets to getKindRoute fn in ui * Add gitopssets query server testcase to server integration tests * Use allowGitOpsSetsAnyOnDefaultNamespace for gitopsset support query server test * Add gitopssets crd to query suite test * changed category gitopsset (#3290) --------- Co-authored-by: Eneko Fernández <[email protected]> * update snaps --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Simon <[email protected]> Co-authored-by: Sara Elzayat <[email protected]> Co-authored-by: Simon Howe <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Rana Tarek Hassan <[email protected]> Co-authored-by: Eneko Fernández <[email protected]>

ranatrk force-pushed the explorer-extending branch 2 times, most recently from cab5a50 to c2d4f58 Compare September 3, 2023 13:57

ranatrk added the enhancement New feature or request label Sep 3, 2023

ranatrk force-pushed the explorer-extending branch from 5f9bdb5 to a361f8b Compare September 4, 2023 12:30

ranatrk marked this pull request as ready for review September 4, 2023 13:09

ranatrk force-pushed the explorer-extending branch from a361f8b to db0166e Compare September 4, 2023 13:10

ranatrk changed the title ~~Explorer extending~~ Explorer extending - gitopssets Sep 4, 2023

ranatrk requested review from enekofb and a team September 4, 2023 13:10

bigkevmcd requested changes Sep 4, 2023

View reviewed changes

pkg/query/configuration/objectkind.go Outdated Show resolved Hide resolved

enekofb requested a review from jpellizzari September 4, 2023 13:49

bigkevmcd self-requested a review September 4, 2023 14:21

bigkevmcd approved these changes Sep 4, 2023

View reviewed changes

enekofb reviewed Sep 4, 2023

View reviewed changes

enekofb requested a review from opudrovs September 4, 2023 15:17

enekofb reviewed Sep 4, 2023

View reviewed changes

enekofb self-requested a review September 4, 2023 15:43

enekofb reviewed Sep 4, 2023

View reviewed changes

ui-cra/src/utils/nav.ts Outdated Show resolved Hide resolved

ui-cra/src/utils/nav.ts Outdated Show resolved Hide resolved

enekofb reviewed Sep 4, 2023

View reviewed changes

pkg/query/server/server_integration_test.go Outdated Show resolved Hide resolved

ranatrk force-pushed the explorer-extending branch from f6de845 to ef6a78b Compare September 4, 2023 16:38

ranatrk force-pushed the explorer-extending branch 4 times, most recently from f578c43 to edb25ba Compare September 5, 2023 11:34

ranatrk added 3 commits September 5, 2023 16:57

Add gitopsset kind to supported objects in explorer query

f509307

add gitopssets to rbac rules

8c1bc60

Add gitopssets to ToFluxObject

01b174f

ranatrk added 7 commits September 5, 2023 16:57

Add gitopssets to getKindRoute fn in ui

b897e6c

Update gitopsset object kind category to categoryAutomation

501c8ac

Add gitopssets query server testcase to server integration tests

f77e30f

Use allowGitOpsSetsAnyOnDefaultNamespace for gitopsset support query …

ca786f5

…server test

Fix routing of gitopssets from explorer to gitopssets view

1518304

Fix imports in test

b0b41a1

Add gitopssets crd to query suite test

40fc374

ranatrk force-pushed the explorer-extending branch from eb7d81c to 40fc374 Compare September 5, 2023 13:57

ranatrk requested a review from enekofb September 5, 2023 14:08

jpellizzari approved these changes Sep 5, 2023

View reviewed changes

enekofb reviewed Sep 5, 2023

View reviewed changes

enekofb self-requested a review September 5, 2023 16:07

enekofb approved these changes Sep 5, 2023

View reviewed changes

changed category gitopsset (#3290)

841252e

ranatrk merged commit 95ff6ff into main Sep 6, 2023

ranatrk deleted the explorer-extending branch September 6, 2023 08:47

foot mentioned this pull request Sep 13, 2023

Switch Cluster/Template/Gitopsset etc querying to the explorer querier #2957

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Explorer extending - gitopssets #3267

Explorer extending - gitopssets #3267

ranatrk commented Aug 30, 2023 •

edited

Loading

bigkevmcd left a comment

enekofb left a comment

enekofb Sep 4, 2023

jpellizzari Sep 5, 2023

enekofb Sep 5, 2023

enekofb Sep 5, 2023

enekofb left a comment

enekofb Sep 4, 2023

enekofb left a comment •

edited

Loading

enekofb left a comment

ranatrk commented Sep 4, 2023

enekofb commented Sep 4, 2023

jpellizzari left a comment

enekofb left a comment

enekofb Sep 5, 2023

enekofb Sep 5, 2023

enekofb left a comment

Explorer extending - gitopssets #3267

Explorer extending - gitopssets #3267

Conversation

ranatrk commented Aug 30, 2023 • edited Loading

bigkevmcd left a comment

Choose a reason for hiding this comment

enekofb left a comment

Choose a reason for hiding this comment

enekofb Sep 4, 2023

Choose a reason for hiding this comment

jpellizzari Sep 5, 2023

Choose a reason for hiding this comment

enekofb Sep 5, 2023

Choose a reason for hiding this comment

enekofb Sep 5, 2023

Choose a reason for hiding this comment

enekofb left a comment

Choose a reason for hiding this comment

enekofb Sep 4, 2023

Choose a reason for hiding this comment

enekofb left a comment • edited Loading

Choose a reason for hiding this comment

enekofb left a comment

Choose a reason for hiding this comment

ranatrk commented Sep 4, 2023

enekofb commented Sep 4, 2023

jpellizzari left a comment

Choose a reason for hiding this comment

enekofb left a comment

Choose a reason for hiding this comment

enekofb Sep 5, 2023

Choose a reason for hiding this comment

enekofb Sep 5, 2023

Choose a reason for hiding this comment

enekofb left a comment

Choose a reason for hiding this comment

ranatrk commented Aug 30, 2023 •

edited

Loading

enekofb left a comment •

edited

Loading