diff --git a/dashboard/src/components/Forms/FormSingleSelect.tsx b/dashboard/src/components/Forms/FormSingleSelect.tsx
index a55fd18e43e..97cf6ba7255 100644
--- a/dashboard/src/components/Forms/FormSingleSelect.tsx
+++ b/dashboard/src/components/Forms/FormSingleSelect.tsx
@@ -52,11 +52,11 @@ const FormSingleSelect = ({
{`(${typeName})`}
+ noWrap>{`(${typeName})`}
diff --git a/dashboard/src/components/GlobalSearch/QuickSearch.tsx b/dashboard/src/components/GlobalSearch/QuickSearch.tsx
index 58452964b0f..6643233f6fd 100644
--- a/dashboard/src/components/GlobalSearch/QuickSearch.tsx
+++ b/dashboard/src/components/GlobalSearch/QuickSearch.tsx
@@ -198,24 +198,24 @@ const QuickSearch = () => {
entities = !isEmpty(searchResults?.entities)
? searchResults?.entities?.map((entityDef: any) => {
- const { name }: { name: string; found: boolean; key: any } =
- extractKeyValueFromEntity(entityDef);
- return {
- title: `${name}`,
- parent: entityDef.typeName,
- types: "Entities",
- entityObj: entityDef
- };
- })
+ const { name }: { name: string; found: boolean; key: any } =
+ extractKeyValueFromEntity(entityDef);
+ return {
+ title: `${name}`,
+ parent: entityDef.typeName,
+ types: "Entities",
+ entityObj: entityDef
+ };
+ })
: [{ title: "No Entities Found", types: "Entities" }];
suggestionNames = !isEmpty(suggestions)
? suggestions.map((suggestion: any) => {
- return {
- title: `${suggestion}`,
- types: "Suggestions"
- };
- })
+ return {
+ title: `${suggestion}`,
+ types: "Suggestions"
+ };
+ })
: [{ title: "No Suggestions Found", types: "Suggestions" }];
setOptions([...entities, ...suggestionNames] as GlobalOptionRow[]);
@@ -439,6 +439,9 @@ const QuickSearch = () => {
sx={{
minWidth: 150,
flex: "1 1 280px",
+ "& .MuiAutocomplete-popper": {
+ maxWidth: "100%"
+ },
"& + .MuiAutocomplete-popper .MuiAutocomplete-option": {
backgroundColor: "white"
},
@@ -446,6 +449,14 @@ const QuickSearch = () => {
backgroundColor: "#c7e3ff"
}
}}
+ componentsProps={{
+ paper: {
+ sx: {
+ maxWidth: "100%",
+ overflowX: "hidden"
+ }
+ }
+ }}
value={null}
onChange={(_event: unknown, newValue: unknown) => {
if (newValue && typeof newValue === "object") {
@@ -476,13 +487,19 @@ const QuickSearch = () => {
const parts = parse(title, matches);
return (
-
+
{parts.map((part, index) => (
{part.text}
@@ -494,14 +511,14 @@ const QuickSearch = () => {
const { entityObj, types, parent } =
typeof option !== "string" &&
- "entityObj" in option &&
- "types" in option &&
- "parent" in option
+ "entityObj" in option &&
+ "types" in option &&
+ "parent" in option
? (option as {
- entityObj: { status?: string; guid?: string };
- types: string;
- parent: string;
- })
+ entityObj: { status?: string; guid?: string };
+ types: string;
+ parent: string;
+ })
: { entityObj: null, types: "", parent: "" };
const title =
typeof option !== "string" && "title" in option
@@ -528,36 +545,32 @@ const QuickSearch = () => {
);
return (
span": {
mr: 2,
flexShrink: 0
- }
+ },
+ textOverflow: "ellipsis",
+ overflow: "hidden",
+ whiteSpace: "nowrap",
+ display: "block",
+ width: "100%"
}}
{...props}
+ title={safeTitle}
onClick={() => {
handleValues(option as GlobalOptionRow);
}}
>
{types === "Entities" && !isEmpty(entityObj) ? (
{
)}
{types === "Entities" && !isEmpty(entityObj)
? parts.map((part, index) => (
-
- {entityObj?.guid !== "-1" && !part.highlight ? (
-
+ {entityObj?.guid !== "-1" && !part.highlight ? (
+
- {part.text}
-
- ) : (
- part.text
- )}
-
- ))
+ ? "error"
+ : "primary"
+ }
+ >
+ {part.text}
+
+ ) : (
+ part.text
+ )}
+
+ ))
: parts.map((part, index) => (
-
- {part.text}
-
- ))}
+
+ {part.text}
+
+ ))}
{types === "Entities" &&
!isEmpty(entityObj) &&
` (${parent})`}
) : (
- parts.map((part, index) => (
-
- {part.text}
-
- ))
+
+ {parts.map((part, index) => (
+
+ {part.text}
+
+ ))}
+
)}
);
diff --git a/dashboard/src/components/Modal.tsx b/dashboard/src/components/Modal.tsx
index 373e5fee264..e91b16d85b9 100644
--- a/dashboard/src/components/Modal.tsx
+++ b/dashboard/src/components/Modal.tsx
@@ -24,7 +24,7 @@ import DialogTitle from "@mui/material/DialogTitle";
import IconButton from "@mui/material/IconButton";
import Stack from "@mui/material/Stack";
import Typography from "@mui/material/Typography";
-import { CloseIcon, CustomButton } from "./muiComponents";
+import { CloseIcon, CustomButton, LightTooltip } from "./muiComponents";
import { isEmpty } from "../utils/Utils";
const BootstrapDialog = styled(Dialog)(() => ({
@@ -118,14 +118,26 @@ export const CustomModal: React.FC = ({
sx={{
padding: "0",
display: "flex",
- alignItems: "center"
+ alignItems: "center",
+ flex: 1,
+ minWidth: 0
}}
>
-
+
{titleIcon != undefined && titleIcon}
-
- {title}
-
+
+
+ {title}
+
+
{postTitleIcon != undefined && postTitleIcon}
@@ -201,11 +213,11 @@ export const CustomModal: React.FC = ({
}),
...(primaryDisabled &&
!isLoading && {
- "&.Mui-disabled": {
- pointerEvents: "unset",
- cursor: "not-allowed"
- }
- })
+ "&.Mui-disabled": {
+ pointerEvents: "unset",
+ cursor: "not-allowed"
+ }
+ })
}}
startIcon={
isLoading ? (
diff --git a/dashboard/src/components/QueryBuilder/RelationshipFilters.tsx b/dashboard/src/components/QueryBuilder/RelationshipFilters.tsx
index a9937aa1c9a..3dd0aaebc01 100644
--- a/dashboard/src/components/QueryBuilder/RelationshipFilters.tsx
+++ b/dashboard/src/components/QueryBuilder/RelationshipFilters.tsx
@@ -48,8 +48,8 @@ const RelationshipFilters = ({
let attrTagObj =
!isEmpty(relationshipDefs) && !isEmpty(relationshipParams)
? relationshipDefs.find((relationship: { name: string }) => {
- return relationship.name == relationshipParams;
- })
+ return relationship.name == relationshipParams;
+ })
: {};
if (attrTagObj) {
@@ -107,8 +107,8 @@ const RelationshipFilters = ({
return (
-
{resultObj[params].map((obj: { name: string }) => {
const { name } = obj;
@@ -132,6 +140,16 @@ const AuditResults = ({ componentProps, row }: any) => {
setOpenModal(true);
setCurrentObj(obj);
}}
+ title={name}
+ sx={{
+ display: "inline-block",
+ maxWidth: "100%",
+ textOverflow: "ellipsis",
+ overflow: "hidden",
+ whiteSpace: "nowrap",
+ textAlign: "left",
+ verticalAlign: "bottom"
+ }}
>
{name}
@@ -169,6 +187,16 @@ const AuditResults = ({ componentProps, row }: any) => {
setOpenPurgeModal(true);
setCurrentPurgeResultObj(obj);
}}
+ title={obj}
+ sx={{
+ display: "inline-block",
+ maxWidth: "100%",
+ textOverflow: "ellipsis",
+ overflow: "hidden",
+ whiteSpace: "nowrap",
+ textAlign: "left",
+ verticalAlign: "bottom"
+ }}
>
{obj}
diff --git a/dashboard/src/views/Administrator/Audits/ImportExportAudits.tsx b/dashboard/src/views/Administrator/Audits/ImportExportAudits.tsx
index 92a5a682d4e..b2df73b67d4 100644
--- a/dashboard/src/views/Administrator/Audits/ImportExportAudits.tsx
+++ b/dashboard/src/views/Administrator/Audits/ImportExportAudits.tsx
@@ -45,23 +45,14 @@ const ImportExportAudits = ({ auditObj }: any) => {
marginTop={1}
>
{`${keys} ${
isArray(value) ? `(${value.length})` : ""
}`}
{getValues(
value,
@@ -94,23 +85,14 @@ const ImportExportAudits = ({ auditObj }: any) => {
marginTop={1}
>
{`${keys} ${
isArray(value) ? `(${value.length})` : ""
}`}
{getValues(
paramsObj,
diff --git a/dashboard/src/views/Classification/AddTag.tsx b/dashboard/src/views/Classification/AddTag.tsx
index 1ec08ac9f5c..ea29ea677ba 100644
--- a/dashboard/src/views/Classification/AddTag.tsx
+++ b/dashboard/src/views/Classification/AddTag.tsx
@@ -137,8 +137,8 @@ const AddTag = (props: {
const classificationNames = !isEmpty(classifications)
? classifications.map((obj: { typeName: any }) => {
- return obj.typeName;
- })
+ return obj.typeName;
+ })
: [];
const nonAssignTag = classificationDefs.filter((obj: { name: string }) => {
@@ -147,23 +147,23 @@ const AddTag = (props: {
const options = !isEmpty(nonAssignTag)
? nonAssignTag.map((obj: { name: any }) => ({
- label: obj.name,
- value: obj.name
- }))
+ label: obj.name,
+ value: obj.name
+ }))
: [];
const classificationObj = !isEmpty(tagName)
? classificationDefs.find((obj: { name: string }) => {
- return obj.name == (isAdd ? tagName.label : tagName);
- })
+ return obj.name == (isAdd ? tagName.label : tagName);
+ })
: null;
let attributeDefList = !isEmpty(classificationObj)
? getNestedSuperTypeObj({
- data: classificationObj,
- collection: classificationDefs,
- attrMerge: true
- })
+ data: classificationObj,
+ collection: classificationDefs,
+ attrMerge: true
+ })
: null;
const renderFormControl: any = (obj: any) => {
@@ -287,8 +287,8 @@ const AddTag = (props: {
if (isAdd) {
let bulkGuids = isArray(entityData)
? entityData.map((obj: { guid: any }) => {
- return obj.guid;
- })
+ return obj.guid;
+ })
: [entityGuid];
data["entityGuids"] = bulkGuids;
@@ -386,8 +386,8 @@ const AddTag = (props: {
isEmpty(classificationData)
? false
: isAdd
- ? !isEmpty(tagName)
- : true
+ ? !isEmpty(tagName)
+ : true
}
>