Revert "Update field names to be consistent with FLEx (#1731)"

[longrunningprocess]

This reverts commit 3927735.

Description

We came to a realization about the significance of the field names and the fact that some were stored in the database that led us to need to back this change out until a later time.

Checklist

• I have labeled my PR with: bug, feature, engineering, security fix or testing
• I have performed a self-review of my own code
• I have reviewed the title & description of this PR which I will use as the squashed PR commit message
• I have enabled auto-merge (optional)

Testing

Testers, use the following instructions against our staging environment. Post your findings as a comment and include any meaningful screenshots, etc.

CI tests should be sufficient.

[github-actions]

Unit Test Results

362 tests   362 ✔️  22s ⏱️
  37 suites      0 💤
    1 files        0 ❌

Results for commit 64c03c0.

[longrunningprocess]

@myieye was there anything you (or we) had to do with this label work after we merged this original PR? I've got this nagging recollection that you found something later on...

[hahn-kev]

It looks fine to me, but it's a lot of code so it's hard to tell if something was missed or not, but I'd assume you just did a revert so It's not like you made these changes by hand this time. As for testing I never setup my local environment. I'll wait and try to test it out on our qa environment.

[myieye]

Actually...it's not obvious to me why we want to revert this. The change didn't fix existing projects, but as long as it didn't break anything then at least it makes new projects consistent with FLEx. If we're asked again why the labels don't match we could say that we did everything we can easily do.

Or are we nervous that the change did break something? Nothing seems to suggest that.

But @longrunningprocess to answer your question, no, I don't think there was anything else we had to do. Nothing comes to mind, at least.

[myieye]

The only 2 strings hardcoded into LFMerge are "Part of Speech" and "Type" and they're both used as the names of option lists.
I just did a sync of test-chris-02 into a fresh local instance of LF and both of those option lists are working fine for me with the prefered/FLEx labels. So, the only other case I can think of that might be worth testing would be to create a new LD project (with no existing option lists?) and sync that, but I don't think that that would be more fragile than what I've already tried.

[myieye]

I was also able to sync changes to those option lists back to LD/FLEx.

[longrunningprocess]

Actually...it's not obvious to me why we want to revert this. The change didn't fix existing projects, but as long as it didn't break anything then at least it makes new projects consistent with FLEx. If we're asked again why the labels don't match we could say that we did everything we can easily do.

@hahn-kev requested it and I do believe it had to do with concerns around some inconsistencies in the code... maybe you and he can discuss it more and decide whether you all want to approve this or not?

[hahn-kev]

Go ahead and continue @longrunningprocess, we discussed it and agreed to rollback the change.