Prototyping React

bug_view_inc.php

@@ -105,14 +105,17 @@
 	'duplicate_of',
 	'has_duplicate',
 	'dependant_on',
-	'blocks'
+	'blocks',
+	'relationship_warning_blocking_bugs_not_resolved'
 );
 $t_data = array( 'query' => array( 'string' => $t_strings ) );
 $t_cmd = new LocalizedStringsGetCommand( $t_data );
 $t_strings_command_results = $t_cmd->execute();
 
 # Get config options
 $t_configs = array(
+	'bug_resolved_status_threshold',
+	'default_bug_dependant',
 	'relationship_graph_view_on_click',
 	'display_bug_padding',
 );
@@ -1001,15 +1004,11 @@ function relationship_buttons( $p_issue_id ) {
  * @return void
  */
 function bug_view_relationship_view_box( $p_bug_id, $p_can_update ) {
-	$t_relationships_html = bug_view_relationship_get_summary_html( $p_bug_id );
+	$t_relationship_all = relationship_get_all( $p_bug_id, $t_show_project );
 
-	if( !$p_can_update && empty( $t_relationships_html ) ) {
+	if( !$p_can_update && empty( $t_relationship_all ) ) {
 		return;
 	}
-
-	$t_relationship_graph = ON == config_get( 'relationship_graph_enable' );
-	$t_event_buttons = event_signal( 'EVENT_MENU_ISSUE_RELATIONSHIP', $p_bug_id );
-	$t_show_top_div = $p_can_update || $t_relationship_graph || !empty( $t_event_buttons );
 ?>
 	<div class="col-md-12 col-xs-12">
 	<div class="space-10"></div>
@@ -1030,64 +1029,6 @@ function bug_view_relationship_view_box( $p_bug_id, $p_can_update ) {
 			</a>
 		</div>
 	</div>
-	<div class="widget-body">
-<?php
-	if( $t_show_top_div ) {
-?>
-		<div class="widget-toolbox padding-8 clearfix">
-<?php
-		# Default relationship buttons
-		$t_buttons = array();
-		if( $t_relationship_graph ) {
-			$t_buttons[lang_get( 'relation_graph' )] =
-				'bug_relationship_graph.php?bug_id=' . $p_bug_id . '&graph=relation';
-			$t_buttons[lang_get( 'dependency_graph' )] =
-				'bug_relationship_graph.php?bug_id=' . $p_bug_id . '&graph=dependency';
-		}
-
-		# Plugin-added buttons
-		foreach( $t_event_buttons as $t_plugin => $t_plugin_buttons ) {
-			foreach( $t_plugin_buttons as $t_callback => $t_callback_buttons ) {
-				if( is_array( $t_callback_buttons ) ) {
-					$t_buttons = array_merge( $t_buttons, $t_callback_buttons );
-				}
-			}
-		}
-?>
-		<div class="btn-group pull-right noprint">
-<?php
-		# Print the buttons, if any
-		foreach( $t_buttons as $t_label => $t_url ) {
-			print_small_button( $t_url, $t_label );
-		}
-?>
-		</div>
-
-<?php
-		if( $p_can_update ) {
-?>
-		<form method="post" action="bug_relationship_add.php" class="form-inline noprint">
-		<?php echo form_security_field( 'bug_relationship_add' ) ?>
-		<input type="hidden" name="src_bug_id" value="<?php echo $p_bug_id?>" />
-		<label class="inline"><?php echo lang_get( 'this_bug' ) ?>&#160;&#160;</label>
-		<?php print_relationship_list_box( config_get( 'default_bug_relationship' ) )?>
-		<input type="text" class="input-sm" name="dest_bug_id" value="" />
-		<input type="submit" class="btn btn-primary btn-sm btn-white btn-round" name="add_relationship" value="<?php echo lang_get( 'add_new_relationship_button' )?>" />
-		</form>
-<?php
-		} # can update
-?>
-		</div>
-<?php
-	} # show top div
-?>
-
-		<div class="widget-main no-padding">
-			<div class="table-responsive">
-				<?php echo $t_relationships_html; ?>
-			</div>
-		</div>
-	</div>
 	<div class="widget-body" id="relationships-body"></div>
 	</div>
 	</div>

client/js/components/IssueRelationships.tsx

@@ -3,31 +3,21 @@ import { IssueService } from '../services';
 import { Relationship } from '../models';
 
 type Props = {
-  /**
-   *  The flag checking issue can be updated
-   */
-  canUpdate: boolean;
-
   /**
    *  Config values array from div configs-data
    */
   configs: Array<any>;
 
   /**
-   *  Id of issue
+   *  Issue data
    */
-  issueId: number;
+  issueData: any;
 
   /**
    *  Localized strings array from div strings-data
    */
   localizedStrings: Array<any>;
 
-  /**
-   *  Relationships array from div issue-data
-   */
-  relationships: Array<Relationship>;
-
   /**
    *  Relationship buttons. Rel graph, Dependency graph, etc
    */
@@ -49,6 +39,11 @@ type States = {
    *  Relationship dest ids entered in Add form
    */
   reqRelDestIds: string,
+
+  /**
+   *  Can resolve bug
+   */
+  canResolve: boolean,
 }
 
 enum RelationshipTypeEnum {
@@ -67,22 +62,40 @@ export class IssueRelationships extends React.Component<Props, States> {
     super(props);
 
     this.state = {
-      relationships: props.relationships,
+      relationships: props.issueData.issue.relationships,
       reqRelTyp: RelationshipTypeEnum.RELATED_TO,
-      reqRelDestIds: ''
+      reqRelDestIds: '',
+      canResolve: true,
     };
-    this.Service = new IssueService(props.issueId);
+    this.Service = new IssueService(props.issueData.issue.id);
+  }
+
+  componentDidUpdate() {
+    /*this.setState({
+      canResolve: this.canResolveBug()
+    });*/
+  }
+
+  canResolveBug() {
+    const { relationships } = this.state;
+
+    for (const relationship of relationships) {
+      if (relationship.type.id === this.getConfigValue('default_bug_dependant') &&
+          relationship.issue.status?.id! < this.getConfigValue('bug_resolved_status_threshold'))
+          return false;
+    }
+    return true;
   }
 
   getLocalizedString(text: string) {
     const index = this.props.localizedStrings.findIndex(x => x.name === text);
-    if (!index) return undefined;
+    if (index < 0) return undefined;
     return this.props.localizedStrings[index].localized;
   }
 
   getConfigValue(option: string) {
     const index = this.props.configs.findIndex(x => x.option === option);
-    if (!index) return undefined;
+    if (index < 0) return undefined;
     return this.props.configs[index].value;
   }
 
@@ -114,13 +127,16 @@ export class IssueRelationships extends React.Component<Props, States> {
 
   render() {
     const { relationships, reqRelDestIds, reqRelTyp } = this.state;
-    const { canUpdate, relationshipButtons } = this.props;
+    const canUpdate = this.props.issueData.flags['relationships_can_update'];
+    const relationshipButtons = Object.entries(this.props.relationshipButtons);
+
     return relationships.length ? (
       <React.Fragment>
+        {(canUpdate || relationshipButtons.length) &&
         <div className='widget-toolbox padding-8 clearfix'>
-          {Object.entries(relationshipButtons).length && (
+          {relationshipButtons.length && (
             <div className='btn-group pull-right noprint'>
-              {Object.entries(relationshipButtons).map(([key, value]) => (
+              {relationshipButtons.map(([key, value]) => (
                 <a className='btn btn-primary btn-white btn-round btn-sm' href={value}>{key}</a>
               ))}
             </div>
@@ -154,7 +170,7 @@ export class IssueRelationships extends React.Component<Props, States> {
               {this.getLocalizedString('add_new_relationship_button')}
             </button>
           </div>}
-        </div>
+        </div>}
         <div className='widget-main no-padding'>
           <div className='table-responsive'>
             <table className='table table-bordered table-condensed table-hover'>
@@ -192,6 +208,13 @@ export class IssueRelationships extends React.Component<Props, States> {
                     </td>
                   </tr>
                 ))}
+                {(relationships.length && !this.canResolveBug()) && (
+                  <tr>
+                    <td colSpan={5}>
+                      <strong>{this.getLocalizedString('relationship_warning_blocking_bugs_not_resolved')}</strong>
+                    </td>
+                  </tr>
+                )}
               </tbody>
             </table>
           </div>

client/js/index.tsx

@@ -9,13 +9,12 @@ if (document.getElementById('issue-data')) {
 
   if (issueData.issue && issueData.issue.relationships && document.getElementById('relationships-body')) {
     const relationshipButtonsData = JSON.parse(document.getElementById('relationship-buttons-data')?.dataset.relationshipButtons!);
+
     ReactDOM.render(
       <IssueRelationships
-        issueId={issueData.issue.id}
-        canUpdate={issueData.flags['relationships_can_update']}
-        relationships={issueData.issue.relationships}
-        localizedStrings={stringsData.strings}
         configs={configsData.configs}
+        issueData={issueData}
+        localizedStrings={stringsData.strings}
         relationshipButtons={relationshipButtonsData}
       />,
       document.getElementById('relationships-body'));

config_defaults_inc.php

@@ -1413,6 +1413,12 @@
  */
 $g_default_bug_view_status = VS_PUBLIC;
 
+/**
+ * Default Bug dependent
+ * @global integer $g_default_bug_dependant
+ */
+$g_default_bug_dependant = BUG_DEPENDANT;
+
 /**
  * Default value for bug description field used on bug report page.
  *
@@ -4412,6 +4418,7 @@
 	'date_partitions',
 	'datetime_picker_format',
 	'default_bug_additional_info',
+	'default_bug_dependant',
 	'default_bug_description',
 	'default_bug_eta',
 	'default_bug_priority',