Merge branch '949-during-adding-a-new-project-glyphs-tab-is-not-hidden' into 'master'

Resolve "during adding a new project GLYPHS tab is not hidden"

Closes #949

See merge request !937

CHANGELOG

@@ -10,6 +10,7 @@ minerva (14.0.0~beta.2) unstable; urgency=low
   * Bug fix: information about deprecated column is more clear about column 
     names (#838)
   * Bug fix: version of the project is limited to 20 characters (#951)
+  * Bug fix: hide glyphs tab when necessary (#949)
 
  -- Piotr Gawron <piotr.gawron@uni.lu>  Mon, 16 Sep 2019 21:00:00 +0200
 

frontend-js/src/main/js/gui/admin/AddProjectDialog.js

@@ -1404,6 +1404,7 @@ AddProjectDialog.prototype.setZipFileContent = function (file) {
     guiUtils.hideTab(self, $(".minerva-project-overlays-tab", self.getElement())[0]);
     guiUtils.hideTab(self, $(".minerva-project-submaps-tab", self.getElement())[0]);
     guiUtils.hideTab(self, $(".minerva-project-overview-images-tab", self.getElement())[0]);
+    guiUtils.hideTab(self, $(".minerva-project-glyphs-tab", self.getElement())[0]);
     return self.setZipEntries([]);
   }
 };

frontend-js/src/test/js/gui/admin/AddProjectDialog-test.js

@@ -156,6 +156,20 @@ describe('AddProjectDialog', function () {
         return dialog.destroy();
       });
     });
+    it('glyphs', function () {
+      var dialog = createDialog();
+      var buf = fs.readFileSync("testFiles/map/complex_model_with_glyphs.zip");
+      buf.name = "complex_model_with_glyphs.zip";
+      return dialog.init().then(function () {
+        var dataTable = $($("[name='glyphsTable']", testDiv)[0]).DataTable();
+        assert.equal(0, dataTable.data().count());
+        return dialog.setZipFileContent(buf);
+      }).then(function () {
+        var dataTable = $($("[name='glyphsTable']", testDiv)[0]).DataTable();
+        assert.ok(dataTable.data().count() > 0);
+        return dialog.destroy();
+      });
+    });
   });
 
   describe('showAnnotatorsDialog', function () {