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

Fix yaml generation #16921

Merged
merged 3 commits into from
Jan 17, 2023
Merged

Fix yaml generation #16921

merged 3 commits into from
Jan 17, 2023

Conversation

vojtechjelinek
Copy link
Contributor

@vojtechjelinek vojtechjelinek commented Jan 13, 2023

Overview

  1. This PR fixes #N/A
  2. This PR does the following: Fixes the script that adds new indexes into index.yaml when the dev server is run.

The problem was that the devserver does not update index.yaml (at least on my device) in cache folder it only updates datastore-indexes-auto.xml which seems to be just an XML representation of the index.yaml, so this PR uses the datastore-indexes-auto.xml instead of index.yaml

Essential Checklist

  • The PR title starts with "Fix #bugnum: ", followed by a short, clear summary of the changes. (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
  • The linter/Karma presubmit checks have passed locally on your machine.
  • "Allow edits from maintainers" is checked. (See here for instructions on how to enable it.)
    • This lets reviewers restart your CircleCI tests for you.
  • The PR is made from a branch that's not called "develop".

Proof that changes are correct

I've tested this locally with #16534 and all indexes were correctly added.

PR Pointers

  • Make sure to follow the instructions for making a code change.
  • If you need a review or an answer to a question, and don't have permissions to assign people, leave a comment like the following: "{{Question/comment}} @{{reviewer_username}} PTAL". Oppiabot will help assign that person for you.
  • For what code owners will expect, see the Code Owner's wiki page.
  • Make sure your PR follows conventions in the style guide, otherwise this will lead to review delays.
  • Never force push. If you do, your PR will be closed.
  • Some of the e2e tests are flaky, and can fail for reasons unrelated to your PR. We are working on fixing this, but in the meantime, if you need to restart the tests, please check the "If your build fails" wiki page.

@oppiabot
Copy link

oppiabot bot commented Jan 13, 2023

Hi @vojtechjelinek, can you complete the following:

  1. The body of this PR is missing the required description, please update the body with a description of what this PR does.
  2. The karma and linter checklist has not been checked, please make sure to run the frontend tests and lint tests before pushing.
    Thanks!

@oppiabot
Copy link

oppiabot bot commented Jan 13, 2023

Hi, @vojtechjelinek, this pull request does not have a "CHANGELOG: ..." label as mentioned in the PR pointers. Assigning @vojtechjelinek to add the required label. PRs without this label will not be merged. If you are unsure of which label to add, please ask the reviewers for guidance. Thanks!

@vojtechjelinek vojtechjelinek removed their assignment Jan 14, 2023
@vojtechjelinek vojtechjelinek marked this pull request as ready for review January 14, 2023 20:47
@vojtechjelinek vojtechjelinek requested review from a team as code owners January 14, 2023 20:47
@vojtechjelinek vojtechjelinek requested a review from gp201 January 14, 2023 20:47
Copy link
Member

@gp201 gp201 left a comment

Choose a reason for hiding this comment

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

LGTM

@gp201 gp201 assigned vojtechjelinek and unassigned gp201 Jan 16, 2023
Copy link
Member

@seanlip seanlip left a comment

Choose a reason for hiding this comment

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

@vojtechjelinek Could you please describe the problem a bit more in the description?

Also should we have a test that ensures the xml is converted into yaml correctly?

Thanks!

@seanlip
Copy link
Member

seanlip commented Jan 16, 2023

Also, just to be clear -- could you also please explain what the developer experience will be like (for indexes) after this PR is merged? Will they need to do anything to generate the indexes in index.yaml, or will that "just happen"?

Should we perhaps send a note to the devs about this?

@seanlip seanlip assigned vojtechjelinek and unassigned seanlip Jan 16, 2023
@vojtechjelinek
Copy link
Contributor Author

@seanlip Done. Added more tests.

I've explained the changes in the description.

For a developer this should be as before. If they perform some action that requires index in their local devserver (basically testing their newly added code) the index will be added to their index.yaml

Copy link
Member

@seanlip seanlip left a comment

Choose a reason for hiding this comment

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

OK, LGTM. Thanks @vojtechjelinek !

@vojtechjelinek
Copy link
Contributor Author

@seanlip Please merge this.

@seanlip
Copy link
Member

seanlip commented Jan 17, 2023

Merging per @vojtechjelinek's request since there is no one besides him currently in the dependencies reviewer team.

@seanlip seanlip merged commit a02dd00 into oppia:develop Jan 17, 2023
462702985 added a commit to 462702985/oppia that referenced this pull request Jan 24, 2023
fix interaction null type related bugs

Fix oppia#16504: Android beta page fixes (oppia#16688)

* Android beta page fixes

* address comments

* fix indentation

* fix fe test

* address comments

* code comments

* fix test

* fix test

* address comments

* address comment and fix tests

* increase z-index of button so clicks are handled correctly

* fix test

* fix coverage

Fix oppia#16648: Increases tick time to fix debounce frontend test flake (oppia#16958)

flake fix

FIX#16908 : Submit button in Feedback dialogbox must have layout indicating its a button (oppia#16954)

Update feedback-popup.component.html

Fix yaml generation (oppia#16921)

* Fix yaml generation

* Fix indexes

* Add tests

fix null bug

fix bug in constructor

fix bug2

interaction id related bug

1

test interaction id bug

1

interaction id null test bug

1

add test coverage

recordLearnerAnswer interaction id not null

add coverage

minor

minor

minor

minor

minor

minor

minor
kevintab95 pushed a commit that referenced this pull request Feb 8, 2023
* remove interactionId null type

fix interaction null type related bugs

Fix #16504: Android beta page fixes (#16688)

* Android beta page fixes

* address comments

* fix indentation

* fix fe test

* address comments

* code comments

* fix test

* fix test

* address comments

* address comment and fix tests

* increase z-index of button so clicks are handled correctly

* fix test

* fix coverage

Fix #16648: Increases tick time to fix debounce frontend test flake (#16958)

flake fix

FIX#16908 : Submit button in Feedback dialogbox must have layout indicating its a button (#16954)

Update feedback-popup.component.html

Fix yaml generation (#16921)

* Fix yaml generation

* Fix indexes

* Add tests

fix null bug

fix bug in constructor

fix bug2

interaction id related bug

1

test interaction id bug

1

interaction id null test bug

1

add test coverage

recordLearnerAnswer interaction id not null

add coverage

minor

minor

minor

minor

minor

minor

minor

* fix explorationHistoryTab test bug

* keep Interaction id null type, remove Answergroup interactionId null type

* check interactionObjectfactory interactionId null type

minor

linter check

1

* delete answergroupobjectfactory null interactionid type

* minor

* interactionobjectfactory createfrombackenddict interactionId only string

* minor

* parameter-metadata service test interaction id is not null

* minor

* minor

* minor check

* parameter-metadata.service get unset parameters info test interactionId not  null

* linter check

* linter check

* minor

* exploration-warnings service test remove answergroup
adityanarayanm095 pushed a commit to adityanarayanm095/oppia that referenced this pull request Feb 15, 2023
…ppia#17132)

* remove interactionId null type

fix interaction null type related bugs

Fix oppia#16504: Android beta page fixes (oppia#16688)

* Android beta page fixes

* address comments

* fix indentation

* fix fe test

* address comments

* code comments

* fix test

* fix test

* address comments

* address comment and fix tests

* increase z-index of button so clicks are handled correctly

* fix test

* fix coverage

Fix oppia#16648: Increases tick time to fix debounce frontend test flake (oppia#16958)

flake fix

FIX#16908 : Submit button in Feedback dialogbox must have layout indicating its a button (oppia#16954)

Update feedback-popup.component.html

Fix yaml generation (oppia#16921)

* Fix yaml generation

* Fix indexes

* Add tests

fix null bug

fix bug in constructor

fix bug2

interaction id related bug

1

test interaction id bug

1

interaction id null test bug

1

add test coverage

recordLearnerAnswer interaction id not null

add coverage

minor

minor

minor

minor

minor

minor

minor

* fix explorationHistoryTab test bug

* keep Interaction id null type, remove Answergroup interactionId null type

* check interactionObjectfactory interactionId null type

minor

linter check

1

* delete answergroupobjectfactory null interactionid type

* minor

* interactionobjectfactory createfrombackenddict interactionId only string

* minor

* parameter-metadata service test interaction id is not null

* minor

* minor

* minor check

* parameter-metadata.service get unset parameters info test interactionId not  null

* linter check

* linter check

* minor

* exploration-warnings service test remove answergroup
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.

3 participants