Skip to content

Validate SNOMED Version URI before submission #20

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.

Sign up for GitHub

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

Open
lawley wants to merge 1 commit into
base: master
Choose a base branch
from
+43 −9
Open

Validate SNOMED Version URI before submission #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 28 additions & 1 deletion src/main/webapp/scripts/controllers/AddEditReleaseVersionModalController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,33 @@ angular.module('MLDS').controller('AddEditReleaseVersionModalController',
$scope.releasePackage = releasePackage;
$scope.releaseVersion = releaseVersion;

// SNOMED CT version URI
var SCT_VERSION_URI_RE = /^http:\/\/snomed\.info\/x?sct\/[0-9]{6,18}\/version\/(19|20)[0-9]{2}(0[1-9]|1[0-2])(0[1-9]|[12][0-9]|3[01])$/;

var ANY_RE = /^.*$/;

function isOtherPackage() {
return $scope.releaseVersion && $scope.releaseVersion.packageType === 'OTHER';
};

// NB: these return shared constants, never freshly-constructed values, so the
// ngPattern and interpolation watchers stay reference-stable across digests.
$scope.versionUriPattern = function() {
return isOtherPackage() ? ABSOLUTE_URI_RE : SCT_VERSION_URI_RE;
};

$scope.versionUriPlaceholder = function() {
return isOtherPackage()
? 'Enter release version'
: 'http://snomed.info/sct/<moduleId>/version/<YYYYMMDD>';
};

$scope.versionUriError = function() {
return isOtherPackage()
? ''
: 'Must be a valid SNOMED CT version URI, e.g. http://snomed.info/sct/32506021000036107/version/20260601 (scheme must be http, not https)';
};

$scope.submitAttempted = false;
$scope.submitting = false;
$scope.alerts = [];
Expand Down Expand Up @@ -48,4 +75,4 @@ angular.module('MLDS').controller('AddEditReleaseVersionModalController',
});
};

}]);
}]);
23 changes: 15 additions & 8 deletions src/main/webapp/views/admin/addEditReleaseVersionModal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,27 @@ <h3 class="modal-title" ng-show="!isNewObject">Edit Release Version</h3>

<div class="form-group">
<label>Release Version URI</label>
<input class="form-control" placeholder="Enter Release Version URI"
name="versionURI" ng-model="releaseVersion.versionURI">
<input class="form-control" placeholder="{{versionUriPlaceholder()}}"
name="versionURI" ng-model="releaseVersion.versionURI"
ng-pattern="versionUriPattern()" ng-required="true">
<span ng-show="formPackageVersion.versionURI.$error.required && submitAttempted" class="help-block">Required Field</span>
<span ng-show="formPackageVersion.versionURI.$error.pattern && submitAttempted" class="help-block">{{versionUriError()}}</span>
</div>

<div class="form-group">
<label>Release Version Dependent URI</label>
<input class="form-control" placeholder="Enter Release Version Dependent URI"
name="versionDependentURI" ng-model="releaseVersion.versionDependentURI">
<label>Release Version Dependent URI</label>
<input class="form-control" placeholder="http://snomed.info/sct/&lt;moduleId&gt;/version/&lt;YYYYMMDD&gt;"
name="versionDependentURI" ng-model="releaseVersion.versionDependentURI"
ng-pattern="/^http:\/\/snomed\.info\/sct\/[0-9]{6,18}\/version\/(19|20)[0-9]{2}(0[1-9]|1[0-2])(0[1-9]|[12][0-9]|3[01])$/">
<span ng-show="formPackageVersion.versionDependentURI.$error.pattern && submitAttempted" class="help-block">Must be a SNOMED CT version URI, e.g. http://snomed.info/sct/32506021000036107/version/20260601 (scheme must be http, not https)</span>
</div>

<div class="form-group">
<label>Release Version Dependent Derivative URI</label>
<input class="form-control" placeholder="Enter Release Version Dependent Derivative URI"
name="versionDependentDerivativeURI" ng-model="releaseVersion.versionDependentDerivativeURI">
<label>Release Version Dependent Derivative URI</label>
<input class="form-control" placeholder="http://snomed.info/sct/&lt;moduleId&gt;/version/&lt;YYYYMMDD&gt;"
name="versionDependentDerivativeURI" ng-model="releaseVersion.versionDependentDerivativeURI"
ng-pattern="/^http:\/\/snomed\.info\/sct\/[0-9]{6,18}\/version\/(19|20)[0-9]{2}(0[1-9]|1[0-2])(0[1-9]|[12][0-9]|3[01])$/">
<span ng-show="formPackageVersion.versionDependentDerivativeURI.$error.pattern && submitAttempted" class="help-block">Must be a SNOMED CT version URI, e.g. http://snomed.info/sct/32506021000036107/version/20260601 (scheme must be http, not https)</span>
</div>
<!-- release package-->

Expand Down