From d158deba77e6458d0d48524d7eea799be4b5a4ff Mon Sep 17 00:00:00 2001
From: fmtabbara <fmtabbara@hotmail.co.uk>
Date: Wed, 17 May 2023 10:07:25 +0100
Subject: [PATCH 1/4] add 'show all versions' options to gateways list

---
 .../Gateways/VersionDisplaySelector.tsx          |  4 ++++
 explorer/src/pages/Gateways/index.tsx            | 16 ++++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/explorer/src/components/Gateways/VersionDisplaySelector.tsx b/explorer/src/components/Gateways/VersionDisplaySelector.tsx
index 927e46c026..e9be02b419 100644
--- a/explorer/src/components/Gateways/VersionDisplaySelector.tsx
+++ b/explorer/src/components/Gateways/VersionDisplaySelector.tsx
@@ -5,6 +5,7 @@ import { useIsMobile } from '../../hooks/useIsMobile';
 export enum VersionSelectOptions {
   latestVersion = 'Latest versions',
   olderVersions = 'Older versions',
+  all = 'All',
 }
 export const VersionDisplaySelector = ({
   selected,
@@ -32,6 +33,9 @@ export const VersionDisplaySelector = ({
         <MenuItem value={VersionSelectOptions.olderVersions} data-testid="show-gateway-old-versions">
           {VersionSelectOptions.olderVersions}
         </MenuItem>
+        <MenuItem value={VersionSelectOptions.all} data-testid="show-gateway-all-versions">
+          {VersionSelectOptions.all}
+        </MenuItem>
       </Select>
     </FormControl>
   );
diff --git a/explorer/src/pages/Gateways/index.tsx b/explorer/src/pages/Gateways/index.tsx
index 77e9e04fa2..13c3eafc05 100644
--- a/explorer/src/pages/Gateways/index.tsx
+++ b/explorer/src/pages/Gateways/index.tsx
@@ -61,10 +61,18 @@ export const PageGateways: FCWithChildren = () => {
     return [];
   }, [gateways]);
 
-  const filteredByVersion = React.useMemo(
-    () => (versionFilter === VersionSelectOptions.latestVersion ? filterByLatestVersions : filterByOlderVersions),
-    [versionFilter, gateways],
-  );
+  const filteredByVersion = React.useMemo(() => {
+    switch (versionFilter) {
+      case VersionSelectOptions.latestVersion:
+        return filterByLatestVersions;
+      case VersionSelectOptions.olderVersions:
+        return filterByOlderVersions;
+      case VersionSelectOptions.all:
+        return gateways?.data || [];
+      default:
+        return [];
+    }
+  }, [versionFilter, gateways]);
 
   React.useEffect(() => {
     if (searchTerm === '') {

From 929b401f95cb62c03a959a666f7f53d4f39bbd1e Mon Sep 17 00:00:00 2001
From: fmtabbara <fmtabbara@hotmail.co.uk>
Date: Wed, 17 May 2023 10:13:14 +0100
Subject: [PATCH 2/4] default to 'all version'

---
 .gitignore                            | 1 +
 explorer/src/pages/Gateways/index.tsx | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 89ef98427f..c42461127a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@
 .idea
 target
 .env
+.env.dev
 /.vscode/settings.json
 validator/.vscode
 sample-configs/validator-config.toml
diff --git a/explorer/src/pages/Gateways/index.tsx b/explorer/src/pages/Gateways/index.tsx
index 13c3eafc05..028b90d8b8 100644
--- a/explorer/src/pages/Gateways/index.tsx
+++ b/explorer/src/pages/Gateways/index.tsx
@@ -25,7 +25,7 @@ export const PageGateways: FCWithChildren = () => {
   const [filteredGateways, setFilteredGateways] = React.useState<GatewayResponse>([]);
   const [pageSize, setPageSize] = React.useState<string>('50');
   const [searchTerm, setSearchTerm] = React.useState<string>('');
-  const [versionFilter, setVersionFilter] = React.useState<VersionSelectOptions>(VersionSelectOptions.latestVersion);
+  const [versionFilter, setVersionFilter] = React.useState<VersionSelectOptions>(VersionSelectOptions.all);
 
   const theme = useTheme();
 

From 3ae5b59141931e1c8531e5505e750e7a93cc7972 Mon Sep 17 00:00:00 2001
From: Gala <calero.vg@gmail.com>
Date: Wed, 17 May 2023 11:27:49 +0200
Subject: [PATCH 3/4] small typo correction and service providers fix

---
 explorer/src/components/Universal-DataGrid.tsx | 2 +-
 explorer/src/typeDefs/explorer-api.ts          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/explorer/src/components/Universal-DataGrid.tsx b/explorer/src/components/Universal-DataGrid.tsx
index e545229a8c..df6c2a41e3 100644
--- a/explorer/src/components/Universal-DataGrid.tsx
+++ b/explorer/src/components/Universal-DataGrid.tsx
@@ -56,7 +56,7 @@ export const UniversalDataGrid: FCWithChildren<DataGridProps> = ({ rows, columns
     return (
       <DataGrid
         pagination={pagination}
-        rows={rows}
+        rows={rows?.data?.items}
         components={{
           Pagination: CustomPagination,
         }}
diff --git a/explorer/src/typeDefs/explorer-api.ts b/explorer/src/typeDefs/explorer-api.ts
index e6cc617ddb..3fb4b60c43 100644
--- a/explorer/src/typeDefs/explorer-api.ts
+++ b/explorer/src/typeDefs/explorer-api.ts
@@ -250,6 +250,6 @@ export type DirectoryServiceProvider = {
 
 export type DirectoryService = {
   id: string;
-  descrtiption: string;
+  description: string;
   items: DirectoryServiceProvider[];
 };

From 1d82ec56d8c1bd177380fa16039d802a3ba8b450 Mon Sep 17 00:00:00 2001
From: Gala <calero.vg@gmail.com>
Date: Wed, 17 May 2023 11:41:45 +0200
Subject: [PATCH 4/4] change where the change is applied

---
 explorer/src/components/Universal-DataGrid.tsx | 2 +-
 explorer/src/pages/ServiceProviders/index.tsx  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/explorer/src/components/Universal-DataGrid.tsx b/explorer/src/components/Universal-DataGrid.tsx
index df6c2a41e3..e545229a8c 100644
--- a/explorer/src/components/Universal-DataGrid.tsx
+++ b/explorer/src/components/Universal-DataGrid.tsx
@@ -56,7 +56,7 @@ export const UniversalDataGrid: FCWithChildren<DataGridProps> = ({ rows, columns
     return (
       <DataGrid
         pagination={pagination}
-        rows={rows?.data?.items}
+        rows={rows}
         components={{
           Pagination: CustomPagination,
         }}
diff --git a/explorer/src/pages/ServiceProviders/index.tsx b/explorer/src/pages/ServiceProviders/index.tsx
index 8a0071c15d..5a6c10b235 100644
--- a/explorer/src/pages/ServiceProviders/index.tsx
+++ b/explorer/src/pages/ServiceProviders/index.tsx
@@ -55,7 +55,7 @@ export const ServiceProviders = () => {
                   pageSize={pageSize}
                   childrenBefore={<SupportedApps />}
                 />
-                <UniversalDataGrid pagination rows={serviceProviders} columns={columns} pageSize={pageSize} />
+                <UniversalDataGrid pagination rows={serviceProviders?.data?.items} columns={columns} pageSize={pageSize} />
               </>
             ) : (
               <Typography>No service providers to display</Typography>