Add resource for tree-menu-item #437

aringocode · 2023-07-12T08:25:25Z

Changes

add resource like a prop for tree-menu-item
update Changelog

resource-treemenu-item.mp4

aringocode · 2023-07-13T04:46:00Z

@Pe5h4 Can you review pls?

Pe5h4

@aringocode Good, only minor thing. Also, has it been tested also when you dont have any resource given in the props?

Pe5h4 · 2023-07-13T08:12:30Z

src/components/TreeMenu/TreeMenuItem.js

-			)}
-			{label}
-		</li>
+		isDisabled && (resources?.indexOf(resource) == -1) && (resources?.indexOf("authz:superuser") == -1) ?


@aringocode I believe you don need here the optional chaining syntax ?

aringocode · 2023-07-13T10:14:12Z

@aringocode Good, only minor thing. Also, has it been tested also when you dont have any resource given in the props?

@Pe5h4 I've tested it now. Assuming the resource comes back undefined. This condition (resources?.indexOf(resource) == -1) will still return -1, disabled items will not be displayed.

Pe5h4 · 2023-07-13T10:50:09Z

@aringocode Good, only minor thing. Also, has it been tested also when you dont have any resource given in the props?

@Pe5h4 I've tested it now. Assuming the resource comes back undefined. This condition (resources?.indexOf(resource) == -1) will still return -1, disabled items will not be displayed.

Alright

Pe5h4

@aringocode PLease add this option to the documentation

aringocode · 2023-07-14T04:39:11Z

@aringocode PLease add this option to the documentation

@Pe5h4 What do you mean? Add information that there must be a necessary resource to see the disable item?

Pe5h4 · 2023-07-14T14:16:43Z

@aringocode PLease add this option to the documentation

@Pe5h4 What do you mean? Add information that there must be a necessary resource to see the disable item?

Basically creating the documentation for TreeMenu as we spoke of about :)

aringocode · 2023-07-17T06:08:53Z

src/components/TreeMenu/index.js

