-
Notifications
You must be signed in to change notification settings - Fork 82
Variant generic unified main #4200
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.
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
base: main
Are you sure you want to change the base?
Conversation
177a77b to
fc01f20
Compare
Yes. Should be consistent. Changing the backend naming would affect the database, too. So this decision was the better one.
Yep! 👍 |
|
@artlog. I see you approach the final solution in steps. I like that. So when ever you think a package is ready, we can merge step by step and give the feature a toggle, so the functionality can be constantly tested without releasing unfinished features. What do you think? |
|
this is the idea. |
|
To have a coherent functionality quickly i study this addition Voting variant generic is disabled by default and should be activated globally by administrator. So there is no visible change at upgrade without an explicit action to enable variant. |
|
@artlog The merge conflict can be solved easily: Just accept both changes. Not that we are waiting for each other: If you want to merge, request a review by me as a sign, that you are finished with this PR from your perspective. |
|
CI looks good so far Some to dos:
|
9105236 to
4a1b004
Compare
|
i just aligned existing code with current main and test request, no new change. Current code add variant generic for which usage is for collecting votes only. Majority judgement new method won't be done within this merge, but this will be required to provide it, This does not include creation of new variant disabled by default from my prior comment, i will notify when done. |
|
@artlog If you make a rebase: TableSchema has moved to a version sub dir. I fear you have to solve this conflict manually. As far as I can see, the only change is the addition of your new field to polls. |
4a1b004 to
1133211
Compare
|
@dartcafe this is working on my system, it look like TableSchema change was already merged, did it ? I had to reset my environment since i got a Not null violation on group_id oc_polls_share , this is working a clean env on 31.0.6 nextcloud version.
This was my final change for this, hoping you get this validated soon ;-) |
|
Some things left:
|
This was probably #4213 |
1133211 to
e09772a
Compare
|
@dartcafe hopefully fixed comments requests |
|
Let's see, what CI says. 😉 |
|
it is a little disapointing... what that's default problem. |
I am wondering, too. I'll have a look at it. I don't know, what I don't see. |
Umpf. 🙈 Yes, I think this is the problem, because a text field with default This means Quick search: https://www.sqlservercentral.com/forums/topic/oracle-empty-string-is-the-same-as-null Usually it should be reported by the migrationManager Same problem applies to boolean fields. Obviously Oracle says |
|
Hello there, We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process. Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6 Thank you for contributing to Nextcloud and we hope to hear from you soon! (If you believe you should not receive this message, you can add yourself to the blocklist.) |
|
i kept '' default value but set it as nullable, hoping this is the good choice. |
how do we proceed ? Can you provide your changes to start from that ? i will install a mariadDB, hoping it really acts the same as a MySql. |
I was referring to the runtime error, when chosenRank was an empty string. I just added some voting options to the field in the db. The CI error is probably caused here |
i will try in following days to support correctly nullable since it is actualy the case, chosenRank in standard polls is just empty anyway. and see for array, since it is really an array when used. |
reworked from [email protected]:vinimoz/polls.git rank-vote-feature-vue3 TRAPPE Vincent <[email protected]> voting variant generic a configuration list of answers for a vote. merged lib/Db/Pool.php with main manually Signed-off-by: philippe lhardy <[email protected]>
Signed-off-by: philippe lhardy <[email protected]>
Move code VoteItem code into VoteButton Add drop-down list in VoteButton adapt with new poll types Signed-off-by: philippe lhardy <[email protected]>
Signed-off-by: philippe lhardy <[email protected]>
remove unused code in VoteIndicator reset VoteIndicator handles only simple variant move generic variant display in VoteItem Signed-off-by: philippe lhardy <[email protected]>
address remarks from nextcloud#4199 Signed-off-by: philippe lhardy <[email protected]>
npm run format:fix make cs-fix Signed-off-by: philippe lhardy <[email protected]>
add a lost comment during merge Signed-off-by: philippe lhardy <[email protected]>
Signed-off-by: philippe lhardy <[email protected]>
To be able to select variant in poll creation option should be checked within user settings allow to have this experimental functionality without impacting classical use Signed-off-by: philippe lhardy <[email protected]>
npm run format:fix Signed-off-by: philippe lhardy <[email protected]>
- add default string value for TEXT - add missing license header Signed-off-by: philippe lhardy <[email protected]>
Signed-off-by: philippe lhardy <[email protected]>
Signed-off-by: philippe lhardy <[email protected]>
- don't parse chosenRank for non generic variant - delegate to existing getChosenRank of getters - set default table column chosen_rank to null - set default chosenRank to json empty array Signed-off-by: philippe lhardy <[email protected]>
b58292b to
4dc2cbe
Compare
|
@dartcafe let's give a try like it is now ? |
e4bfe78 to
0ec37e8
Compare
Signed-off-by: philippe lhardy <[email protected]>
Signed-off-by: philippe lhardy <[email protected]>
|
@dartcafe : after refereshing my environment with last merge and running occ upgrade i get this error : this is related to #4225 |
|
Yep. I accessed thew table schema to check for the existence of a column, but forgot to initialize it. |
|
@dartcafe what is status of this, will it be integrated or what is expected from me ? |
|
I had no change to look into it, since the problem around the migration got priority and my time is limited atm due to some personal tasks and work. |

Variant Generic adapted/merged to main
Following #4199
Variant generic is another choice than Poll type where chosen_rank is a json array of possible configurable text answers from poll creator/owner.
creating
selecting possible answers at creation time in configuration tab :
then polls are selectable
Currently used to be exported and computed outside nextcloud poll with csv, results are not visible nor computed in poll.
VoteVariant type in front was renamed VotingVariant to match php code naming. Choice to use VoteVariant into php could have been done too, prefering to keep api side naming. Unification seems needed for Api poll calls.
Hoping this is clearer now.