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

Allow importing OBS markdown files #461

Merged
merged 2 commits into from
Jul 1, 2019
Merged

Allow importing OBS markdown files #461

merged 2 commits into from
Jul 1, 2019

Conversation

aunger
Copy link
Contributor

@aunger aunger commented Jun 27, 2019

  • MimeType enum instead of string literals.
  • Ignore creator if unable to match help RCs otherwise.
  • Unhide the Tree generics.
  • More type safety.

For #460
Also see WycliffeAssociates/otter-common#106

MimeType enum instead of string literals.
Ignore creator if unable to match help RCs otherwise.
Unhide the Tree generics.
More type safety.
@@ -103,7 +110,7 @@ class ResourceContainerRepository(
private val helpContentTypes = listOf(ContentType.TITLE, ContentType.BODY)
private val dublinCoreIdDslVal = DSL.`val`(dublinCoreId)

fun import(node: TreeNode) {
fun import(node: OtterTreeNode<Any>) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Should Any change to CollectionOrContent?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes. Fixed now.

@jsarabia jsarabia merged commit a7adc0e into dev Jul 1, 2019
@jsarabia jsarabia deleted the rba-obs-import branch July 1, 2019 12:03
KJoslyn pushed a commit that referenced this pull request Jul 1, 2019
* Allow importing OBS markdown files.

MimeType enum instead of string literals.
Ignore creator if unable to match help RCs otherwise.
Unhide the Tree generics.
More type safety.

* Narrow down a few more OtterTree<Any> params.
jsarabia pushed a commit that referenced this pull request Jul 2, 2019
* Resource takes page view

* Test app for resource take cards

* Added test wav files

* Renamed test app

* Takes view model

* Load test text and takes

* Navigate to takes from resources list (load real data)

* TakesListView and Play/Pause event handling

* Takes page refactor

Fix broken Takes Fragment

* Support change to Resource

* Refactoring to support RecordableItem

* Use observable list of Recordables rather than 'title' and 'body'

* Better names for Takes fragments

* WorkbookViewModel

* navigateToTakesPage() uses BookElement

* Support change to RecordTake

* New take action

* Put tab label properties in an enum map

* Add sort to tabs

* Fixed bug in TakeDao

* Proper subscribe handling

* Add vgrow to workspace root to fill screen

* Dispose takes subscription when Recordable changes

* Remove test files to be put in test branch

* WorkbookViewModel getters return non-null values or throw error

* Remove code dependent on testapp files

* Utility function for EnumMap: getNotNull()

* Bug fix for TakesTab clear disposables

* Restore functionality to TMVM recordContent (sort of)

TakeManagementViewModel will be merged with TakesViewModel soon, so these changes will be obsolete when that happens.

* PR Comments

* PR Comments

* PR Comments and applying FileName pattern

* Using Recordable Interface and WorkbookFileNamerBuilder

* Simplified WorkbookFileNameBuilder

* Using simplified FileNamer

* Better filenames

* Renamed to RecordResourceViewModel

Moved recording functionality to TakeManagementViewModel (which needs to be refactored later)

* Removed Platform.runLater where it is not necessary

* Refactored RecordableTab, added RecordableTabViewModel

* Minor improvements

* ResourcesViewModel tests and RecordableTab tests

* Allow importing OBS markdown files (#461)

* Allow importing OBS markdown files.

MimeType enum instead of string literals.
Ignore creator if unable to match help RCs otherwise.
Unhide the Tree generics.
More type safety.

* Narrow down a few more OtterTree<Any> params.

* Test cleanup

* Fix broken unit tests

* Update travis.yml to include chromeabletabpane

* Remove RecordableTabTest until better solution found

It used PlatformImpl.startup, which errors on travis
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