@@ -9,7 +9,7 @@ import SimpleTreeMenu from 'react-simple-tree-menu';
 import TreeMenuItem from "./TreeMenuItem";

 const TreeMenu = ({
-	data, searchOptions, ...props
+	data, searchOptions, hasSearch, ...props


I took hasSearch parameter out of the props because it's only used in this file

@aringocode Not sure about this action, hasSearch is a part of the TreeMenuItem and it can be eventually present in the Treemenu. Have you tested it with the hasSearch={true} option?

Pe5h4 · 2023-07-17T15:39:28Z

src/components/TreeMenu/index.js

@@ -9,7 +9,7 @@ import SimpleTreeMenu from 'react-simple-tree-menu';
 import TreeMenuItem from "./TreeMenuItem";

 const TreeMenu = ({
-	data, searchOptions, ...props
+	data, searchOptions, hasSearch, ...props


@aringocode Not sure about this action, hasSearch is a part of the TreeMenuItem and it can be eventually present in the Treemenu. Have you tested it with the hasSearch={true} option?

Pe5h4 · 2023-07-17T15:40:33Z

doc/tree-menu.md

+
+	- `data`: object or array, data in a special structure. The detailed data structure is described in the library documentation react-simple-tree-menu.
+
+	- `hasSearch`: boolean, changes the styles for the search input and affects the display of placeholder


@aringocode Its not a placeholer, it should render the Search for the TreeMenu

Pe5h4 · 2023-07-17T15:40:54Z

doc/tree-menu.md

+
+	- `hasSearch`: boolean, changes the styles for the search input and affects the display of placeholder
+
+	- `hasNodes`: boolean, if a `TreeNode` is the last node of its branch	


@aringocode I dont understand this :(

doc/tree-menu.md

Pe5h4 · 2023-07-17T15:45:10Z

doc/tree-menu.md

+	- `resource`: string, resource granting display disabled tree-menu-item elements
+
+
+#### Optional:


There are more optional props, I would just add reference to this: https://github.com/iannbing/react-simple-tree-menu#api

aringocode · 2023-07-18T06:13:01Z

doc/tree-menu.md

+## Props:
+More parameters can be found [here](https://github.com/iannbing/react-simple-tree-menu#api).
+
+#### Required:
+
+	- `data`: object or array, data in a special structure. The detailed data structure is described in the library documentation react-simple-tree-menu.
+
+	- `resource`: string, resource granting display disabled tree-menu-item elements
+
+
+#### Optional:
+
+	- `searchOptions`: object, conducts placeholder and the dropdown component
+


I think you can leave the very minimum of parameters in this documentation, because the parameters for a library are described in its documentation. And here will be only those parameters that we use in our component (resource, searchOption)

Pe5h4

@aringocode Only minor refactorisation request with the resource/resources being an optional prop

Pe5h4 · 2023-07-19T15:20:39Z

src/components/TreeMenu/TreeMenuItem.js

 }) => {
 	const sessionExpired = useSelector(state => state.auth?.sessionExpired);
+	const resources = useSelector(state => state.auth?.resources);


@aringocode I think resources should be also passed to <TreeMenu /> as a prop, like we said - resource/resources should be a optional argument. Take a look to the ButtonWithAuthz, it has a similar approach - and why I think its better to do it this way?Because we will loose a dependency to some parts of the application when we will be decoupling the UI's to microfrontend apps

Pe5h4 · 2023-07-19T15:21:05Z

src/components/TreeMenu/TreeMenuItem.js

-			)}
-			{label}
-		</li>
+		isDisabled && (resources.indexOf(resource) == -1) && (resources.indexOf("authz:superuser") == -1) ?


Alright, good. Test that also in Configuration part of the UI please :)

aringocode · 2023-07-24T07:10:49Z

@Pe5h4 I've tested it in all cases. configuration and library are displayed correctly

Pe5h4 · 2023-07-24T15:55:12Z

src/components/TreeMenu/index.js

@@ -9,7 +9,7 @@ import SimpleTreeMenu from 'react-simple-tree-menu';
 import TreeMenuItem from "./TreeMenuItem";

 const TreeMenu = ({
-	data, searchOptions, ...props
+	data, searchOptions, resources, ...props


@aringocode Not necessary, resources are part of ...props

Pe5h4 · 2023-07-24T15:55:25Z

src/components/TreeMenu/index.js

@@ -45,6 +45,7 @@ const TreeMenu = ({
 							{items.map(({ reset, ...props }) => (
 								<TreeMenuItem
 									active="false"
+									resources={resources}


@aringocode Not necessary here

Pe5h4 · 2023-07-24T15:55:42Z

src/components/TreeMenu/TreeMenuItem.js

@@ -24,28 +26,32 @@ const TreeMenuItem = ({
 		props.onClick && props.onClick();
 	}

+


@aringocode Remove this empty line please

Pe5h4 · 2023-07-24T15:55:58Z

src/components/TreeMenu/TreeMenuItem.js

 	const paddingLeft = 1.25 * level + 0.5;
 	const selected = focused ? " selected" : "";
 	const disabled = (isDisabled || sessionExpired) ? " disabled" : "";
+	// const showDisabledItems = isDisabled && resources && resource &&


@aringocode Remove commented obsolete code

Pe5h4 · 2023-07-24T15:56:11Z

src/components/TreeMenu/TreeMenuItem.js

 }) => {
 	const sessionExpired = useSelector(state => state.auth?.sessionExpired);
+	// const resources = useSelector(state => state.auth?.resources);


@aringocode Remove commented obsolete code please :)

Pe5h4 · 2023-07-24T15:57:33Z

doc/tree-menu.md

+...
+
+<TreeMenu
+	resource={resource}


@aringocode If there is a resource in the example, there should be also resources, innit? :)

Pe5h4 · 2023-07-24T15:58:03Z

doc/tree-menu.md

+
+	- `searchOptions`: object, conducts placeholder and the dropdown component
+
+	- `resource`: string, resource granting display disabled tree-menu-item elements


@aringocode Add also info about that resources are optional argument

src/components/TreeMenu/index.js

Pe5h4 · 2023-07-25T15:50:34Z

doc/tree-menu.md

+
+	- `resource`: string, resource granting display disabled tree-menu-item elements
+
+	- `resources`: array, list of resources that the user has


@aringocode resources: array, list of resources that the user has assigned

src/components/TreeMenu/index.js

Pe5h4 · 2023-07-27T07:33:46Z

src/components/TreeMenu/index.js

 								<TreeMenuItem
 									active="false"
+									{...params}


@aringocode Anyway, are the ...params used anywhere? I dont see the being used in the TreeMenuItem so I suppose you want to pass the {...params} to the <li> or somewhere, not to loose TreeMenuItem behavior

What was originally passed to the TreeMenuItem when using just {...props} ?

@aringocode Well, anyway, I just wanted some information, nevertheless, your previous solution with passing {...props} together with {...params} was ok. What I wanted was just answer to my questions, why did you choose this solution and if it is propely handled in the <TreeMenuItem /> component :)

Pe5h4 · 2023-07-28T11:37:42Z

src/components/TreeMenu/index.js

 								<TreeMenuItem
 									active="false"
+									{...params}


@aringocode Well, anyway, I just wanted some information, nevertheless, your previous solution with passing {...props} together with {...params} was ok. What I wanted was just answer to my questions, why did you choose this solution and if it is propely handled in the <TreeMenuItem /> component :)

aringocode · 2023-07-28T11:50:07Z

@Pe5h4 Yes, it is processed correctly. Props from the parent component did not come before, so I think we can leave this solution to avoid passing unnecessary parameters:

resource={props.resource}
resources={props.resources}

add resource

5d76c75

aringocode self-assigned this Jul 12, 2023

akonshina added 3 commits July 12, 2023 11:04

Merge branch 'master' into refactor/add-resource-for-tree-item

ae038d9

remove console.log

7a00246

update changelog

a32e013

aringocode requested a review from Pe5h4 July 13, 2023 04:45

Pe5h4 requested changes Jul 13, 2023

View reviewed changes

remove unused ? condition

740a46f

aringocode requested a review from Pe5h4 July 13, 2023 10:15

Pe5h4 approved these changes Jul 13, 2023

View reviewed changes

Pe5h4 requested changes Jul 13, 2023

View reviewed changes

akonshina added 4 commits July 17, 2023 06:54

remove unused imports

5b96399

create docs

0d3e581

add new line

0136301

move hassearch from props

a86aaf6

aringocode commented Jul 17, 2023

View reviewed changes

aringocode requested a review from Pe5h4 July 17, 2023 06:09

Pe5h4 requested changes Jul 17, 2023

View reviewed changes

akonshina added 5 commits July 18, 2023 07:46

add link to more optional params

3d79eff

return changes with props.hassearch

4031a15

add link to more props, remove unused docs part

03da9be

resolve conflictt

994b12b

add basic tree-menu props

5a7dc22

aringocode commented Jul 18, 2023

View reviewed changes

aringocode requested a review from Pe5h4 July 18, 2023 06:13

Pe5h4 requested changes Jul 19, 2023

View reviewed changes

akonshina added 2 commits July 20, 2023 07:51

add resources like a prop

7acfbde

send resources to the tree menu

6ebb35d

aringocode requested a review from Pe5h4 July 24, 2023 07:12

Pe5h4 requested changes Jul 24, 2023

View reviewed changes

Pe5h4 reviewed Jul 24, 2023

View reviewed changes

akonshina added 2 commits July 25, 2023 07:38

update docs

67662d3

refactor props for TreeMenuItem

4d1b6fc

aringocode commented Jul 25, 2023

View reviewed changes

src/components/TreeMenu/index.js Show resolved Hide resolved

aringocode requested a review from Pe5h4 July 25, 2023 05:46

Pe5h4 requested changes Jul 25, 2023

View reviewed changes

fix docs about resources

6c52111

Pe5h4 reviewed Jul 27, 2023

View reviewed changes

akonshina added 5 commits July 27, 2023 15:20

pass resorce and resources from props to the Treemenuitem

574e133

add resource

9932bdd

remove empty line

c5ad003

Merge branch 'master' into refactor/add-resource-for-tree-item

b52266a

update sprint number in the Changelog

36aa35c

aringocode requested a review from Pe5h4 July 28, 2023 05:44

Pe5h4 requested changes Jul 28, 2023

View reviewed changes

return changes with ...props

570842d

aringocode requested a review from Pe5h4 July 31, 2023 03:52

Pe5h4 approved these changes Jul 31, 2023

View reviewed changes

resolve conflict

953674b

aringocode marked this pull request as ready for review August 1, 2023 05:04

aringocode merged commit 7802fff into master Aug 1, 2023

aringocode deleted the refactor/add-resource-for-tree-item branch August 1, 2023 05:04

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add resource for tree-menu-item #437

Add resource for tree-menu-item #437

aringocode commented Jul 12, 2023 •

edited

Loading

aringocode commented Jul 13, 2023

Pe5h4 left a comment

Pe5h4 Jul 13, 2023

aringocode commented Jul 13, 2023

Pe5h4 commented Jul 13, 2023

Pe5h4 left a comment

aringocode commented Jul 14, 2023

Pe5h4 commented Jul 14, 2023

aringocode Jul 17, 2023

Pe5h4 Jul 17, 2023

Pe5h4 Jul 17, 2023

Pe5h4 Jul 17, 2023

Pe5h4 Jul 17, 2023

Pe5h4 Jul 17, 2023

aringocode Jul 18, 2023

Pe5h4 left a comment

Pe5h4 Jul 19, 2023

Pe5h4 Jul 19, 2023

aringocode commented Jul 24, 2023

Pe5h4 Jul 24, 2023

Pe5h4 Jul 24, 2023

Pe5h4 Jul 24, 2023

Pe5h4 Jul 24, 2023

Pe5h4 Jul 24, 2023

Pe5h4 Jul 24, 2023

Pe5h4 Jul 24, 2023

Pe5h4 Jul 25, 2023

Pe5h4 Jul 27, 2023

Pe5h4 Jul 27, 2023

Pe5h4 Jul 28, 2023

Pe5h4 Jul 28, 2023

aringocode commented Jul 28, 2023


		- `data`: object or array, data in a special structure. The detailed data structure is described in the library documentation react-simple-tree-menu.

		- `hasSearch`: boolean, changes the styles for the search input and affects the display of placeholder


		- `hasSearch`: boolean, changes the styles for the search input and affects the display of placeholder

		- `hasNodes`: boolean, if a `TreeNode` is the last node of its branch

		- `resource`: string, resource granting display disabled tree-menu-item elements


		#### Optional:

		@@ -24,28 +26,32 @@ const TreeMenuItem = ({
		props.onClick && props.onClick();
		}


		- `searchOptions`: object, conducts placeholder and the dropdown component

		- `resource`: string, resource granting display disabled tree-menu-item elements


		- `resource`: string, resource granting display disabled tree-menu-item elements

		- `resources`: array, list of resources that the user has

Add resource for tree-menu-item #437

Add resource for tree-menu-item #437

Conversation

aringocode commented Jul 12, 2023 • edited Loading

Changes

aringocode commented Jul 13, 2023

Pe5h4 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

aringocode commented Jul 13, 2023

Pe5h4 commented Jul 13, 2023

Pe5h4 left a comment

Choose a reason for hiding this comment

aringocode commented Jul 14, 2023

Pe5h4 commented Jul 14, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Pe5h4 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

aringocode commented Jul 24, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

aringocode commented Jul 28, 2023

aringocode commented Jul 12, 2023 •

edited

Loading