From 023b5aa27246c76b61472677c2803bfe935b723b Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Thu, 12 May 2022 13:35:10 +0200
Subject: [PATCH] chore: refactor the query string building a little

Signed-off-by: blam <ben@blam.sh>
---
 plugins/scaffolder/src/api.ts                          | 10 +++++-----
 .../src/components/ListTasksPage/ListTasksPage.tsx     |  6 +-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/plugins/scaffolder/src/api.ts b/plugins/scaffolder/src/api.ts
index 8f2319cb9d..eaf92f949e 100644
--- a/plugins/scaffolder/src/api.ts
+++ b/plugins/scaffolder/src/api.ts
@@ -39,6 +39,7 @@ import {
   ScaffolderTask,
   TasksOwnerFilterKind,
 } from './types';
+import queryString from 'qs';
 
 /**
  * Utility API reference for the {@link ScaffolderApi}.
@@ -77,12 +78,11 @@ export class ScaffolderClient implements ScaffolderApi {
 
   async listTasks(createdBy: TasksOwnerFilterKind): Promise<ScaffolderTask[]> {
     const baseUrl = await this.discoveryApi.getBaseUrl('scaffolder');
+    const { userEntityRef } = await this.identityApi.getBackstageIdentity();
 
-    let query = '';
-    if (createdBy === 'owned') {
-      const { userEntityRef } = await this.identityApi.getBackstageIdentity();
-      query = `createdBy=${encodeURIComponent(userEntityRef)}`;
-    }
+    const query = queryString.stringify(
+      createdBy === 'owned' ? { createdBy: userEntityRef } : {},
+    );
 
     const url = `${baseUrl}/v2/tasks?${query}`;
 
diff --git a/plugins/scaffolder/src/components/ListTasksPage/ListTasksPage.tsx b/plugins/scaffolder/src/components/ListTasksPage/ListTasksPage.tsx
index 8d51c9c403..7866375fb1 100644
--- a/plugins/scaffolder/src/components/ListTasksPage/ListTasksPage.tsx
+++ b/plugins/scaffolder/src/components/ListTasksPage/ListTasksPage.tsx
@@ -24,10 +24,7 @@ import {
   Progress,
 } from '@backstage/core-components';
 import { useApi, useRouteRef } from '@backstage/core-plugin-api';
-import {
-  CatalogFilterLayout,
-  EntityRefLink,
-} from '@backstage/plugin-catalog-react';
+import { CatalogFilterLayout } from '@backstage/plugin-catalog-react';
 import useAsync from 'react-use/lib/useAsync';
 import MaterialTable from '@material-table/core';
 import React, { useState } from 'react';
@@ -41,7 +38,6 @@ import {
   TaskStatusColumn,
   TemplateTitleColumn,
 } from './columns';
-import { parseEntityRef } from '@backstage/catalog-model';
 
 export interface MyTaskPageProps {
   initiallySelectedFilter?: TasksOwnerFilterKind;