ref: Remove unused var

admin/api/app.py

@@ -74,7 +74,7 @@ async def create_incident(request):
     })
     data = await request.data()
     try:
-        validated = schema.validate(data)
+        schema.validate(data)
     except Exception as e:
         logger.info(f"Invalid incident params - {e}")
         return 400, 'Invalid parameters'
@@ -104,7 +104,7 @@ async def update_incident(request):
     })
     data = await request.data()
     try:
-        validated = schema.validate(data)
+        schema.validate(data)
     except Exception as e:
         logger.info(f"Invalid incident params - {e}")
         return 400, 'Invalid parameters'

admin/api/utils.py

@@ -90,8 +90,7 @@ async def execute_query(query, positional_args=None, autocommit=True):
     db_pool_conn = db_connection.getconn()
 
     encoding = 'utf-8'
-    if encoding is not None:
-        db_pool_conn.set_client_encoding(encoding)
+    db_pool_conn.set_client_encoding(encoding)
 
     cursor = db_pool_conn.cursor(cursor_factory=DictCursor)
 
@@ -141,7 +140,6 @@ async def execute_query(query, positional_args=None, autocommit=True):
                     "Query: '%s' \n"
                     "Arguments: %s: \n"
                     "Error: %s, \n"
-                    "query list: %s\n"
                     "" % (query, arguments, e))
 
     try:
@@ -163,5 +161,4 @@ async def execute_query(query, positional_args=None, autocommit=True):
 
         return kw
     except Exception as e:
-        logger.error(f"ERROR closing connection {e}")
-        pass
+        logger.error(f"ERROR closing connection {e}")

catalog-manager/operator/utils.py

@@ -156,7 +156,6 @@ async def execute_query(query, positional_args=None, autocommit=True):
             "Query: '%s' \n"
             "Arguments: %s: \n"
             "Error: %s, \n"
-            "query list: %s\n"
             "" % (query, arguments, e)
         )
 
@@ -180,4 +179,3 @@ async def execute_query(query, positional_args=None, autocommit=True):
         return kw
     except Exception as e:
         logger.error(f"ERROR closing connection {e}")
-        pass

catalog/api/wsgi.py

@@ -300,7 +300,6 @@ def get_service_namespaces(api_client, user_namespace):
 
 def get_user_namespace(user, api_client):
     user_uid = user['metadata']['uid']
-    namespaces = []
 
     for ns in core_v1_api.list_namespace(label_selector='usernamespace.gpte.redhat.com/user-uid=' + user_uid).items:
         name = ns.metadata.name
@@ -560,6 +559,7 @@ def get_auth_session():
         "lifetime": session_lifetime,
         "serviceNamespaces": service_namespaces,
         "userNamespace": user_namespace,
