- fixed showing of drawing progress dialog when no drawing available (#320)

- changed button from Done to Ok

Author: obergrd

WebApplication/ClientApp/src/components/drawing.js

@@ -65,7 +65,7 @@ export class Drawing extends Component {
         {!empty &&
           <ForgePdfView/>
         }
-        {this.props.drawingProgressShowing &&
+        {!empty && this.props.drawingProgressShowing &&
           <ModalProgress
               open={true}
               title="Generating Drawing"

WebApplication/ClientApp/src/components/modalProgress.js

@@ -71,9 +71,9 @@ export class ModalProgress extends Component {
                     <div id="modalDone">
                         <Button className="button" style={
                             { width: '116px', height: '36px', borderRadius: '2px', marginLeft: '12px'}}
-                            type="secondary"
+                            type="primary"
                             size="small"
-                            title="Done"
+                            title="Ok"
                             onClick={this.props.onClose}
                         />
                     </div>

WebApplication/ClientApp/src/ui-tests/drawing_test.js

@@ -39,11 +39,11 @@ Scenario('should check that Drawing tab shows drawing for an Assembly', async (I
     I.waitForForgeViewerToPreventItFromCrashing(30);
     I.goToDrawingTab();
 
-    // check the dialog will appear with Done button
+    // check the dialog will appear with Ok button
     const drawingProgress = '//p[text()="Generating Drawing"]';
     I.waitForVisible(drawingProgress, 10);
-    I.waitForVisible(locators.xpButtonDone, locators.FDAActionTimeout);
-    I.click(locators.xpButtonDone);
+    I.waitForVisible(locators.xpButtonOk, locators.FDAActionTimeout);
+    I.click(locators.xpButtonOk);
 
     // wait for drawing to be displayed
     I.waitForVisible(viewCubeElement, locators.FDAActionTimeout);
@@ -78,11 +78,11 @@ Scenario('should check id a drawing has more sheet is will show arrow buttons',
     I.waitForForgeViewerToPreventItFromCrashing(30);
     I.goToDrawingTab();
 
-    // check the dialog will appear with Done button
+    // check the dialog will appear with Ok button
     const drawingProgress = '//p[text()="Generating Drawing"]';
     I.waitForVisible(drawingProgress, 10);
-    I.waitForVisible(locators.xpButtonDone, locators.FDAActionTimeout);
-    I.click(locators.xpButtonDone);
+    I.waitForVisible(locators.xpButtonOk, locators.FDAActionTimeout);
+    I.click(locators.xpButtonOk);
 
     // wait for drawing page to be displayed with extra arrow buttons
     const customDrwToolbar = '//div[@id="custom-drawing-toolbar"]';

WebApplication/ClientApp/src/ui-tests/elements_definition.js

@@ -26,7 +26,7 @@
 module.exports = {
      xpButtonReset : locate('button').find('span').withText('Reset'),
      xpButtonUpdate : locate('button').find('span').withText('Update'),
-     xpButtonDone: locate('button').find('span').withText('Done'),
+     xpButtonOk: locate('button').find('span').withText('Ok'),
      ForgeViewer : '#ForgeViewer',
      xpLinkAdskForge : '//a[@href="https://forge.autodesk.com"]',
      xpComboProjects : '//div[@role="button"] //*[local-name()="svg"]',

WebApplication/ClientApp/src/ui-tests/tabs_test.js

@@ -61,11 +61,11 @@ Scenario('should check if all Tabs are loaded after click', async (I) => {
     // click on Drawing tab
     I.click( locators.drawingTab);
 
-    // check the dialog will appear with Done button
+    // check the dialog will appear with Ok button
     const drawingProgress = '//p[text()="Generating Drawing"]';
     I.waitForVisible(drawingProgress, 10);
-    I.waitForVisible(locators.xpButtonDone, locators.FDAActionTimeout);
-    I.click(locators.xpButtonDone);
+    I.waitForVisible(locators.xpButtonOk, locators.FDAActionTimeout);
+    I.click(locators.xpButtonOk);
 
     // check that Drawing tab has correct content
     I.waitForVisible( locators.DrawingContainer, 10);

WebApplication/ClientApp/steps_file.js

@@ -229,8 +229,8 @@ module.exports = function() {
       // wait for progress bar shows and disappears
       const updatingProjectProgress = '//p[text()="Updating Project"]';
       this.waitForVisible(updatingProjectProgress, 10);
-      this.waitForVisible(locators.xpButtonDone, locators.FDAActionTimeout);
-      this.click(locators.xpButtonDone);
+      this.waitForVisible(locators.xpButtonOk, locators.FDAActionTimeout);
+      this.click(locators.xpButtonOk);
       this.waitForInvisible(updatingProjectProgress, 10);
     },
     waitForForgeViewerToPreventItFromCrashing(timeout)