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

fix(api): Updated user requests to use the new activeUser query #83

Merged
merged 2 commits into from
Jul 6, 2023
Merged

fix(api): Updated user requests to use the new activeUser query #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b4eae3
chore(api): user -> activeUser
JR-Morgan Jul 6, 2023
067d66a
Removed marketplace publishing for UE 4.26
JR-Morgan Jul 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
steps:
- checkout
- add-source-copyright:
copyright-string: "Copyright AEC SYSTEMS 2022"
copyright-string: "Copyright AEC SYSTEMS 2023"
- zip-source:
target: <<parameters.target>>
outputdir: "output/unreal/<<parameters.target>>"
Expand Down Expand Up @@ -80,9 +80,6 @@ workflows:
marketplace-publish:
when: <<pipeline.parameters.marketplace-deploy>>
jobs:
- generate-source-zip:
name: "Generate Source Archive UE4.26"
target: "4.26"
- generate-source-zip:
name: "Generate Source Archive UE4.27"
target: "4.27"
Expand All @@ -98,7 +95,6 @@ workflows:
- hold:
type: approval
requires:
- "Generate Source Archive UE4.26"
- "Generate Source Archive UE4.27"
- "Generate Source Archive UE5.0"
- "Generate Source Archive UE5.1"
Expand All @@ -107,4 +103,4 @@ workflows:
name: "Deploy to marketplace"
context: do-spaces-speckle-releases
requires:
- hold
- hold
6 changes: 0 additions & 6 deletions .pluginconfig/4.26/.gitattributes
View file
Open in desktop

This file was deleted.

42 changes: 0 additions & 42 deletions .pluginconfig/4.26/SpeckleUnreal.uplugin
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion .pluginconfig/4.27/SpeckleUnreal.uplugin
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"FileVersion": 3,
"Version": 1,
"VersionName": "2.15.0",
"VersionName": "2.15.1",
"FriendlyName": "Speckle Unreal",
"Description": "Speckle is an open source data platform for Architecture, Engineering, and Construction. It has been open sourced under the Apache License 2.0, is customizable, and available in the cloud or via a self-hosted server. It allows users to exchange data between various AEC modelling and content creation platforms.",
"Category": "AEC",
Expand Down
2 changes: 1 addition & 1 deletion .pluginconfig/5.0/SpeckleUnreal.uplugin
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"FileVersion": 3,
"Version": 1,
"VersionName": "2.15.0",
"VersionName": "2.15.1",
"FriendlyName": "Speckle Unreal",
"Description": "Speckle is an open source data platform for Architecture, Engineering, and Construction. It has been open sourced under the Apache License 2.0, is customizable, and available in the cloud or via a self-hosted server. It allows users to exchange data between various AEC modelling and content creation platforms.",
"Category": "AEC",
Expand Down
2 changes: 1 addition & 1 deletion .pluginconfig/5.1/SpeckleUnreal.uplugin
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"FileVersion": 3,
"Version": 1,
"VersionName": "2.15.0",
"VersionName": "2.15.1",
"FriendlyName": "Speckle Unreal",
"Description": "Speckle is an open source data platform for Architecture, Engineering, and Construction. It has been open sourced under the Apache License 2.0, is customizable, and available in the cloud or via a self-hosted server. It allows users to exchange data between various AEC modelling and content creation platforms.",
"Category": "AEC",
Expand Down
2 changes: 1 addition & 1 deletion .pluginconfig/5.2/SpeckleUnreal.uplugin
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"FileVersion": 3,
"Version": 1,
"VersionName": "2.15.0",
"VersionName": "2.15.1",
"FriendlyName": "Speckle Unreal",
"Description": "Speckle is an open source data platform for Architecture, Engineering, and Construction. It has been open sourced under the Apache License 2.0, is customizable, and available in the cloud or via a self-hosted server. It allows users to exchange data between various AEC modelling and content creation platforms.",
"Category": "AEC",
Expand Down
Binary file modified Content/API/BP_APIOperations.uasset
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions Source/SpeckleUnreal/Private/ReceiveSelectionComponent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ void UReceiveSelectionComponent::UpdateStreams()
if(!IsAccountValid || bManualMode) return;

const FString LogName(__FUNCTION__);
const FString Payload = FString::Printf(TEXT("{\"query\": \"query{user{id streams(limit: %d){items{id name}}}}\"}"), Limit);
const FString Payload = FString::Printf(TEXT("{\"query\": \"query{activeUser{id streams(limit: %d){items{id name}}}}\"}"), Limit);

//Response Handling
auto OnComplete = [&](const FString& ResponseJson)
Expand Down Expand Up @@ -253,7 +253,7 @@ void UReceiveSelectionComponent::UpdateStreams()
FErrorDelegate ErrorDelegate;
ErrorDelegate.BindStatic(LogError, LogName);

FClientAPI::MakeGraphQLRequest(ServerUrl, AuthToken, "user", Payload, LogName, CompleteDelegate, ErrorDelegate);
FClientAPI::MakeGraphQLRequest(ServerUrl, AuthToken, "activeUser", Payload, LogName, CompleteDelegate, ErrorDelegate);

}

Expand Down
3 changes: 3 additions & 0 deletions Source/SpeckleUnreal/Public/API/Models/SpeckleUser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ struct FSpeckleUser

UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
FString Avatar;

UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
bool Verified;

UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
FString Role;
Expand Down
2 changes: 1 addition & 1 deletion Source/SpeckleUnreal/SpeckleUnreal.Build.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public SpeckleUnreal(ReadOnlyTargetRules Target) : base(Target)
//
// bUseUnity = false;

PublicDefinitions.Add("SPECKLE_CONNECTOR_VERSION=\"2.15.0\"");
PublicDefinitions.Add("SPECKLE_CONNECTOR_VERSION=\"2.15.1\"");

PublicIncludePaths.AddRange(
new string[] {
Expand Down
2 changes: 1 addition & 1 deletion SpeckleUnreal.uplugin
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"FileVersion": 3,
"Version": 1,
"VersionName": "2.15.0",
"VersionName": "2.15.1",
"FriendlyName": "Speckle Unreal",
"Description": "Speckle is an open source data platform for Architecture, Engineering, and Construction. It has been open sourced under the Apache License 2.0, is customizable, and available in the cloud or via a self-hosted server. It allows users to exchange data between various AEC modelling and content creation platforms.",
"Category": "AEC",
Expand Down