feat: support show all enable plugin list tab #2585
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
guoqqqi
reviewed
Aug 14, 2022
|
Hello @Morakes Can you help by posting a before and after picture of the change so that we can easily help review 😄 |
guoqqqi
changed the title
Codecov Report
@@ Coverage Diff @@
## master #2585 +/- ##
==========================================
- Coverage 76.00% 68.00% -8.00%
==========================================
Files 136 136
Lines 3588 3601 +13
Branches 865 868 +3
==========================================
- Hits 2727 2449 -278
- Misses 861 1152 +291
Flags with carried forward coverage won't be shown. Click here to find out more.
📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
guoqqqi
reviewed
Aug 15, 2022
|
also need to resolve these conflicts |
|
before after |
Morakes
force-pushed
the
feat/global-plugin-add-tab
branch
from
261579f
to
827f4bf
Compare
guoqqqi
reviewed
Aug 15, 2022
Morakes
force-pushed
the
feat/global-plugin-add-tab
branch
from
54747cf
to
a9bd4eb
Compare
guoqqqi
reviewed
Aug 16, 2022
web/cypress/integration/route/create-route-with-cors-form.spec.js
Outdated
Show resolved
Hide resolved
added 3 commits
August 16, 2022 15:50
guoqqqi
reviewed
Aug 17, 2022
|
also cc @SkyeYoung PTAL |
SkyeYoung
approved these changes
Aug 17, 2022
SkyeYoung
requested changes
Aug 17, 2022
Comment on lines
132
to
136
| if (val === 'enablePlugins') { | ||
| setShowEnablePlugin(true); | ||
| } else { | ||
| setShowEnablePlugin(false); | ||
| } |
There was a problem hiding this comment.
Suggested change
| if (val === 'enablePlugins') { | |
| setShowEnablePlugin(true); | |
| } else { | |
| setShowEnablePlugin(false); | |
| } | |
| setShowEnablePlugin(val === 'enablePlugins'); |
SkyeYoung
requested changes
Aug 17, 2022
Comment on lines
109
to
111
| const openPluginList = pluginList.filter( | ||
| (item) => initialData[item.name] && !initialData[item.name].disable, | ||
| ); |
There was a problem hiding this comment.
Could you help us improve this section, please? Like you've done here?
There was a problem hiding this comment.
Ok, I will improve it
Baoyuantop
reviewed
Aug 18, 2022
There was a problem hiding this comment.
There is an issue that needs to be verified and fixed:
- Go to the Plugin List page and add Enable
- Enable
basic authandkey authplugin - Switch tabs and data are as expected
- Click the Plugin menu and go to the plugin list page
- Click Enable button and click Enable tab
- Delete the last plugin and find that deleted both
Oh sorry I find this issue in #2592, please ignore this comment |
Baoyuantop
approved these changes
Aug 18, 2022
guoqqqi
approved these changes
Aug 18, 2022
oil-oil
reviewed
Aug 18, 2022
| @@ -66,6 +66,8 @@ const PluginPage: React.FC<Props> = ({ | |||
| const { formatMessage } = useIntl(); | |||
| const [form] = Form.useForm(); | |||
| const [pluginList, setPluginList] = useState<PluginComponent.Meta[]>([]); | |||
| const [enablePluginsList, setEnablePluginsList] = useState<PluginComponent.Meta[]>([]); | |||
| const [showEnablePlugin, setShowEnablePlugin] = useState<boolean>(false); | |||
There was a problem hiding this comment.
Suggested change
| const [showEnablePlugin, setShowEnablePlugin] = useState<boolean>(false); | |
| const [showEnablePlugin, setShowEnablePlugin] = useState(false); |
| @@ -66,6 +66,8 @@ const PluginPage: React.FC<Props> = ({ | |||
| const { formatMessage } = useIntl(); | |||
| const [form] = Form.useForm(); | |||
| const [pluginList, setPluginList] = useState<PluginComponent.Meta[]>([]); | |||
| const [enablePluginsList, setEnablePluginsList] = useState<PluginComponent.Meta[]>([]); | |||
There was a problem hiding this comment.
enablePluginsList can be obtained from the pluginList after calculation, no need to define a new state.
hongbinhsu
pushed a commit
to fitphp/apix-dashboard
that referenced
this pull request
Sep 10, 2022
* upstream/master: (23 commits) feat: Add config struct of OpenID-Connect Login (apache#2597) feat: set serverUrlMap with env, update cypress, update stylelint (apache#2583) chore: fix function name typo (apache#2599) fix: page refresh causes deletion exception (apache#2593) feat: support show all enable plugin list tab (apache#2585) fix: drawer components delete plugin not working (apache#2573) feat: add batch delete function for route (apache#2502) test: reduce fe ci time (apache#2557) doc(csp): add correct csp rule (apache#2548) doc: add a notice about the compatibility of Ingress and Dashboard (apache#2552) fix: add judgement for last_report_time (apache#2551) fix: cli test invalid etcd (apache#2544) feat: fix actions version to root version (apache#2521) fix: duplicate ID (apache#2501) fix: block arbitrary file index (apache#2497) docs: update deploy-with-docker.md (apache#2472) feat: translating Turkish for new features (apache#2487) docs: add new import and export docs to sidebar (apache#2485) docs: add data loader and new OpenAPI 3 loader (apache#2484) feat: support data loader in frontend (apache#2480) ... # Conflicts: # api/internal/route.go # web/config/defaultSettings.ts # web/yarn.lock
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Please answer these questions before submitting a pull request, or your PR will get closed.
Why submit this pull request?
What changes will this PR take into?
Please update this section with detailed description.
Related issues
fix/resolve #2299
Checklist: