version 4.7.1

scale-tone · scale-tone · commit 2eae49e874c3 · 2021-08-03T19:16:04.000+02:00
diff --git a/custom-backends/mssql/Dfm.MsSql.csproj b/custom-backends/mssql/Dfm.MsSql.csproj
@@ -8,7 +8,7 @@
     <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="3.0.12" />
     <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="2.5.0" />
     <PackageReference Include="Microsoft.DurableTask.SqlServer.AzureFunctions" Version="0.9.0-beta" />
-    <PackageReference Include="durablefunctionsmonitor.dotnetbackend" Version="4.7.0" />
+    <PackageReference Include="durablefunctionsmonitor.dotnetbackend" Version="4.7.1" />
   </ItemGroup>
   <ItemGroup>
     <None Update="host.json">
diff --git a/custom-backends/netcore31/Dfm.NetCore31.csproj b/custom-backends/netcore31/Dfm.NetCore31.csproj
@@ -6,7 +6,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="3.0.12" />
     <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="2.5.0" />
-    <PackageReference Include="durablefunctionsmonitor.dotnetbackend" Version="4.6.0" />
+    <PackageReference Include="durablefunctionsmonitor.dotnetbackend" Version="4.7.1" />
   </ItemGroup>
   <ItemGroup>
     <None Update="host.json">
