resolve conflict

Author: anmarhindi

Dockerfile

@@ -1,4 +1,4 @@
-FROM kernai/refinery-parent-images:v1.11.0-next
+FROM kernai/refinery-parent-images:v1.16.0-next
 
 WORKDIR /app
 COPY package*.json /app/

dev.Dockerfile

@@ -1,4 +1,4 @@
-FROM kernai/refinery-parent-images:v1.11.0-next
+FROM kernai/refinery-parent-images:v1.16.0-next
 
 WORKDIR /app
 

package.json

@@ -9,18 +9,18 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@apollo/client": "^3.7.0",
-    "@headlessui/react": "^1.7.13",
+    "@apollo/client": "^3.7.10",
+    "@headlessui/react": "^1.7.18",
     "@heroicons/react": "^2.0.17",
     "@monaco-editor/react": "^4.5.1",
     "@nextui-org/react": "^1.0.0-beta.13",
     "@reduxjs/toolkit": "^1.9.5",
-    "@tabler/icons-react": "^2.25.0",
+    "@tabler/icons-react": "^3.2.0",
     "@tailwindcss/forms": "^0.5.3",
     "@types/jest": "^29.5.2",
     "@types/node": "18.15.11",
-    "@types/react": "18.0.28",
-    "@types/react-dom": "18.2.4",
+    "@types/react": "^18.0.28",
+    "@types/react-dom": "^18.2.4",
     "autoprefixer": "^10.4.8",
     "aws-sdk": "^2.1460.0",
     "chart.js": "^4.3.0",
@@ -41,7 +41,7 @@
     "react-redux": "^8.1.1",
     "react-router-dom": "^6.10.0",
     "rxjs": "^7.8.1",
-    "tailwindcss": "^3.1.8",
+    "tailwindcss": "^3.4.1",
     "typescript": "^5.1.3"
   },
   "devDependencies": {

src/components/projects/projectId/settings/labeling-tasks/RenameLabelModal.tsx

@@ -98,7 +98,7 @@ export default function RenameLabelModal() {
                 <div className="self-center flex flex-row flex-nowrap items-center justify-center">
                     <p className="mr-2 font-bold">Change label name:</p><span
                         className={`border rounded-md py-1 px-2 text-sm font-medium shadow-sm  text-center ${modalRenameLabel.label.color?.backgroundColor} ${modalRenameLabel.label.color?.textColor} ${modalRenameLabel.label.color?.borderColor} ${modalRenameLabel.label.color?.hoverColor}`}>{modalRenameLabel.label.name}</span>
-                    <Tooltip content={TOOLTIPS_DICT.PROJECT_SETTINGS.LABELING_TASK.INFO_RENAME_LABEL} color="invert" placeholder="top" className="ml-2">
+                    <Tooltip content={TOOLTIPS_DICT.PROJECT_SETTINGS.LABELING_TASK.INFO_RENAME_LABEL} color="invert" placement="top" className="ml-2">
                         <IconInfoCircleFilled className="h-6 w-6 text-blue-500" />
                     </Tooltip>
                 </div>

src/components/shared/multilines-tooltip/MultilineTooltip.tsx

@@ -1,11 +1,10 @@
-import { MultilineTooltipProps } from "@/src/types/shared/multiline-tooltip";
-import type { MultilineTooltip } from "@/src/types/shared/multiline-tooltip";
+import { MultilineTooltipProps, MultilineTooltipContent } from "@/src/types/shared/multiline-tooltip";
 import { extendArrayElementsByUniqueId } from "@/submodules/javascript-functions/id-prep";
 import { Fragment, useEffect, useState } from "react";
 
 // TODO: Make Submodule component with an option to split on different characters as flexbox
 export default function MultilineTooltip(props: MultilineTooltipProps) {
-    const [tooltipArray, setTooltipArray] = useState<MultilineTooltip[]>(null);
+    const [tooltipArray, setTooltipArray] = useState<MultilineTooltipContent[]>(null);
 
     useEffect(() => {
         if (!props.tooltipLines) return;

src/types/shared/multiline-tooltip.ts

@@ -2,7 +2,7 @@ export type MultilineTooltipProps = {
     tooltipLines: string[];
 };
 
-export type MultilineTooltip = {
+export type MultilineTooltipContent = {
     value: string;
     id: string;
 }