Merge pull request #2938 from devtron-labs/fix/issues

fix: multiple issues

Author: Elessar1802

src/components/charts/list/DiscoverCharts.tsx

@@ -15,7 +15,7 @@
  */
 
 import React, { useEffect, useMemo, useRef, useState } from 'react'
-import { NavLink, Prompt, Route, Switch, useHistory, useLocation, useRouteMatch } from 'react-router-dom'
+import { Prompt, Route, Switch, useHistory, useLocation, useRouteMatch } from 'react-router-dom'
 import Tippy from '@tippyjs/react'
 
 import {
@@ -28,6 +28,7 @@ import {
     FeatureTitleWithInfo,
     getApplicationManagementBreadcrumb,
     handleAnalyticsEvent,
+    InfoIconTippy,
     PageHeader,
     Progressing,
     showError,
@@ -327,13 +328,31 @@ const DiscoverChartList = ({ isSuperAdmin }: { isSuperAdmin: boolean }) => {
             alias: {
                 ...getApplicationManagementBreadcrumb(),
                 'chart-store': null,
-                discover: { component: 'Chart Store', linked: false },
+                discover: {
+                    component: (
+                        <div className="flex left dc__gap-16">
+                            <div className="flex">
+                                <span>Chart Store</span>
+
+                                <InfoIconTippy
+                                    infoText={CHART_STORE_TIPPY_CONTENT}
+                                    heading="Chart Store"
+                                    iconClassName="icon-dim-20 ml-8 fcn-5"
+                                    documentationLink="CHART_STORE"
+                                    documentationLinkText="View Documentation"
+                                />
+                            </div>
+
+                            {isSuperAdmin && <ChartsList isLoading={isLoading} chartsList={chartsList} />}
+                        </div>
+                    ),
+                    linked: false,
+                },
             },
         },
         [],
     )
 
-
     const renderBreadcrumbs = () => {
         if (typeof state.configureChartIndex === 'number') {
             return (

src/components/common/helpers/workflowURL.ts

@@ -54,7 +54,7 @@ export function getCIPipelineURL(
                 ? generatePath(CommonURLS.APPLICATION_MANAGEMENT_TEMPLATES_DEVTRON_APP_DETAIL, {
                       appId,
                   })
-                : `/${isJobView ? CommonURLS.AUTOMATION_AND_ENABLEMENT_JOB : CommonURLS.APPLICATION_MANAGEMENT_APP}/${appId}`
+                : `${isJobView ? CommonURLS.AUTOMATION_AND_ENABLEMENT_JOB : CommonURLS.APPLICATION_MANAGEMENT_APP}/${appId}`
         }/edit/workflow/`
     }
     const ciPipelineSuffix = ciPipelineId ? `/${ciPipelineId}` : ''

src/css/patternfly.scss

@@ -2382,44 +2382,6 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
     border-top-right-radius: 1px;
     border-bottom-right-radius: 1px;
 }
-.pager {
-    padding-left: 0;
-    margin: 20px 0;
-    text-align: center;
-    list-style: none;
-}
-.pager li {
-    display: inline;
-}
-.pager li > a,
-.pager li > span {
-    display: inline-block;
-    padding: 5px 14px;
-    background-color: var(--N100);
-    border: 1px solid var(--N200);
-    border-radius: 0;
-}
-.pager li > a:hover,
-.pager li > a:focus {
-    text-decoration: none;
-    background-color: var(--N100);
-}
-.pager .next > a,
-.pager .next > span {
-    float: right;
-}
-.pager .previous > a,
-.pager .previous > span {
-    float: left;
-}
-.pager .disabled > a,
-.pager .disabled > a:hover,
-.pager .disabled > a:focus,
-.pager .disabled > span {
-    color: #8b8d8f;
-    cursor: not-allowed;
-    background-color: var(--N100);
-}
 .label {
     display: inline;
     padding: 0.2em 0.6em 0.3em;