diff --git a/durablefunctionsmonitor-vscodeext/CHANGELOG.md b/durablefunctionsmonitor-vscodeext/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## Version 4.7.1
+
+- Hotfix for incompatibility with Storage Emulator ([#112](https://github.com/scale-tone/DurableFunctionsMonitor/issues/112)).
+
 ## Version 4.7
 
 - Latest [az-func-as-a-graph](https://github.com/scale-tone/az-func-as-a-graph) integrated, and it is now used as yet another visualization tab for both search results and instance details, with instance counts and statuses rendered on top of it. So it now acts as an *animated* code map of your project:
diff --git a/durablefunctionsmonitor-vscodeext/package.json b/durablefunctionsmonitor-vscodeext/package.json
@@ -2,7 +2,7 @@
     "name": "durablefunctionsmonitor",
     "displayName": "Durable Functions Monitor",
     "description": "Monitoring/debugging UI tool for Azure Durable Functions. View->Command Palette...->Durable Functions Monitor",
-    "version": "4.7.0",
+    "version": "4.7.1",
     "engines": {
         "vscode": "^1.39.0"
     },
diff --git a/durablefunctionsmonitor-vscodeext/src/az-func-as-a-graph/traverseFunctionProjectUtils.ts b/durablefunctionsmonitor-vscodeext/src/az-func-as-a-graph/traverseFunctionProjectUtils.ts
@@ -135,7 +135,7 @@ export class TraversalRegexes {
     }
 
     static getCallActivityRegex(activityName: string): RegExp {
-        return new RegExp(`(CallActivity|call_activity)[\\s\\w\.-<>\\[\\]\\(]*\\([\\s\\w\.-]*["'\`]?${activityName}\\s*["'\`\\)]{1}`, 'i');
+        return new RegExp(`(CallActivity|call_activity)[\\s\\w,\.-<>\\[\\]\\(\\)]*\\([\\s\\w\.-]*["'\`]?${activityName}\\s*["'\`\\)]{1}`, 'i');
     }
 }
 
diff --git a/durablefunctionsmonitor.dotnetbackend/DfmStatics/index.html b/durablefunctionsmonitor.dotnetbackend/DfmStatics/index.html
diff --git a/durablefunctionsmonitor.dotnetbackend/DfmStatics/static/js/main.14d3190a.chunk.js.map b/durablefunctionsmonitor.dotnetbackend/DfmStatics/static/js/main.14d3190a.chunk.js.map
diff --git a/durablefunctionsmonitor.dotnetbackend/DfmStatics/static/js/main.37cea6d6.chunk.js b/durablefunctionsmonitor.dotnetbackend/DfmStatics/static/js/main.37cea6d6.chunk.js
diff --git a/durablefunctionsmonitor.dotnetbackend/DfmStatics/static/js/main.37cea6d6.chunk.js.map b/durablefunctionsmonitor.dotnetbackend/DfmStatics/static/js/main.37cea6d6.chunk.js.map
diff --git a/durablefunctionsmonitor.dotnetbackend/durablefunctionsmonitor.dotnetbackend.csproj b/durablefunctionsmonitor.dotnetbackend/durablefunctionsmonitor.dotnetbackend.csproj
@@ -2,8 +2,8 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <AzureFunctionsVersion>v2</AzureFunctionsVersion>
-    <AssemblyVersion>4.7.0.0</AssemblyVersion>
-    <FileVersion>4.7.0.0</FileVersion>
+    <AssemblyVersion>4.7.1.0</AssemblyVersion>
+    <FileVersion>4.7.1.0</FileVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="2.4.3" />
diff --git a/durablefunctionsmonitor.dotnetbackend/nuspec.nuspec b/durablefunctionsmonitor.dotnetbackend/nuspec.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata minClientVersion="2.5">
         <id>DurableFunctionsMonitor.DotNetBackend</id>
-        <version>4.7.0</version>
+        <version>4.7.1</version>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>DurableFunctionsMonitor.DotNetBackend</description>
         <authors>DurableFunctionsMonitor</authors>
diff --git a/durablefunctionsmonitor.react/package.json b/durablefunctionsmonitor.react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "durablefunctionsmonitor.react",
-  "version": "4.7.0",
+  "version": "4.7.1",
   "private": true,
   "homepage": "http://localhost:7072",
   "dependencies": {
diff --git a/durablefunctionsmonitor.react/src/states/SequenceDiagramTabState.ts b/durablefunctionsmonitor.react/src/states/SequenceDiagramTabState.ts
@@ -14,7 +14,7 @@ export class SequenceDiagramTabState extends MermaidDiagramTabState {
     protected buildDiagram(details: DurableOrchestrationStatus, history: HistoryEvent[], cancelToken: CancelToken) : Promise<void> {
 
         return new Promise<void>((resolve, reject) => {
-            Promise.all(this.getSequenceForOrchestration(details.name, '.', history)).then(sequenceLines => {
+            Promise.all(this.getSequenceForOrchestration(details.name, '.', details.runtimeStatus === 'Failed', history)).then(sequenceLines => {
 
                 if (cancelToken.isCancelled) {
                     resolve();
@@ -42,7 +42,7 @@ export class SequenceDiagramTabState extends MermaidDiagramTabState {
         });
     }
 
-    private getSequenceForOrchestration(orchestrationName: string, parentOrchestrationName: string, historyEvents: HistoryEvent[]): Promise<string>[] {
+    private getSequenceForOrchestration(orchestrationName: string, parentOrchestrationName: string, isFailed: boolean, historyEvents: HistoryEvent[]): Promise<string>[] {
 
         const externalActor = '.'
         const results: Promise<string>[] = [];
@@ -58,10 +58,14 @@ export class SequenceDiagramTabState extends MermaidDiagramTabState {
                     nextLine =
                         `${parentOrchestrationName}->>+${orchestrationName}:[ExecutionStarted] \n` +
                         `Note over ${parentOrchestrationName},${orchestrationName}: ${this.formatTimestamp(event.Timestamp)} \n`;
+                                        
                     results.push(Promise.resolve(nextLine));
 
                     break;
                 case 'SubOrchestrationInstanceCompleted':
+                case 'SubOrchestrationInstanceFailed':
+
+                    const subOrchFailed = event.EventType === 'SubOrchestrationInstanceFailed';
 
                     if (!!event.SubOrchestrationId) {
 
@@ -71,7 +75,7 @@ export class SequenceDiagramTabState extends MermaidDiagramTabState {
                         results.push(new Promise<string>((resolve, reject) => {
                             this._loadHistory(subOrchestrationId).then(history => {
 
-                                Promise.all(this.getSequenceForOrchestration(subOrchestrationName, orchestrationName, history)).then(sequenceLines => {
+                                Promise.all(this.getSequenceForOrchestration(subOrchestrationName, orchestrationName, subOrchFailed, history)).then(sequenceLines => {
 
                                     resolve(sequenceLines.join(''));
 
@@ -83,16 +87,22 @@ export class SequenceDiagramTabState extends MermaidDiagramTabState {
                                 resolve(`${orchestrationName}-x${subOrchestrationName}:[FailedToLoad] \n`);
                             });
                         }));
-                    }
 
-                    break;
-                case 'SubOrchestrationInstanceFailed':
+                    } else if (!!subOrchFailed) {
 
-                    nextLine = `rect rgba(255,0,0,0.4) \n` +
+                        nextLine = `rect rgba(255,0,0,0.4) \n` +
                         `${orchestrationName}-x${event.FunctionName}:[SubOrchestrationInstanceFailed] \n` +
                         'end \n';
 
-                    results.push(Promise.resolve(nextLine));
+                        results.push(Promise.resolve(nextLine));
+                        
+                    } else {
+
+                        nextLine = `${orchestrationName}->>+${event.FunctionName}:[SubOrchestrationInstanceStarted] \n`;
+
+                        results.push(Promise.resolve(nextLine));                        
+                    }
+
                     break;
                 case 'TaskCompleted':
 
@@ -165,8 +175,14 @@ export class SequenceDiagramTabState extends MermaidDiagramTabState {
                 case 'ExecutionCompleted':
 
                     nextLine =
-                        `${orchestrationName}-->>-${parentOrchestrationName}:[ExecutionCompleted] \n` +
+                        `${orchestrationName}-->>-${parentOrchestrationName}:[${!!isFailed ? 'ExecutionFailed' : 'ExecutionCompleted'}] \n` +
                         `Note over ${orchestrationName},${parentOrchestrationName}: ${this.formatDuration(event.DurationInMs)} \n`;
+
+                    if (!!isFailed) {
+                    
+                        nextLine = `rect rgba(255,0,0,0.4) \n` + nextLine + 'end \n';
+                    }
+                        
                     results.push(Promise.resolve(nextLine));
 
                     break;

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ export class TraversalRegexes {`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`static getCallActivityRegex(activityName: string): RegExp {`
`138`		- return new RegExp(`(CallActivity\|call_activity)[\\s\\w\.-<>\\[\\]\\(]\\([\\s\\w\.-]["'\`]?${activityName}\\s*["'\`\\)]{1}`, 'i');
	`138`	+ return new RegExp(`(CallActivity\|call_activity)[\\s\\w,\.-<>\\[\\]\\(\\)]\\([\\s\\w\.-]["'\`]?${activityName}\\s*["'\`\\)]{1}`, 'i');
`139`	`139`	`}`
`140`	`140`	`}`
`141`	`141`