feat: added reference and combination #13455

JamalAlabdullah · 2024-09-02T08:04:29Z

Description

Added combination and referance to drop-down menu in datamodel/felter/legg til felt
Fixed the order of elements to match other menus
Added icons for the elements.
Updated test

Related Issue(s)

Add combination and referanse types to dropdown menu in felter section in datamodel #13317

Verification

Your code builds clean without any errors or warnings
Manual testing done (required)
Relevant automated test added (if you find this hard, leave it and we'll help out)

Documentation

User documentation is updated with a separate linked PR in altinn-studio-docs. (if applicable)

…-and-referanse-types-to-dropdown-menu-in-felter-section-in-datamodel

codecov · 2024-09-02T08:14:05Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 94.30%. Comparing base (34a57f0) to head (466154d).
Report is 3 commits behind head on main.

Additional details and impacted files

@@           Coverage Diff           @@
##             main   #13455   +/-   ##
=======================================
  Coverage   94.30%   94.30%           
=======================================
  Files        1534     1539    +5     
  Lines       20899    20913   +14     
  Branches     2515     2513    -2     
=======================================
+ Hits        19709    19723   +14     
  Misses        945      945           
  Partials      245      245

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

frontend/packages/schema-editor/src/components/SchemaInspector/ItemFieldsTab/ItemFieldsTab.tsx

...a-editor/src/components/SchemaInspector/ItemFieldsTab/ItemFieldsTable/ItemFieldsTableRow.tsx

frontend/packages/schema-editor/src/components/SchemaInspector/hooks/useKindOption.ts

...ackages/schema-editor/src/components/SchemaTree/SchemaNode/ActionButtons/AddPropertyMenu.tsx

…-dropdown-menu-in-felter-section-in-datamodel

…enu-in-felter-section-in-datamodel' of https://github.com/Altinn/altinn-studio into 13317-add-combination-and-referanse-types-to-dropdown-menu-in-felter-section-in-datamodel

frontend/packages/schema-editor/src/components/AddPropertiesMenu/AddPropertiesMenu.tsx

...a-editor/src/components/SchemaInspector/ItemFieldsTab/ItemFieldsTable/ItemFieldsTableRow.tsx

frontend/packages/schema-editor/src/components/SchemaInspector/hooks/useKindOptions.ts

…-dropdown-menu-in-felter-section-in-datamodel

…-and-referanse-types-to-dropdown-menu-in-felter-section-in-datamodel

…enu-in-felter-section-in-datamodel' of https://github.com/Altinn/altinn-studio into 13317-add-combination-and-referanse-types-to-dropdown-menu-in-felter-section-in-datamodel

…-and-referanse-types-to-dropdown-menu-in-felter-section-in-datamodel

TomasEng

Da har jeg tatt en ny runde. Hovedpunkter:

Vi må implementere AddPropertiesMenu på en litt annerledes måte. Nå har du laget to menyer inni hverandre. Det er nok også grunnen til at du har vanskeligheter med å ta i bruk StudioDropdownMenu.
Jeg er usikker på den nye komponenten for referanseknapp er nødvendig, siden de to bruksområdene er såpass forskjellige.
Veldig fint at du har laget en egen komponent for visningen av type. Det er mer av logikken i ItemFIeldsTableRow som bare er relevant for den cellen, så det kan du også flytte inn i den nye komponenten.
Se om du kan skrive enhetstestene uten å mocke ut hooks. Se gjerne på hvordan det er gjort i andre komponenter.

...ackages/schema-editor/src/components/SchemaTree/SchemaNode/ActionButtons/AddPropertyMenu.tsx

frontend/packages/schema-editor/src/components/AddPropertiesMenu/AddPropertiesMenu.tsx

...d/packages/schema-editor/src/components/SchemaInspector/ItemFieldsTab/ItemFieldsTab.test.tsx

frontend/packages/schema-editor/src/components/SchemaInspector/ItemFieldsTab/ItemFieldsTab.tsx

frontend/libs/studio-components/src/components/StudioReferenceButton/StudioReferenceButton.tsx

...hema-editor/src/components/SchemaInspector/ItemFieldsTab/ItemFieldsTable/ItemFieldsTypes.tsx

...editor/src/components/SchemaInspector/ItemFieldsTab/ItemFieldsTable/ItemFieldsTypes.test.tsx

...a-editor/src/components/SchemaInspector/ItemFieldsTab/ItemFieldsTable/ItemFieldsTableRow.tsx

…-and-referanse-types-to-dropdown-menu-in-felter-section-in-datamodel

TomasEng

Nå ser dette mye bedre ut. Jeg synes vi skal se på muligheten til å ta denne i bruk i AddNodeMenu også, men det kan vi gjøre i en separat PR. La oss starte med å fokusere på de to stedene hvor du har implementert den nye komponenten nå.

...d/packages/schema-editor/src/components/SchemaInspector/ItemFieldsTab/ItemFieldsTab.test.tsx

...src/components/SchemaInspector/ItemFieldsTab/ItemFieldsTable/ItemFieldType/ItemFieldType.tsx

frontend/packages/schema-editor/src/components/SchemaInspector/hooks/useTypeNames.ts

...ackages/schema-editor/src/components/SchemaTree/SchemaNode/ActionButtons/AddPropertyMenu.tsx

frontend/packages/schema-editor/src/components/AddPropertiesMenu/AddPropertiesMenu.tsx

...ackages/schema-editor/src/components/SchemaTree/SchemaNode/ActionButtons/AddPropertyMenu.tsx

...src/components/SchemaInspector/ItemFieldsTab/ItemFieldsTable/ItemFieldType/ItemFieldType.tsx

...omponents/SchemaInspector/ItemFieldsTab/ItemFieldsTable/ItemFieldType/ItemFieldType.test.tsx

frontend/packages/schema-editor/src/components/SchemaInspector/hooks/useKindNames.ts

…-and-referanse-types-to-dropdown-menu-in-felter-section-in-datamodel

TomasEng

Bra jobbet. Har bare noen siste, konkrete forslag til endringer.

...src/components/SchemaInspector/ItemFieldsTab/ItemFieldsTable/ItemFieldType/ItemFieldType.tsx

...omponents/SchemaInspector/ItemFieldsTab/ItemFieldsTable/ItemFieldType/ItemFieldType.test.tsx

...ponents/SchemaInspector/ItemFieldsTab/ItemFieldsTable/ItemFieldType/ItemFieldType.module.css

...a-editor/src/components/SchemaInspector/ItemFieldsTab/ItemFieldsTable/ItemFieldsTableRow.tsx

...d/packages/schema-editor/src/components/SchemaInspector/ItemFieldsTab/ItemFieldsTab.test.tsx

…-and-referanse-types-to-dropdown-menu-in-felter-section-in-datamodel

Jondyr

Tested✅

…-and-referanse-types-to-dropdown-menu-in-felter-section-in-datamodel

added reference and combination

dcef150

JamalAlabdullah linked an issue Sep 2, 2024 that may be closed by this pull request

Add combination and referanse types to dropdown menu in felter section in datamodel #13317

Closed

github-actions bot added area/data-modeling Area: Related to data models - e.g. create, edit, use data models. solution/studio/designer Issues related to the Altinn Studio Designer solution. labels Sep 2, 2024

Merge remote-tracking branch 'origin/main' into 13317-add-combination…

74f634d

…-and-referanse-types-to-dropdown-menu-in-felter-section-in-datamodel

JamalAlabdullah changed the title ~~added reference and combination~~ feat: added reference and combination Sep 2, 2024

updated

4775d0d

TomasEng requested changes Sep 9, 2024

View reviewed changes

JamalAlabdullah and others added 5 commits September 13, 2024 16:57

Fixed a part of comments --WIP

957b1c6

Merge branch 'main' into 13317-add-combination-and-referanse-types-to…

d16e22d

…-dropdown-menu-in-felter-section-in-datamodel

updated test

cb23621

Merge branch '13317-add-combination-and-referanse-types-to-dropdown-m…

46fb75f

…enu-in-felter-section-in-datamodel' of https://github.com/Altinn/altinn-studio into 13317-add-combination-and-referanse-types-to-dropdown-menu-in-felter-section-in-datamodel

created new component AddPropertiesMenu and fixe som issues

6582777

JamalAlabdullah commented Sep 16, 2024

View reviewed changes

frontend/packages/schema-editor/src/components/AddPropertiesMenu/AddPropertiesMenu.tsx Outdated Show resolved Hide resolved

JamalAlabdullah commented Sep 16, 2024

View reviewed changes

...a-editor/src/components/SchemaInspector/ItemFieldsTab/ItemFieldsTable/ItemFieldsTableRow.tsx Outdated Show resolved Hide resolved

JamalAlabdullah commented Sep 16, 2024

View reviewed changes

frontend/packages/schema-editor/src/components/SchemaInspector/hooks/useKindOptions.ts Outdated Show resolved Hide resolved

JamalAlabdullah requested a review from TomasEng September 16, 2024 13:30

JamalAlabdullah and others added 8 commits September 16, 2024 16:32

Merge branch 'main' into 13317-add-combination-and-referanse-types-to…

6ad9030

…-dropdown-menu-in-felter-section-in-datamodel

Merge remote-tracking branch 'origin/main' into 13317-add-combination…

6807f43

…-and-referanse-types-to-dropdown-menu-in-felter-section-in-datamodel

Merge branch '13317-add-combination-and-referanse-types-to-dropdown-m…

4fbdeb8

…enu-in-felter-section-in-datamodel' of https://github.com/Altinn/altinn-studio into 13317-add-combination-and-referanse-types-to-dropdown-menu-in-felter-section-in-datamodel

fix typecheck

917aa22

updated test

a7ac55b

added test

4030d86

Merge remote-tracking branch 'origin/main' into 13317-add-combination…

9f7ed40

…-and-referanse-types-to-dropdown-menu-in-felter-section-in-datamodel

added test

93cd6ae

TomasEng requested changes Sep 18, 2024

View reviewed changes

JamalAlabdullah added 3 commits September 18, 2024 17:23

fixed part of comments --WIP

4a7cb79

Fixed comments --WIP

c7858c0

Merge remote-tracking branch 'origin/main' into 13317-add-combination…

bb71c6b

…-and-referanse-types-to-dropdown-menu-in-felter-section-in-datamodel

JamalAlabdullah added 3 commits September 19, 2024 16:04

update test

d1609fd

update test --WIP

b4d02ea

updated css

babcea6

JamalAlabdullah requested a review from TomasEng September 20, 2024 07:40

TomasEng requested changes Sep 23, 2024

View reviewed changes

JamalAlabdullah added 5 commits September 24, 2024 11:53

fixed part of comments --WIP

e108ad3

moved related hooks files to ItemFieldType folder

16d6e6a

update test

8ef8b37

update test

1e10d76

Merge remote-tracking branch 'origin/main' into 13317-add-combination…

f2e90b8

…-and-referanse-types-to-dropdown-menu-in-felter-section-in-datamodel

JamalAlabdullah requested a review from TomasEng September 24, 2024 12:34

TomasEng requested changes Sep 26, 2024

View reviewed changes

JamalAlabdullah added 2 commits September 27, 2024 08:37

fixe comments

e4be8e3

Merge remote-tracking branch 'origin/main' into 13317-add-combination…

0e7c2ae

…-and-referanse-types-to-dropdown-menu-in-felter-section-in-datamodel

JamalAlabdullah requested a review from TomasEng September 27, 2024 06:48

TomasEng approved these changes Sep 27, 2024

View reviewed changes

Jondyr approved these changes Sep 30, 2024

View reviewed changes

Merge remote-tracking branch 'origin/main' into 13317-add-combination…

466154d

…-and-referanse-types-to-dropdown-menu-in-felter-section-in-datamodel

JamalAlabdullah merged commit fe5395f into main Sep 30, 2024
10 checks passed

JamalAlabdullah deleted the 13317-add-combination-and-referanse-types-to-dropdown-menu-in-felter-section-in-datamodel branch September 30, 2024 13:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: added reference and combination #13455

feat: added reference and combination #13455

JamalAlabdullah commented Sep 2, 2024 •

edited

Loading

codecov bot commented Sep 2, 2024 •

edited

Loading

TomasEng left a comment

TomasEng left a comment

TomasEng left a comment

Jondyr left a comment

feat: added reference and combination #13455

feat: added reference and combination #13455

Conversation

JamalAlabdullah commented Sep 2, 2024 • edited Loading

Description

Related Issue(s)

Verification

Documentation

codecov bot commented Sep 2, 2024 • edited Loading

Codecov Report

TomasEng left a comment

Choose a reason for hiding this comment

TomasEng left a comment

Choose a reason for hiding this comment

TomasEng left a comment

Choose a reason for hiding this comment

Jondyr left a comment

Choose a reason for hiding this comment

JamalAlabdullah commented Sep 2, 2024 •

edited

Loading

codecov bot commented Sep 2, 2024 •

edited

Loading