From 87f1bf350d2b11fae5d23bdc97a3f1e418a9977b Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Thu, 7 Sep 2023 16:49:48 +1000 Subject: [PATCH 1/7] update org group and project icons --- src/components/Organizations/NavTabs/OrgNavTabsSkeleton.tsx | 6 +++--- src/components/Organizations/NavTabs/index.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/Organizations/NavTabs/OrgNavTabsSkeleton.tsx b/src/components/Organizations/NavTabs/OrgNavTabsSkeleton.tsx index 70779842..ff50ea82 100644 --- a/src/components/Organizations/NavTabs/OrgNavTabsSkeleton.tsx +++ b/src/components/Organizations/NavTabs/OrgNavTabsSkeleton.tsx @@ -1,6 +1,6 @@ import React, { FC } from 'react'; -import { BellOutlined, DeploymentUnitOutlined, ReadOutlined, SettingOutlined, TeamOutlined } from '@ant-design/icons'; +import { BellOutlined, GroupOutlined, ReadOutlined, SettingOutlined, GlobalOutlined, TeamOutlined } from '@ant-design/icons'; import { StyledNavigation } from './StyledNavTabs'; @@ -19,7 +19,7 @@ const OrgNavTabsSkeleton: FC = ({ activeTab }) => (
  • - + Groups
    • @@ -31,7 +31,7 @@ const OrgNavTabsSkeleton: FC = ({ activeTab }) => (
  • - + Projects
    • diff --git a/src/components/Organizations/NavTabs/index.js b/src/components/Organizations/NavTabs/index.js index db09e52a..f33a2e44 100644 --- a/src/components/Organizations/NavTabs/index.js +++ b/src/components/Organizations/NavTabs/index.js @@ -1,6 +1,6 @@ import React from 'react'; -import { BellOutlined, DeploymentUnitOutlined, ReadOutlined, SettingOutlined, TeamOutlined } from '@ant-design/icons'; +import { BellOutlined, GlobalOutlined, ReadOutlined, SettingOutlined, GroupOutlined, TeamOutlined } from '@ant-design/icons'; import OrgGroupsLink from 'components/link/Organizations/Groups'; import OrgManageLink from 'components/link/Organizations/Manage'; import OrgNotificationsLink from 'components/link/Organizations/Notifications'; @@ -20,7 +20,7 @@ const OrgNavTabs = ({ activeTab, organization }) => (
  • - + Groups
    • @@ -32,7 +32,7 @@ const OrgNavTabs = ({ activeTab, organization }) => (
  • - + Projects
    • From a695ae7cf83c2911483d6007bee1c6ab93b3ac1a Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Fri, 8 Sep 2023 09:57:57 +1000 Subject: [PATCH 2/7] Add references to Overview tab in Nav --- src/components/NavTabs/NavTabsSkeleton.tsx | 2 +- src/components/NavTabs/index.js | 2 +- src/components/Organizations/NavTabs/OrgNavTabsSkeleton.tsx | 2 +- src/components/Organizations/NavTabs/index.js | 2 +- src/components/ProjectNavTabs/ProjectNavTabsSkeleton.tsx | 2 +- src/components/ProjectNavTabs/index.js | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/NavTabs/NavTabsSkeleton.tsx b/src/components/NavTabs/NavTabsSkeleton.tsx index 772a3f2c..8a06b2dd 100644 --- a/src/components/NavTabs/NavTabsSkeleton.tsx +++ b/src/components/NavTabs/NavTabsSkeleton.tsx @@ -18,7 +18,7 @@ const NavTabsSkeleton: FC = ({ activeTab, projectName, openshi
  • - Overview + Environment Overview
  • diff --git a/src/components/NavTabs/index.js b/src/components/NavTabs/index.js index ef6de4eb..da1d8f28 100644 --- a/src/components/NavTabs/index.js +++ b/src/components/NavTabs/index.js @@ -20,7 +20,7 @@ const NavTabs = ({ activeTab, environment }) => ( projectSlug={environment.project.name} className="deployLink" > - Overview + Environment Overview
  • diff --git a/src/components/Organizations/NavTabs/OrgNavTabsSkeleton.tsx b/src/components/Organizations/NavTabs/OrgNavTabsSkeleton.tsx index ff50ea82..812054f7 100644 --- a/src/components/Organizations/NavTabs/OrgNavTabsSkeleton.tsx +++ b/src/components/Organizations/NavTabs/OrgNavTabsSkeleton.tsx @@ -13,7 +13,7 @@ const OrgNavTabsSkeleton: FC = ({ activeTab }) => (
  • - Overview + Organization Overview
    • diff --git a/src/components/Organizations/NavTabs/index.js b/src/components/Organizations/NavTabs/index.js index f33a2e44..d0e9d3ba 100644 --- a/src/components/Organizations/NavTabs/index.js +++ b/src/components/Organizations/NavTabs/index.js @@ -15,7 +15,7 @@ const OrgNavTabs = ({ activeTab, organization }) => (
  • - Overview + Organization Overview
  • diff --git a/src/components/ProjectNavTabs/ProjectNavTabsSkeleton.tsx b/src/components/ProjectNavTabs/ProjectNavTabsSkeleton.tsx index 27722d02..e727a9bd 100644 --- a/src/components/ProjectNavTabs/ProjectNavTabsSkeleton.tsx +++ b/src/components/ProjectNavTabs/ProjectNavTabsSkeleton.tsx @@ -20,7 +20,7 @@ const ProjectNavTabsSkeleton: FC = ({ activeTab == "overview" ? "active" : "" } deployLink`} > - Overview + Project Overview
  • { activeTab === "overview" ? "active" : "" } deployLink`} > - Overview + Project Overview
    • {publicRuntimeConfig.LAGOON_UI_VIEW_ENV_VARIABLES == null &&
  • Date: Mon, 11 Sep 2023 16:06:20 +0400 Subject: [PATCH 3/7] same sidebar styles and new ant icons --- src/components/NavTabs/NavTabsSkeleton.tsx | 31 ++-- src/components/NavTabs/StylednavTabs.tsx | 168 +----------------- src/components/NavTabs/index.js | 102 +++++++---- .../ProjectNavTabs/ProjectNavTabsSkeleton.tsx | 74 +++----- .../ProjectNavTabs/StyledProjectNavTabs.tsx | 107 +---------- src/components/ProjectNavTabs/index.js | 58 +++--- src/components/link/DeployTargets.js | 2 +- src/components/link/Project.js | 2 +- src/components/link/ProjectChildPageLink.js | 2 +- 9 files changed, 142 insertions(+), 404 deletions(-) diff --git a/src/components/NavTabs/NavTabsSkeleton.tsx b/src/components/NavTabs/NavTabsSkeleton.tsx index 8a06b2dd..eaebc104 100644 --- a/src/components/NavTabs/NavTabsSkeleton.tsx +++ b/src/components/NavTabs/NavTabsSkeleton.tsx @@ -1,6 +1,7 @@ import React, { FC } from 'react'; import Skeleton from 'react-loading-skeleton'; +import { CheckSquareOutlined, ReadOutlined, RocketOutlined, SaveOutlined } from '@ant-design/icons'; import BackupsLink from 'components/link/Backups'; import DeploymentsLink from 'components/link/Deployments'; import EnvironmentLink from 'components/link/Environment'; @@ -15,25 +16,29 @@ interface NavSkeletonProps { } const NavTabsSkeleton: FC = ({ activeTab, projectName, openshiftProjectName }) => ( - -
  • - - Environment Overview + +
  • + + + Environment Overview
    • -
  • - - Deployments +
  • + + + Deployments
    • -
  • - - Backups +
  • + + + Backups
    • -
  • - - Tasks +
  • + + + Tasks
    • diff --git a/src/components/NavTabs/StylednavTabs.tsx b/src/components/NavTabs/StylednavTabs.tsx index 15d0bfa1..e003bc0b 100644 --- a/src/components/NavTabs/StylednavTabs.tsx +++ b/src/components/NavTabs/StylednavTabs.tsx @@ -1,167 +1,3 @@ -import { bp, color } from 'lib/variables'; -import styled from 'styled-components'; +import { StyledNavigation as NavStyles } from 'components/Organizations/NavTabs/StyledNavTabs'; -export const StyledNavigation = styled.ul` - background: ${props => props.theme.backgrounds.sidebar}; - border-right: 1px solid ${props => props.theme.borders.input}; - margin: 0; - z-index: 10; - @media ${bp.tabletUp} { - min-width: 30%; - padding-bottom: 60px; - } - @media ${bp.wideUp} { - min-width: 25%; - } - - li { - border-bottom: 1px solid ${props => props.theme.borders.input}; - margin: 0; - padding: 0; - position: relative; - transition: all 0.2s ease; - - &:hover { - background-color: ${color.white} !important; - } - - &::before { - background-color: ${color.linkBlue}; - background-position: center center; - background-repeat: no-repeat; - content: ''; - display: block; - height: 59px; - left: 0; - position: absolute; - top: 0; - transition: all 0.3s ease-in-out; - width: 45px; - } - - a { - color: ${props => props.theme.texts.navigation}; - display: block; - padding: 20px 20px 19px 60px; - @media ${bp.wideUp} { - padding-left: calc((100vw / 16) * 1); - } - } - - &.active { - background-color: ${props => props.theme.backgrounds.content}; - border-right: 1px solid ${props => props.theme.backgrounds.content}; - width: calc(100% + 1px); - - a { - color: ${props => props.theme.texts.navigation}; - } - } - - &.overview { - &::before { - background-image: url('/static/images/overview.svg'); - background-size: 18px; - } - - &.active::before { - background-image: url('/static/images/overview-active.svg'); - } - } - - &.deployments { - &::before { - background-image: url('/static/images/deployments.svg'); - background-size: 21px 16px; - } - - &.active::before { - background-image: url('/static/images/deployments-active.svg'); - } - } - - &.backups { - &::before { - background-image: url('/static/images/backups.svg'); - background-size: 19px; - } - - &.active::before { - background-image: url('/static/images/backups-active.svg'); - } - } - - &.tasks { - &::before { - background-image: url('/static/images/tasks.svg'); - background-size: 16px; - } - - &.active::before { - background-image: url('/static/images/tasks-active.svg'); - } - } - - &.environmentVariables { - &::before { - background-image: url('/static/images/variables.svg'); - background-size: 22px; - } - &.active::before { - background-image: url('/static/images/variables-active.svg'); - } - } - - &.problems { - &::before { - background-image: url('/static/images/problems.svg'); - background-size: 16px; - } - - &.active::before { - background-image: url('/static/images/problems-active.svg'); - } - } - - &.facts { - &::before { - background-image: url('/static/images/facts.svg'); - background-size: 16px; - } - - &.active::before { - background-image: url('/static/images/facts-active.svg'); - } - } - - &.insights { - &::before { - background-image: url('/static/images/insights.svg'); - background-size: 16px; - } - - &.active::before { - background-image: url('/static/images/insights-active.svg'); - } - } - } - - .deployLink { - a { - color: ${props => props.theme.texts.navigation}; - display: block; - padding: 20px 20px 19px 60px; - transition: color 0.2s ease; - @media ${bp.wideUp} { - padding-left: calc((100vw / 16) * 1); - } - &:hover { - color: ${color.darkGrey}; - } - } - - .active a { - color: ${color.black}; - } - } -`; +export const StyledNavigation = NavStyles; diff --git a/src/components/NavTabs/index.js b/src/components/NavTabs/index.js index da1d8f28..21b89bef 100644 --- a/src/components/NavTabs/index.js +++ b/src/components/NavTabs/index.js @@ -1,97 +1,121 @@ import React from 'react'; +import getConfig from 'next/config'; + +import { + AlertOutlined, + BarChartOutlined, + CheckSquareOutlined, + LockOutlined, + ReadOutlined, + RocketOutlined, + SaveOutlined, + TagsOutlined, +} from '@ant-design/icons'; import BackupsLink from 'components/link/Backups'; import DeploymentsLink from 'components/link/Deployments'; import EnvironmentLink from 'components/link/Environment'; +import EnvironmentVariablesLink from 'components/link/EnvironmentVariables'; import FactsLink from 'components/link/Facts'; import InsightsLink from 'components/link/Insights'; -import EnvironmentVariablesLink from 'components/link/EnvironmentVariables'; -import getConfig from "next/config"; -const { publicRuntimeConfig } = getConfig(); -import {StyledNavigation} from "./StylednavTabs"; import ProblemsLink from 'components/link/Problems'; import TasksLink from 'components/link/Tasks'; +import { StyledNavigation } from './StylednavTabs'; + +const { publicRuntimeConfig } = getConfig(); + const NavTabs = ({ activeTab, environment }) => ( - -
  • + +
  • - Environment Overview + + Environment Overview
    • -
  • + +
  • - Deployments + + Deployments
    • -
  • + +
  • - Backups + + Backups
    • -
  • + +
  • - Tasks + + Tasks
    • - {publicRuntimeConfig.LAGOON_UI_VIEW_ENV_VARIABLES == null &&
  • - - Variables - -
    • - } + + {publicRuntimeConfig.LAGOON_UI_VIEW_ENV_VARIABLES == null && ( +
  • + + + Variables + +
    • + )} {environment.project.problemsUi == 1 && ( -
  • - + - Problems + + Problems
    • )} {environment.project.factsUi == 1 && ( -
  • +
  • - Facts + + Facts
    • )} {environment.project.factsUi == 1 && ( -
  • +
  • - Insights + + Insights
    • )} diff --git a/src/components/ProjectNavTabs/ProjectNavTabsSkeleton.tsx b/src/components/ProjectNavTabs/ProjectNavTabsSkeleton.tsx index e727a9bd..b7e23c78 100644 --- a/src/components/ProjectNavTabs/ProjectNavTabsSkeleton.tsx +++ b/src/components/ProjectNavTabs/ProjectNavTabsSkeleton.tsx @@ -1,55 +1,39 @@ -import React, { FC } from "react"; -import ProjectChildPageLink from "components/link/ProjectChildPageLink"; -import ProjectLink from "components/link/Project"; -import DeployTargetsLink from "components/link/DeployTargets"; -import { StyledProjectNavTabs } from "./StyledProjectNavTabs"; -import Skeleton from "react-loading-skeleton"; +import React, { FC } from 'react'; + +import { DeploymentUnitOutlined, KeyOutlined, ReadOutlined } from '@ant-design/icons'; +import DeployTargetsLink from 'components/link/DeployTargets'; +import ProjectLink from 'components/link/Project'; +import ProjectChildPageLink from 'components/link/ProjectChildPageLink'; + +import { StyledProjectNavTabs } from './StyledProjectNavTabs'; interface ProjectNavTabsSkeleton { activeTab: string; projectName: string; } -const ProjectNavTabsSkeleton: FC = ({ - activeTab, - projectName, -}) => ( - -
  • - Project Overview +const ProjectNavTabsSkeleton: FC = ({ activeTab, projectName }) => ( + +
  • + + + Project Overview + +
    • +
  • + + + Variables + +
    • + {activeTab == 'deployTargets' && ( +
  • + + + Deploy Targets +
    • -
  • - - Variables - - -
    • - { activeTab == "deployTargets" && ( -
  • - - Deploy Targets - -
    • - )} - - {/**/} + )}     ); diff --git a/src/components/ProjectNavTabs/StyledProjectNavTabs.tsx b/src/components/ProjectNavTabs/StyledProjectNavTabs.tsx index f32580af..a939c108 100644 --- a/src/components/ProjectNavTabs/StyledProjectNavTabs.tsx +++ b/src/components/ProjectNavTabs/StyledProjectNavTabs.tsx @@ -1,106 +1,3 @@ -import styled from "styled-components"; -import { bp, color } from "lib/variables"; +import { StyledNavigation as Nav } from "components/Organizations/NavTabs/StyledNavTabs"; -export const StyledProjectNavTabs = styled.ul` - background: ${props => props.theme.backgrounds.sidebar}; - border-right: 1px solid ${props => props.theme.borders.input}; - margin: 0; - z-index: 10; - - @media ${bp.tabletUp} { - min-width: 30%; - padding-bottom: 60px; - } - @media ${bp.wideUp} { - min-width: 25%; - } - li { - border-bottom: 1px solid ${props => props.theme.borders.input}; - margin: 0; - padding: 0; - position: relative; - &:hover { - background-color: ${color.white}; - } - &::before { - background-color: ${color.linkBlue}; - background-position: center center; - background-repeat: no-repeat; - content: ""; - display: block; - height: 59px; - left: 0; - position: absolute; - top: 0; - transition: all 0.3s ease-in-out; - width: 45px; - } - a { - color: ${props => props.theme.texts.navigation}; - display: block; - padding: 20px 20px 19px 60px; - @media ${bp.wideUp} { - padding-left: calc((100vw / 16) * 1); - } - } - &.active { - &::before { - // background-color: ${color.almostWhite}; - } - &:hover { - background-color: white; - } - background-color: ${props => props.theme.backgrounds.content}; - border-right: 1px solid ${(props)=>props.theme.backgrounds.content}; - width: calc(100% + 1px); - a { - color: ${props => props.theme.texts.navigation}; - } - } - &.overview { - &::before { - background-image: url("/static/images/overview.svg"); - background-size: 18px; - } - &.active::before { - background-image: url("/static/images/overview-active.svg"); - } - } - &.variables { - &::before { - background-image: url("/static/images/variables.svg"); - background-size: 22px; - } - &.active::before { - background-image: url("/static/images/variables-active.svg"); - } - } - &.deployTargets { - &::before { - background-image: url("/static/images/target-sidebar.svg"); - background-size: 22px; - } - &.active::before { - background-image: url("/static/images/target-sidebar-active.svg"); - } - } - } - - .deployLink { - a { - color: ${props => props.theme.texts.navigation}; - display: block; - padding: 20px 20px 19px 60px; - @media ${bp.wideUp} { - padding-left: calc((100vw / 16) * 1); - } - &:hover{ - color: ${color.darkGrey}; - } - } - - .active a { - color: ${color.black}; - } - } -`; +export const StyledProjectNavTabs = Nav; \ No newline at end of file diff --git a/src/components/ProjectNavTabs/index.js b/src/components/ProjectNavTabs/index.js index 6053abad..c902d9ed 100644 --- a/src/components/ProjectNavTabs/index.js +++ b/src/components/ProjectNavTabs/index.js @@ -1,46 +1,38 @@ -import React from "react"; +import React from 'react'; + +import getConfig from 'next/config'; + +import { DeploymentUnitOutlined, KeyOutlined, ReadOutlined } from '@ant-design/icons'; +import DeployTargetsLink from 'components/link/DeployTargets'; +import ProjectLink from 'components/link/Project'; import ProjectVariablesLink from 'components/link/ProjectVariables'; -import ProjectLink from "components/link/Project"; -import DeployTargetsLink from "components/link/DeployTargets"; -import { StyledProjectNavTabs } from "./StyledProjectNavTabs"; -import getConfig from "next/config"; + +import { StyledProjectNavTabs } from './StyledProjectNavTabs'; + const { publicRuntimeConfig } = getConfig(); const ProjectNavTabs = ({ activeTab, project }) => { return ( -
  • - Project Overview +
  • + + + Project Overview +
    • - {publicRuntimeConfig.LAGOON_UI_VIEW_ENV_VARIABLES == null && -
  • - - Variables + {publicRuntimeConfig.LAGOON_UI_VIEW_ENV_VARIABLES == null && ( +
  • + + + Variables
    • - } + )} {project.deployTargetConfigs.length > 0 && ( -
  • - - Deploy Targets +
  • + + + Deploy Targets
    • )} diff --git a/src/components/link/DeployTargets.js b/src/components/link/DeployTargets.js index 8370c585..f599cc82 100644 --- a/src/components/link/DeployTargets.js +++ b/src/components/link/DeployTargets.js @@ -11,7 +11,7 @@ export const getLinkData = (projectSlug) => ({ const DeployTargetsLink = ({ projectSlug, children, - className = null, + className = '', prefetch = false, }) => { const linkData = getLinkData(projectSlug); diff --git a/src/components/link/Project.js b/src/components/link/Project.js index 9a092bc8..9dbbb341 100644 --- a/src/components/link/Project.js +++ b/src/components/link/Project.js @@ -11,7 +11,7 @@ export const getLinkData = projectSlug => ({ /** * Links to the project page given the project name. */ -const ProjectLink = ({ projectSlug, children, className = null, prefetch = false }) => { +const ProjectLink = ({ projectSlug, children, className = '', prefetch = false }) => { const linkData = getLinkData(projectSlug); return ( diff --git a/src/components/link/ProjectChildPageLink.js b/src/components/link/ProjectChildPageLink.js index db44feaa..e6c86014 100644 --- a/src/components/link/ProjectChildPageLink.js +++ b/src/components/link/ProjectChildPageLink.js @@ -12,7 +12,7 @@ const ProjectChildPageLink = ({ childPage, projectSlug, children, - className = null, + className = '', prefetch = false }) => { const linkData = getLinkData(childPage, projectSlug); From 1640cb4e54e1adae51e1336da4351fee00d7adb9 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Tue, 12 Sep 2023 12:05:17 +1000 Subject: [PATCH 4/7] fixup openInTab variable --- src/components/link/Project.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/link/Project.js b/src/components/link/Project.js index 2f5518a0..114c01da 100644 --- a/src/components/link/Project.js +++ b/src/components/link/Project.js @@ -11,7 +11,7 @@ export const getLinkData = projectSlug => ({ /** * Links to the project page given the project name. */ -const ProjectLink = ({ projectSlug, children, className = '', prefetch = false }) => { +const ProjectLink = ({ projectSlug, children, className = '', prefetch = false, openInTab }) => { const linkData = getLinkData(projectSlug); From 9b6e0140a82949a2919b36e8f6f403440e7d1c78 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Tue, 12 Sep 2023 12:11:50 +1000 Subject: [PATCH 5/7] update Nav and ProjectNav Icons --- src/components/NavTabs/index.js | 4 ++-- src/components/ProjectNavTabs/ProjectNavTabsSkeleton.tsx | 4 ++-- src/components/ProjectNavTabs/index.js | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/NavTabs/index.js b/src/components/NavTabs/index.js index 21b89bef..0931d13e 100644 --- a/src/components/NavTabs/index.js +++ b/src/components/NavTabs/index.js @@ -6,7 +6,7 @@ import { AlertOutlined, BarChartOutlined, CheckSquareOutlined, - LockOutlined, + UnorderedListOutlined, ReadOutlined, RocketOutlined, SaveOutlined, @@ -78,7 +78,7 @@ const NavTabs = ({ activeTab, environment }) => ( projectSlug={environment.project.name} className="navLink" > - + Variables diff --git a/src/components/ProjectNavTabs/ProjectNavTabsSkeleton.tsx b/src/components/ProjectNavTabs/ProjectNavTabsSkeleton.tsx index b7e23c78..feaf5e29 100644 --- a/src/components/ProjectNavTabs/ProjectNavTabsSkeleton.tsx +++ b/src/components/ProjectNavTabs/ProjectNavTabsSkeleton.tsx @@ -1,6 +1,6 @@ import React, { FC } from 'react'; -import { DeploymentUnitOutlined, KeyOutlined, ReadOutlined } from '@ant-design/icons'; +import { DeploymentUnitOutlined, UnorderedListOutlined, ReadOutlined } from '@ant-design/icons'; import DeployTargetsLink from 'components/link/DeployTargets'; import ProjectLink from 'components/link/Project'; import ProjectChildPageLink from 'components/link/ProjectChildPageLink'; @@ -22,7 +22,7 @@ const ProjectNavTabsSkeleton: FC = ({ activeTab, project
  • - + Variables
    • diff --git a/src/components/ProjectNavTabs/index.js b/src/components/ProjectNavTabs/index.js index c902d9ed..a507890b 100644 --- a/src/components/ProjectNavTabs/index.js +++ b/src/components/ProjectNavTabs/index.js @@ -2,7 +2,7 @@ import React from 'react'; import getConfig from 'next/config'; -import { DeploymentUnitOutlined, KeyOutlined, ReadOutlined } from '@ant-design/icons'; +import { DeploymentUnitOutlined, UnorderedListOutlined, ReadOutlined } from '@ant-design/icons'; import DeployTargetsLink from 'components/link/DeployTargets'; import ProjectLink from 'components/link/Project'; import ProjectVariablesLink from 'components/link/ProjectVariables'; @@ -23,7 +23,7 @@ const ProjectNavTabs = ({ activeTab, project }) => { {publicRuntimeConfig.LAGOON_UI_VIEW_ENV_VARIABLES == null && (
  • - + Variables
    • From 6df5a2e4639530c303aea761cdd2f7b7baa67803 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Tue, 12 Sep 2023 12:17:48 +1000 Subject: [PATCH 6/7] set openInTab default false --- src/components/link/Project.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/link/Project.js b/src/components/link/Project.js index 114c01da..5cee1cea 100644 --- a/src/components/link/Project.js +++ b/src/components/link/Project.js @@ -11,7 +11,7 @@ export const getLinkData = projectSlug => ({ /** * Links to the project page given the project name. */ -const ProjectLink = ({ projectSlug, children, className = '', prefetch = false, openInTab }) => { +const ProjectLink = ({ projectSlug, children, className = '', prefetch = false, openInTab = false }) => { const linkData = getLinkData(projectSlug); From 57d2c9056fb4adf0ee84e6a806f44d2ed6417781 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Tue, 12 Sep 2023 12:18:05 +1000 Subject: [PATCH 7/7] Update Nav and ProjectNav skeletons --- src/components/NavTabs/NavTabsSkeleton.tsx | 10 +++++++++- .../ProjectNavTabs/ProjectNavTabsSkeleton.tsx | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/components/NavTabs/NavTabsSkeleton.tsx b/src/components/NavTabs/NavTabsSkeleton.tsx index eaebc104..73108e7f 100644 --- a/src/components/NavTabs/NavTabsSkeleton.tsx +++ b/src/components/NavTabs/NavTabsSkeleton.tsx @@ -1,11 +1,12 @@ import React, { FC } from 'react'; import Skeleton from 'react-loading-skeleton'; -import { CheckSquareOutlined, ReadOutlined, RocketOutlined, SaveOutlined } from '@ant-design/icons'; +import { CheckSquareOutlined, ReadOutlined, RocketOutlined, SaveOutlined, UnorderedListOutlined } from '@ant-design/icons'; import BackupsLink from 'components/link/Backups'; import DeploymentsLink from 'components/link/Deployments'; import EnvironmentLink from 'components/link/Environment'; import TasksLink from 'components/link/Tasks'; +import EnvironmentVariablesLink from 'components/link/EnvironmentVariables'; import { StyledNavigation } from './StylednavTabs'; @@ -41,6 +42,13 @@ const NavTabsSkeleton: FC = ({ activeTab, projectName, openshi Tasks +
  • + + + Variables + +
    • +     diff --git a/src/components/ProjectNavTabs/ProjectNavTabsSkeleton.tsx b/src/components/ProjectNavTabs/ProjectNavTabsSkeleton.tsx index feaf5e29..9d18fc2b 100644 --- a/src/components/ProjectNavTabs/ProjectNavTabsSkeleton.tsx +++ b/src/components/ProjectNavTabs/ProjectNavTabsSkeleton.tsx @@ -1,4 +1,5 @@ import React, { FC } from 'react'; +import Skeleton from 'react-loading-skeleton'; import { DeploymentUnitOutlined, UnorderedListOutlined, ReadOutlined } from '@ant-design/icons'; import DeployTargetsLink from 'components/link/DeployTargets'; @@ -34,6 +35,7 @@ const ProjectNavTabsSkeleton: FC = ({ activeTab, project )} + );