gherkin updation- bug ux enhancement

frontend/packages/dev-console/integration-tests/features/Knative/knative-Actions_on_knative_service.feature

@@ -154,10 +154,10 @@ Scenario: Set traffic distribution greater than 100% for the Revisions of the kn
    Given knative service named "nodejs-ex-git-1" is higlighted on topology page
    And service should have at least 1 revision 
    When user selects "Set Traffic Distribution" context menu option of knative service "nodejs-ex-git-1"
-   And user clicks on "Add Revision" button present in "Set Traffic Dsitribution" modal
+   And user clicks on "Add Revision" button present in "Set Traffic Distribution" modal
    And user enters "50" into the "Split" text box of new revision
    And user selects the "Revision" option from "revision" drop down
-   And user clicks the save button on the "Set Traffic Dsitribution" modal
+   And user clicks the save button on the "Set Traffic Distribution" modal
    Then error message displays as "validation failed: Traffic targets sum to 150, want 100: spec.traffic"
 
 
@@ -167,10 +167,10 @@ Scenario: Set traffic distribution less than 100% for the Revisions of the knati
    And service should have at least 1 revision 
    When user selects "Set Traffic Distribution" context menu option of knative service "nodejs-ex-git-1"
    And user enters "25" into the "Split" text box
-   And user clicks on "Add Revision" button present in "Set Traffic Dsitribution" modal
+   And user clicks on "Add Revision" button present in "Set Traffic Distribution" modal
    And user enters "50" into the "Split" text box of new revision
    And user selects the "Revision" option from "revision" drop down
-   And user clicks the save button on the "Set Traffic Dsitribution" modal
+   And user clicks the save button on the "Set Traffic Distribution" modal
    Then error message displays as "validation failed: Traffic targets sum to 75, want 100: spec.traffic"
 
 
@@ -180,10 +180,10 @@ Scenario: Set traffic distribution equal to 100% for the Revisions of the knativ
    And service should have at least 1 revision 
    When user selects "Set Traffic Distribution" context menu option of knative service "nodejs-ex-git-1"
    And user enters "50" into the "Split" text box
-   And user clicks on "Add Revision" button present in "Set Traffic Dsitribution" modal
+   And user clicks on "Add Revision" button present in "Set Traffic Distribution" modal
    And user enters "50" into the "Split" text box of new revision
    And user selects the "Revision" option from "revision" drop down
-   And user clicks the save button on the "Set Traffic Dsitribution" modal
+   And user clicks the save button on the "Set Traffic Distribution" modal
    Then number of routes should get increased in side bar - resources tab - routes section
 
 

frontend/packages/dev-console/integration-tests/features/topology/topology-chart_area_visual.feature

@@ -23,7 +23,7 @@ Scenario: Topology with workloads : T-02-TC01
 @regression, @smoke, @manual
 Scenario: Visual for deployment : T-02-TC01
    Given user has created a workload named "nodejs-ex-git"
-   And user is at the Topolgy page
+   And user is at the Topology page
    When user checks nodes and the decorators associated with them
    Then nodes are circular shaped with builder image in them
    And pod ring associated with node are present around node with color according to the pod status
@@ -35,7 +35,7 @@ Scenario: Visual for deployment : T-02-TC01
 
 @regression, @smoke, @manual
 Scenario: Visual for deployment-config : T-02-TC01
-   Given user is at the Topolgy page
+   Given user is at the Topology page
    And deployment-config workload is present in topology
    When user checks nodes and the decorators associated with them
    Then nodes are circular shaped with builder image in them
@@ -48,7 +48,7 @@ Scenario: Visual for deployment-config : T-02-TC01
 
 @regression, @smoke, @manual
 Scenario: Visual for knative service with no revision : T-02-TC03
-   Given user is at the Topolgy page
+   Given user is at the Topology page
    And knative workload without revision is present in topology
    When user checks nodes and the decorators associated with them
    Then user can view knative service are rectangular shaped with round corners
@@ -60,7 +60,7 @@ Scenario: Visual for knative service with no revision : T-02-TC03
 
 @regression, @smoke, @manual
 Scenario: Visual for knative service with revisions : T-02-TC03
-   Given user is at the Topolgy page
+   Given user is at the Topology page
    And knative workload with revison is present in topology
    When user checks nodes and the decorators associated with them
    Then user can view knative service are rectangular shaped with round corners