+        "roles": roles,
     }
     if not user_is_admin:
         ret['quota'] = {

catalog/ui/src/app/Header/Header.tsx

@@ -14,7 +14,6 @@ import {
 import QuestionCircleIcon from '@patternfly/react-icons/dist/js/icons/question-circle-icon';
 import CommentIcon from '@patternfly/react-icons/dist/js/icons/comment-icon';
 import CaretDownIcon from '@patternfly/react-icons/dist/js/icons/caret-down-icon';
-import CatalogIcon from '@patternfly/react-icons/dist/js/icons/catalog-icon';
 import UserInterfaceLogo from '@app/components/UserInterfaceLogo';
 import ImpersonateUserModal from '@app/components/ImpersonateUserModal';
 import summitLogo from '@app/bgimages/Summit-Logo.svg';

catalog/ui/src/app/Header/PublicHeader.tsx

@@ -9,7 +9,6 @@ import {
   PageHeaderTools,
 } from '@patternfly/react-core';
 import CommentIcon from '@patternfly/react-icons/dist/js/icons/comment-icon';
-import CatalogIcon from '@patternfly/react-icons/dist/js/icons/catalog-icon';
 import QuestionCircleIcon from '@patternfly/react-icons/dist/js/icons/question-circle-icon';
 import UserInterfaceLogo from '@app/components/UserInterfaceLogo';
 

catalog/ui/src/app/Modal/Modal.tsx

@@ -106,6 +106,7 @@ const _Modal: ForwardRefRenderFunction<
       if (e.target === backdrop || backdrop.contains(targetEl)) {
         if (e.target !== modal && !modal.contains(targetEl)) {
           close();
+          return null;
         }
       }
       return e;

catalog/ui/src/app/Services/InfoTab.tsx

@@ -33,9 +33,6 @@ const InfoTab: React.FC<{
   }) => void;
 }> = ({ resourceClaim, showModal }) => {
   const infoMessageTemplate = getInfoMessageTemplate(resourceClaim);
-  if (!infoMessageTemplate) {
-    return null;
-  }
   const { resource: mostRelevantResource, template: mostRelevantTemplate } =
     getMostRelevantResourceAndTemplate(resourceClaim);
   const externalPlatformUrl = resourceClaim.metadata?.annotations?.[`${BABYLON_DOMAIN}/internalPlatformUrl`];
@@ -52,6 +49,10 @@ const InfoTab: React.FC<{
       }))
     );
 
