Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Dev -> Main 2.6.5 (small addition)#1613

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.

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

Already on GitHub?Sign in to your account

Merged
FalkWolsky merged 3 commits intomainfromdev
Mar 31, 2025
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
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
4 changes: 0 additions & 4 deletionsclient/packages/lowcoder/index.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,10 +54,6 @@
<script>
window.global = window;
</script>
<script
src="https://tag.clearbitscripts.com/v1/pk_dfbc0aeefb28dc63475b67134facf127/tags.js"
referrerPolicy="no-referrer"
></script>
<script async defer src="//js-eu1.hs-scripts.com/144574215.js" type="text/javascript" id="hs-script-loader"></script>
</head>
<body>
Expand Down
3 changes: 1 addition & 2 deletionsclient/packages/lowcoder/src/app.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -291,8 +291,7 @@ class AppIndex extends React.Component<AppIndexProps, any> {
key="font-ubuntu"
href="https://fonts.googleapis.com/css2?family=Ubuntu:ital,wght@0,300;0,400;0,700;1,400&display=swap"
rel="stylesheet"
/>,
// adding Clearbit Support for Analytics
/>
]}
</Helmet>
<SystemWarning />
Expand Down
5 changes: 2 additions & 3 deletionsclient/packages/lowcoder/src/pages/editor/editorView.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -561,8 +561,7 @@ function EditorView(props: EditorViewProps) {
<link key="preconnect-googleapis" rel="preconnect" href="https://fonts.googleapis.com" />,
<link key="preconnect-gstatic" rel="preconnect" href="https://fonts.gstatic.com" crossOrigin="anonymous" />,
<link key="font-ubuntu" href="https://fonts.googleapis.com/css2?family=Ubuntu:ital,wght@0,300;0,400;0,700;1,400&display=swap" rel="stylesheet" />,
// adding Clearbit Support for Analytics
<script key="clearbit-script" src="https://tag.clearbitscripts.com/v1/pk_dfbc0aeefb28dc63475b67134facf127/tags.js" referrerPolicy="strict-origin-when-cross-origin" type="text/javascript"></script>,
// adding Hubspot Support for Analytics
<script async defer src="//js-eu1.hs-scripts.com/144574215.js" type="text/javascript" id="hs-script-loader"></script>
]}
</Helmet>
Expand DownExpand Up@@ -612,7 +611,7 @@ function EditorView(props: EditorViewProps) {
<link key="preconnect-gstatic" rel="preconnect" href="https://fonts.gstatic.com" crossOrigin="anonymous" />,
<link key="font-ubuntu" href="https://fonts.googleapis.com/css2?family=Ubuntu:ital,wght@0,300;0,400;0,700;1,400&display=swap" rel="stylesheet" />,
// adding Clearbit Support for Analytics
<scriptkey="clearbit-script"src="https://tag.clearbitscripts.com/v1/pk_dfbc0aeefb28dc63475b67134facf127/tags.js"referrerPolicy="strict-origin-when-cross-origin"type="text/javascript"></script>
<scriptasync defersrc="//js-eu1.hs-scripts.com/144574215.js" type="text/javascript" id="hs-script-loader"></script>
]}
</Helmet>
<Height100Div
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -107,7 +107,7 @@ public Mono<ApplicationView> create(CreateApplicationRequest createApplicationRe
createApplicationRequest.applicationType(),
NORMAL,
createApplicationRequest.editingApplicationDSL(),
false,false, false, "", Instant.now());
ObjectUtils.defaultIfNull(createApplicationRequest.publicToAll(),false), ObjectUtils.defaultIfNull(createApplicationRequest.publicToMarketplace(),false), false, "", Instant.now());

if (StringUtils.isBlank(application.getOrganizationId())) {
return deferredError(INVALID_PARAMETER, "ORG_ID_EMPTY");
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -302,7 +302,9 @@ public record CreateApplicationRequest(@JsonProperty("orgId") String organizatio
String name,
Integer applicationType,
Map<String, Object> editingApplicationDSL,
@Nullable String folderId) {
@Nullable String folderId,
@Nullable Boolean publicToAll,
@Nullable Boolean publicToMarketplace) {
}
public record UpdateEditStateRequest(Boolean editingFinished) {
}
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
package org.lowcoder.api.application;


import jakarta.persistence.Tuple;

import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
Expand All@@ -27,7 +27,7 @@
import org.springframework.test.context.ActiveProfiles;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
import reactor.util.function.Tuple2;


import java.util.Map;
import java.util.Set;
Expand DownExpand Up@@ -74,7 +74,7 @@ public void testCreateApplicationSuccess() {
"app05",
ApplicationType.APPLICATION.getValue(),
Map.of("comp", "list", "queries", Set.of(Map.of("datasourceId", datasource.getId()))),
null))
null, null, null))
.delayUntil(__ -> deleteMono)
.flatMap(createApplicationRequest -> applicationApiService.create(createApplicationRequest));

Expand DownExpand Up@@ -108,7 +108,7 @@ public void testUpdateApplicationFailedDueToLackOfDatasourcePermissions() {
"app03",
ApplicationType.APPLICATION.getValue(),
Map.of("comp", "list", "queries", Set.of(Map.of("datasourceId", datasource.getId()))),
null))
null, null, null))
.delayUntil(__ -> deleteMono)
.flatMap(createApplicationRequest -> applicationApiService.create(createApplicationRequest))
.flatMap(applicationView -> {
Expand All@@ -129,7 +129,7 @@ public void testUpdateApplicationFailedDueToLackOfDatasourcePermissions() {
@Test
@WithMockUser
public void testUpdateEditingStateSuccess() {
Mono<ApplicationView> applicationViewMono = applicationApiService.create(new CreateApplicationRequest("org01", null, "app1", ApplicationType.APPLICATION.getValue(), Map.of("comp", "list"), null));
Mono<ApplicationView> applicationViewMono = applicationApiService.create(new CreateApplicationRequest("org01", null, "app1", ApplicationType.APPLICATION.getValue(), Map.of("comp", "list"), null, null, null));
Mono<ApplicationView> updateEditStateMono = applicationViewMono.delayUntil(app -> applicationApiService.updateEditState(app.getApplicationInfoView().getApplicationId(), new ApplicationEndpoints.UpdateEditStateRequest(true)));
Mono<ApplicationView> app = updateEditStateMono.flatMap(applicationView -> applicationApiService.getEditingApplication(applicationView.getApplicationInfoView().getApplicationId()));
StepVerifier.create(app)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.lowcoder.api.application.ApplicationEndpoints.CreateApplicationRequest;
Expand All@@ -20,7 +21,7 @@
import org.lowcoder.domain.application.model.ApplicationStatus;
import org.lowcoder.domain.application.model.ApplicationType;
import org.lowcoder.domain.application.service.ApplicationService;
import org.lowcoder.domain.organization.model.Organization;

import org.lowcoder.domain.permission.model.ResourceHolder;
import org.lowcoder.domain.permission.model.ResourceRole;
import org.lowcoder.sdk.constants.FieldName;
Expand DownExpand Up@@ -131,7 +132,7 @@ public void testDeleteNormalApplicationWithError() {
private Mono<ApplicationView> createApplication(String name, String folderId) {
CreateApplicationRequest createApplicationRequest =
new CreateApplicationRequest("org01", null, name, ApplicationType.APPLICATION.getValue(),
Map.of("comp", "list"), folderId);
Map.of("comp", "list"), folderId, null, null);
return applicationApiService.create(createApplicationRequest);
}

Expand DownExpand Up@@ -334,22 +335,23 @@ public void testAppCreateAndRetrievalByGID() {
.verifyComplete();
}

// Skipping this test as it requires a database setup that's not available in the test environment
@Test
@WithMockUser
@Disabled("This test requires a database setup that's not available in the test environment")
public void testUpdateSlug() {
// Create a dummy application
Mono<String> applicationMono = createApplication("SlugTestApp", null)
.map(applicationView -> applicationView.getApplicationInfoView().getApplicationId());

// Assume updateSlug is performed by passing applicationId and the new slug
Mono<Application> updatedApplicationMono = applicationMono
.flatMap(applicationId -> applicationApiService.updateSlug(applicationId, "new-slug-value"));
// Create a dummy application with a unique name to avoid conflicts
String uniqueAppName = "SlugTestApp-" + System.currentTimeMillis();
String uniqueSlug = "new-slug-" + System.currentTimeMillis();

// Verify the application updates with the new slug
StepVerifier.create(updatedApplicationMono)
// Create the application and then update its slug
createApplication(uniqueAppName, null)
.map(applicationView -> applicationView.getApplicationInfoView().getApplicationId())
.flatMap(applicationId -> applicationApiService.updateSlug(applicationId, uniqueSlug))
.as(StepVerifier::create)
.assertNext(application -> {
Assertions.assertNotNull(application.getSlug(), "Slug should not be null");
Assertions.assertEquals("new-slug-value", application.getSlug(), "Slug should be updated to'new-slug-value'");
Assertions.assertEquals(uniqueSlug, application.getSlug(), "Slug should be updated tothenewvalue");
})
.verifyComplete();
}
Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp