Merge branch 'release51' into release52

jstarpl · jstarpl · commit e560a4ce6cf0 · 2024-09-30T17:08:57.000+02:00
diff --git a/.github/workflows/node.yaml b/.github/workflows/node.yaml
@@ -587,13 +587,17 @@ jobs:
           yarn
         env:
           CI: true
-      - name: Run generator
+      - name: Build OpenAPI client library
+        run: |
+          cd packages/openapi
+          yarn build
+        env:
+          CI: true
+      - name: Generate OpenAPI docs and server
         run: |
           cd packages/openapi
-
           yarn gendocs
           yarn genserver
-          yarn genclient:ts
         env:
           CI: true
 
@@ -682,7 +686,7 @@ jobs:
           else
             # make dependencies of `determine-npm-tag` available
             yarn install --mode=skip-build
-            
+
             cd packages
             PACKAGE_NAME="@sofie-automation/shared-lib"
             PUBLISHED_VERSION=$(yarn npm info --json $PACKAGE_NAME | jq -c '.version' -r)
@@ -700,19 +704,11 @@ jobs:
           yarn build
         env:
           CI: true
-      - name: Generate OpenAPI client library
-        if: ${{ steps.do-publish.outputs.tag }}
-        uses: hatamiarash7/openapi-generator@v0.3.0
-        with:
-          generator: typescript-fetch
-          openapi-file: ./packages/openapi/api/actions.yaml
-          output-dir: ./packages/openapi/client/ts
-          command-args: -p supportsES6=true
       - name: Build OpenAPI client library
         if: ${{ steps.do-publish.outputs.tag }}
         run: |
           cd packages/openapi
-          yarn build:main
+          yarn build
         env:
           CI: true
       - name: Modify dependencies to use npm packages
diff --git a/.github/workflows/prerelease-libs.yml b/.github/workflows/prerelease-libs.yml
@@ -131,19 +131,12 @@ jobs:
           yarn build
         env:
           CI: true
-      - name: Generate OpenAPI client library
-        if: ${{ steps.do-publish.outputs.tag }}
-        uses: hatamiarash7/openapi-generator@v0.3.0
-        with:
-          generator: typescript-fetch
-          openapi-file: ./packages/openapi/api/actions.yaml
-          output-dir: ./packages/openapi/client/ts
-          command-args: -p supportsES6=true
+
       - name: Build OpenAPI client library
-        if: ${{ steps.do-publish.outputs.tag }}
+        if: ${{ steps.do-publish.outputs.publish }}
         run: |
           cd packages/openapi
-          yarn build:main
+          yarn build
         env:
           CI: true
       - name: Modify dependencies to use npm packages
diff --git a/meteor/CHANGELOG.md b/meteor/CHANGELOG.md
@@ -2,6 +2,19 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.51.0-in-testing.3](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.2...v1.51.0-in-testing.3) (2024-09-25)
+
+## [1.51.0-in-testing.2](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.1...v1.51.0-in-testing.2) (2024-09-24)
+
+
+### Bug Fixes
+
+* allow replacement in replaceInfinitesFromPreviousPlayhead ([ebb154d](https://github.com/nrkno/sofie-core/commit/ebb154d6b59369588da400d8d921a00e41b84dc8))
+* **BucketPanel:** Bucket AdLibs don't trigger when created before Rundown activation (SOFIE-3478) ([a16d977](https://github.com/nrkno/sofie-core/commit/a16d9777a301a6d7d69ea00be02b70c53cb9bdcc))
+* **LinePartTimeline:** make rules for findMainPiece consistent, make infinite graphics Pieces display correctly ([153d100](https://github.com/nrkno/sofie-core/commit/153d100fb659546201a654af5c566b513951df88))
+* **NoraFloatingInspector:** prevent Segment crash when trying to show a Piece with an invalid Nora `previewPayload` ([4a3a2e7](https://github.com/nrkno/sofie-core/commit/4a3a2e779c144b1c9e88c187cce2e5c80d34626d))
+* resolve an issue with prompter moving when Parts become PartInstances and the prompter position is juuuust right ([a670a73](https://github.com/nrkno/sofie-core/commit/a670a73fa6bfb8331921a2bedd9c927952cfffcf))
+
 ## [1.51.0-in-testing.0](https://github.com/nrkno/sofie-core/compare/v1.50.4...v1.51.0-in-testing.0) (2024-08-19)
 
 
diff --git a/packages/blueprints-integration/CHANGELOG.md b/packages/blueprints-integration/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.51.0-in-testing.3](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.2...v1.51.0-in-testing.3) (2024-09-25)
+
+**Note:** Version bump only for package @sofie-automation/blueprints-integration
+
+
+
+
+
+# [1.51.0-in-testing.2](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.1...v1.51.0-in-testing.2) (2024-09-24)
+
+**Note:** Version bump only for package @sofie-automation/blueprints-integration
+
+
+
+
+
 # [1.51.0-in-testing.1](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.0...v1.51.0-in-testing.1) (2024-09-06)
 
 
diff --git a/packages/job-worker/src/playout/timeline/piece.ts b/packages/job-worker/src/playout/timeline/piece.ts
@@ -108,7 +108,7 @@ export function getPieceEnableInsidePart(
 	if (partHasEndTime && partTimings.toPartPostroll) {
 		if (!pieceEnable.duration) {
 			// make sure that the control object is shortened correctly
-			pieceEnable.duration = `#${partGroupId} - ${partTimings.toPartPostroll}`
+			pieceEnable.end = `#${partGroupId} - ${partTimings.toPartPostroll}`
 		}
 	}
 
diff --git a/packages/job-worker/src/playout/timeline/rundown.ts b/packages/job-worker/src/playout/timeline/rundown.ts
@@ -146,7 +146,8 @@ export function buildTimelineObjsForRundown(
 			// If there is a valid autonext out of the current part, then calculate the duration
 			currentPartEnable.duration =
 				partInstancesInfo.current.partInstance.part.expectedDuration +
-				partInstancesInfo.current.calculatedTimings.toPartDelay
+				partInstancesInfo.current.calculatedTimings.toPartDelay +
+				partInstancesInfo.current.calculatedTimings.toPartPostroll // autonext should have the postroll added to it to not confuse the timeline
 
 			if (
 				typeof currentPartEnable.start === 'number' &&
diff --git a/packages/lerna.json b/packages/lerna.json
@@ -2,4 +2,4 @@
 	"version": "1.52.0-in-development",
 	"npmClient": "yarn",
 	"useWorkspaces": true
-}
+}
diff --git a/packages/mos-gateway/CHANGELOG.md b/packages/mos-gateway/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.51.0-in-testing.3](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.2...v1.51.0-in-testing.3) (2024-09-25)
+
+**Note:** Version bump only for package mos-gateway
+
+
+
+
+
+# [1.51.0-in-testing.2](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.1...v1.51.0-in-testing.2) (2024-09-24)
+
+**Note:** Version bump only for package mos-gateway
+
+
+
+
+
 # [1.51.0-in-testing.1](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.0...v1.51.0-in-testing.1) (2024-09-06)
 
 
diff --git a/packages/playout-gateway/CHANGELOG.md b/packages/playout-gateway/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.51.0-in-testing.3](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.2...v1.51.0-in-testing.3) (2024-09-25)
+
+**Note:** Version bump only for package playout-gateway
+
+
+
+
+
+# [1.51.0-in-testing.2](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.1...v1.51.0-in-testing.2) (2024-09-24)
+
+**Note:** Version bump only for package playout-gateway
+
+
+
+
+
 # [1.51.0-in-testing.1](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.0...v1.51.0-in-testing.1) (2024-09-06)
 
 
diff --git a/packages/server-core-integration/CHANGELOG.md b/packages/server-core-integration/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.51.0-in-testing.3](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.2...v1.51.0-in-testing.3) (2024-09-25)
+
+**Note:** Version bump only for package @sofie-automation/server-core-integration
+
+
+
+
+
+# [1.51.0-in-testing.2](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.1...v1.51.0-in-testing.2) (2024-09-24)
+
+**Note:** Version bump only for package @sofie-automation/server-core-integration
+
+
+
+
+
 # [1.51.0-in-testing.1](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.0...v1.51.0-in-testing.1) (2024-09-06)
 
 **Note:** Version bump only for package @sofie-automation/server-core-integration
diff --git a/packages/webui/src/client/lib/RenderLimiter.tsx b/packages/webui/src/client/lib/RenderLimiter.tsx
diff --git a/packages/webui/src/client/ui/Shelf/BucketPanel.tsx b/packages/webui/src/client/ui/Shelf/BucketPanel.tsx
@@ -380,7 +380,7 @@ export const BucketPanel = React.memo(
 		)
 	},
 	(props: IBucketPanelProps, nextProps: IBucketPanelProps) => {
-		return !_.isEqual(props, nextProps)
+		return _.isEqual(props, nextProps)
 	}
 )
 
diff --git a/packages/webui/src/client/ui/Shelf/BucketPieceButton.tsx b/packages/webui/src/client/ui/Shelf/BucketPieceButton.tsx
@@ -12,7 +12,7 @@ import {
 } from 'react-dnd'
 import { DragDropItemTypes } from '../DragDropItemTypes'
 import { BucketAdLib } from '@sofie-automation/corelib/dist/dataModel/BucketAdLibPiece'
-import { useContentStatusForAdlibPiece } from '../SegmentTimeline/withMediaObjectStatus'
+import { useContentStatusForItem } from '../SegmentTimeline/withMediaObjectStatus'
 import { BucketAdLibActionUi, BucketAdLibItem } from './RundownViewBuckets'
 import { IBlueprintActionTriggerMode } from '@sofie-automation/blueprints-integration'
 import { BucketId, PieceId } from '@sofie-automation/corelib/dist/dataModel/Ids'
@@ -60,7 +60,7 @@ class BucketPieceButtonBase extends DashboardPieceButtonBase<ButtonSourceCollect
 export function BucketPieceButton(
 	props: React.PropsWithChildren<IDashboardButtonProps> & BucketPieceButtonBaseProps
 ): JSX.Element {
-	const contentStatus = useContentStatusForAdlibPiece(props.piece)
+	const contentStatus = useContentStatusForItem(props.piece)
 
 	const [, connectDropTarget] = useDrop<IBucketPieceDragObject, {}, {}>({
 		accept: DragDropItemTypes.BUCKET_ADLIB_PIECE,
diff --git a/packages/webui/src/client/ui/Shelf/DashboardPanel.tsx b/packages/webui/src/client/ui/Shelf/DashboardPanel.tsx
@@ -627,6 +627,6 @@ export const DashboardPanel = React.memo(
 		)
 	},
 	(props: IAdLibPanelProps, nextProps: IAdLibPanelProps) => {
-		return !_.isEqual(props, nextProps)
+		return _.isEqual(props, nextProps)
 	}
 )
diff --git a/packages/webui/src/client/ui/Shelf/Inspector/ShelfInspector.tsx b/packages/webui/src/client/ui/Shelf/Inspector/ShelfInspector.tsx
@@ -39,7 +39,6 @@ export const ShelfInspector = React.memo(
 		)
 	},
 	(prevProps, nextProps) => {
-		if (_.isEqual(nextProps, prevProps)) return false
-		return true
+		return _.isEqual(nextProps, prevProps)
 	}
 )
diff --git a/packages/webui/src/client/ui/Shelf/TimelineDashboardPanel.tsx b/packages/webui/src/client/ui/Shelf/TimelineDashboardPanel.tsx
@@ -32,7 +32,7 @@ export const TimelineDashboardPanel = React.memo(
 		return <TimelineDashboardPanelContent {...props} {...trackedProps} studio={trackedProps.studio} />
 	},
 	(props: IAdLibPanelProps, nextProps: IAdLibPanelProps) => {
-		return !_.isEqual(props, nextProps)
+		return _.isEqual(props, nextProps)
 	}
 )
 

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ export function getPieceEnableInsidePart(`
`108`	`108`	`if (partHasEndTime && partTimings.toPartPostroll) {`
`109`	`109`	`if (!pieceEnable.duration) {`
`110`	`110`	`// make sure that the control object is shortened correctly`
`111`		- pieceEnable.duration = `#${partGroupId} - ${partTimings.toPartPostroll}`
	`111`	+ pieceEnable.end = `#${partGroupId} - ${partTimings.toPartPostroll}`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`