Sorry I forgot to respond to your last message. I didn't quite understand the whole thing. Currently we always have an empty row in the AC editor which makes things more complicated than they need to be, is that the issue?
2022-09-12 25512, 2022
Shubh
We do have single row when AC is not disable for inline ac component
In which case I agree, we don't need an empty row and we can just add it when required
2022-09-12 25537, 2022
Shubh
Would it be good idea to do this in separate PR?
2022-09-12 25549, 2022
monkey
Probably best, yes
2022-09-12 25554, 2022
monkey
I was thinking the same
2022-09-12 25510, 2022
monkey
Let's focus on finishing the open PRs first
2022-09-12 25509, 2022
Shubh
Yep!
2022-09-12 25559, 2022
Shubh
monkey: i made the changes on processing entity as we discussed, let me know if there's any thing left in the early submit PR.
2022-09-12 25534, 2022
monkey
👍
2022-09-12 25540, 2022
Shubh
also that relationship merge issue should be fix after concurrent rel PR.
2022-09-12 25530, 2022
monkey
Yep. So the order in which I should merge then? 874, then 876, then update the new-creation-form feature branch?
2022-09-12 25510, 2022
Shubh
if possible merge #876 (concurrent rel) on new-creation-form branch then i will merge it with early-submit branch and will make some changes to support new relationship workflow. then we can merge PR#874 with new-creation-form.
2022-09-12 25530, 2022
monkey
Shubh: I've changed the target branch for #876 to new-creation-from, but that created some merge conflicts to resolve
2022-09-12 25506, 2022
Shubh
i was thinking of first merging it with master then with new-creation-form branch
2022-09-12 25533, 2022
monkey
Ah, sorry I didn't understand. Let me revert the target branch change
2022-09-12 25506, 2022
monkey
OK, 876 merged
2022-09-12 25505, 2022
monkey
So now I get the same conflicts when updating new-creation-from with latest master. Let me see if I can resolve them easily
2022-09-12 25524, 2022
Shubh
let me know if it is okay if i will merge master with new-creation-form branch
2022-09-12 25547, 2022
monkey
Oh, if you want to do it go right ahead !
2022-09-12 25535, 2022
monkey
Conflicts don't seem tooooo bad
2022-09-12 25532, 2022
Shubh
monkey: Pushing direct commit to new-creation-form (main repo) would be ok, right?
2022-09-12 25555, 2022
monkey
Is it just the merged commit?
2022-09-12 25501, 2022
monkey
If so no problem
2022-09-12 25540, 2022
monkey
If it's new code It's best to open a PR so that there's a paper trail for reviews etc.
2022-09-12 25515, 2022
Shubh
merge done!
2022-09-12 25506, 2022
monkey
Neat! Now one final merge conflict to resolve on 874 and I will deploy it on the test server
2022-09-12 25520, 2022
Shubh
done!
2022-09-12 25541, 2022
Shubh
Ah wait need some modifications
2022-09-12 25514, 2022
Shubh
monkey: now, it is ready!
2022-09-12 25513, 2022
Shubh
also one minor issue i notice with concurrent-rel is when using manual method to sort items, removed items (`isRemoved:true`) still shows up in series editor. though fixed it in this branch.
I don't think we need this anymore since it only add existing entities to relationship section which no longer require
2022-09-12 25557, 2022
Shubh
rels*
2022-09-12 25542, 2022
Shubh
that's why i was so keen on merging the concurrent PR before this
2022-09-12 25514, 2022
monkey
I'll have to check, but I think we need this code. This is for mergin entities, for example merging author A into author B, all relationship between author A and other entities should be recreated with author B instead of author A
2022-09-12 25533, 2022
Shubh
Ah my bad , another look and i deleted the wrong code. will fix it
2022-09-12 25547, 2022
monkey
👍
2022-09-12 25523, 2022
elgranRoble joined the channel
2022-09-12 25515, 2022
BenOckmore joined the channel
2022-09-12 25514, 2022
BenOckmore
monkey: was doing some coding on -site and -data last week, and was thinking it's quite a hassle to clone them separately and keep things in sync when implementing new stuff in -data. So, I've made a test repository which merges the two repos as if -data had always been a part of site... Test repository is here: https://github.com/LordSputnik/bookbrainz and the merge is here:
