Add Entity to DB, Rework SME import to DB, Add Parameter to SME-GUI #319

blidhpxc · 2024-06-28T13:07:33Z

Description

Add Entity to DB. Rework SME import to DB. Add Parameter to SME-GUI.

Type of change

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)

How Has This Been Tested?

These changes have been tested by running the application with 5.000 aas and ensuring that all functionalities work as expected.

Checklist:

My code follows the style guidelines of this project
I have commented my code, particularly in hard-to-understand areas
I have made corresponding changes to the documentation
I have added tests that prove my fix is effective or that my feature works

Merge with remote branch aasx-server/main

Merge with remote branch

Merge main

Merge with dev-entity

src/AasxServerDB/PageRetriever.cs

-                            (sme.ValueType.Equals("S") && db.SValueSets.Any(sv => sv.SMEId == sme.Id && ((sv.Annotation != null  && sv.Annotation.ToLower().Contains(searchLower)) || (sv.Value != null && sv.Value.ToLower().Contains(searchLower))))) ||
-                            (sme.ValueType.Equals("I") && db.IValueSets.Any(sv => sv.SMEId == sme.Id && ((sv.Annotation != null  && sv.Annotation.ToLower().Contains(searchLower)) || (sv.Value != null && sv.Value.ToString().ToLower().Contains(searchLower))))) ||
-                            (sme.ValueType.Equals("F") && db.DValueSets.Any(sv => sv.SMEId == sme.Id && ((sv.Annotation != null  && sv.Annotation.ToLower().Contains(searchLower)) || (sv.Value != null && sv.Value.ToString().ToLower().Contains(searchLower)))))))))
+                            (sme.ValueType.Equals("S") && db.SValueSets.Any(sv => sv.SMEId == sme.Id && ((sv.Annotation != null && sv.Annotation.ToLower().Contains(searchLower)) || (sv.Value != null && sv.Value.ToLower().Contains(searchLower))))) ||


src/AasxServerDB/PageRetriever.cs

-                            (sme.ValueType.Equals("I") && db.IValueSets.Any(sv => sv.SMEId == sme.Id && ((sv.Annotation != null  && sv.Annotation.ToLower().Contains(searchLower)) || (sv.Value != null && sv.Value.ToString().ToLower().Contains(searchLower))))) ||
-                            (sme.ValueType.Equals("F") && db.DValueSets.Any(sv => sv.SMEId == sme.Id && ((sv.Annotation != null  && sv.Annotation.ToLower().Contains(searchLower)) || (sv.Value != null && sv.Value.ToString().ToLower().Contains(searchLower)))))))))
+                            (sme.ValueType.Equals("S") && db.SValueSets.Any(sv => sv.SMEId == sme.Id && ((sv.Annotation != null && sv.Annotation.ToLower().Contains(searchLower)) || (sv.Value != null && sv.Value.ToLower().Contains(searchLower))))) ||
+                            (sme.ValueType.Equals("I") && db.IValueSets.Any(sv => sv.SMEId == sme.Id && ((sv.Annotation != null && sv.Annotation.ToLower().Contains(searchLower)) || (sv.Value != null && sv.Value.ToString().ToLower().Contains(searchLower))))) ||


src/AasxServerDB/PageRetriever.cs

+                    .Where(sme => (smid == 0 || sme.SMId == smid) && (smeid == 0 || sme.Id == smeid) && (parid == 0 || sme.ParentSMEId == parid) &&
                        (searchLower.IsNullOrEmpty() ||
                        (sme.IdShort != null  && sme.IdShort.ToLower().Contains(searchLower)) ||
                        (sme.SemanticId != null  && sme.SemanticId.ToLower().Contains(searchLower)) ||
                        (sme.SMEType != null  && sme.SMEType.ToLower().Contains(searchLower)) ||
                        (sme.ValueType != null  && sme.ValueType.ToLower().Contains(searchLower)) ||
                        (withDateTime && sme.TimeStamp.CompareTo(dateTime) > 0) ||
                        (sme.ValueType != null && (
-                            (sme.ValueType.Equals("S") && db.SValueSets.Any(sv => sv.SMEId == sme.Id && ((sv.Annotation != null  && sv.Annotation.ToLower().Contains(searchLower)) || (sv.Value != null && sv.Value.ToLower().Contains(searchLower))))) ||
-                            (sme.ValueType.Equals("I") && db.IValueSets.Any(sv => sv.SMEId == sme.Id && ((sv.Annotation != null  && sv.Annotation.ToLower().Contains(searchLower)) || (sv.Value != null && sv.Value.ToString().ToLower().Contains(searchLower))))) ||
-                            (sme.ValueType.Equals("F") && db.DValueSets.Any(sv => sv.SMEId == sme.Id && ((sv.Annotation != null  && sv.Annotation.ToLower().Contains(searchLower)) || (sv.Value != null && sv.Value.ToString().ToLower().Contains(searchLower)))))))))
+                            (sme.ValueType.Equals("S") && db.SValueSets.Any(sv => sv.SMEId == sme.Id && ((sv.Annotation != null && sv.Annotation.ToLower().Contains(searchLower)) || (sv.Value != null && sv.Value.ToLower().Contains(searchLower))))) ||
+                            (sme.ValueType.Equals("I") && db.IValueSets.Any(sv => sv.SMEId == sme.Id && ((sv.Annotation != null && sv.Annotation.ToLower().Contains(searchLower)) || (sv.Value != null && sv.Value.ToString().ToLower().Contains(searchLower))))) ||
+                            (sme.ValueType.Equals("D") && db.DValueSets.Any(sv => sv.SMEId == sme.Id && ((sv.Annotation != null && sv.Annotation.ToLower().Contains(searchLower)) || (sv.Value != null && sv.Value.ToString().ToLower().Contains(searchLower)))))))))


