Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP: Fix/single tool import support #1864

Merged
merged 12 commits into from Nov 15, 2023
Merged

WIP: Fix/single tool import support #1864

merged 12 commits into from Nov 15, 2023

Conversation

seyfeb
Copy link
Collaborator

@seyfeb seyfeb commented Oct 29, 2023

Topic and Scope

Allows importing JSON-LD where the tools' field is a single tool instead of an array, like tool: "My tool" (see #1641)

Formal requirements

There are some formal requirements that should be satisfied. Please mark those by checking the corresponding box.

  • I did check that the app can still be opened and does not throw any browser logs
  • I created tests for newly added PHP code (check this if no PHP changes were made)
  • I updated the OpenAPI specs and added an entry to the API changelog (check if API was not modified)
  • I notified the matrix channel if I introduced an API change

@seyfeb
refactor: Change variable name for description filter key
2c6ab53 
Signed-off-by: Sebastian Fey <info@sebastianfey.de>
@seyfeb
test: Add test cases for string-valued recipe tool(s)
49924f8 
Signed-off-by: Sebastian Fey <info@sebastianfey.de>
@seyfeb
fix: Allow single tool in JSON+LD import
2565266 
Previously an array of tools was required.

Closes nextcloud#1641

Signed-off-by: Sebastian Fey <info@sebastianfey.de>
@seyfeb
docs: Update CHANGELOG
2500f35 
Signed-off-by: Sebastian Fey <info@sebastianfey.de>
@seyfeb seyfeb added php Pull requests that update Php code Backend Issue or PR related to the backend code labels Oct 29, 2023
@github-actions
Copy link

github-actions bot commented Oct 29, 2023 •
edited

Test Results

     27 files  1 242 suites   6m 39s ⏱️
   505 tests    504 ✔️ 0 💤 1 ❌
4 545 runs  4 535 ✔️ 1 💤 9 ❌

For more details on these failures, see this check.

Results for commit 75e6907.

♻️ This comment has been updated with latest results.

@seyfeb
style: Fix code style
48ac10b 
Signed-off-by: Sebastian Fey <info@sebastianfey.de>
@seyfeb
test: Fix test and add unit tests for FixToolsFilter
bddf2a6 
Signed-off-by: Sebastian Fey <info@sebastianfey.de>
@seyfeb
Fix: Handle empty string as tool field value
c435f80 
Signed-off-by: Sebastian Fey <info@sebastianfey.de>
@seyfeb seyfeb changed the title Fix/single tool import support WIP: Fix/single tool import support Oct 29, 2023
@seyfeb seyfeb removed the request for review from christianlupus October 29, 2023 13:54
christianlupus
christianlupus approved these changes Oct 29, 2023
View reviewed changes
Copy link
Collaborator

@christianlupus christianlupus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good in general. The issues in the code (see ci errors) need to be addressed, though 😁

CHANGELOG.md Outdated Show resolved Hide resolved
@seyfeb
test: Deleted wrong test, add PR no to CHANGELOG
75e6907 
Signed-off-by: Sebastian Fey <info@sebastianfey.de>
@seyfeb seyfeb force-pushed the fix/single-tool-import-support branch from 769c00a to 75e6907 Compare October 29, 2023 17:31
@christianlupus
Merge remote-tracking branch 'origin/master' into fix/single-tool-imp…
140d874 
…ort-support

# Conflicts:
#	CHANGELOG.md
@christianlupus
Fixed PR version
e96bbe3 
Signed-off-by: Christian Wolf <github@christianwolf.email>
@christianlupus
Fix test case
3123f26 
Signed-off-by: Christian Wolf <github@christianwolf.email>
@christianlupus
Reverted wrong PR numbering
5ec75c4 
Signed-off-by: Christian Wolf <github@christianwolf.email>
@christianlupus christianlupus merged commit 9bbeb0c into nextcloud:master Nov 15, 2023
20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@christianlupus christianlupus christianlupus approved these changes

Assignees
No one assigned
Labels
Backend Issue or PR related to the backend code php Pull requests that update Php code
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@seyfeb @christianlupus