You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2022/07/13 13:54:33 UTC
[incubator-streampipes] branch STREAMPIPES-558 updated (9272bb9d0 -> 64c681258)
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a change to branch STREAMPIPES-558
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
from 9272bb9d0 [STREAMPIPES-537] Harmonize layout of pipeline monitoring view
new d6c8759cd [hotfix] Minor layout improvement
new 637563f3d [hotfix] Improve reload behaviour of File Management
new 55b850132 [hotfix] Minor layout improvements
new 7831a8cbc [test] Adapt tests to support UI changes
new 64c681258 [hotfix] Support BaseVariableTypes in OPC adapter
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../iiot/adapters/opcua/OpcUaNodeBrowser.java | 8 +--
.../support/utils/ConnectEventSchemaUtils.ts | 1 +
ui/cypress/support/utils/ConnectUtils.ts | 14 ++++-
ui/cypress/support/utils/PipelineUtils.ts | 3 +-
ui/cypress/support/utils/StaticPropertyUtils.ts | 2 +-
.../data-marketplace.component.html | 7 ++-
.../data-marketplace.component.scss | 5 ++
.../existing-adapters.component.html | 6 +-
.../schema-editor-header.component.html | 2 +-
.../adapter-options-panel.component.html | 2 +-
.../file-overview/file-overview.component.html | 71 +++++++++++-----------
.../file-overview/file-overview.component.scss | 4 +-
.../file-overview/file-overview.component.ts | 11 +++-
ui/src/app/pipelines/pipelines.component.html | 2 +-
14 files changed, 85 insertions(+), 53 deletions(-)
[incubator-streampipes] 04/05: [test] Adapt tests to support UI changes
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch STREAMPIPES-558
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 7831a8cbc08ce5b2a98caca9b73c77c9a0ea177e
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Wed Jul 13 15:53:56 2022 +0200
[test] Adapt tests to support UI changes
---
ui/cypress/support/utils/ConnectEventSchemaUtils.ts | 1 +
ui/cypress/support/utils/ConnectUtils.ts | 14 ++++++++++++--
ui/cypress/support/utils/PipelineUtils.ts | 3 ++-
ui/cypress/support/utils/StaticPropertyUtils.ts | 2 +-
4 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/ui/cypress/support/utils/ConnectEventSchemaUtils.ts b/ui/cypress/support/utils/ConnectEventSchemaUtils.ts
index c39da2173..ba9405be0 100644
--- a/ui/cypress/support/utils/ConnectEventSchemaUtils.ts
+++ b/ui/cypress/support/utils/ConnectEventSchemaUtils.ts
@@ -119,6 +119,7 @@ export class ConnectEventSchemaUtils {
// validate that static value is persisted
cy.dataCy('edit-' + propertyName, { timeout: 10000 }).click({ force: true });
cy.dataCy('connect-change-runtime-type', { timeout: 10000 }).contains(dataType);
+ cy.wait(1000);
cy.dataCy('sp-save-edit-property').click();
}
public static eventSchemaNextBtnDisabled() {
diff --git a/ui/cypress/support/utils/ConnectUtils.ts b/ui/cypress/support/utils/ConnectUtils.ts
index becfa724a..f2a39dfd7 100644
--- a/ui/cypress/support/utils/ConnectUtils.ts
+++ b/ui/cypress/support/utils/ConnectUtils.ts
@@ -32,6 +32,8 @@ export class ConnectUtils {
ConnectUtils.goToConnect();
+ ConnectUtils.goToNewAdapterPage();
+
ConnectUtils.selectAdapter(adapterConfiguration.adapterType);
ConnectUtils.configureAdapter(adapterConfiguration.adapterConfiguration);
@@ -72,6 +74,8 @@ export class ConnectUtils {
private static addGenericAdapter(adapterConfiguration: GenericAdapterInput) {
ConnectUtils.goToConnect();
+ ConnectUtils.goToNewAdapterPage();
+
ConnectUtils.selectAdapter(adapterConfiguration.adapterType);
ConnectUtils.configureAdapter(adapterConfiguration.protocolConfiguration);
@@ -100,6 +104,8 @@ export class ConnectUtils {
ConnectUtils.goToConnect();
+ ConnectUtils.goToNewAdapterPage();
+
ConnectUtils.selectAdapter(configuration.adapterType);
ConnectUtils.configureAdapter(configuration.adapterConfiguration);
@@ -114,13 +120,17 @@ export class ConnectUtils {
cy.visit('#/connect');
}
+ public static goToNewAdapterPage() {
+ cy.dataCy('connect-create-new-adapter-button').click();
+ }
+
public static selectAdapter(name) {
// Select adapter
cy.get('#' + name).click();
}
public static configureAdapter(configs: UserInput[]) {
-
+ cy.wait(2000);
StaticPropertyUtils.input(configs);
// Next Button should not be disabled
@@ -185,7 +195,6 @@ export class ConnectUtils {
// Delete adapter
cy.visit('#/connect');
- cy.get('div').contains('My Adapters').parent().click();
cy.dataCy('delete').should('have.length', 1);
cy.dataCy('delete').click();
cy.dataCy('delete-adapter').click();
@@ -207,6 +216,7 @@ export class ConnectUtils {
ConnectUtils.goToConnect();
+ ConnectUtils.goToNewAdapterPage();
ConnectUtils.selectAdapter(adapterConfiguration.adapterType);
ConnectUtils.configureAdapter(adapterConfiguration.protocolConfiguration);
ConnectUtils.configureFormat(adapterConfiguration);
diff --git a/ui/cypress/support/utils/PipelineUtils.ts b/ui/cypress/support/utils/PipelineUtils.ts
index d74522cee..89e34d582 100644
--- a/ui/cypress/support/utils/PipelineUtils.ts
+++ b/ui/cypress/support/utils/PipelineUtils.ts
@@ -49,7 +49,8 @@ export class PipelineUtils {
private static goToPipelineEditor() {
// Go to StreamPipes editor
- cy.visit('#/editor');
+ cy.visit('#/pipelines');
+ cy.dataCy('pipelines-navigate-to-editor').click();
}
private static selectDataStream(pipelineInput: PipelineInput) {
diff --git a/ui/cypress/support/utils/StaticPropertyUtils.ts b/ui/cypress/support/utils/StaticPropertyUtils.ts
index a8d9f35dd..c87e67697 100644
--- a/ui/cypress/support/utils/StaticPropertyUtils.ts
+++ b/ui/cypress/support/utils/StaticPropertyUtils.ts
@@ -38,7 +38,7 @@ export class StaticPropertyUtils {
cy.dataCy('reset-code-' + config.selector).click();
cy.dataCy('code-editor-' + config.selector).type(config.value);
} else if (config.type === 'input') {
- cy.dataCy(config.selector).type(config.value).blur();
+ cy.dataCy(config.selector).clear().type(config.value).blur();
} else {
cy.dataCy(config.selector).type(config.value);
}
[incubator-streampipes] 01/05: [hotfix] Minor layout improvement
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch STREAMPIPES-558
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit d6c8759cd755e25d152a86212122dd272310c336
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Tue Jul 12 23:38:00 2022 +0200
[hotfix] Minor layout improvement
---
.../components/data-marketplace/data-marketplace.component.html | 7 +++++--
.../components/data-marketplace/data-marketplace.component.scss | 5 +++++
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ui/src/app/connect/components/data-marketplace/data-marketplace.component.html b/ui/src/app/connect/components/data-marketplace/data-marketplace.component.html
index 0156ac43f..0d279a7c8 100644
--- a/ui/src/app/connect/components/data-marketplace/data-marketplace.component.html
+++ b/ui/src/app/connect/components/data-marketplace/data-marketplace.component.html
@@ -18,8 +18,11 @@
<sp-basic-view showBackLink="true" [backLinkTarget]="['connect']" [padding]="true">
- <div nav fxFlex="100">
- <sp-connect-filter-toolbar (filterChangedEmitter)="applyFilter($event)"></sp-connect-filter-toolbar>
+ <div nav fxFlex="100" fxLayoutAlign="start center" fxLayout="row">
+ <sp-connect-filter-toolbar
+ class="filter-bar-margin"
+ (filterChangedEmitter)="applyFilter($event)">
+ </sp-connect-filter-toolbar>
<div fxFlex="100" fxLayout="row" fxLayoutAlign="end center"
style="padding-left:10px;padding-right:10px;font-size:14px;" class="page-container-nav">
<button mat-icon-button id="startAdapterTutorial3" (click)="startAdapterTutorial3()"
diff --git a/ui/src/app/connect/components/data-marketplace/data-marketplace.component.scss b/ui/src/app/connect/components/data-marketplace/data-marketplace.component.scss
index 04d1f5dca..6f91e02ca 100644
--- a/ui/src/app/connect/components/data-marketplace/data-marketplace.component.scss
+++ b/ui/src/app/connect/components/data-marketplace/data-marketplace.component.scss
@@ -51,5 +51,10 @@
color: var(--color-accent);
}
+.filter-bar-margin {
+ margin-left: 10px;
+ padding-left: 10px;
+}
+
[incubator-streampipes] 02/05: [hotfix] Improve reload behaviour of File Management
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch STREAMPIPES-558
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 637563f3dd6e675ac0c041d79c22e14838d18128
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Wed Jul 13 07:49:21 2022 +0200
[hotfix] Improve reload behaviour of File Management
---
.../file-overview/file-overview.component.html | 71 +++++++++++-----------
.../file-overview/file-overview.component.scss | 4 +-
.../file-overview/file-overview.component.ts | 11 +++-
3 files changed, 47 insertions(+), 39 deletions(-)
diff --git a/ui/src/app/files/components/file-overview/file-overview.component.html b/ui/src/app/files/components/file-overview/file-overview.component.html
index ea985b392..051d7b97c 100644
--- a/ui/src/app/files/components/file-overview/file-overview.component.html
+++ b/ui/src/app/files/components/file-overview/file-overview.component.html
@@ -16,45 +16,48 @@
~
-->
-<div fxFlex="100" fxLayout="column" *ngIf="filesAvailable" style="margin:1px;">
- <table fxFlex="100" mat-table [dataSource]="dataSource" style="width: 100%;">
- <ng-container matColumnDef="filename">
- <th mat-header-cell *matHeaderCellDef> Filename</th>
- <td mat-cell *matCellDef="let fileMetadata">
- <h4>{{fileMetadata.originalFilename}}</h4>
- </td>
- </ng-container>
- <ng-container matColumnDef="filetype">
- <th mat-header-cell *matHeaderCellDef> Filetype</th>
- <td mat-cell *matCellDef="let fileMetadata">
- <span class="filetype-container">{{fileMetadata.filetype}}</span>
- </td>
- </ng-container>
- <ng-container matColumnDef="uploaded">
- <th mat-header-cell *matHeaderCellDef> Uploaded</th>
- <td mat-cell *matCellDef="let fileMetadata">
- <h5>{{fileMetadata.createdAt | date:'dd.MM.yyyy HH:mm'}}</h5>
- </td>
- </ng-container>
+<div fxFlex="100" fxLayout="column" style="margin:1px;">
+ <div fxLayout="column" fxFlex="100" *ngIf="filesAvailable">
+ <table fxFlex="100" mat-table [dataSource]="dataSource" style="width: 100%;">
+ <ng-container matColumnDef="filename">
+ <th mat-header-cell *matHeaderCellDef> Filename</th>
+ <td mat-cell *matCellDef="let fileMetadata">
+ <h4>{{fileMetadata.originalFilename}}</h4>
+ </td>
+ </ng-container>
+ <ng-container matColumnDef="filetype">
+ <th mat-header-cell *matHeaderCellDef> Filetype</th>
+ <td mat-cell *matCellDef="let fileMetadata">
+ <span class="filetype-container">{{fileMetadata.filetype}}</span>
+ </td>
+ </ng-container>
+ <ng-container matColumnDef="uploaded">
+ <th mat-header-cell *matHeaderCellDef> Uploaded</th>
+ <td mat-cell *matCellDef="let fileMetadata">
+ <h5>{{fileMetadata.createdAt | date:'dd.MM.yyyy HH:mm'}}</h5>
+ </td>
+ </ng-container>
- <ng-container matColumnDef="action">
- <th mat-header-cell *matHeaderCellDef> Action</th>
- <td mat-cell *matCellDef="let fileMetadata">
- <button color="accent" mat-button mat-icon-button matTooltip="Delete file" matTooltipPosition="above"
+ <ng-container matColumnDef="action">
+ <th mat-header-cell *matHeaderCellDef> Action</th>
+ <td mat-cell *matCellDef="let fileMetadata">
+ <button color="accent" mat-button mat-icon-button matTooltip="Delete file"
+ matTooltipPosition="above"
(click)="deleteFile(fileMetadata)" data-cy="delete">
<i class="material-icons">delete</i>
</button>
- </td>
- </ng-container>
+ </td>
+ </ng-container>
- <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
- <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
+ <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+ <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
- </table>
- <div fxFlex="100" fxLayoutAlign="end end">
- <mat-paginator [pageSizeOptions]="[5, 10, 25, 100]" [pageSize]="10"></mat-paginator>
+ </table>
+ <div fxFlex="100" fxLayoutAlign="end end">
+ <mat-paginator [pageSizeOptions]="[5, 10, 25, 100]" [pageSize]="10"></mat-paginator>
+ </div>
+ </div>
+ <div fxFlex="100" fxLayout="column" fxLayoutAlign="center center" *ngIf="!filesAvailable">
+ <h5>(no files available)</h5>
</div>
-</div>
-<div fxFlex="100" fxLayout="column" fxLayoutAlign="center center" *ngIf="!filesAvailable">
- <h5>(no files available)</h5>
</div>
diff --git a/ui/src/app/files/components/file-overview/file-overview.component.scss b/ui/src/app/files/components/file-overview/file-overview.component.scss
index e37a83c84..a1b130075 100644
--- a/ui/src/app/files/components/file-overview/file-overview.component.scss
+++ b/ui/src/app/files/components/file-overview/file-overview.component.scss
@@ -26,10 +26,10 @@
}
.mat-row:nth-child(even) {
- background-color: var(--color-bg-2);
+ background-color: var(--color-bg-1);
}
.mat-row:nth-child(odd) {
- background-color: var(--color-bg-3);
+ background-color: var(--color-bg-2);
}
.filetype-container {
diff --git a/ui/src/app/files/components/file-overview/file-overview.component.ts b/ui/src/app/files/components/file-overview/file-overview.component.ts
index 35f87a092..dda5d580c 100644
--- a/ui/src/app/files/components/file-overview/file-overview.component.ts
+++ b/ui/src/app/files/components/file-overview/file-overview.component.ts
@@ -35,7 +35,7 @@ export class FileOverviewComponent implements OnInit {
dataSource: MatTableDataSource<FileMetadata>;
filesAvailable = false;
- @ViewChild(MatPaginator) paginator: MatPaginator;
+ paginator: MatPaginator;
pageSize = 1;
constructor(private filesService: FilesService,
@@ -44,13 +44,14 @@ export class FileOverviewComponent implements OnInit {
}
ngOnInit() {
+ this.dataSource = new MatTableDataSource<FileMetadata>([]);
this.refreshFiles();
}
refreshFiles() {
this.filesService.getFileMetadata().subscribe(fm => {
- this.dataSource = new MatTableDataSource<FileMetadata>(fm);
- this.filesAvailable = true;
+ this.dataSource.data = fm;
+ this.filesAvailable = fm && fm.length > 0;
setTimeout(() => {
this.dataSource.paginator = this.paginator;
});
@@ -77,4 +78,8 @@ export class FileOverviewComponent implements OnInit {
}
});
}
+
+ @ViewChild(MatPaginator) set content(paginator: MatPaginator) {
+ this.paginator = paginator;
+ }
}
[incubator-streampipes] 03/05: [hotfix] Minor layout improvements
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch STREAMPIPES-558
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 55b850132243d2b772f930e2a582125cecf169a9
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Wed Jul 13 15:53:39 2022 +0200
[hotfix] Minor layout improvements
---
.../components/existing-adapters/existing-adapters.component.html | 6 +++++-
.../schema-editor-header/schema-editor-header.component.html | 2 +-
.../adapter-options-panel/adapter-options-panel.component.html | 2 +-
ui/src/app/pipelines/pipelines.component.html | 2 +-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ui/src/app/connect/components/existing-adapters/existing-adapters.component.html b/ui/src/app/connect/components/existing-adapters/existing-adapters.component.html
index b15664311..6f92c7656 100644
--- a/ui/src/app/connect/components/existing-adapters/existing-adapters.component.html
+++ b/ui/src/app/connect/components/existing-adapters/existing-adapters.component.html
@@ -18,7 +18,11 @@
<sp-basic-view [showBackLink]="false" [padding]="true">
<div nav fxFlex="100" fxLayoutAlign="start center" fxLayout="row" class="pl-10">
- <button mat-button mat-raised-button color="accent" (click)="createNewAdapter()">
+ <button mat-button
+ mat-raised-button
+ color="accent"
+ data-cy="connect-create-new-adapter-button"
+ (click)="createNewAdapter()">
<i class="material-icons">add</i> New adapter
</button>
<sp-connect-filter-toolbar
diff --git a/ui/src/app/connect/components/new-adapter/schema-editor/schema-editor-header/schema-editor-header.component.html b/ui/src/app/connect/components/new-adapter/schema-editor/schema-editor-header/schema-editor-header.component.html
index 7bd8abdaa..841820167 100644
--- a/ui/src/app/connect/components/new-adapter/schema-editor/schema-editor-header/schema-editor-header.component.html
+++ b/ui/src/app/connect/components/new-adapter/schema-editor/schema-editor-header/schema-editor-header.component.html
@@ -36,7 +36,7 @@
</button>
<button color="accent"
mat-button
- data-cy="connect-add-timestamp-property"
+ data-cy="connect-schema-add-timestamp-btn"
matTooltip="Add timestamp to event schema"
(click)="addTimestampProperty()">
<mat-icon>access_time</mat-icon>
diff --git a/ui/src/app/connect/components/new-adapter/start-adapter-configuration/adapter-options-panel/adapter-options-panel.component.html b/ui/src/app/connect/components/new-adapter/start-adapter-configuration/adapter-options-panel/adapter-options-panel.component.html
index a8ed1d084..4a769b4d2 100644
--- a/ui/src/app/connect/components/new-adapter/start-adapter-configuration/adapter-options-panel/adapter-options-panel.component.html
+++ b/ui/src/app/connect/components/new-adapter/start-adapter-configuration/adapter-options-panel/adapter-options-panel.component.html
@@ -25,7 +25,7 @@
<div fxFlex="100" class="title" fxLayout="row">
<div fxLayoutAlign="start start" class="mr-15">
<mat-checkbox (change)="optionSelectedEmitter.emit($event.checked)"
- data-cy="{{dataCy}}" class="large-checkbox">
+ [attr.data-cy]="dataCy" class="large-checkbox">
</mat-checkbox>
</div>
<div fxFlex fxLayout="column">
diff --git a/ui/src/app/pipelines/pipelines.component.html b/ui/src/app/pipelines/pipelines.component.html
index 71835b494..fb08754e6 100644
--- a/ui/src/app/pipelines/pipelines.component.html
+++ b/ui/src/app/pipelines/pipelines.component.html
@@ -18,7 +18,7 @@
<sp-basic-view [showBackLink]="false" [padding]="true">
<div nav fxFlex="100" fxLayoutAlign="start center" fxLayout="row" class="pl-10">
- <button mat-button mat-raised-button color="accent" (click)="navigateToPipelineEditor()">
+ <button mat-button mat-raised-button color="accent" (click)="navigateToPipelineEditor()" data-cy="pipelines-navigate-to-editor">
<i class="material-icons">add</i> New pipeline
</button>
<button class="mr-10" mat-button color="accent" (click)="startAllPipelines(true)"
[incubator-streampipes] 05/05: [hotfix] Support BaseVariableTypes in OPC adapter
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch STREAMPIPES-558
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 64c681258c48b2460573df3fa3d1a16e3fd34939
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Wed Jul 13 15:54:19 2022 +0200
[hotfix] Support BaseVariableTypes in OPC adapter
---
.../streampipes/connect/iiot/adapters/opcua/OpcUaNodeBrowser.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/opcua/OpcUaNodeBrowser.java b/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/opcua/OpcUaNodeBrowser.java
index 5a9f2fbd0..f391de15e 100644
--- a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/opcua/OpcUaNodeBrowser.java
+++ b/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/opcua/OpcUaNodeBrowser.java
@@ -23,7 +23,7 @@ import org.apache.streampipes.connect.iiot.adapters.opcua.utils.OpcUaTypes;
import org.apache.streampipes.model.staticproperty.TreeInputNode;
import org.eclipse.milo.opcua.sdk.client.AddressSpace;
import org.eclipse.milo.opcua.sdk.client.OpcUaClient;
-import org.eclipse.milo.opcua.sdk.client.model.nodes.variables.BaseDataVariableTypeNode;
+import org.eclipse.milo.opcua.sdk.client.model.nodes.variables.BaseVariableTypeNode;
import org.eclipse.milo.opcua.sdk.client.nodes.UaNode;
import org.eclipse.milo.opcua.stack.core.UaException;
import org.eclipse.milo.opcua.stack.core.types.builtin.NodeId;
@@ -80,8 +80,8 @@ public class OpcUaNodeBrowser {
NodeId nodeId = NodeId.parse(nodeName);
UaNode node = addressSpace.getNode(nodeId);
- if (node instanceof BaseDataVariableTypeNode) {
- UInteger value = (UInteger) ((BaseDataVariableTypeNode) node).getDataType().getIdentifier();
+ if (node instanceof BaseVariableTypeNode) {
+ UInteger value = (UInteger) ((BaseVariableTypeNode) node).getDataType().getIdentifier();
return new OpcNode(node.getDisplayName().getText(), OpcUaTypes.getType(value), node.getNodeId());
}
@@ -112,6 +112,6 @@ public class OpcUaNodeBrowser {
}
private boolean isDataNode(UaNode node) {
- return node.getNodeClass().equals(NodeClass.Variable) && node instanceof BaseDataVariableTypeNode;
+ return node.getNodeClass().equals(NodeClass.Variable) && node instanceof BaseVariableTypeNode;
}
}