Merge pull request #7318 from dtaylor113/fix-search-top-filter

Bug 1900022: Search Page - Top Name/Label filter is not applied to selected Pipeline resources
openshift · Nov 25, 2020 · 33165d5 · 33165d5
2 parents c8c5e16 + 1bd08a9
commit 33165d5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/frontend/packages/pipelines-plugin/src/components/pipelines/PipelinesResourceList.tsx b/frontend/packages/pipelines-plugin/src/components/pipelines/PipelinesResourceList.tsx
@@ -14,7 +14,7 @@ interface PipelinesResourceListProps extends React.ComponentProps<typeof FireMan
 
 const PipelinesResourceList: React.FC<PipelinesResourceListProps> = (props) => {
   const { t } = useTranslation();
-  const { namespace, showTitle = true } = props;
+  const { namespace, showTitle = true, selector, name } = props;
 
   const resources = [
     {
@@ -23,6 +23,8 @@ const PipelinesResourceList: React.FC<PipelinesResourceListProps> = (props) => {
       namespace,
       prop: PipelineModel.id,
       filters: { ...filters },
+      selector,
+      name,
     },
   ];
 
@@ -46,7 +48,7 @@ const PipelinesResourceList: React.FC<PipelinesResourceListProps> = (props) => {
       badge={getBadgeFromType(PipelineModel.badge)}
     >
       <Firehose resources={resources}>
-        <PipelineAugmentRunsWrapper />
+        <PipelineAugmentRunsWrapper hideNameLabelFilters={props.hideNameLabelFilters} />
       </Firehose>
     </FireMan>
   );

diff --git a/...ckages/pipelines-plugin/src/components/pipelines/list-page/PipelineAugmentRunsWrapper.tsx b/...ckages/pipelines-plugin/src/components/pipelines/list-page/PipelineAugmentRunsWrapper.tsx
@@ -10,6 +10,7 @@ import PipelineList from './PipelineList';
 interface PipelineAugmentRunsWrapperProps {
   pipeline?: any;
   reduxIDs?: string[];
+  hideNameLabelFilters?: boolean;
 }
 
 const PipelineAugmentRunsWrapper: React.FC<PipelineAugmentRunsWrapperProps> = (props) => {
@@ -29,10 +30,12 @@ const PipelineAugmentRunsWrapper: React.FC<PipelineAugmentRunsWrapperProps> = (p
         propsReferenceForRuns={firehoseResources.propsReferenceForRuns}
       >
         <ListPageWrapper
+          {...props}
           flatten={(_resources) => _.get(_resources, ['pipeline', 'data'], {})}
           kinds={['Pipeline']}
           ListComponent={PipelineList}
           rowFilters={filters}
+          hideNameLabelFilters={props.hideNameLabelFilters}
         />
       </PipelineAugmentRuns>
     </Firehose>