Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FIX: Chat load fails #1925

Merged
merged 3 commits into from
Sep 19, 2023
Merged

FIX: Chat load fails #1925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f543274
White screen was open after clicking on "New Chat"
JindrichSusen Sep 18, 2023
e52ae67
Web screen loading refactored
JindrichSusen Sep 18, 2023
21d0edd
Chat package in test model updated
JindrichSusen Sep 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion frontend-html/src/gui/Components/WebScreen/WebScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import S from "gui/Components/WebScreen/WebScreen.module.scss";
import cx from "classnames";

export const WebScreen: React.FC<{
url: string;
source: string;
isLoading?: boolean;
refIFrame?: any;
onLoad?: any;
Expand Down Expand Up @@ -59,6 +59,7 @@ export const WebScreen: React.FC<{
onLoadStart={props.onLoadStart}
ref={refIFrame}
className={S.webContent}
src={props.source}
/>
<div className={cx(S.transparentOverlay, {isVisible: mouseDowned})}/>
</div>
Expand Down
26 changes: 16 additions & 10 deletions frontend-html/src/gui/connections/CScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import { getApi } from "model/selectors/getApi";
const WebScreenComposite: React.FC<{ openedScreen: IOpenedScreen }> = observer((props) => {
const {openedScreen} = props;
const [isLoading, setLoading] = useState(false);
const [source, setSource] = useState("");
const refIFrame = useRef<any>(null);

const setTabTitleFromIFrame = useMemo(
Expand All @@ -47,22 +48,27 @@ const WebScreenComposite: React.FC<{ openedScreen: IOpenedScreen }> = observer((
},
[openedScreen]
);

useEffect(() => {
if (openedScreen.screenUrl) {
setLoading(true);
}
const frameWindow = refIFrame.current as HTMLIFrameElement;
function loadInternalApiDataWithAuthentication() {
const fetchData = async () => {
if(!props.openedScreen.screenUrl){
if (!openedScreen.screenUrl) {
return;
}
if (!openedScreen.screenUrl.startsWith("internalApi/")){
setSource(openedScreen.screenUrl);
return;
}
const api = getApi(props.openedScreen);
const url = props.openedScreen.screenUrl.replace("internalApi/", "")
const url = openedScreen.screenUrl.replace("internalApi/", "")
const content = await api.callUserApi(url);
frameWindow.src = URL.createObjectURL(content)
setSource(URL.createObjectURL(content));
}
fetchData().catch(error => console.error(error));
}
useEffect(() => {
if (openedScreen.screenUrl) {
setLoading(true);
}
loadInternalApiDataWithAuthentication();
}, []); // eslint-disable-line react-hooks/exhaustive-deps
useEffect(() => {
const handle = setInterval(() => {
Expand Down Expand Up @@ -112,7 +118,7 @@ const WebScreenComposite: React.FC<{ openedScreen: IOpenedScreen }> = observer((
return (
<Screen isHidden={!getIsTopmostNonDialogScreen(openedScreen)}>
<WebScreen
url={openedScreen.screenUrl || ""}
source={source || ""}
isLoading={isLoading}
onLoad={(event: any) => {
event.persist();
Expand Down
4 changes: 2 additions & 2 deletions model-tests/model/Chat/.origamPackage
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<x:file xmlns:p="http://schemas.origam.com/Origam.Schema.Package/6.1.0" xmlns:pr="http://schemas.origam.com/Origam.Schema.PackageReference/6.0.0" xmlns:x="http://schemas.origam.com/model-persistence/1.0.0">
<x:file xmlns:x="http://schemas.origam.com/model-persistence/1.0.0" xmlns:p="http://schemas.origam.com/Origam.Schema.Package/6.1.0" xmlns:pr="http://schemas.origam.com/Origam.Schema.PackageReference/6.0.0">
<p:package
x:id="261b7cd5-4ba1-46a0-8963-27793379ac11"
x:isFolder="true"
p:name="Chat"
p:version="1.0.0">
p:version="1.0.1">
<pr:packageReference
x:id="645bcb11-7459-4f25-a0de-a5cc085dd6e0"
pr:referencedPackage="Root/.origamPackage#147fa70d-6519-4393-b5d0-87931f9fd609" />
Expand Down
265 changes: 142 additions & 123 deletions model-tests/model/Chat/DataEntity/Chat/OrigamChatMessage.origam
View file
Open in desktop

Large diffs are not rendered by default.

43 changes: 26 additions & 17 deletions model-tests/model/Chat/DataEntity/Chat/OrigamChatMessageBusinessPartner.origam
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<x:file xmlns:ade="http://schemas.origam.com/Origam.Schema.EntityModel.AbstractDataEntity/6.0.0" xmlns:adec="http://schemas.origam.com/Origam.Schema.EntityModel.AbstractDataEntityColumn/6.0.0" xmlns:asi="http://schemas.origam.com/Origam.Schema.AbstractSchemaItem/6.0.0" xmlns:dei="http://schemas.origam.com/Origam.Schema.EntityModel.DataEntityIndex/6.0.0" xmlns:deif="http://schemas.origam.com/Origam.Schema.EntityModel.DataEntityIndexField/6.0.0" xmlns:fmi="http://schemas.origam.com/Origam.Schema.EntityModel.FieldMappingItem/6.0.0" xmlns:sia="http://schemas.origam.com/Origam.Schema.SchemaItemAncestor/6.0.0" xmlns:tmi="http://schemas.origam.com/Origam.Schema.EntityModel.TableMappingItem/6.0.0" xmlns:x="http://schemas.origam.com/model-persistence/1.0.0">
<x:file
xmlns:x="http://schemas.origam.com/model-persistence/1.0.0"
xmlns:ade="http://schemas.origam.com/Origam.Schema.EntityModel.AbstractDataEntity/6.0.0"
xmlns:adec="http://schemas.origam.com/Origam.Schema.EntityModel.AbstractDataEntityColumn/6.0.0"
xmlns:asi="http://schemas.origam.com/Origam.Schema.AbstractSchemaItem/6.0.0"
xmlns:dei="http://schemas.origam.com/Origam.Schema.EntityModel.DataEntityIndex/6.0.0"
xmlns:deif="http://schemas.origam.com/Origam.Schema.EntityModel.DataEntityIndexField/6.0.0"
xmlns:fmi="http://schemas.origam.com/Origam.Schema.EntityModel.FieldMappingItem/6.0.0"
xmlns:sia="http://schemas.origam.com/Origam.Schema.SchemaItemAncestor/6.0.0"
xmlns:tmi="http://schemas.origam.com/Origam.Schema.EntityModel.TableMappingItem/6.0.0">
<tmi:DataEntity
asi:abstract="false"
ade:audit="None"
Expand All @@ -9,9 +18,19 @@
tmi:mappedObjectName="OrigamChatMessageBusinessPartner"
asi:name="OrigamChatMessageBusinessPartner"
ade:readOnly="false">
<sia:ancestor
sia:ancestor="Root/DataEntity/__Origam General Interfaces/IOrigamEntity2.origam#IOrigamEntity2/28c21d99-785a-4cc5-bce9-62dca7b852c6"
x:id="8aa8e1a1-37b4-4c1e-8b63-d17515b6edbf" />
<dei:DataEntityIndex
asi:abstract="false"
dei:generateDeploymentScript="true"
x:id="11764138-7773-4fe4-a6db-aa1d330371ea"
asi:name="ix_OrigamChatMessage"
dei:unique="false">
<deif:DataEntityIndexField
asi:abstract="false"
deif:field="Chat/DataEntity/Chat/OrigamChatMessageBusinessPartner.origam#OrigamChatMessageBusinessPartner/refOrigamChatMessageId/7ccb6016-26bc-4197-aa03-88476e60f50a"
x:id="1f76cfff-5d6b-4024-ba13-f01f363a6822"
asi:name="0_refOrigamChatMessageId"
deif:sortOrder="Ascending" />
</dei:DataEntityIndex>
<fmi:DataEntityColumn
asi:abstract="false"
adec:allowNulls="false"
Expand Down Expand Up @@ -43,18 +62,8 @@
asi:name="refBusinessPartnerId"
adec:onCopyAction="Copy"
adec:xmlMappingType="Attribute" />
<dei:DataEntityIndex
asi:abstract="false"
dei:generateDeploymentScript="true"
x:id="11764138-7773-4fe4-a6db-aa1d330371ea"
asi:name="ix_OrigamChatMessage"
dei:unique="false">
<deif:DataEntityIndexField
asi:abstract="false"
deif:field="Chat/DataEntity/Chat/OrigamChatMessageBusinessPartner.origam#OrigamChatMessageBusinessPartner/refOrigamChatMessageId/7ccb6016-26bc-4197-aa03-88476e60f50a"
x:id="1f76cfff-5d6b-4024-ba13-f01f363a6822"
asi:name="0_refOrigamChatMessageId"
deif:sortOrder="Ascending" />
</dei:DataEntityIndex>
<sia:ancestor
sia:ancestor="Root/DataEntity/__Origam General Interfaces/IOrigamEntity2.origam#IOrigamEntity2/28c21d99-785a-4cc5-bce9-62dca7b852c6"
x:id="8aa8e1a1-37b4-4c1e-8b63-d17515b6edbf" />
</tmi:DataEntity>
</x:file>
99 changes: 54 additions & 45 deletions model-tests/model/Chat/DataEntity/Chat/OrigamChatRoom.origam
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<x:file xmlns:ade="http://schemas.origam.com/Origam.Schema.EntityModel.AbstractDataEntity/6.0.0" xmlns:adec="http://schemas.origam.com/Origam.Schema.EntityModel.AbstractDataEntityColumn/6.0.0" xmlns:asi="http://schemas.origam.com/Origam.Schema.AbstractSchemaItem/6.0.0" xmlns:ercpi="http://schemas.origam.com/Origam.Schema.EntityModel.EntityRelationColumnPairItem/6.0.0" xmlns:eri="http://schemas.origam.com/Origam.Schema.EntityModel.EntityRelationItem/6.0.0" xmlns:fmi="http://schemas.origam.com/Origam.Schema.EntityModel.FieldMappingItem/6.0.0" xmlns:sia="http://schemas.origam.com/Origam.Schema.SchemaItemAncestor/6.0.0" xmlns:tmi="http://schemas.origam.com/Origam.Schema.EntityModel.TableMappingItem/6.0.0" xmlns:x="http://schemas.origam.com/model-persistence/1.0.0">
<x:file
xmlns:x="http://schemas.origam.com/model-persistence/1.0.0"
xmlns:ade="http://schemas.origam.com/Origam.Schema.EntityModel.AbstractDataEntity/6.0.0"
xmlns:adec="http://schemas.origam.com/Origam.Schema.EntityModel.AbstractDataEntityColumn/6.0.0"
xmlns:asi="http://schemas.origam.com/Origam.Schema.AbstractSchemaItem/6.0.0"
xmlns:ercpi="http://schemas.origam.com/Origam.Schema.EntityModel.EntityRelationColumnPairItem/6.0.0"
xmlns:eri="http://schemas.origam.com/Origam.Schema.EntityModel.EntityRelationItem/6.0.0"
xmlns:fmi="http://schemas.origam.com/Origam.Schema.EntityModel.FieldMappingItem/6.0.0"
xmlns:sia="http://schemas.origam.com/Origam.Schema.SchemaItemAncestor/6.0.0"
xmlns:tmi="http://schemas.origam.com/Origam.Schema.EntityModel.TableMappingItem/6.0.0">
<tmi:DataEntity
asi:abstract="false"
ade:audit="None"
Expand All @@ -9,50 +18,6 @@
tmi:mappedObjectName="OrigamChatRoom"
asi:name="OrigamChatRoom"
ade:readOnly="false">
<sia:ancestor
sia:ancestor="Root/DataEntity/__Origam General Interfaces/IOrigamEntity2.origam#IOrigamEntity2/28c21d99-785a-4cc5-bce9-62dca7b852c6"
x:id="4ed7b1b1-7b2d-4f58-8c60-510f8f6f2a57" />
<fmi:DataEntityColumn
asi:abstract="false"
adec:allowNulls="false"
adec:autoIncrement="false"
adec:dataLength="50"
adec:dataType="String"
adec:excludeFromAllFields="false"
fmi:excludeFromAuditing="false"
x:id="a161d727-97b7-44d3-a314-037183e7c43e"
adec:isPrimaryKey="false"
fmi:mappedColumnName="Name"
asi:name="Name"
adec:onCopyAction="Copy"
adec:xmlMappingType="Attribute" />
<fmi:DataEntityColumn
asi:abstract="false"
adec:allowNulls="true"
adec:autoIncrement="false"
adec:dataType="UniqueIdentifier"
adec:excludeFromAllFields="false"
fmi:excludeFromAuditing="false"
x:id="9437df39-e464-4117-bce7-109d985cac82"
adec:isPrimaryKey="false"
fmi:mappedColumnName="ReferenceId"
asi:name="ReferenceId"
adec:onCopyAction="Copy"
adec:xmlMappingType="Attribute" />
<fmi:DataEntityColumn
asi:abstract="false"
adec:allowNulls="true"
adec:autoIncrement="false"
adec:dataLength="50"
adec:dataType="String"
adec:excludeFromAllFields="false"
fmi:excludeFromAuditing="false"
x:id="98fdd11b-a908-438a-9775-53a6945a7013"
adec:isPrimaryKey="false"
fmi:mappedColumnName="ReferenceEntity"
asi:name="ReferenceEntity"
adec:onCopyAction="Copy"
adec:xmlMappingType="Attribute" />
<eri:EntityRelation
asi:abstract="false"
x:id="544a39c8-b9c4-44c7-899f-edd5e9abacb6"
Expand Down Expand Up @@ -83,5 +48,49 @@
asi:name="OrigamChatRoomBusinessPartnerKey1"
ercpi:relatedEntityField="Chat/DataEntity/Chat/OrigamChatRoomBusinessPartner.origam#OrigamChatRoomBusinessPartner/refOrigamChatRoomId/48044453-19bb-40a1-8bb4-bb3173fbbae7" />
</eri:EntityRelation>
<fmi:DataEntityColumn
asi:abstract="false"
adec:allowNulls="true"
adec:autoIncrement="false"
adec:dataType="UniqueIdentifier"
adec:excludeFromAllFields="false"
fmi:excludeFromAuditing="false"
x:id="9437df39-e464-4117-bce7-109d985cac82"
adec:isPrimaryKey="false"
fmi:mappedColumnName="ReferenceId"
asi:name="ReferenceId"
adec:onCopyAction="Copy"
adec:xmlMappingType="Attribute" />
<fmi:DataEntityColumn
asi:abstract="false"
adec:allowNulls="true"
adec:autoIncrement="false"
adec:dataLength="50"
adec:dataType="String"
adec:excludeFromAllFields="false"
fmi:excludeFromAuditing="false"
x:id="98fdd11b-a908-438a-9775-53a6945a7013"
adec:isPrimaryKey="false"
fmi:mappedColumnName="ReferenceEntity"
asi:name="ReferenceEntity"
adec:onCopyAction="Copy"
adec:xmlMappingType="Attribute" />
<fmi:DataEntityColumn
asi:abstract="false"
adec:allowNulls="false"
adec:autoIncrement="false"
adec:dataLength="50"
adec:dataType="String"
adec:excludeFromAllFields="false"
fmi:excludeFromAuditing="false"
x:id="a161d727-97b7-44d3-a314-037183e7c43e"
adec:isPrimaryKey="false"
fmi:mappedColumnName="Name"
asi:name="Name"
adec:onCopyAction="Copy"
adec:xmlMappingType="Attribute" />
<sia:ancestor
sia:ancestor="Root/DataEntity/__Origam General Interfaces/IOrigamEntity2.origam#IOrigamEntity2/28c21d99-785a-4cc5-bce9-62dca7b852c6"
x:id="4ed7b1b1-7b2d-4f58-8c60-510f8f6f2a57" />
</tmi:DataEntity>
</x:file>