From 553a2e91036e0c0d67fa0c3e76836e5178d2ec58 Mon Sep 17 00:00:00 2001 From: Davit Date: Sun, 30 Jun 2024 21:03:05 +0400 Subject: [PATCH 01/10] use dynamic length for deployments --- src/components/DeploymentsByFilter/index.js | 102 ++++++++++---------- 1 file changed, 50 insertions(+), 52 deletions(-) diff --git a/src/components/DeploymentsByFilter/index.js b/src/components/DeploymentsByFilter/index.js index f9849b9f..93be94a9 100644 --- a/src/components/DeploymentsByFilter/index.js +++ b/src/components/DeploymentsByFilter/index.js @@ -118,10 +118,12 @@ const DeploymentsByFilter = ({ deployments }) => { }); }; + const sortedFilteredItems = sortedItems.filter(deployment => filterResults(deployment)); + return (
- + { - {!sortedItems.filter(deployment => filterResults(deployment)).length && ( -
No deployments
- )} - {sortedItems - .filter(deployment => filterResults(deployment)) - .map(deployment => { - return ( -
-
- - {formatString(deployment.environment.project.name, 'project')} - -
-
- - {formatString(deployment.environment.name, 'environment')} - -
-
{formatString(deployment.environment.openshift.name, 'cluster')}
-
- - {deployment.name} - -
-
{deployment.priority}
-
- {moment.utc(deployment.created).local().format('DD MMM YYYY, HH:mm:ss (Z)')} -
-
- {deployment.status.charAt(0).toUpperCase() + deployment.status.slice(1)} - - {!['complete', 'cancelled', 'failed'].includes(deployment.status) && deployment.buildStep && ( - - )} -
-
{getDeploymentDuration(deployment)}
-
- {['new', 'pending', 'queued', 'running'].includes(deployment.status) && ( - - )} -
+ {!sortedFilteredItems.length &&
No deployments
} + {sortedFilteredItems.map(deployment => { + return ( +
+
+ + {formatString(deployment.environment.project.name, 'project')} + +
+
+ + {formatString(deployment.environment.name, 'environment')} + +
+
{formatString(deployment.environment.openshift.name, 'cluster')}
+
+ + {deployment.name} + +
+
{deployment.priority}
+
+ {moment.utc(deployment.created).local().format('DD MMM YYYY, HH:mm:ss (Z)')} +
+
+ {deployment.status.charAt(0).toUpperCase() + deployment.status.slice(1)} + + {!['complete', 'cancelled', 'failed'].includes(deployment.status) && deployment.buildStep && ( + + )} +
+
{getDeploymentDuration(deployment)}
+
+ {['new', 'pending', 'queued', 'running'].includes(deployment.status) && ( + + )}
- ); - })} +
+ ); + })} ); From 1d6e6044508bddf6d0daaf3d31e779b59cfe0645 Mon Sep 17 00:00:00 2001 From: Davit Date: Sun, 30 Jun 2024 22:29:28 +0400 Subject: [PATCH 02/10] show which user is being removed --- src/components/Organizations/SharedStyles.tsx | 3 +++ src/components/Organizations/Users/index.js | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/components/Organizations/SharedStyles.tsx b/src/components/Organizations/SharedStyles.tsx index ba652c07..4fe024a6 100644 --- a/src/components/Organizations/SharedStyles.tsx +++ b/src/components/Organizations/SharedStyles.tsx @@ -450,6 +450,9 @@ export const RemoveModalParagraph = styled.p` line-height: 24px; span { font-weight: bold; + &.highlight { + color: #4b84ff; + } } `; diff --git a/src/components/Organizations/Users/index.js b/src/components/Organizations/Users/index.js index ef62e6c0..fb7882bd 100644 --- a/src/components/Organizations/Users/index.js +++ b/src/components/Organizations/Users/index.js @@ -132,7 +132,7 @@ const Users = ({ users = [], organization, organizationId, organizationName, ref {!user.email.startsWith('default-user') ? ( <> - + { @@ -144,7 +144,8 @@ const Users = ({ users = [], organization, organizationId, organizationName, ref Remove user? - This action will remove this user from all groups, you might not be able to reverse this. + This action will remove user {user.email} from all groups, you + might not be able to reverse this.
From eb95f7be584393fffdb9d775dbc766bd7d342c74 Mon Sep 17 00:00:00 2001 From: Davit Date: Mon, 1 Jul 2024 01:55:20 +0400 Subject: [PATCH 03/10] change wording --- src/components/Organizations/Users/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Organizations/Users/index.js b/src/components/Organizations/Users/index.js index fb7882bd..e3579f8c 100644 --- a/src/components/Organizations/Users/index.js +++ b/src/components/Organizations/Users/index.js @@ -144,8 +144,8 @@ const Users = ({ users = [], organization, organizationId, organizationName, ref Remove user? - This action will remove user {user.email} from all groups, you - might not be able to reverse this. + This action will remove user {user.email} from all groups in this + organization, you might not be able to reverse this.
From 0b1d4f52825b2036157e40002dfe58e36da32e48 Mon Sep 17 00:00:00 2001 From: Davit Date: Mon, 1 Jul 2024 12:36:23 +0400 Subject: [PATCH 04/10] add friendlyname and description debounced filtering --- .../Organizations/OrganizationsSkeleton.tsx | 14 +- .../Organizations/Organizations/index.tsx | 133 +++++++++++++----- src/pages/organizations/index.js | 9 +- 3 files changed, 117 insertions(+), 39 deletions(-) diff --git a/src/components/Organizations/Organizations/OrganizationsSkeleton.tsx b/src/components/Organizations/Organizations/OrganizationsSkeleton.tsx index 40191e0c..e0d9a676 100644 --- a/src/components/Organizations/Organizations/OrganizationsSkeleton.tsx +++ b/src/components/Organizations/Organizations/OrganizationsSkeleton.tsx @@ -5,7 +5,11 @@ import Box from 'components/Box'; import { Organization, OrganizationsPage, OrgsHeader, SearchInput } from './StyledOrganizations'; -const OrganizationsSkeleton = () => { +interface Props { + setSearch: React.Dispatch>; +} + +const OrganizationsSkeleton = ({ setSearch }: Props) => { const RenderSkeletonBox = (index: number) => { return ( @@ -27,7 +31,13 @@ const OrganizationsSkeleton = () => { - + setSearch(e.target.value)} + aria-labelledby="search" + className="searchInput" + type="text" + placeholder="Type to search" + /> <>{[...Array(numberOfItems)].map((_, idx) => RenderSkeletonBox(idx))} diff --git a/src/components/Organizations/Organizations/index.tsx b/src/components/Organizations/Organizations/index.tsx index 8d95711a..2ac00fb5 100644 --- a/src/components/Organizations/Organizations/index.tsx +++ b/src/components/Organizations/Organizations/index.tsx @@ -1,8 +1,11 @@ -import React, { useState } from 'react'; +import React, { FC, useCallback, useEffect, useMemo, useRef, useState } from 'react'; import Highlighter from 'react-highlight-words'; +import { LoadingOutlined } from '@ant-design/icons'; +import { Spin } from 'antd'; import Box from 'components/Box'; import OrganizationLink from 'components/link/Organizations/Organization'; +import { debounce } from 'lib/util'; import { Organization, OrganizationsPage, OrgsHeader, SearchInput } from './StyledOrganizations'; @@ -14,29 +17,112 @@ export interface IOrganization { __typename: 'Organization'; } +interface OrganizationProps { + organizations: IOrganization[]; + initialSearch: string; +} /** * The primary list of organizations. */ -const Organizations = ({ organizations = [] }: { organizations: IOrganization[] }) => { - const [searchInput, setSearchInput] = useState(''); +const Organizations: FC = ({ organizations = [], initialSearch }) => { + const [searchInput, setSearchInput] = useState(initialSearch || ''); + + const [isFiltering, setIsFiltering] = useState(false); + const [filteredOrgs, setFilteredOrgs] = useState(organizations); + + const searchInputRef = useRef(null); + + useEffect(() => { + if (initialSearch && searchInputRef.current) { + searchInputRef.current.focus(); + } + }, []); + + const timerLengthPercentage = useMemo( + () => Math.min(1000, Math.max(40, Math.floor(organizations.length * 0.0725))), + [organizations.length] + ); + + const debouncedSearch = useCallback( + debounce((searchVal: string) => { + setSearchInput(searchVal); + }, timerLengthPercentage), + [] + ); + + const handleSearch = (searchVal: string) => { + setIsFiltering(true); + debouncedSearch(searchVal); + }; - const filteredOrganizations = organizations.filter(key => { - const sortByName = key.name.toLowerCase().includes(searchInput.toLowerCase()); - const sortByUrl = ''; - return ['name', 'environments', '__typename'].includes(key.name) ? false : (true && sortByName) || sortByUrl; - }); + useEffect(() => { + const filterOrgs = async (): Promise => { + return new Promise(resolve => { + const filteredOrganizations = organizations.filter(org => { + const searchStrLowerCase = searchInput.toLowerCase(); + const filterFn = (key?: string) => key?.toLowerCase().includes(searchStrLowerCase); + + const sortByName = filterFn(org.name); + const sortByDesc = filterFn(org.description); + const sortByFriendlyName = filterFn(org.friendlyName); + + if (['__typename', 'name', 'id'].includes(org.name)) { + return false; + } + return sortByName || sortByFriendlyName || sortByDesc; + }); + + resolve(filteredOrganizations); + }); + }; + + filterOrgs() + .then(filtered => setFilteredOrgs(filtered)) + .finally(() => setIsFiltering(false)); + }, [searchInput, organizations]); + + const filteredMappedOrgs = useMemo(() => { + return filteredOrgs.map(organization => ( + + + +

+ +

+
+ +
+ +
+ + + )); + }, [filteredOrgs]); return ( - + setSearchInput(e.target.value)} + onChange={e => handleSearch(e.target.value)} placeholder="Type to search" disabled={organizations.length === 0} /> @@ -48,37 +134,14 @@ const Organizations = ({ organizations = [] }: { organizations: IOrganization[] )} - {searchInput && !filteredOrganizations.length && ( + {searchInput && !filteredMappedOrgs.length && (

No organizations matching "{searchInput}"

 )} - {filteredOrganizations.map(organization => ( - - - -

- -

-
- -
- -
- - - ))} + {filteredMappedOrgs} ); }; diff --git a/src/pages/organizations/index.js b/src/pages/organizations/index.js index c6d341f4..b95c99dd 100644 --- a/src/pages/organizations/index.js +++ b/src/pages/organizations/index.js @@ -1,4 +1,4 @@ -import React from 'react'; +import React, { useState } from 'react'; import Head from 'next/head'; @@ -18,6 +18,7 @@ const OrganizationsPage = () => { const { data, error, loading } = useQuery(AllOrganizationsQuery, { displayName: 'AllOrganizationsQuery', }); + const [searchInput, setSearchInput] = useState(''); if (error) { return ; @@ -31,7 +32,11 @@ const OrganizationsPage = () => {

Organizations

- {loading ? : } + {loading ? ( + + ) : ( + + )}
From 0509a78dfd571ca0583385ba8d8b4ac9640c0e75 Mon Sep 17 00:00:00 2001 From: Davit Date: Mon, 1 Jul 2024 12:42:31 +0400 Subject: [PATCH 05/10] linr --- src/components/Organizations/Organizations/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Organizations/Organizations/index.tsx b/src/components/Organizations/Organizations/index.tsx index 2ac00fb5..00ac463c 100644 --- a/src/components/Organizations/Organizations/index.tsx +++ b/src/components/Organizations/Organizations/index.tsx @@ -76,7 +76,7 @@ const Organizations: FC = ({ organizations = [], initialSearc }); }; - filterOrgs() + void filterOrgs() .then(filtered => setFilteredOrgs(filtered)) .finally(() => setIsFiltering(false)); }, [searchInput, organizations]); From 3e31ce863e5bb8de879d1112b11cf92aa8942315 Mon Sep 17 00:00:00 2001 From: Davit Date: Mon, 1 Jul 2024 16:50:10 +0400 Subject: [PATCH 06/10] properly update notifications --- .../Organizations/Notifications/index.js | 800 +++++++++--------- 1 file changed, 405 insertions(+), 395 deletions(-) diff --git a/src/components/Organizations/Notifications/index.js b/src/components/Organizations/Notifications/index.js index cfa06c0b..e3e19dd3 100644 --- a/src/components/Organizations/Notifications/index.js +++ b/src/components/Organizations/Notifications/index.js @@ -100,6 +100,7 @@ const OrgNotifications = ({ open: false, type: '', current: {}, + updated: {}, }; const [editState, setEditState] = useState(initialEditState); @@ -130,8 +131,8 @@ const OrgNotifications = ({ const newValue = e.target.value; setEditState(prevState => ({ ...prevState, - current: { - ...prevState.current, + updated: { + ...prevState.updated, [property]: newValue, }, })); @@ -185,94 +186,95 @@ const OrgNotifications = ({ - - -
- -
- -
- -
- -
- -
- -
- console.error(e)}> - {(updateSlack, { called, error, data }) => { - if (error) { - return
{error.message}
; - } - if (data) { - refresh().then(() => { - closeEditModal(); - }); - } - return ( - - ); - }} - - -
- - + }); + }} + > + Continue + + ); + }} + + +
+ + )} console.error(e)}> {(removeNotification, { called, error, data }) => { if (data) { @@ -316,93 +318,95 @@ const OrgNotifications = ({ - - -
- -
- -
- -
- -
- -
- -
- console.error(e)}> - {(updateRocketChat, { called, error, data }) => { - if (error) { - return
{error.message}
; - } - if (data) { - refresh().then(() => { - closeEditModal(); - }); - } - return ( - - ); - }} - - -
- + }); + }} + > + Continue + + ); + }} + + +
+ + )} console.error(e)}> {(removeNotification, { called, error, data }) => { if (error) { @@ -449,82 +453,84 @@ const OrgNotifications = ({ - - -
- -
- -
- - {!isValidEmail &&

Invalid email address

} -
- -
- console.error(e)}> - {(updateEmail, { called, error, data }) => { - if (error) { - return
{error.message}
; - } - if (data) { - refresh().then(() => { - closeEditModal(); - }); - } - return ( - - ); - }} - - -
- + {editState.current && editState.current.name === notification.name && ( + + +
+ +
+ +
+ + {!isValidEmail &&

Invalid email address

} +
+ +
+ console.error(e)}> + {(updateEmail, { called, error, data }) => { + if (error) { + return
{error.message}
; + } + if (data) { + refresh().then(() => { + closeEditModal(); + }); + } + return ( + + ); + }} + + +
+ + )} console.error(e)}> {(removeNotification, { called, error, data }) => { if (data) { @@ -574,80 +580,81 @@ const OrgNotifications = ({ - - -
- -
- -
- -
- -
- console.error(e)}> - {(updateWebhook, { called, error, data }) => { - if (error) { - return
{error.message}
; - } - if (data) { - refresh().then(() => { - closeEditModal(); - }); - } - return ( - - ); - }} - - -
- - + }); + }} + > + Continue + + ); + }} + + + + + )} console.error(e)}> {(removeNotification, { called, error, data }) => { if (data) { @@ -693,79 +700,82 @@ const OrgNotifications = ({ - - -
- -
- -
- -
- -
- console.error(e)}> - {(updateTeams, { called, error, data }) => { - if (error) { - return
{error.message}
; - } - if (data) { - refresh().then(() => { - closeEditModal(); - }); - } - return ( - - ); - }} - - -
- + }); + }} + > + Continue + + ); + }} + + + + + )} console.error(e)}> {(removeNotification, { called, error, data }) => { if (data) { From dce718b174081d0ebbf9beb0b8bee3ed0c82292d Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Wed, 3 Jul 2024 16:57:37 +1000 Subject: [PATCH 07/10] chore: set network-timeout on yarn run build --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index e5dd783e..bdae267f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Node builder image -FROM uselagoon/node-20-builder:latest as builder +FROM uselagoon/node-20-builder:latest AS builder COPY . /app/ @@ -25,7 +25,7 @@ ARG GRAPHQL_API ENV GRAPHQL_API=$GRAPHQL_API # Build app -RUN yarn run build +RUN yarn --network-timeout 300000 run build EXPOSE 3000 -CMD ["yarn", "start"] \ No newline at end of file +CMD ["yarn", "start"] From c0b73468f568b34853490591257407b2672f868f Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Wed, 3 Jul 2024 17:26:17 +1000 Subject: [PATCH 08/10] chore: set network-timeout on yarn install --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index bdae267f..2805fc09 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM uselagoon/node-20-builder:latest AS builder COPY . /app/ -RUN yarn install +RUN yarn install --network-timeout 300000 # Node service image @@ -25,7 +25,7 @@ ARG GRAPHQL_API ENV GRAPHQL_API=$GRAPHQL_API # Build app -RUN yarn --network-timeout 300000 run build +RUN yarn run build EXPOSE 3000 CMD ["yarn", "start"] From f3a42244220dba8b59102dcfa5b432f383941aad Mon Sep 17 00:00:00 2001 From: shreddedbacon Date: Wed, 3 Jul 2024 19:33:24 +1000 Subject: [PATCH 09/10] chore: add sidecar --- test/docker-compose.yaml | 14 +++++++++++++- test/keycloak/configure-keycloak.sh | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/test/docker-compose.yaml b/test/docker-compose.yaml index c49e7404..83cbf2bc 100644 --- a/test/docker-compose.yaml +++ b/test/docker-compose.yaml @@ -28,6 +28,12 @@ services: condition: service_completed_successfully # don't start the lagoon migrations until the db migrations is completed keycloak: condition: service_started + api-sidecar-handler: + # this is neded for the internal dns references + container_name: apisidecarhandler + image: testlagoon/api-sidecar-handler:main + ports: + - '3333:3333' api: image: testlagoon/api:main ports: @@ -44,8 +50,14 @@ services: - S3_BAAS_ACCESS_KEY_ID=minio - S3_BAAS_SECRET_ACCESS_KEY=minio123 - CONSOLE_LOGGING_LEVEL=trace + - SIDECAR_HANDLER_HOST=apisidecarhandler depends_on: - - api-lagoon-migrations + api-lagoon-migrations: + condition: service_started + keycloak: + condition: service_started + api-sidecar-handler: + condition: service_started api-redis: image: testlagoon/api-redis:main keycloak: diff --git a/test/keycloak/configure-keycloak.sh b/test/keycloak/configure-keycloak.sh index 0aa788c0..aee9bf06 100755 --- a/test/keycloak/configure-keycloak.sh +++ b/test/keycloak/configure-keycloak.sh @@ -10,7 +10,7 @@ function is_keycloak_running { function configure_user_passwords { LAGOON_DEMO_USERS=("guest@example.com" "reporter@example.com" "developer@example.com" "maintainer@example.com" "owner@example.com") - LAGOON_DEMO_ORG_USERS=("orguser@example.com" "orgviewer@example.com" "orgowner@example.com" "platformowner@example.com") + LAGOON_DEMO_ORG_USERS=("orguser@example.com" "orgviewer@example.com" "orgadmin@example.com" "orgowner@example.com" "platformowner@example.com") for i in ${LAGOON_DEMO_USERS[@]} do From 34d1e3a89aa81b68d46aa395d820d3818ff6ab70 Mon Sep 17 00:00:00 2001 From: shreddedbacon Date: Wed, 3 Jul 2024 19:58:21 +1000 Subject: [PATCH 10/10] chore: increase command timeout --- cypress/cypress.config.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/cypress/cypress.config.ts b/cypress/cypress.config.ts index 9954393f..27492a32 100644 --- a/cypress/cypress.config.ts +++ b/cypress/cypress.config.ts @@ -2,6 +2,7 @@ import { defineConfig } from 'cypress'; export default defineConfig({ requestTimeout: 15000, + defaultCommandTimeout: 8000, e2e: { env: { api: 'http://0.0.0.0:33000/graphql',