Merge pull request #3477 from RedisInsight/fe/feature/RI-5662-remove-tf

#RI-5662 - remove tf

Author: rsergeenko

redisinsight/ui/src/assets/img/triggers_and_functions_dark.svg

@@ -2,15 +2,13 @@ import SearchIcon from 'uiSrc/assets/img/guides/search.svg?react'
 import ProbabilisticDataIcon from 'uiSrc/assets/img/guides/probabilistic-data.svg?react'
 import JSONIcon from 'uiSrc/assets/img/guides/json.svg?react'
 import TimeSeriesIcon from 'uiSrc/assets/img/guides/time-series.svg?react'
-import TriggersAndFunctionsIcon from 'uiSrc/assets/img/guides/triggers-and-functions.svg?react'
 import VectorSimilarity from 'uiSrc/assets/img/guides/vector-similarity.svg?react'
 
 const GUIDE_ICONS: Record<string, any> = {
   search: SearchIcon,
   json: JSONIcon,
   'probabilistic-data-structures': ProbabilisticDataIcon,
   'time-series': TimeSeriesIcon,
-  'triggers-and-functions': TriggersAndFunctionsIcon,
   'vector-similarity-search': VectorSimilarity
 }
 

redisinsight/ui/src/assets/img/triggers_and_functions_light.svg

