From 68404abe2a77a1b153ae274e322be448ace49fa8 Mon Sep 17 00:00:00 2001
From: Antonin Delpeuch <antonin@delpeuch.eu>
Date: Fri, 21 Aug 2020 07:15:02 +0200
Subject: [PATCH] Fix race condition in service manifest fetching (#2872)

* Fix race condition in service manifest fetching. Fixes #2803

* Set own recon endpoint for Wikidata extension
---
 .../dialogs/schema-alignment-dialog.js        | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/extensions/wikidata/module/scripts/dialogs/schema-alignment-dialog.js b/extensions/wikidata/module/scripts/dialogs/schema-alignment-dialog.js
index 6924cf4a8..387c2083e 100644
--- a/extensions/wikidata/module/scripts/dialogs/schema-alignment-dialog.js
+++ b/extensions/wikidata/module/scripts/dialogs/schema-alignment-dialog.js
@@ -127,10 +127,7 @@ SchemaAlignmentDialog.setUpTabs = function() {
 
   // Init the column area
   this.updateColumns();
-
-  var url = ReconciliationManager.ensureDefaultServicePresent();
-  SchemaAlignmentDialog._reconService = ReconciliationManager.getServiceFromUrl(url);
-
+ 
   /**
    * Init the issues tab
    */
@@ -148,10 +145,17 @@ SchemaAlignmentDialog.setUpTabs = function() {
 
   this._previewPanes = $(".schema-alignment-dialog-preview");
 
-  // Load the existing schema
-  this._reset(theProject.overlayModels.wikibaseSchema);
-  // Perform initial preview
-  this.preview();
+  var lang = $.i18n('core-recon/wd-recon-lang');
+  var url = "https://wdreconcile.toolforge.org/"+lang+"/api";
+  ReconciliationManager.getOrRegisterServiceFromUrl(url, function(service) {
+
+    // Load the existing schema
+    SchemaAlignmentDialog._reconService = service; 
+    SchemaAlignmentDialog._reset(theProject.overlayModels.wikibaseSchema);
+
+    // Perform initial preview
+    SchemaAlignmentDialog.preview();
+  }, false);
 }
 
 SchemaAlignmentDialog.updateColumns = function() {