Skip to content

Commit a48ea4e

Browse files
FosolFosol
authored
Merge pull request #4 from AlessiaYChen/MMI_3389-updat
Mmi 3389 update
2 parents 58fe126 + 68b8be9 commit a48ea4e

26 files changed

+694
-169
lines changed

‎app/editor/.yarn/cache/tno-core-npm-1.0.29-b0ccc3fe82-277dacbb50.zip‎

-2.03 MB
Binary file not shown.

‎app/editor/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"redux-logger": "3.0.6",
6161
"styled-components": "6.1.11",
6262
"stylis": "4.3.2",
63-
"tno-core": "1.0.29"
63+
"tno-core": "1.0.30"
6464
},
6565
"devDependencies": {
6666
"@simbathesailor/use-what-changed": "2.0.0",

‎app/editor/tno-core-1.0.28.tgz‎

-606 KB
Binary file not shown.

‎app/editor/yarn.lock‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12209,7 +12209,7 @@ __metadata:
1220912209
sass-extract-loader: 1.1.0
1221012210
styled-components: 6.1.11
1221112211
stylis: 4.3.2
12212-
tno-core: 1.0.29
12212+
tno-core: 1.0.30
1221312213
typescript: 4.9.5
1221412214
vitest: 3.0.7
1221512215
languageName: unknown
@@ -16674,9 +16674,9 @@ __metadata:
1667416674
languageName: node
1667516675
linkType: hard
1667616676

16677-
"tno-core@npm:1.0.29":
16678-
version: 1.0.29
16679-
resolution: "tno-core@npm:1.0.29"
16677+
"tno-core@npm:1.0.30":
16678+
version: 1.0.30
16679+
resolution: "tno-core@npm:1.0.30"
1668016680
dependencies:
1668116681
"@elastic/elasticsearch": ^8.13.1
1668216682
"@fortawesome/free-solid-svg-icons": ^6.4.2
@@ -16709,7 +16709,7 @@ __metadata:
1670916709
styled-components: ^6.1.11
1671016710
stylis: ^4.3.2
1671116711
yup: ^1.1.1
16712-
checksum: 277dacbb5080703241317cb524e6faa7f7dd6e9af7b8bfb7e247d72f185c344cf2a486d6349960a2cf239c06f41c1124242d3e1c962ca37cee9e57de70e2ec62
16712+
checksum: 33f6b3545abd77bf5f34848cf0a25d240e1d8ddfd4e542fa18be357977e5d584f60668eb01c2d5e3f10052eaec83366ee9f07b2c245a9176bf7b47a1bc9952f3
1671316713
languageName: node
1671416714
linkType: hard
1671516715

‎app/subscriber/.yarn/cache/tno-core-npm-1.0.29-b0ccc3fe82-277dacbb50.zip‎

-2.03 MB
Binary file not shown.

‎app/subscriber/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"sheetjs": "file:packages/xlsx-0.20.1.tgz",
4949
"styled-components": "6.1.11",
5050
"stylis": "4.3.2",
51-
"tno-core": "1.0.29"
51+
"tno-core": "1.0.30"
5252
},
5353
"devDependencies": {
5454
"@testing-library/jest-dom": "6.6.3",

‎app/subscriber/yarn.lock‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12042,7 +12042,7 @@ __metadata:
1204212042
sheetjs: "file:packages/xlsx-0.20.1.tgz"
1204312043
styled-components: 6.1.11
1204412044
stylis: 4.3.2
12045-
tno-core: 1.0.29
12045+
tno-core: 1.0.30
1204612046
typescript: 4.9.5
1204712047
vitest: 3.0.7
1204812048
languageName: unknown
@@ -16397,9 +16397,9 @@ __metadata:
1639716397
languageName: node
1639816398
linkType: hard
1639916399

16400-
"tno-core@npm:1.0.29":
16401-
version: 1.0.29
16402-
resolution: "tno-core@npm:1.0.29"
16400+
"tno-core@npm:1.0.30":
16401+
version: 1.0.30
16402+
resolution: "tno-core@npm:1.0.30"
1640316403
dependencies:
1640416404
"@elastic/elasticsearch": ^8.13.1
1640516405
"@fortawesome/free-solid-svg-icons": ^6.4.2
@@ -16432,7 +16432,7 @@ __metadata:
1643216432
styled-components: ^6.1.11
1643316433
stylis: ^4.3.2
1643416434
yup: ^1.1.1
16435-
checksum: 277dacbb5080703241317cb524e6faa7f7dd6e9af7b8bfb7e247d72f185c344cf2a486d6349960a2cf239c06f41c1124242d3e1c962ca37cee9e57de70e2ec62
16435+
checksum: 33f6b3545abd77bf5f34848cf0a25d240e1d8ddfd4e542fa18be357977e5d584f60668eb01c2d5e3f10052eaec83366ee9f07b2c245a9176bf7b47a1bc9952f3
1643616436
languageName: node
1643716437
linkType: hard
1643816438

‎libs/npm/core/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "tno-core",
33
"description": "TNO shared library",
4-
"version": "1.0.29",
4+
"version": "1.0.30",
55
"homepage": "https://github.com/bcgov/tno",
66
"license": "Apache-2.0",
77
"files": [

‎services/net/TNO.Services.sln‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ Global
3333
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3434
Debug|Any CPU = Debug|Any CPU
3535
Release|Any CPU = Release|Any CPU
36+
{60B05E2B-CD93-4D44-9FF0-F84135B40E03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
37+
{60B05E2B-CD93-4D44-9FF0-F84135B40E03}.Debug|Any CPU.Build.0 = Debug|Any CPU
38+
{60B05E2B-CD93-4D44-9FF0-F84135B40E03}.Release|Any CPU.ActiveCfg = Release|Any CPU
39+
{60B05E2B-CD93-4D44-9FF0-F84135B40E03}.Release|Any CPU.Build.0 = Release|Any CPU
3640
EndGlobalSection
3741
GlobalSection(ProjectConfigurationPlatforms) = postSolution
3842
{F3D767A1-7B69-415D-ADAF-29EF5814C4EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

‎services/net/auto-clipper/AutoClipperManager.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ private async Task<string> CreateClipFileAsync(string srcFile, string outputPref
567567

568568
private async Task CreateClipContentAsync(ContentModel parentContent, ClipDefinition definition, string transcriptBody, string clipPath, int clipIndex)
569569
{
570-
var clipContent = BuildClipContentModel(parentContent, definition, transcriptBody, clipIndex);
570+
var clipContent = await BuildClipContentModelAsync(parentContent, definition, transcriptBody, clipIndex);
571571
var created = await this.Api.AddContentAsync(clipContent);
572572
if (created == null) return;
573573

@@ -576,7 +576,7 @@ private async Task CreateClipContentAsync(ContentModel parentContent, ClipDefini
576576
this.Logger.LogInformation("Clip content created. Parent Content: {ParentId}, Clip Content: {ClipId}", parentContent.Id, created?.Id);
577577
}
578578

579-
private ContentModel BuildClipContentModel(ContentModel sourceContent, ClipDefinition definition, string transcriptBody, int clipIndex)
579+
private async Task<ContentModel> BuildClipContentModelAsync(ContentModel sourceContent, ClipDefinition definition, string transcriptBody, int clipIndex)
580580
{
581581
var clipSummary = string.IsNullOrWhiteSpace(definition.Summary)
582582
? $"Clip covering {FormatTimestamp(definition.Start)} to {FormatTimestamp(definition.End)}"

0 commit comments

Comments
 (0)