+    if (!infoMessageTemplate) {
+      return null;
+    }
+
     const htmlRenderedTemplate = renderContent(infoMessageTemplate.template, {
       format: infoMessageTemplate.templateFormat,
       vars: createAsciiDocAttributes(provision_vars, '--'),

catalog/ui/src/app/Services/ServiceItemStatus.tsx

@@ -166,7 +166,7 @@ const ServiceItemStatus: React.FC<{
         const resourceVars = resourceState?.spec?.vars;
 
         return (
-          <div key={idx} className="services-item-status__resource">
+          <div key={componentDisplayName} className="services-item-status__resource">
             <Title headingLevel="h2" size="lg">
               {componentDisplayName}
             </Title>

catalog/ui/src/app/Services/ServiceStatus.tsx

@@ -5,7 +5,7 @@ import StopCircleIcon from '@patternfly/react-icons/dist/js/icons/stop-circle-ic
 import CheckCircleIcon from '@patternfly/react-icons/dist/js/icons/check-circle-icon';
 import ExclamationCircleIcon from '@patternfly/react-icons/dist/js/icons/exclamation-circle-icon';
 import { AnarchySubject, ResourceClaim, ResourceClaimSpecResourceTemplate } from '@app/types';
-import { getAutoTimes, getMostRelevantResourceAndTemplate } from './service-utils';
+import { getAutoTimes } from './service-utils';
 
 import './service-status.css';
 

catalog/ui/src/app/Services/ServiceUsers.tsx

@@ -104,6 +104,7 @@ const ServiceUsers: React.FC<{
         const userMessages: string = userData.msg;
         return (
           <UserMessage
+            key={userLabUrl || userMessages}
             userMessages={userMessages}
             userDataEntries={userDataEntries}
             userLabUrl={userLabUrl}

catalog/ui/src/app/Services/services-list.css

@@ -34,11 +34,6 @@
   margin-top: var(--pf-global--spacer--xs);
 }
 
-.services-list__topbar.pf-c-page__main-section {
-  padding: var(--pf-global--spacer--xs) var(--pf-global--spacer--sm);
-  border-bottom: 1px solid var(--pf-global--palette--black-300);
-}
-
 .services-list__schedule-btn {
   width: auto;
   display: flex;

catalog/ui/src/app/Workshops/WorkshopsItem.tsx

@@ -431,7 +431,7 @@ const WorkshopsItemComponent: React.FC<{
   );
 };
 
-const WorkshopsItem: React.FC<{}> = ({}) => {
+const WorkshopsItem: React.FC<{}> = () => {
   const { name: workshopName, namespace: serviceNamespaceName, tab: activeTab = 'details' } = useParams();
   return (
     <ErrorBoundaryPage namespace={workshopName} name={serviceNamespaceName} type="Workshop">

catalog/ui/src/app/api.ts

@@ -21,8 +21,7 @@ import {
   Nullable,
   ResourceType,
 } from '@app/types';
-import { store } from '@app/store';
-import { selectImpersonationUser } from '@app/store';
+import { store, selectImpersonationUser } from '@app/store';
 import {
   checkAccessControl,
   displayName,
@@ -832,7 +831,7 @@ async function deleteK8sObject<Type extends K8sObject>(definition: Type): Promis
   const plural = definition.kind.toLowerCase() + 's';
   const path = definition.metadata.namespace
     ? `/apis/${definition.apiVersion}/namespaces/${definition.metadata.namespace}/${plural}/${definition.metadata.name}`
-    : `/apis/${definition.apiVersion}/${plural}/${name}`;
+    : `/apis/${definition.apiVersion}/${plural}/${definition.metadata.name}`;
   try {
     const resp = await apiFetch(path, { method: 'DELETE' });
     return await resp.json();
@@ -1066,15 +1065,15 @@ export async function patchWorkshop({
   namespace: string;
   jsonPatch?: JSONPatch;
   patch?: Record<string, unknown>;
-}) {
+}): Promise<Workshop> {
   return (await patchK8sObject({
     apiVersion: `${BABYLON_DOMAIN}/v1`,
     jsonPatch: jsonPatch,
     name: name,
     namespace: namespace,
     plural: 'workshops',
     patch: patch,
-  })) as Workshop;
+  }));
 }
 
 export async function patchWorkshopProvision({
@@ -1087,15 +1086,15 @@ export async function patchWorkshopProvision({
   namespace: string;
   jsonPatch?: JSONPatch;
   patch?: Record<string, unknown>;
-}) {
+}): Promise<WorkshopProvision> {
   return (await patchK8sObject({
     apiVersion: `${BABYLON_DOMAIN}/v1`,
     jsonPatch: jsonPatch,
     name: name,
     namespace: namespace,
     plural: 'workshopprovisions',
     patch: patch,
-  })) as WorkshopProvision;
+  }));
 }
 
 export async function requestStatusForAllResourcesInResourceClaim(resourceClaim: ResourceClaim) {

catalog/ui/src/app/components/BulkUserAssignmentModal.tsx

@@ -1,5 +1,4 @@
-import React from 'react';
-import { useEffect, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 
 import { Button, Form, FormGroup, Modal, ModalVariant, TextArea } from '@patternfly/react-core';
 

catalog/ui/src/app/components/CopyToClipboard.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useState } from 'react';
 import CopyIcon from '@patternfly/react-icons/dist/js/icons/copy-icon';
-import { Button, TextArea, TextInput, Tooltip } from '@patternfly/react-core';
+import { Button, TextArea, Tooltip } from '@patternfly/react-core';
 
 const CopyToClipboard: React.FC<{
   text: string;

catalog/ui/src/app/components/Editor/editor.css

@@ -20,7 +20,6 @@
   min-height: 150px;
   resize: none;
   font-size: var(--pf-global--FontSize--sm);
-  caret-color: rgb(5, 5, 5);
   position: relative;
   tab-size: 1;
   outline: 0;
@@ -224,11 +223,6 @@
   background-color: rgba(150, 150, 150, 0.4);
 }
 
-.emoji-inner::moz-selection {
-  color: transparent;
-  background-color: rgba(150, 150, 150, 0.4);
-}
-
 .emoji.happysmile {
   background-image: url(./images/emoji/1F642.png);
 }
@@ -263,7 +257,6 @@
 
 .toolbar button.toolbar-item i.format {
   background-size: contain;
-  display: inline-block;
   height: 18px;
   width: 18px;
   margin-top: 2px;
@@ -317,7 +310,6 @@
 .toolbar .toolbar-item .text {
   display: flex;
   line-height: 20px;
-  width: 200px;
   vertical-align: middle;
   font-size: 14px;
   color: #777;

catalog/ui/src/app/components/ImpersonateUserModal.tsx

@@ -1,7 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import { listUsers } from '@app/api';
-import { useNavigate } from 'react-router-dom';
-import { Button, ContextSelector, ContextSelectorItem, Modal, SearchInput } from '@patternfly/react-core';
+import { Button, ContextSelector, ContextSelectorItem, Modal } from '@patternfly/react-core';
 import { User, UserList } from '@app/types';
 import useImpersonateUser from '@app/utils/useImpersonateUser';
 import useSession from '@app/utils/useSession';

catalog/ui/src/app/components/IncidentsBanner.tsx

@@ -21,6 +21,7 @@ const IncidentsBanner: React.FC = () => {
     <>
       {data.map((i) => (
         <Banner
+          key={i.id}
           isSticky
           screenReaderText={i.message}
           variant={i.level === 'info' ? 'info' : i.level === 'critical' ? 'danger' : 'warning'}

catalog/ui/src/app/components/ansible-run-log.css

@@ -1,5 +1,4 @@
 .ansible-run-log {
-  display: block;
   background-color: #f2f2f2;
   border-radius: 0 0 4px 4px;
   border: 1px solid #b7b7b7;

catalog/ui/src/app/util.ts

@@ -311,8 +311,8 @@ export const compareK8sObjectsArr = (obj1?: K8sObject[], obj2?: K8sObject[]): bo
   if (obj1 !== obj2) {
     const map1 = new Map<string, string>();
     const map2 = new Map<string, string>();
-    if (obj1) obj1.map((i: K8sObject) => map1.set(i.metadata.uid, i.metadata.resourceVersion));
-    if (obj2) obj2.map((i: K8sObject) => map2.set(i.metadata.uid, i.metadata.resourceVersion));
+    if (obj1) obj1.forEach((i: K8sObject) => map1.set(i.metadata.uid, i.metadata.resourceVersion));
+    if (obj2) obj2.forEach((i: K8sObject) => map2.set(i.metadata.uid, i.metadata.resourceVersion));
     return areMapsEqual(map1, map2);
   }
   return true;

lab-ui-manager/operator/operator.py

@@ -535,7 +535,6 @@ def get_image(self):
                 return image_stream['status']['tags'][0]['items'][0]['dockerImageReference']
             else:
                 return f"{image_stream['status']['dockerImageRepository']}:latest"
-            return
         else:
             return self.image
 

ratings/api/app.py

@@ -88,7 +88,7 @@ async def provision_rating_set(request):
     })
     data = await request.data()
     try:
-        validated = schema.validate(data)
+        schema.validate(data)
     except Exception as e:
         logger.info(f"Invalid rating params for {data} - {e}")
         return 400, 'Invalid parameters'

ratings/api/utils.py

@@ -90,8 +90,7 @@ async def execute_query(query, positional_args=None, autocommit=True):
     db_pool_conn = db_connection.getconn()
 
     encoding = 'utf-8'
-    if encoding is not None:
-        db_pool_conn.set_client_encoding(encoding)
+    db_pool_conn.set_client_encoding(encoding)
 
     cursor = db_pool_conn.cursor(cursor_factory=DictCursor)
 
@@ -138,7 +137,6 @@ async def execute_query(query, positional_args=None, autocommit=True):
                     "Query: '%s' \n"
                     "Arguments: %s: \n"
                     "Error: %s, \n"
-                    "query list: %s\n"
                     "" % (query, arguments, e))
 
     try:
@@ -160,5 +158,4 @@ async def execute_query(query, positional_args=None, autocommit=True):
 
         return kw
     except Exception as e:
-        logger.error(f"ERROR closing connection {e}")
-        pass
+        logger.error(f"ERROR closing connection {e}")