fix tests after Typescript update

superdesk · Mar 23, 2023 · f61daef · f61daef
1 parent 46d2240
commit f61daef
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 21 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -132,6 +132,7 @@
     "@superdesk/build-tools": "file:build-tools",
     "@types/classnames": "^2.2.10",
     "@types/webpack-env": "^1.17.0",
+    "@types/webrtc": "0.0.33",
     "enzyme": "3.9.0",
     "enzyme-adapter-react-16": "^1.15.5",
     "grunt-karma": "^2.0.0",

diff --git a/scripts/apps/contacts/components/Form/ContactFormContainer.tsx b/scripts/apps/contacts/components/Form/ContactFormContainer.tsx
@@ -144,7 +144,7 @@ export class ContactFormContainer extends React.PureComponent<IProps, IState> {
             } else if (
                 sanitizedValue instanceof Array &&
                 sanitizedValue.length > 0 &&
-                sanitizedValue.every((val) => typeof val === 'string')
+                (sanitizedValue as Array<any>).every((val) => typeof val === 'string')
             ) {
                 sanitizedValue = (sanitizedValue as Array<string>)
                     .map((arrayValue: string) => arrayValue.trim())

diff --git a/scripts/apps/search/controllers/get-multi-actions.tsx b/scripts/apps/search/controllers/get-multi-actions.tsx
@@ -292,7 +292,7 @@ export function getMultiActions(
         const selectedItems = getSelectedItems();
 
         confirmPublish(selectedItems).then(() => {
-            Promise.all(
+            Promise.all<void>(
                 selectedItems.map((item) => new Promise((resolve) => {
                     authoring.publish(item, item)
                         .then((response) => {

diff --git a/scripts/core/helpers/waitUtil.ts b/scripts/core/helpers/waitUtil.ts
@@ -1,4 +1,4 @@
-export const waitUntil = (precondition, timeoutAt = 1000 * 60) => new Promise((resolve, reject) => {
+export const waitUntil = (precondition, timeoutAt = 1000 * 60) => new Promise<void>((resolve, reject) => {
     function checkNow() {
         if (precondition() === true) {
             window.clearInterval(interval);

diff --git a/scripts/extensions/sams/package.json b/scripts/extensions/sams/package.json
@@ -20,7 +20,7 @@
   },
   "peerDependencies": {
     "react": "^16.9.0",
-    "superdesk-ui-framework": "^2.2.4",
+    "superdesk-ui-framework": "^3.0.8",
     "classnames": "^2.2.5",
     "lodash": "^4.17.5",
     "json-merge-patch": "0.2.3"

diff --git a/scripts/extensions/sams/src/api/assets.ts b/scripts/extensions/sams/src/api/assets.ts
@@ -310,18 +310,6 @@ export function queryAssets(
         querySizeRange,
     ].forEach((func) => func(source, params));
 
-    if (source.query.bool.must.length === 0) {
-        delete source.query.bool.must;
-    }
-
-    if (source.query.bool.must_not.length === 0) {
-        delete source.query.bool.must_not;
-    }
-
-    if (Object.keys(source.query.bool).length === 0) {
-        delete source.query;
-    }
-
     const sortOrder = params.sortOrder === SORT_ORDER.ASCENDING ? 1 : 0;
     const sort = `[("${params.sortField}",${sortOrder})]`;
 

diff --git a/scripts/extensions/videoEditor/src/VideoEditorTools.tsx b/scripts/extensions/videoEditor/src/VideoEditorTools.tsx
@@ -19,7 +19,7 @@ interface IProps {
     videoResolution: number;
 }
 
-class VideoEditorToolsComponent extends React.PureComponent<IProps> {
+export class VideoEditorTools extends React.PureComponent<IProps> {
     render() {
         const resolutions = [{label: 'Same', value: 0}].concat(
             [480, 720, 1080]
@@ -91,7 +91,3 @@ class VideoEditorToolsComponent extends React.PureComponent<IProps> {
         );
     }
 }
-
-export const VideoEditorTools = React.forwardRef((props: IProps, ref: React.Ref<HTMLDivElement>) =>
-    <VideoEditorToolsComponent wrapperRef={ref} {...props} />,
-);