src/AasxServerDB/PageRetriever.cs

-                            (sme.ValueType.Equals("F") && db.DValueSets.Any(sv => sv.SMEId == sme.Id && ((sv.Annotation != null  && sv.Annotation.ToLower().Contains(searchLower)) || (sv.Value != null && sv.Value.ToString().ToLower().Contains(searchLower)))))))))
+                            (sme.ValueType.Equals("S") && db.SValueSets.Any(sv => sv.SMEId == sme.Id && ((sv.Annotation != null && sv.Annotation.ToLower().Contains(searchLower)) || (sv.Value != null && sv.Value.ToLower().Contains(searchLower))))) ||
+                            (sme.ValueType.Equals("I") && db.IValueSets.Any(sv => sv.SMEId == sme.Id && ((sv.Annotation != null && sv.Annotation.ToLower().Contains(searchLower)) || (sv.Value != null && sv.Value.ToString().ToLower().Contains(searchLower))))) ||
+                            (sme.ValueType.Equals("D") && db.DValueSets.Any(sv => sv.SMEId == sme.Id && ((sv.Annotation != null && sv.Annotation.ToLower().Contains(searchLower)) || (sv.Value != null && sv.Value.ToString().ToLower().Contains(searchLower)))))))))


src/AasxServerDB/VisitorAASX.cs

src/AasxServerBlazor/Pages/Db.razor

+                                    string seperateString = " | ";
+                                    @for (int z = 0; z < list.Count; z++)
+                                    {
+                                        mlp += $"[{list[z][1]}] {list[z][0]}{seperateString}";


Freezor · 2024-07-01T07:34:51Z

src/AasxServerBlazor/Pages/Db.razor

                                        }
                                    </ul>
                                }
                                else
                                {
-                                    @smeDB.getValue()
+                                    @smeDB.getValue().First()[0]


What if .First() returns null? FirstOrDefault would be a better option.

The method is designed to always return at least the default value.

Freezor · 2024-07-01T07:40:40Z

src/AasxServerDB/Converter.cs

                switch (smel.SMEType)
                {
                    case "Prop":
-                        nextSME = new Property(DataTypeDefXsd.String, idShort: smel.IdShort, value: smel.getValue());
+                        nextSME = new Property(DataTypeDefXsd.String, value: value.First()[0]);


Same here. If you use .First and that returns null we get an exception

The method is designed to always return at least the default value.

yes. which is an empty list. And when it is empty and you want to access it first element with [0] than there is no element, so you get an exception

The list has at least one element in it.

I wanted to avoid always having to check for the first Element because of multiple code and complexity.

Can you rebase with the current main. When I try this I get the following issue:

Freezor · 2024-07-08T09:57:03Z

@blidhpxc seems to run locally

Freezor · 2024-07-08T10:45:16Z

@blidhpxc can you solve the merge conflict so I can merge?

blidhpxc added 30 commits February 22, 2024 11:52

Initial commit on orphan branch

98d6b16

Merge remote-tracking branch 'aasx-server/main'

0d0fc04

Merge with remote branch aasx-server/main

file error fix

7d0b4cc

start

8ce8359

Merge remote-tracking branch 'aasx-server/main'

87b4422

Merge with remote branch

merge main

b969a1d

merge dev

926b000

Database-schema, Clear, Load

fe7bfc4

delete

03d6937

works

17b6750

works

4897703

extrude to seperate files finished

a2d3f87

db name change

ff54a09

image of db schema changed

3cecd5b

blazor changes

f03dd01

blazor changes

38c36f7

delete table config

9525437

delete num to id

3671182

Identifier changed

7db3d80

outsource of code from page for db

db23fc5

fremdschluessel einbau noch nicht fertig

835e440

finish refactoring

2fbe953

bug fix

0d4b8a3

bug fix

11ddf86

work on SearchSMEsResult

35eae17

Edit works now

be61abd

smal fix

2740fe0

smal fix

af8a872

faster

81fc166

faster works

b22dd70

blidhpxc added 17 commits June 24, 2024 13:12

launchSettings.json

9b0742b

Start rework sme value

c3be0b6

Merge main

214e20b

Merge main

a0ea22e

Rework SME Value finished

c0c1887

entity finished

cfff935

Merge remote-tracking branch 'eclipse-server/main' into dev-entity

8c65a16

Merge main

merge main

bb56856

Start of ReferenceElement

c5f903d

Merge remote-tracking branch 'eclipse-server/main' into dev-entity

ac1a920

Merge main

finish

16ce6c1

Merge main

3f8321b

Add entity to db, rework sme, new parameter on gui

094dfb5

Merge remote-tracking branch 'pxc-server/dev-entity'

89636b6

Merge with dev-entity

Add entity to db, rework sme, new parameter on gui

016640e

Add entity to db, rework sme, new parameter on gui

164ad4f

Add entity to db, rework sme, new parameter on gui

753ba3d

github-advanced-security bot found potential problems Jun 28, 2024

View reviewed changes

blidhpxc added 2 commits July 1, 2024 06:52

Implement comments

46a2581

Change launchSettings

f1eed35

github-advanced-security bot found potential problems Jul 1, 2024

View reviewed changes

src/AasxServerBlazor/Pages/Db.razor

string seperateString = " | ";

@for (int z = 0; z < list.Count; z++)

{

mlp += $"[{list[z][1]}] {list[z][0]}{seperateString}";

Check notice

Code scanning / CodeQL

String concatenation in loop Note

String concatenation in loop: use 'StringBuilder'.

Freezor self-requested a review July 1, 2024 06:07

Freezor reviewed Jul 1, 2024

View reviewed changes

launchSettings

34661b8

Freezor added the enhancement New feature or request label Jul 8, 2024

blidhpxc added 2 commits July 8, 2024 13:18

db schema image

5b062e2

merge main

0af3187

Freezor merged commit 847a3ed into eclipse-aaspe:main Jul 8, 2024
7 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Entity to DB, Rework SME import to DB, Add Parameter to SME-GUI #319

Add Entity to DB, Rework SME import to DB, Add Parameter to SME-GUI #319

blidhpxc commented Jun 28, 2024

Freezor Jul 1, 2024

blidhpxc Jul 1, 2024 •

edited

Loading

Freezor Jul 1, 2024

blidhpxc Jul 1, 2024

Freezor Jul 1, 2024

blidhpxc Jul 1, 2024

blidhpxc Jul 1, 2024

blidhpxc Jul 1, 2024 •

edited

Loading

Freezor Jul 5, 2024

Freezor commented Jul 8, 2024

Freezor commented Jul 8, 2024

Add Entity to DB, Rework SME import to DB, Add Parameter to SME-GUI #319

Add Entity to DB, Rework SME import to DB, Add Parameter to SME-GUI #319

Conversation

blidhpxc commented Jun 28, 2024

Description

Type of change

How Has This Been Tested?

Checklist:

Freezor Jul 1, 2024

Choose a reason for hiding this comment

blidhpxc Jul 1, 2024 • edited Loading

Choose a reason for hiding this comment

Freezor Jul 1, 2024

Choose a reason for hiding this comment

blidhpxc Jul 1, 2024

Choose a reason for hiding this comment

Freezor Jul 1, 2024

Choose a reason for hiding this comment

blidhpxc Jul 1, 2024

Choose a reason for hiding this comment

blidhpxc Jul 1, 2024

Choose a reason for hiding this comment

blidhpxc Jul 1, 2024 • edited Loading

Choose a reason for hiding this comment

Freezor Jul 5, 2024

Choose a reason for hiding this comment

Freezor commented Jul 8, 2024

Freezor commented Jul 8, 2024

blidhpxc Jul 1, 2024 •

edited

Loading

blidhpxc Jul 1, 2024 •

edited

Loading