Skip to content

Commit 6598e01

Browse files
oyeaussieoyeaussie
committed
!410 - Fixed bug with bumping version from meta to rc to release.
- Added more options for generating releases with combination of major/minor/patch + pre-release + meta.
1 parent 16964a5 commit 6598e01

File tree

7 files changed

+303
-131
lines changed

7 files changed

+303
-131
lines changed

‎apps/Core/Components/Devtools/Modules/ModulesComponent.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,8 @@ public function viewAction()
321321
}
322322

323323
if ($this->view->newrelease) {
324+
$this->view->availableReleaseTypes = $this->modulesPackage->getAvailableReleaseTypes();
325+
324326
$module['isPreRelease'] = false;
325327
$module['preRelease'] = false;
326328
$module['buildMeta'] = false;

‎apps/Core/Packages/Devtools/Modules/DevtoolsModules.php‎

Lines changed: 238 additions & 77 deletions
Large diffs are not rendered by default.

‎apps/Core/Views/Default/html/devtools/modules/module.html‎

Lines changed: 54 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -123,21 +123,33 @@
123123
$('#custom').attr('hidden', true);
124124
$('#{{componentId}}-{{sectionId}}-custom-version').val('');
125125

126-
if (bump === 'buildMeta') {
127-
$('#{{componentId}}-{{sectionId}}-build-meta-prefix').val('');
128-
$('#{{componentId}}-{{sectionId}}-pre-release-prefix').val('');
129-
$('#{{componentId}}-{{sectionId}}-build-meta-prefix').attr('disabled', false);
130-
$('#{{componentId}}-{{sectionId}}-pre-release-prefix').attr('disabled', true);
131-
$('#{{componentId}}-{{sectionId}}-force-mark-prerelease').attr('disabled', true);
132-
$('#{{componentId}}-{{sectionId}}-force-mark-prerelease')[0].checked = true;
133-
} else if (bump === 'preRelease') {
126+
if (bump === 'preRelease' ||
127+
bump === 'major_preRelease' ||
128+
bump === 'minor_preRelease' ||
129+
bump === 'patch_preRelease'
130+
) {
134131
$('#{{componentId}}-{{sectionId}}-pre-release-prefix').val('');
135132
$('#{{componentId}}-{{sectionId}}-build-meta-prefix').val('');
136133
$('#{{componentId}}-{{sectionId}}-pre-release-prefix').attr('disabled', false);
137134
$('#{{componentId}}-{{sectionId}}-build-meta-prefix').attr('disabled', true);
138135
$('#{{componentId}}-{{sectionId}}-force-mark-prerelease').attr('disabled', true);
139136
$('#{{componentId}}-{{sectionId}}-force-mark-prerelease')[0].checked = true;
140-
} else if (bump === 'preReleaseBuildMeta') {
137+
} else if (bump === 'buildMeta' ||
138+
bump === 'major_buildMeta' ||
139+
bump === 'minor_buildMeta' ||
140+
bump === 'patch_buildMeta'
141+
) {
142+
$('#{{componentId}}-{{sectionId}}-build-meta-prefix').val('');
143+
$('#{{componentId}}-{{sectionId}}-pre-release-prefix').val('');
144+
$('#{{componentId}}-{{sectionId}}-build-meta-prefix').attr('disabled', false);
145+
$('#{{componentId}}-{{sectionId}}-pre-release-prefix').attr('disabled', true);
146+
$('#{{componentId}}-{{sectionId}}-force-mark-prerelease').attr('disabled', true);
147+
$('#{{componentId}}-{{sectionId}}-force-mark-prerelease')[0].checked = true;
148+
} else if (bump === 'preReleaseBuildMeta' ||
149+
bump === 'major_preReleaseBuildMeta' ||
150+
bump === 'minor_preReleaseBuildMeta' ||
151+
bump === 'patch_preReleaseBuildMeta'
152+
) {
141153
$('#{{componentId}}-{{sectionId}}-pre-release-prefix').val('');
142154
$('#{{componentId}}-{{sectionId}}-build-meta-prefix').val('');
143155
$('#{{componentId}}-{{sectionId}}-pre-release-prefix').attr('disabled', false);
@@ -172,19 +184,31 @@
172184
postData['force-mark-prerelease'] = $('#{{componentId}}-{{sectionId}}-force-mark-prerelease')[0].checked;
173185
postData['bump'] = bump;
174186

175-
if (bump === 'preRelease') {
187+
if (bump === 'preRelease' ||
188+
bump === 'major_preRelease' ||
189+
bump === 'minor_preRelease' ||
190+
bump === 'patch_preRelease'
191+
) {
176192
postData['preReleasePrefix'] = $('#{{componentId}}-{{sectionId}}-pre-release-prefix').val();
177193
if (postData['preReleasePrefix'] === '') {
178194
PNotify.error({'text': 'Provide pre-release prefix.'});
179195
return;
180196
}
181-
} else if (bump === 'buildMeta') {
197+
} else if (bump === 'buildMeta' ||
198+
bump === 'major_buildMeta' ||
199+
bump === 'minor_buildMeta' ||
200+
bump === 'patch_buildMeta'
201+
) {
182202
postData['buildMetaPrefix'] = $('#{{componentId}}-{{sectionId}}-build-meta-prefix').val();
183203
if (postData['buildMetaPrefix'] === '') {
184204
PNotify.error({'text': 'Provide build meta prefix.'});
185205
return;
186206
}
187-
} else if (bump === 'preReleaseBuildMeta') {
207+
} else if (bump === 'preReleaseBuildMeta' ||
208+
bump === 'major_preReleaseBuildMeta' ||
209+
bump === 'minor_preReleaseBuildMeta' ||
210+
bump === 'patch_preReleaseBuildMeta'
211+
) {
188212
postData['preReleasePrefix'] = $('#{{componentId}}-{{sectionId}}-pre-release-prefix').val();
189213
postData['buildMetaPrefix'] = $('#{{componentId}}-{{sectionId}}-build-meta-prefix').val();
190214
if (postData['preReleasePrefix'] === '') {
@@ -301,24 +325,36 @@
301325
$('#{{componentId}}-{{sectionId}}').BazContentSectionWithForm({'task':'validateForm'});
302326

303327
if ($('#{{componentId}}-{{sectionId}}-alert').length === 0) {
304-
$('#generate').attr('disabled', true);
305-
$('#generate').children('i').removeClass('fa-wand-sparkles').addClass('fa-spin fa-cog');
328+
// $('#generate').attr('disabled', true);
329+
// $('#generate').children('i').removeClass('fa-wand-sparkles').addClass('fa-spin fa-cog');
306330

307331
var postData = { };
308332
postData['bump'] = $('#{{componentId}}-{{sectionId}}-release-type').val();
309-
if (postData['bump'] === 'preRelease') {
333+
if (postData['bump'] === 'preRelease' ||
334+
postData['bump'] === 'major_preRelease' ||
335+
postData['bump'] === 'minor_preRelease' ||
336+
postData['bump'] === 'patch_preRelease'
337+
) {
310338
postData['preReleasePrefix'] = $('#{{componentId}}-{{sectionId}}-pre-release-prefix').val();
311339
if (postData['preReleasePrefix'] === '') {
312340
PNotify.error({'text': 'Provide pre-release prefix.'});
313341
return;
314342
}
315-
} else if (postData['bump'] === 'buildMeta') {
343+
} else if (postData['bump'] === 'buildMeta' ||
344+
postData['bump'] === 'major_buildMeta' ||
345+
postData['bump'] === 'minor_buildMeta' ||
346+
postData['bump'] === 'patch_buildMeta'
347+
) {
316348
postData['buildMetaPrefix'] = $('#{{componentId}}-{{sectionId}}-build-meta-prefix').val();
317349
if (postData['buildMetaPrefix'] === '') {
318350
PNotify.error({'text': 'Provide build meta prefix.'});
319351
return;
320352
}
321-
} else if (postData['bump'] === 'preReleaseBuildMeta') {
353+
} else if (postData['bump'] === 'preReleaseBuildMeta' ||
354+
postData['bump'] === 'major_preReleaseBuildMeta' ||
355+
postData['bump'] === 'minor_preReleaseBuildMeta' ||
356+
postData['bump'] === 'patch_preReleaseBuildMeta'
357+
) {
322358
postData['preReleasePrefix'] = $('#{{componentId}}-{{sectionId}}-pre-release-prefix').val();
323359
postData['buildMetaPrefix'] = $('#{{componentId}}-{{sectionId}}-build-meta-prefix').val();
324360
if (postData['preReleasePrefix'] === '') {
@@ -1223,6 +1259,7 @@
12231259
$('#repo-details').attr('hidden', false);
12241260
$('#module-details').attr('hidden', true);
12251261
$('.addData').attr('hidden', true);
1262+
$('.updateData').attr('hidden', true);
12261263
$('.cancelForm').attr('hidden', true);
12271264
$('.closeForm').attr('hidden', false);
12281265

‎apps/Core/Views/Default/html/devtools/modules/module/release.html‎

Lines changed: 5 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -175,40 +175,11 @@
175175
'fieldAdditionalClass' : 'mb-2',
176176
'fieldBazScan' : true,
177177
'fieldHelpTooltipContent' : 'Select release type: Major, Minor Or Patch.',
178-
'fieldDataSelect2Options' : {
179-
'major' : {
180-
'id' : 'major',
181-
'name' : 'MAJOR'
182-
},
183-
'minor' : {
184-
'id' : 'minor',
185-
'name' : 'MINOR'
186-
},
187-
'patch' : {
188-
'id' : 'patch',
189-
'name' : 'PATCH'
190-
},
191-
'preRelease' : {
192-
'id' : 'preRelease',
193-
'name' : 'PRE RELEASE'
194-
},
195-
'buildMeta' : {
196-
'id' : 'buildMeta',
197-
'name' : 'BUILD META'
198-
},
199-
'preReleaseBuildMeta' : {
200-
'id' : 'preReleaseBuildMeta',
201-
'name' : 'PRE RELEASE + BUILD META'
202-
},
203-
'custom' : {
204-
'id' : 'custom',
205-
'name' : 'CUSTOM (NON SEMANTIC VERSION)'
206-
}
207-
},
208-
'fieldDataSelect2OptionsArray' : true,
209-
'fieldDataSelect2OptionsKey' : 'id',
210-
'fieldDataSelect2OptionsValue' : 'name',
211-
'fieldDataSelect2OptionsSelected' : releastTypeSelect
178+
'fieldDataSelect2Options' : availableReleaseTypes,
179+
'fieldDataSelect2OptionsArray' : true,
180+
'fieldDataSelect2OptionsKey' : 'id',
181+
'fieldDataSelect2OptionsValue' : 'name',
182+
'fieldDataSelect2OptionsSelected' : releastTypeSelect
212183
]
213184
)}}
214185
</div>

‎apps/Core/Views/Default/html/devtools/modules/view.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@
6565
'cardBodyInclude' : 'modules/module',
6666
'formButtons' :
6767
[
68-
'cancelActionUrl' : 'devtools/modules'
68+
'cancelActionUrl' : 'devtools/modules',
69+
'closeActionUrl' : 'devtools/modules'
6970
],
7071
'formSecondaryButtons' :
7172
[

‎system/Base/Installer/Packages/Setup/Register/Modules/Packages/Providers/Core/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"module_type" : "packages",
66
"app_type" : "core",
77
"category" : "providers",
8-
"version" : "0.0.0",
8+
"version" : "0.0.0-rc.1",
99
"repo" : "https://dev.bazaari.com.au/sp-core/core",
1010
"class" : "System\\Base\\Providers\\CoreServiceProvider\\Core",
1111
"dependencies" :

‎system/Base/Installer/Packages/Setup/Schema/Providers/Apps/Types.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function columns()
4949
'version',
5050
[
5151
'type' => Column::TYPE_VARCHAR,
52-
'size' => 15,
52+
'size' => 100,
5353
'notNull' => true,
5454
]
5555
),

0 commit comments

Comments
 (0)