Skip to content

Commit

Permalink
Merge pull request #35308 from dimagi/ze/mobile-ucr-migration-link
Browse files Browse the repository at this point in the history
Mobile UCR Version Migration Link
  • Loading branch information
zandre-eng authored Oct 31, 2024
2 parents 2f67c50 + e32adc0 commit 9c92007
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ hqDefine('app_manager/js/releases/releases', function () {
self.buildState = ko.observable('');
self.buildErrorCode = ko.observable('');
self.errorMessage = ko.observable(self.genericErrorMessage);
self.releaseErrorMessage = ko.observable();
self.onlyShowReleased = ko.observable(false);
self.fetchState = ko.observable('');
self.fetchLimit = ko.observable();
Expand Down Expand Up @@ -387,6 +388,7 @@ hqDefine('app_manager/js/releases/releases', function () {
};

self.toggleRelease = function (savedApp, event) {
self.releaseErrorMessage(null);
$(event.currentTarget).parent().prev('.js-release-waiting').removeClass('hide');
var isReleased = savedApp.is_released();
var savedAppId = savedApp.id();
Expand All @@ -404,7 +406,7 @@ hqDefine('app_manager/js/releases/releases', function () {
},
success: function (data) {
if (data.error) {
alert(data.error);
self.releaseErrorMessage(data.error);
$(event.currentTarget).parent().prev('.js-release-waiting').addClass('hide');
savedApp.is_released(isReleased);
} else {
Expand Down Expand Up @@ -492,6 +494,7 @@ hqDefine('app_manager/js/releases/releases', function () {
self.actuallyMakeBuild = function () {
self.buildState('pending');
self.errorMessage(self.genericErrorMessage);
self.releaseErrorMessage(null);
$.post({
url: self.reverse('save_copy'),
success: function (data) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@
<span data-bind="visible: buildErrorCode() !== 403, text: errorMessage">
</span>
</div>
<div class="alert alert-danger" data-bind="html: releaseErrorMessage, visible: releaseErrorMessage">
</div>

<h4 id="loading" class="hide"
data-bind="visible: showLoadingSpinner(), css: {hide: false}">
Expand Down
22 changes: 16 additions & 6 deletions corehq/apps/app_manager/views/releases.py
Original file line number Diff line number Diff line change
Expand Up @@ -405,14 +405,24 @@ def _track_build_for_app_preview(domain, couch_user, app_id, message):
def _check_app_for_mobile_ucr_v1_refs(domain, app):
if not toggles.MOBILE_UCR.enabled(domain):
return

mobile_ucr_doc_url = 'https://commcare-hq.readthedocs.io/ucr/mobile_ucr_v2_migration_guide.html'
if app.mobile_ucr_restore_version != '2.0':
return _("The mobile UCR restore version for v%(app_version)s needs to be updated to V2.0") % {
'app_version': app.version,
}
return mark_safe(_(
"The mobile UCR restore version for v%(app_version)s needs to be updated to V2.0. "
"Please refer to the <a href='%(url)s'>migration documentation</a> for more details."
) % {
"app_version": app.version,
"url": mobile_ucr_doc_url,
})
if does_app_have_mobile_ucr_v1_refs(app):
return _("One or more forms for v%(app_version)s contain V1 Mobile UCR references.") % {
'app_version': app.version,
}
return mark_safe(_(
"One or more forms for v%(app_version)s contain V1 Mobile UCR references."
"Please refer to the <a href='%(url)s'>migration documentation</a> for more details."
) % {
"app_version": app.version,
"url": mobile_ucr_doc_url,
})


@no_conflict_require_POST
Expand Down

0 comments on commit 9c92007

Please sign in to comment.