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.

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

Feat/new fields metadata #432

Merged

Conversation

a-crea
Copy link
Contributor

@a-crea a-crea commented Oct 18, 2023

This pull request includes the new metadata fields in list view, detail view, new and edit views. It also contains the new functionality to "ADD NEW" value to existing options.

@gappc
Copy link
Collaborator

gappc commented Oct 19, 2023

@a-crea thank you for this PR.

Given that the PR changes 66 files, I took a deeper look at it. It seems, that most modifications should not be part of this PR and are related to other work - maybe PR #431 or even PR #429?

I would appreciate if you could clean up this PR and provide only the changes necessary for this PR to fulfill its requirements. Otherwise it gets really hard for me to do a proper review

thx

@gappc gappc mentioned this pull request Oct 19, 2023
@a-crea
Copy link
Contributor Author

a-crea commented Oct 23, 2023

@gappc Hi!
I have rebased both this PR and #431.

This PR should address #416. Shouldn't we take into account both the new input and the new fields in this PR? I believe it was already treated as a "bundle" since the two features are interconnected.

@gappc
Copy link
Collaborator

gappc commented Oct 26, 2023

@a-crea thank you for your effort, but still it seems that something is odd.

If you take a look at the number of files this PR wants to merge on the top right of this page, you'll see that 78 files wait to be merged. I'm pretty sure that most of those files do not belong to this PR. I also tested to merge this PR locally (on my machine) into the current development branch, which resulted in at least one merge conflict (file .github/workflows/main.yml).

Would it be possible for you to open a new PR where you apply your changes (and only those)? I think that would be the easiest way to go forward.

thx

@a-crea
Copy link
Contributor Author

a-crea commented Oct 31, 2023

@gappc Hi!
It should be fixed on both PRs. Let me know if everything is good.
Thanks!

</template>

<script setup lang="ts">
import { computed, toRefs } from 'vue';
Copy link
Collaborator

Choose a reason for hiding this comment

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

@a-crea please remove the import for computed, it is never used

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done!

@gappc
Copy link
Collaborator

gappc commented Oct 31, 2023

@a-crea
Copy link
Contributor Author

a-crea commented Oct 31, 2023

@gappc done, let me know :)

@gappc gappc merged commit c7c8d1b into noi-techpark:development Oct 31, 2023
4 checks passed
@gappc
Copy link
Collaborator

gappc commented Oct 31, 2023

@a-crea I've merged this PR, thx for your work 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants