Skip to content

Commit

Permalink
Merge branch 'staging' into 1926-indexing-of-map-3
Browse files Browse the repository at this point in the history
  • Loading branch information
paw787878 authored Jan 17, 2025
2 parents a5f825f + e69c74b commit 191b76c
Show file tree
Hide file tree
Showing 217 changed files with 6,513 additions and 1,726 deletions.
48 changes: 8 additions & 40 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -510,8 +510,7 @@ lazy val distribution: Project = sbt
},
devArtifacts := {
modelArtifacts.value ++ List(
(flinkDevModel / assembly).value -> "model/devModel.jar",
(flinkPeriodicDeploymentManager / assembly).value -> "managers/nussknacker-flink-periodic-manager.jar",
(flinkDevModel / assembly).value -> "model/devModel.jar",
)
},
Universal / packageName := ("nussknacker" + "-" + version.value),
Expand Down Expand Up @@ -611,8 +610,8 @@ lazy val flinkDeploymentManager = (project in flink("management"))
libraryDependencies ++= {
Seq(
"org.typelevel" %% "cats-core" % catsV % Provided,
"org.apache.flink" % "flink-streaming-java" % flinkV % flinkScope
excludeAll (
("org.apache.flink" % "flink-streaming-java" % flinkV % flinkScope)
.excludeAll(
ExclusionRule("log4j", "log4j"),
ExclusionRule("org.slf4j", "slf4j-log4j12"),
ExclusionRule("com.esotericsoftware", "kryo-shaded"),
Expand All @@ -636,37 +635,6 @@ lazy val flinkDeploymentManager = (project in flink("management"))
kafkaTestUtils % "it,test"
)

lazy val flinkPeriodicDeploymentManager = (project in flink("management/periodic"))
.settings(commonSettings)
.settings(assemblyNoScala("nussknacker-flink-periodic-manager.jar"): _*)
.settings(publishAssemblySettings: _*)
.settings(
name := "nussknacker-flink-periodic-manager",
libraryDependencies ++= {
Seq(
"org.typelevel" %% "cats-core" % catsV % Provided,
"com.typesafe.slick" %% "slick" % slickV % Provided,
"com.typesafe.slick" %% "slick-hikaricp" % slickV % "provided, test",
"com.github.tminglei" %% "slick-pg" % slickPgV,
"org.hsqldb" % "hsqldb" % hsqldbV % Test,
"org.flywaydb" % "flyway-core" % flywayV % Provided,
"com.cronutils" % "cron-utils" % cronParserV,
"com.typesafe.akka" %% "akka-actor" % akkaV,
"com.typesafe.akka" %% "akka-testkit" % akkaV % Test,
"com.dimafeng" %% "testcontainers-scala-scalatest" % testContainersScalaV % Test,
"com.dimafeng" %% "testcontainers-scala-postgresql" % testContainersScalaV % Test,
)
}
)
.dependsOn(
flinkDeploymentManager,
deploymentManagerApi % Provided,
scenarioCompiler % Provided,
componentsApi % Provided,
httpUtils % Provided,
testUtils % Test
)

lazy val flinkMetricsDeferredReporter = (project in flink("metrics-deferred-reporter"))
.settings(commonSettings)
.settings(
Expand Down Expand Up @@ -1811,10 +1779,10 @@ lazy val flinkBaseUnboundedComponents = (project in flink("components/base-unbou
.settings(
name := "nussknacker-flink-base-unbounded-components",
libraryDependencies ++= Seq(
"org.apache.flink" % "flink-streaming-java" % flinkV % Provided,
"com.clearspring.analytics" % "stream" % "2.9.8"
"org.apache.flink" % "flink-streaming-java" % flinkV % Provided,
// It is used only in QDigest which we don't use, while it's >20MB in size...
exclude ("it.unimi.dsi", "fastutil")
("com.clearspring.analytics" % "stream" % "2.9.8")
.exclude("it.unimi.dsi", "fastutil")
)
)
.dependsOn(
Expand Down Expand Up @@ -2004,6 +1972,7 @@ lazy val designer = (project in file("designer/server"))
"com.typesafe.akka" %% "akka-testkit" % akkaV % Test,
"de.heikoseeberger" %% "akka-http-circe" % akkaHttpCirceV,
"com.softwaremill.sttp.client3" %% "async-http-client-backend-cats" % sttpV,
"com.cronutils" % "cron-utils" % cronParserV,
"ch.qos.logback" % "logback-core" % logbackV,
"ch.qos.logback" % "logback-classic" % logbackV,
"ch.qos.logback.contrib" % "logback-json-classic" % logbackJsonV,
Expand All @@ -2026,6 +1995,7 @@ lazy val designer = (project in file("designer/server"))
"com.beachape" %% "enumeratum-circe" % enumeratumV,
"tf.tofu" %% "derevo-circe" % "0.13.0",
"com.softwaremill.sttp.apispec" %% "openapi-circe-yaml" % openapiCirceYamlV,
"com.github.tminglei" %% "slick-pg" % slickPgV,
"com.softwaremill.sttp.tapir" %% "tapir-akka-http-server" % tapirV,
"com.softwaremill.sttp.tapir" %% "tapir-core" % tapirV,
"com.softwaremill.sttp.tapir" %% "tapir-derevo" % tapirV,
Expand Down Expand Up @@ -2080,7 +2050,6 @@ lazy val designer = (project in file("designer/server"))
liteEmbeddedDeploymentManager % Provided,
liteK8sDeploymentManager % Provided,
developmentTestsDeploymentManager % Provided,
flinkPeriodicDeploymentManager % Provided,
schemedKafkaComponentsUtils % Provided,
)

Expand Down Expand Up @@ -2170,7 +2139,6 @@ lazy val modules = List[ProjectReference](
requestResponseRuntime,
liteEngineRuntimeApp,
flinkDeploymentManager,
flinkPeriodicDeploymentManager,
flinkDevModel,
flinkDevModelJava,
flinkTableApiComponents,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class SwaggerParserTest extends AnyFunSuite with BaseOpenAPITest with Matchers {
openApi.name.value shouldBe "getCollectionDataUsingGET"

openApi.parameters shouldBe List(
UriParameter("accountNo", SwaggerLong),
UriParameter("accountNo", SwaggerInteger),
QueryParameter("pretty", SwaggerBool),
HeaderParameter("System-Name", SwaggerString),
HeaderParameter("System-User-Name", SwaggerString),
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion designer/client/cypress/e2e/components.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ describe("Components list", () => {
cy.matchQuery("?TEXT=xxx");
cy.viewport(1600, 500);
cy.wait(500); //ensure "loading" mask is hidden
cy.get("#app-container>main").matchImage();
cy.get("#app-container>main").matchImage({ maxDiffThreshold: 0.01 });
});

it("should allow filtering by processing mode", () => {
Expand Down
1 change: 1 addition & 0 deletions designer/client/cypress/e2e/creatorToolbar.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ describe("Creator toolbar", () => {
cy.contains(/^types$/i).click();
cy.contains(/^services$/i).click();
cy.contains(/^sinks$/i).click();
cy.contains(/^sticky notes$/i).click();
cy.reload();
cy.get("@toolbar").matchImage();
cy.get("@toolbar").find("input").type("var");
Expand Down
2 changes: 1 addition & 1 deletion designer/client/cypress/e2e/fragment.cy.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
describe("Fragment", () => {
describe.skip("Fragment", () => {
const seed = "fragment";
before(() => {
cy.deleteAllTestProcesses({
Expand Down
65 changes: 65 additions & 0 deletions designer/client/cypress/e2e/stickyNotes.cy.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
describe("Sticky notes", () => {
const seed = "stickyNotes";

before(() => {
cy.deleteAllTestProcesses({ filter: seed, force: true });
});

beforeEach(() => {
cy.visitNewProcess(seed, "stickyNotes");
});

const screenshotOptions: Cypress.MatchImageOptions = {
screenshotConfig: { clip: { x: 0, y: 0, width: 1400, height: 600 } },
};

it("should allow to drag sticky note", () => {
cy.layoutScenario();
cy.contains(/^sticky notes$/i)
.should("exist")
.scrollIntoView();
cy.get("[data-testid='component:sticky note']")
.should("be.visible")
.drag("#nk-graph-main", {
target: {
x: 600,
y: 300,
},
force: true,
});

cy.get("[data-testid=graphPage]").matchImage(screenshotOptions);
});

it("should add text to note and display it as markdown", () => {
cy.layoutScenario();
cy.contains(/^sticky notes$/i)
.should("exist")
.scrollIntoView();
cy.get("[data-testid='component:sticky note']")
.should("be.visible")
.drag("#nk-graph-main", {
target: {
x: 600,
y: 300,
},
force: true,
});
cy.get(".sticky-note-content").dblclick();
cy.get(".sticky-note-content textarea").type("# Title\n- p1\n- p2\n\n[link](href)");
cy.get("[model-id='request']").click();
cy.get("[data-testid=graphPage]").matchImage(screenshotOptions);
});

it("should disable sticky note when scenario is not saved", () => {
cy.layoutScenario();
cy.contains(/^sticky notes$/i)
.should("exist")
.scrollIntoView();

cy.dragNode("request", { x: 600, y: 300 });

cy.get("[data-testid='component:sticky note']").should("have.class", "tool disabled");
cy.get("[data-testid=graphPage]").matchImage(screenshotOptions);
});
});
58 changes: 58 additions & 0 deletions designer/client/cypress/fixtures/stickyNotes.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
"metaData": {
"id": "sticky",
"additionalFields": {
"description": null,
"properties": {
"inputSchema": "{}",
"outputSchema": "{}",
"slug": "sticky"
},
"metaDataType": "RequestResponseMetaData",
"showDescription": false
}
},
"nodes": [
{
"id": "request",
"ref": {
"typ": "request",
"parameters": []
},
"additionalFields": {
"description": null,
"layoutData": {
"x": 0,
"y": 0
}
},
"type": "Source"
},
{
"id": "response",
"ref": {
"typ": "response",
"parameters": [
{
"name": "Raw editor",
"expression": {
"language": "spel",
"expression": "false"
}
}
]
},
"endResult": null,
"isDisabled": null,
"additionalFields": {
"description": null,
"layoutData": {
"x": 0,
"y": 180
}
},
"type": "Sink"
}
],
"additionalBranches": []
}
Loading

0 comments on commit 191b76c

Please sign in to comment.