Преглед изворни кода

Merge pull request #639 from smiclea/fix-details-link

Fix replica details executions URL while loading
Nashwan Azhari пре 5 година
родитељ
комит
57ac39fb5e
1 измењених фајлова са 2 додато и 2 уклоњено
  1. 2 2
      src/components/organisms/ReplicaDetailsContent/ReplicaDetailsContent.tsx

+ 2 - 2
src/components/organisms/ReplicaDetailsContent/ReplicaDetailsContent.tsx

@@ -201,7 +201,7 @@ class ReplicaDetailsContent extends React.Component<Props, State> {
         onCancelExecutionClick={this.props.onCancelExecutionClick}
         onCancelExecutionClick={this.props.onCancelExecutionClick}
         onDeleteExecutionClick={this.props.onDeleteExecutionClick}
         onDeleteExecutionClick={this.props.onDeleteExecutionClick}
         onExecuteClick={this.props.onExecuteClick}
         onExecuteClick={this.props.onExecuteClick}
-        loading={this.props.executionsLoading}
+        loading={this.props.executionsLoading || this.props.detailsLoading}
         onChange={this.props.onExecutionChange}
         onChange={this.props.onExecutionChange}
         tasksLoading={this.props.executionsTasksLoading}
         tasksLoading={this.props.executionsTasksLoading}
       />
       />
@@ -236,7 +236,7 @@ class ReplicaDetailsContent extends React.Component<Props, State> {
         <DetailsNavigation
         <DetailsNavigation
           items={NavigationItems}
           items={NavigationItems}
           selectedValue={this.props.page}
           selectedValue={this.props.page}
-          itemId={this.props.item ? this.props.item.id : ''}
+          itemId={this.props.itemId}
           itemType="replica"
           itemType="replica"
         />
         />
         <DetailsBody>
         <DetailsBody>