@@ -12,9 +12,8 @@ import {
 import WorkbenchPage from 'uiSrc/pages/workbench'
 import PubSubPage from 'uiSrc/pages/pub-sub'
 import AnalyticsPage from 'uiSrc/pages/analytics'
-import TriggeredFunctionsPage from 'uiSrc/pages/triggered-functions'
 import RdiList from 'uiSrc/pages/rdi/home'
-import { ANALYTICS_ROUTES, RDI_ROUTES, TRIGGERED_FUNCTIONS_ROUTES } from './sub-routes'
+import { ANALYTICS_ROUTES, RDI_ROUTES } from './sub-routes'
 
 import COMMON_ROUTES from './commonRoutes'
 
@@ -39,11 +38,6 @@ const INSTANCE_ROUTES: IRoute[] = [
     component: AnalyticsPage,
     routes: ANALYTICS_ROUTES,
   },
-  {
-    path: Pages.triggeredFunctions(':instanceId'),
-    component: TriggeredFunctionsPage,
-    routes: TRIGGERED_FUNCTIONS_ROUTES
-  }
 ]
 
 const ROUTES: IRoute[] = [

redisinsight/ui/src/components/explore-guides/icons.ts

@@ -9,8 +9,6 @@ import EditConnection from 'uiSrc/pages/redis-stack/components/edit-connection'
 import ClusterDetailsPage from 'uiSrc/pages/cluster-details'
 import AnalyticsPage from 'uiSrc/pages/analytics'
 import DatabaseAnalysisPage from 'uiSrc/pages/database-analysis'
-import TriggeredFunctionsPage from 'uiSrc/pages/triggered-functions'
-import { LibrariesPage, FunctionsPage } from 'uiSrc/pages/triggered-functions/pages'
 import COMMON_ROUTES from './commonRoutes'
 
 const ANALYTICS_ROUTES: IRoute[] = [
@@ -34,21 +32,6 @@ const ANALYTICS_ROUTES: IRoute[] = [
   },
 ]
 
-const TRIGGERED_FUNCTIONS_ROUTES: IRoute[] = [
-  {
-    pageName: PageNames.triggeredFunctionsFunctions,
-    path: Pages.triggeredFunctionsFunctions(':instanceId'),
-    protected: true,
-    component: FunctionsPage,
-  },
-  {
-    pageName: PageNames.triggeredFunctionsLibraries,
-    path: Pages.triggeredFunctionsLibraries(':instanceId'),
-    protected: true,
-    component: LibrariesPage,
-  },
-]
-
 const INSTANCE_ROUTES: IRoute[] = [
   {
     pageName: PageNames.browser,
@@ -74,11 +57,6 @@ const INSTANCE_ROUTES: IRoute[] = [
     component: AnalyticsPage,
     routes: ANALYTICS_ROUTES,
   },
-  {
-    path: Pages.triggeredFunctions(':instanceId'),
-    component: TriggeredFunctionsPage,
-    routes: TRIGGERED_FUNCTIONS_ROUTES
-  }
 ]
 
 const ROUTES: IRoute[] = [

redisinsight/ui/src/components/main-router/constants/defaultRoutes.ts

@@ -1,9 +1,7 @@
 import { ANALYTICS_ROUTES } from './analyticsRoutes'
-import { TRIGGERED_FUNCTIONS_ROUTES } from './triggeredFunctionsRoutes'
 import { RDI_ROUTES } from './rdiRoutes'
 
 export {
   ANALYTICS_ROUTES,
-  TRIGGERED_FUNCTIONS_ROUTES,
   RDI_ROUTES,
 }

redisinsight/ui/src/components/main-router/constants/redisStackRoutes.ts

@@ -20,8 +20,4 @@ export const MODULE_CAPABILITY_TEXT_NOT_AVAILABLE: { [key in RedisDefaultModules
     title: 'Time series data structure is not available',
     text: 'Create a free Redis Stack database with the time series data structure that extends the core capabilities of your Redis.'
   },
-  [RedisDefaultModules.RedisGears]: {
-    title: 'Triggers and functions capability is not available',
-    text: 'Create a free Redis Stack database with triggers and functions that extend the core capabilities of your Redis.'
-  },
 }

redisinsight/ui/src/components/main-router/constants/sub-routes/index.ts

@@ -13,7 +13,7 @@ import {
   EuiToolTip
 } from '@elastic/eui'
 import HighlightedFeature, { Props as HighlightedFeatureProps } from 'uiSrc/components/hightlighted-feature/HighlightedFeature'
-import { ANALYTICS_ROUTES, TRIGGERED_FUNCTIONS_ROUTES } from 'uiSrc/components/main-router/constants/sub-routes'
+import { ANALYTICS_ROUTES } from 'uiSrc/components/main-router/constants/sub-routes'
 
 import { PageNames, Pages } from 'uiSrc/constants'
 import { EXTERNAL_LINKS } from 'uiSrc/constants/links'
@@ -34,8 +34,6 @@ import SlowLogSVG from 'uiSrc/assets/img/sidebar/slowlog.svg'
 import SlowLogActiveSVG from 'uiSrc/assets/img/sidebar/slowlog_active.svg'
 import PubSubSVG from 'uiSrc/assets/img/sidebar/pubsub.svg'
 import PubSubActiveSVG from 'uiSrc/assets/img/sidebar/pubsub_active.svg'
-import TriggeredFunctionsSVG from 'uiSrc/assets/img/sidebar/gears.svg'
-import TriggeredFunctionsActiveSVG from 'uiSrc/assets/img/sidebar/gears_active.svg'
 import GithubSVG from 'uiSrc/assets/img/sidebar/github.svg'
 import Divider from 'uiSrc/components/divider/Divider'
 import { BuildType } from 'uiSrc/constants/env'
@@ -87,10 +85,6 @@ const NavigationMenu = () => {
     ({ path }) => (`/${last(path.split('/'))}` === activePage)
   )
 
-  const isTriggeredFunctionsPath = (activePage: string) => !!TRIGGERED_FUNCTIONS_ROUTES.find(
-    ({ path }) => (`/${last(path.split('/'))}` === activePage)
-  )
-
   const getAdditionPropsForHighlighting = (pageName: string): Omit<HighlightedFeatureProps, 'children'> => {
     if (BUILD_FEATURES[pageName]?.asPageFeature) {
       return ({
@@ -167,23 +161,6 @@ const NavigationMenu = () => {
       },
       onboard: ONBOARDING_FEATURES.PUB_SUB_PAGE
     },
-    {
-      tooltipText: 'Triggers and Functions',
-      pageName: PageNames.triggeredFunctions,
-      ariaLabel: 'Triggers and Functions',
-      onClick: () => handleGoPage(Pages.triggeredFunctions(connectedInstanceId)),
-      dataTestId: 'triggered-functions-page-btn',
-      connectedInstanceId,
-      isActivePage: isTriggeredFunctionsPath(activePage),
-      isBeta: true,
-      getClassName() {
-        return cx(styles.navigationButton, { [styles.active]: this.isActivePage })
-      },
-      getIconType() {
-        return this.isActivePage ? TriggeredFunctionsActiveSVG : TriggeredFunctionsSVG
-      },
-      onboard: ONBOARDING_FEATURES.TRIGGERED_FUNCTIONS_PAGE
-    },
   ]
 
   const publicRoutes: INavigations[] = [

redisinsight/ui/src/components/main-router/constants/sub-routes/triggeredFunctionsRoutes.ts

@@ -2,9 +2,8 @@ import React from 'react'
 import { cloneDeep } from 'lodash'
 import { cleanup, fireEvent, mockedStore, render, within } from 'uiSrc/utils/test-utils'
 import { TelemetryEvent, sendEventTelemetry } from 'uiSrc/telemetry'
-import { addFreeDb, oauthCloudPlanSelector, oauthCloudSelector, initialState } from 'uiSrc/slices/oauth/cloud'
+import { addFreeDb, oauthCloudPlanSelector } from 'uiSrc/slices/oauth/cloud'
 import { appFeatureFlagsFeaturesSelector } from 'uiSrc/slices/app/features'
-import { OAuthSocialSource } from 'uiSrc/slices/interfaces'
 import { MOCK_NO_TF_REGION, MOCK_REGIONS, MOCK_RS_PREVIEW_REGION, MOCK_CUSTOM_REGIONS } from 'uiSrc/constants/mocks/mock-sso'
 import OAuthSelectPlan from './OAuthSelectPlan'
 
@@ -33,16 +32,6 @@ jest.mock('uiSrc/slices/app/features', () => ({
       data: {
         selectPlan: {
           components: {
-            triggersAndFunctions: [
-              {
-                provider: 'AWS',
-                regions: ['ap-southeast-1']
-              },
-              {
-                provider: 'GCP',
-                regions: ['asia-northeast1']
-              }
-            ],
             redisStackPreview: [
               {
                 provider: 'AWS',
@@ -118,21 +107,7 @@ describe('OAuthSelectPlan', () => {
     expect(store.getActions()).toEqual(expectedActions)
   })
 
-  it('if source is Trigger and Functions region with TF should be selected by default', async () => {
-    (oauthCloudSelector as jest.Mock).mockReturnValue({
-      ...initialState,
-      source: OAuthSocialSource.TriggersAndFunctions,
-    })
-
-    const container = render(<OAuthSelectPlan />)
-
-    const { queryByTestId } = within(container.queryByTestId('select-oauth-region') as HTMLElement)
-    const tfIconEl = queryByTestId(/tf-icon-/)
-
-    expect(tfIconEl).toBeInTheDocument()
-  })
-
-  it('if source is not Trigger and Functions region with RS should be selected by default', async () => {
+  it('region with RS should be selected by default', async () => {
     const container = render(<OAuthSelectPlan />)
 
     const { queryByTestId } = within(container.queryByTestId('select-oauth-region') as HTMLElement)
@@ -198,19 +173,6 @@ describe('OAuthSelectPlan', () => {
     expect(rsTextEl).toBeInTheDocument()
   })
 
-  it('should display text if no Trigger and Function regions available on this vendor', async () => {
-    (oauthCloudPlanSelector as jest.Mock).mockReturnValue({
-      isOpenDialog: true,
-      data: [MOCK_NO_TF_REGION],
-    })
-
-    const { queryByTestId } = render(<OAuthSelectPlan />)
-    const selectDescriptionEl = queryByTestId('select-region-select-description')
-
-    expect(selectDescriptionEl).toBeInTheDocument()
-    expect(selectDescriptionEl).toHaveTextContent('This vendor does not support triggers and functions capability.')
-  })
-
   it('should display text if regions is no available on this venodor', async () => {
     (oauthCloudPlanSelector as jest.Mock).mockReturnValue({
       isOpenDialog: true,