@@ -78,31 +78,31 @@ Scenario: Visual for knative service with revisions : T-02-TC03
 @regression, @smoke
 Scenario: Context menu of node : T-06-TC10
    Given user has created a workload named "nodejs-ex-git"
-   And user is at the Topolgy page
+   And user is at the Topology page
    When user right clicks on the node "nodejs-ex-git" to open context menu 
    Then user is able to context menu options like Edit Application Grouping, Edit Pod Count, Pause Rollouts, Add Health Checks, Add Horizontal Pod Autoscaler, Add Storage, Edit Update Strategy, Edit Labels, Edit Annotations, Edit Deployment, Delete Deployment 
 
 
 @regression, @smoke, @manual
 Scenario: Zoom In in topology : T-07-TC01
    Given user has created a workload named "nodejs-ex-git"
-   And user is at the Topolgy page
+   And user is at the Topology page
    When user clicks on Zoom In option
    Then user sees the chart area is zoomed
 
 
 @regression, @smoke, @manual
 Scenario: Zoom Out in topology : T-07-TC01
    Given user has created a workload named "nodejs-ex-git"
-   And user is at the Topolgy page
+   And user is at the Topology page
    When user clicks on Zoom Out option
    Then user sees the chart area is zoomed out
 
 
 @regression, @manual
 Scenario: Fit to Screen in topology : T-07-TC03
    Given user has created a workload named "nodejs-ex-git"
-   And user is at the Topolgy page
+   And user is at the Topology page
    When user clicks on Zoom In option
    And user sees the chart area is zoomed
    And user clicks on Fit to Screen option
@@ -112,8 +112,19 @@ Scenario: Fit to Screen in topology : T-07-TC03
 @regression, @manual
 Scenario: Reset view in topology: T-07-TC02
    Given user has created a workload named "nodejs-ex-git"
-   And user is at the Topolgy page
+   And user is at the Topology page
    When user clicks on Zoom In option
    And user sees the chart area is zoomed
    And user clicks on Reset View option
    Then user sees the chart area is reset to original
+
+@regression
+Scenario: Topology filter by resource: T-07-TC06, T-07-TC07
+   Given user created two workloads with resource type "Deployment" and "Deployment-Config" 
+   When user is at Topology page chart view
+   And user clicks the filter by resource on top
+   And user will see "Deployment" and "Deployment-Config" options with '1' associated with it
+   And user clicks on Deployment
+   And user can see only the deployment workload
+   And user clicks on Deployment-Config
+   Then user can see only the deployment-config workload

frontend/packages/dev-console/integration-tests/features/topology/topology-list_view.feature

@@ -10,5 +10,16 @@ Background:
 Scenario: Topology List view : T-07-TC05
    Given user created workload "nodejs-ex-git" with resource type "Deployment" 
    When user clicks on List view button
-   And user verifies the Group by filter on top
+   And user verifies the filter by resource on top
    Then user will see workloads are segregated by applications groupings
+
+@regression
+Scenario: Topology filter by resource: T-07-TC06, T-07-TC07
+   Given user created two workloads with resource type "Deployment" and "Deployment-Config" 
+   When user clicks on List view button
+   And user clicks the filter by resource on top
+   And user will see "Deployment" and "Deployment-Config" options with '1' associated with it
+   And user clicks on Deployment
+   And user can see only the deployment workload
+   And user clicks on Deployment-Config
+   Then user can see only the deployment-config workload

frontend/packages/dev-console/integration-tests/features/topology/workload-Groupings-ODC-2922.feature

@@ -10,18 +10,18 @@ Background:
 Scenario: Default state of Display dropdown
     Given user is at the Topology page
     When user clicks on the Display dropdown
-    Then user will see the Show Groups is checked
+    Then user will see the Connectivity Mode is checked
     And user will see the Expand is checked
     And user will see the Knative Services checkbox checked
     And user will see the Helm Releses checkbox checked
     And user will see the Operator Groups checkbox checked
 
 
 @regression
-Scenario: Uncheck the Show Groups
+Scenario: Check the Consuption Mode
     Given user is at the Topology page
     When user clicks on the Display dropdown
-    And user unchecks the Show Groups
+    And user checks the Consumption Mode
     Then user will see that the Expand and it's children are disabled
     And user will see that the group no longer appear in the view