fix bugs for release

Seaneeee · Jun 24, 2020 · 4120d21 · 4120d21
1 parent 8d43db8
commit 4120d21
Show file tree

Hide file tree

Showing 4 changed files with 284 additions and 5 deletions.
diff --git a/.github/workflows/azureARMDeploy-orig.yml b/.github/workflows/azureARMDeploy-orig.yml
@@ -0,0 +1,46 @@
+name: .NET Core
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: azure/[email protected]
+      with:
+        creds: ${{ secrets.WHEXAMPLECREDENTIALS }}
+    - uses: actions/checkout@v2
+    - name: Setup .NET Core
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 3.1.101
+    - name: Install dependencies
+      run: dotnet restore
+    - name: Build
+      run: dotnet build --configuration Release --no-restore
+    - name: Test
+      run: dotnet test --no-restore --verbosity normal
+
+    - name: Use Node.js ${{ env.NODE_VERSION }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ env.NODE_VERSION }}
+    - name: npm install, build, and test
+      run: |
+        # Build and test the project, then
+        # deploy to Azure Web App.
+        npm install
+        npm run build --if-present
+        npm run test --if-present
+    - name: 'Deploy to Azure WebApp'
+      uses: azure/webapps-deploy@v2
+      with:
+        app-name: ${{ env.AZURE_WEBAPP_NAME }}
+        publish-profile: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE }}
+        package: ${{ env.AZURE_WEBAPP_PACKAGE_PATH }}
diff --git a/WarehouseTransport/ClientApp/src/components/Transport.js b/WarehouseTransport/ClientApp/src/components/Transport.js
@@ -55,15 +55,16 @@ class MapDirectionsRenderer extends React.Component {
 
     render() {
         let newDriver = this.props.driver;
-        if (newDriver != this.state.driver) {
-            this.state.loaded = false;
+        let loadedDriver = this.state.loaded;
+        if (newDriver !== this.state.driver) {
+            loadedDriver = false;
             this.getDirections();
         }
 
         if (this.state.error) {
             return <h1>{this.state.error}</h1>;
         }
-        if (!this.state.loaded) {
+        if (!loadedDriver) {
             return <h1 className="loadingRoute">Loading route</h1>;
         }
         return (this.state.directions && <DirectionsRenderer directions={this.state.directions} />)
@@ -111,8 +112,7 @@ class Transport extends React.Component {
             containerElement,
             mapElement,
             defaultCenter,
-            defaultZoom,
-            driver
+            defaultZoom
         } = this.props;
 
         return (

diff --git a/azureinfo/server deployment scripts/deployment.json b/azureinfo/server deployment scripts/deployment.json
@@ -0,0 +1,149 @@
+{
+  "id": "/subscriptions/b3032e36-4f82-47be-8b68-da1c1fd449b4/resourceGroups/savedevgithubdeploy/providers/Microsoft.Resources/deployments/Microsoft.Web-WebApp-Portal-26a824a2-b037",
+  "name": "Microsoft.Web-WebApp-Portal-26a824a2-b037",
+  "type": "Microsoft.Resources/deployments",
+  "tags": {
+    "primaryResourceId": "/subscriptions/b3032e36-4f82-47be-8b68-da1c1fd449b4/resourcegroups/savedevgithubdeploy/providers/Microsoft.Web/sites/WharHouseX1",
+    "marketplaceItemId": "Microsoft.WebSite"
+  },
+  "properties": {
+    "templateHash": "1260747125165513672",
+    "parameters": {
+      "subscriptionId": {
+        "type": "String",
+        "value": "b3032e36-4f82-47be-8b68-da1c1fd449b4"
+      },
+      "name": {
+        "type": "String",
+        "value": "WharHouseX1"
+      },
+      "location": {
+        "type": "String",
+        "value": "Central US"
+      },
+      "hostingEnvironment": {
+        "type": "String",
+        "value": ""
+      },
+      "hostingPlanName": {
+        "type": "String",
+        "value": "ASP-savedevgithubdeploy-ba27"
+      },
+      "serverFarmResourceGroup": {
+        "type": "String",
+        "value": "savedevgithubdeploy"
+      },
+      "alwaysOn": {
+        "type": "Bool",
+        "value": false
+      },
+      "sku": {
+        "type": "String",
+        "value": "Free"
+      },
+      "skuCode": {
+        "type": "String",
+        "value": "F1"
+      },
+      "workerSize": {
+        "type": "String",
+        "value": "0"
+      },
+      "workerSizeId": {
+        "type": "String",
+        "value": "0"
+      },
+      "numberOfWorkers": {
+        "type": "String",
+        "value": "1"
+      },
+      "currentStack": {
+        "type": "String",
+        "value": "dotnetcore"
+      },
+      "phpVersion": {
+        "type": "String",
+        "value": "OFF"
+      },
+      "errorLink": {
+        "type": "String",
+        "value": "https://WharHouseX1.scm.azurewebsites.net/detectors?type=tools&name=eventviewer"
+      }
+    },
+    "mode": "Incremental",
+    "debugSetting": {
+      "detailLevel": "None"
+    },
+    "provisioningState": "Succeeded",
+    "timestamp": "2020-06-24T01:31:37.001402Z",
+    "duration": "PT40.0595581S",
+    "correlationId": "54d2acbf-5040-40b4-8b53-2c2391339642",
+    "providers": [
+      {
+        "namespace": "Microsoft.Web",
+        "resourceTypes": [
+          {
+            "resourceType": "sites",
+            "locations": [
+              "centralus"
+            ]
+          },
+          {
+            "resourceType": "serverfarms",
+            "locations": [
+              "centralus"
+            ]
+          }
+        ]
+      },
+      {
+        "namespace": "microsoft.insights",
+        "resourceTypes": [
+          {
+            "resourceType": "components",
+            "locations": [
+              "centralus"
+            ]
+          }
+        ]
+      }
+    ],
+    "dependencies": [
+      {
+        "dependsOn": [
+          {
+            "id": "/subscriptions/b3032e36-4f82-47be-8b68-da1c1fd449b4/resourceGroups/savedevgithubdeploy/providers/microsoft.insights/components/WharHouseX1",
+            "resourceType": "microsoft.insights/components",
+            "resourceName": "WharHouseX1"
+          },
+          {
+            "id": "/subscriptions/b3032e36-4f82-47be-8b68-da1c1fd449b4/resourceGroups/savedevgithubdeploy/providers/Microsoft.Web/serverfarms/ASP-savedevgithubdeploy-ba27",
+            "resourceType": "Microsoft.Web/serverfarms",
+            "resourceName": "ASP-savedevgithubdeploy-ba27"
+          },
+          {
+            "id": "/subscriptions/b3032e36-4f82-47be-8b68-da1c1fd449b4/resourceGroups/savedevgithubdeploy/providers/microsoft.insights/components/WharHouseX1",
+            "resourceType": "microsoft.insights/components",
+            "resourceName": "WharHouseX1",
+            "apiVersion": "2015-05-01"
+          }
+        ],
+        "id": "/subscriptions/b3032e36-4f82-47be-8b68-da1c1fd449b4/resourceGroups/savedevgithubdeploy/providers/Microsoft.Web/sites/WharHouseX1",
+        "resourceType": "Microsoft.Web/sites",
+        "resourceName": "WharHouseX1"
+      }
+    ],
+    "outputResources": [
+      {
+        "id": "/subscriptions/b3032e36-4f82-47be-8b68-da1c1fd449b4/resourceGroups/savedevgithubdeploy/providers/microsoft.insights/components/WharHouseX1"
+      },
+      {
+        "id": "/subscriptions/b3032e36-4f82-47be-8b68-da1c1fd449b4/resourceGroups/savedevgithubdeploy/providers/Microsoft.Web/serverfarms/ASP-savedevgithubdeploy-ba27"
+      },
+      {
+        "id": "/subscriptions/b3032e36-4f82-47be-8b68-da1c1fd449b4/resourceGroups/savedevgithubdeploy/providers/Microsoft.Web/sites/WharHouseX1"
+      }
+    ],
+    "validationLevel": "Template"
+  }
+}
diff --git a/azureinfo/server deployment scripts/deployment_operations.json b/azureinfo/server deployment scripts/deployment_operations.json
@@ -0,0 +1,84 @@
+[
+  {
+    "id": "/subscriptions/b3032e36-4f82-47be-8b68-da1c1fd449b4/resourceGroups/savedevgithubdeploy/providers/Microsoft.Resources/deployments/Microsoft.Web-WebApp-Portal-26a824a2-b037/operations/C06C6081DFE791AA",
+    "operationId": "C06C6081DFE791AA",
+    "properties": {
+      "provisioningOperation": "Create",
+      "provisioningState": "Succeeded",
+      "timestamp": "2020-06-24T01:31:36.537593Z",
+      "duration": "PT20.9713867S",
+      "trackingId": "a6012772-9809-40e2-a1b6-a162bbc65278",
+      "statusCode": "OK",
+      "targetResource": {
+        "id": "/subscriptions/b3032e36-4f82-47be-8b68-da1c1fd449b4/resourceGroups/savedevgithubdeploy/providers/Microsoft.Web/sites/WharHouseX1",
+        "resourceType": "Microsoft.Web/sites",
+        "resourceName": "WharHouseX1"
+      }
+    }
+  },
+  {
+    "id": "/subscriptions/b3032e36-4f82-47be-8b68-da1c1fd449b4/resourceGroups/savedevgithubdeploy/providers/Microsoft.Resources/deployments/Microsoft.Web-WebApp-Portal-26a824a2-b037/operations/23344DB16B91F3C6",
+    "operationId": "23344DB16B91F3C6",
+    "properties": {
+      "provisioningOperation": "Create",
+      "provisioningState": "Succeeded",
+      "timestamp": "2020-06-24T01:31:11.7595483Z",
+      "duration": "PT10.5168125S",
+      "trackingId": "cefe82b9-4e85-488b-a192-81e07d444879",
+      "statusCode": "OK",
+      "targetResource": {
+        "id": "/subscriptions/b3032e36-4f82-47be-8b68-da1c1fd449b4/resourceGroups/savedevgithubdeploy/providers/Microsoft.Web/serverfarms/ASP-savedevgithubdeploy-ba27",
+        "resourceType": "Microsoft.Web/serverfarms",
+        "resourceName": "ASP-savedevgithubdeploy-ba27"
+      }
+    }
+  },
+  {
+    "id": "/subscriptions/b3032e36-4f82-47be-8b68-da1c1fd449b4/resourceGroups/savedevgithubdeploy/providers/Microsoft.Resources/deployments/Microsoft.Web-WebApp-Portal-26a824a2-b037/operations/3818BB7B2371CE02",
+    "operationId": "3818BB7B2371CE02",
+    "properties": {
+      "provisioningOperation": "Read",
+      "provisioningState": "Succeeded",
+      "timestamp": "2020-06-24T01:31:08.6602165Z",
+      "duration": "PT0.2591951S",
+      "trackingId": "23eac3c9-2805-41c8-a96c-bce1cbba9f05",
+      "statusCode": "OK",
+      "targetResource": {
+        "id": "/subscriptions/b3032e36-4f82-47be-8b68-da1c1fd449b4/resourceGroups/savedevgithubdeploy/providers/microsoft.insights/components/WharHouseX1",
+        "resourceType": "microsoft.insights/components",
+        "resourceName": "WharHouseX1",
+        "apiVersion": "2015-05-01"
+      }
+    }
+  },
+  {
+    "id": "/subscriptions/b3032e36-4f82-47be-8b68-da1c1fd449b4/resourceGroups/savedevgithubdeploy/providers/Microsoft.Resources/deployments/Microsoft.Web-WebApp-Portal-26a824a2-b037/operations/A0F4E933F46A3E95",
+    "operationId": "A0F4E933F46A3E95",
+    "properties": {
+      "provisioningOperation": "Create",
+      "provisioningState": "Succeeded",
+      "timestamp": "2020-06-24T01:31:08.2535687Z",
+      "duration": "PT7.0108329S",
+      "trackingId": "6ac1b867-75e8-4f89-a9e4-09a0fb82722a",
+      "statusCode": "OK",
+      "targetResource": {
+        "id": "/subscriptions/b3032e36-4f82-47be-8b68-da1c1fd449b4/resourceGroups/savedevgithubdeploy/providers/microsoft.insights/components/WharHouseX1",
+        "resourceType": "microsoft.insights/components",
+        "resourceName": "WharHouseX1"
+      }
+    }
+  },
+  {
+    "id": "/subscriptions/b3032e36-4f82-47be-8b68-da1c1fd449b4/resourceGroups/savedevgithubdeploy/providers/Microsoft.Resources/deployments/Microsoft.Web-WebApp-Portal-26a824a2-b037/operations/08586086446285357907",
+    "operationId": "08586086446285357907",
+    "properties": {
+      "provisioningOperation": "EvaluateDeploymentOutput",
+      "provisioningState": "Succeeded",
+      "timestamp": "2020-06-24T01:31:36.7576127Z",
+      "duration": "PT0.0547958S",
+      "trackingId": "d06d63e4-8d4b-4816-bc44-abe0d29d2e70",
+      "statusCode": "OK",
+      "statusMessage": null
+    }
+  }
+]