Skip to content

Commit 6cb99f5

Browse files
PerplexedThetaPerplexedTheta
committed
chore: general stability fixes for production
1 parent 8ef0e05 commit 6cb99f5

File tree

4 files changed

+80
-61
lines changed

4 files changed

+80
-61
lines changed

‎Koha/Plugin/Com/PerplexedTheta/SENUX.pm‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,6 @@ sub uninstall {
7575
sub npm_new {
7676
my ( $self, $args ) = @_;
7777

78-
return undef
79-
unless ( $self->npm_delete );
80-
8178
return undef
8279
unless ( $self->_chdir( { path => abs_path( $self->mbf_dir ) . '/static_files' } ) );
8380

@@ -159,7 +156,7 @@ sub npm_delete {
159156
return undef
160157
unless ( $self->_chdir( { path => abs_path( $self->mbf_dir ) . '/static_files' } ) );
161158

162-
my $delete = `bash -- ./manage_senux.sh --delete 2>&1`;
159+
my $delete = `bash -- ./manage_senux.sh --delete-all 2>&1`;
163160
unless ( $? == 0 ) {
164161
$self->_throw_error(
165162
{

‎Koha/Plugin/Com/PerplexedTheta/SENUX/configure.tt‎

Lines changed: 46 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -221,80 +221,98 @@
221221
$('#variables_scss_form').on('submit', event => {
222222
event.preventDefault();
223223

224-
return (async() => {
224+
(async() => {
225225
spinner = new SpinnerManager('variables_scss');
226226
spinner.showSpinner();
227227

228-
await variables_scss_SenuxManager.updateSetting();
229-
await genericApiManager.triggerBuild('variables_scss', 'sass');
228+
try {
229+
await variables_scss_SenuxManager.updateSetting();
230+
await genericApiManager.triggerBuild('variables_scss', 'sass');
230231

231-
spinner.hideSpinner();
232-
233-
return false;
232+
spinner.hideSpinner();
233+
} catch(error) {
234+
spinner.hideSpinner();
235+
}
234236
})();
237+
238+
return false;
235239
});
236240

237241
$('#customisations_scss_form').on('submit', event => {
238242
event.preventDefault();
239243

240-
return (async() => {
244+
(async() => {
241245
spinner = new SpinnerManager('customisations_scss');
242246
spinner.showSpinner();
243247

244-
await customisations_scss_SenuxManager.updateSetting();
245-
await genericApiManager.triggerBuild('customisations_scss', 'sass');
246-
247-
spinner.hideSpinner();
248+
try {
249+
await customisations_scss_SenuxManager.updateSetting();
250+
await genericApiManager.triggerBuild('customisations_scss', 'sass');
248251

249-
return false;
252+
spinner.hideSpinner();
253+
} catch(error) {
254+
spinner.hideSpinner();
255+
}
250256
})();
257+
258+
return false;
251259
});
252260

253261
$('#customisations_js_form').on('submit', event => {
254262
event.preventDefault();
255263

256-
return (async() => {
264+
(async() => {
257265
spinner = new SpinnerManager('customisations_js');
258266
spinner.showSpinner();
259267

260-
await customisations_js_SenuxManager.updateSetting();
261-
await genericApiManager.triggerBuild('customisations_js', 'js');
262-
263-
spinner.hideSpinner();
268+
try {
269+
await customisations_js_SenuxManager.updateSetting();
270+
await genericApiManager.triggerBuild('customisations_js', 'js');
264271

265-
return false;
272+
spinner.hideSpinner();
273+
} catch(error) {
274+
spinner.hideSpinner();
275+
}
266276
})();
277+
278+
return false;
267279
});
268280

269281
$('#rebuild_all_form').on('submit', event => {
270282
event.preventDefault();
271283

272-
return (async() => {
284+
(async() => {
273285
spinner = new SpinnerManager('rebuild_all');
274286
spinner.showSpinner();
275287

276-
await genericApiManager.triggerBuild('rebuild_all', 'all');
277-
278-
spinner.hideSpinner();
288+
try {
289+
await genericApiManager.triggerBuild('rebuild_all', 'all');
279290

280-
return false;
291+
spinner.hideSpinner();
292+
} catch(error) {
293+
spinner.hideSpinner();
294+
}
281295
})();
296+
297+
return false;
282298
});
283299

284300
$('#reset_all_form').on('submit', event => {
285301
event.preventDefault();
286302

287303
if(confirm('Are you really sure you wish to start from scratch?'))
288304
if(confirm('Doubly sure?'))
289-
return (async() => {
305+
(async() => {
290306
spinner = new SpinnerManager('reset_all');
291307
spinner.showSpinner();
292308

293-
await genericApiManager.triggerReset('yes_please');
294-
295-
spinner.hideSpinner();
309+
try {
310+
await genericApiManager.triggerReset('yes_please');
296311

297-
return false;
312+
spinner.hideSpinner();
313+
} catch(error) {
314+
spinner.hideSpinner();
315+
}
298316
})();
299317

300318
return false;

‎Koha/Plugin/Com/PerplexedTheta/SENUX/static_files/gulpfile.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ gulp.task('compile-sass', function () {
1313
.pipe(sass({
1414
outputStyle: 'compressed',
1515
precision: 3,
16-
errLogToConsole: true,
16+
silenceDeprecations: ['legacy-js-api', 'import', 'global-builtin', 'color-functions'],
17+
quietDeps: true,
1718
includePaths: ['node_modules/']
1819
}).on('error', console.error))
1920
.pipe(gulp.dest('dist')); // Output directory for CSS files

‎Koha/Plugin/Com/PerplexedTheta/SENUX/static_files/manage_senux.sh‎

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@ alias npx="$(which npx)"
1414
cd "${SCRIPT_DIR}"
1515

1616
build_js() {
17-
npx gulp js || exit 1
17+
npx gulp js || exit $?
1818

19-
return
19+
return 0
2020
}
2121

2222
build_sass() {
23-
npx gulp sass || exit 1
23+
npx gulp sass || exit $?
2424

25-
return
25+
return 0
2626
}
2727

2828
build_all() {
2929
build_js
3030
build_sass
3131

32-
return
32+
return 0
3333
}
3434

3535
init() {
@@ -38,37 +38,38 @@ init() {
3838
cp -nv "${SCRIPT_DIR}/src/js/customisations.sample.js" "${SCRIPT_DIR}/customisations.js"
3939
build_all
4040

41-
return
41+
return 0
4242
}
4343

4444
install() {
45-
mkdir -pv "${SCRIPT_DIR}/node_cache" || exit 1
46-
mkdir -pv "${SCRIPT_DIR}/node_modules" || exit 1
47-
npm install --include=dev || exit 1
45+
mkdir -pv "${SCRIPT_DIR}/node_cache" || exit $?
46+
mkdir -pv "${SCRIPT_DIR}/node_modules" || exit $?
4847

49-
return
48+
npm install --include=dev || exit $?
49+
50+
return 0
5051
}
5152

5253
install_all() {
5354
install
5455
init
5556

56-
return
57+
return 0
5758
}
5859

5960
reset() {
6061
cp -fv "${SCRIPT_DIR}/src/js/customisations.sample.js" "${SCRIPT_DIR}/customisations.js"
6162
build_all
6263

63-
return
64+
return 0
6465
}
6566

6667
reset_all() {
6768
cp -fv "${SCRIPT_DIR}/src/css/variables.sample.scss" "${SCRIPT_DIR}/variables.scss"
6869
cp -fv "${SCRIPT_DIR}/src/css/customisations.sample.scss" "${SCRIPT_DIR}/customisations.scss"
6970
reset
7071

71-
return
72+
return 0
7273
}
7374

7475
delete() {
@@ -78,7 +79,7 @@ delete() {
7879
rm -fv "${SCRIPT_DIR}/dist/senux.min.js"
7980
rm -fv "${SCRIPT_DIR}/dist/senux.min.css"
8081

81-
return
82+
return 0
8283
}
8384

8485
delete_all() {
@@ -87,7 +88,7 @@ delete_all() {
8788
rm -fv "${SCRIPT_DIR}/customisations.js"
8889
delete
8990

90-
return
91+
return 0
9192
}
9293

9394
usage() {
@@ -146,35 +147,35 @@ Options:
146147
147148
EOF
148149

149-
exit 0
150+
return 0
150151
}
151152

152153
while true; do
153154
case "$1" in
154155
-bj|--build-js)
155-
build_js ; shift ;;
156+
build_js ; exit 0 ;;
156157
-bs|--build-sass)
157-
build_sass ; shift ;;
158+
build_sass ; exit 0 ;;
158159
-ba|--build-all)
159-
build_all ; shift ;;
160+
build_all ; exit 0 ;;
160161
-in|--init)
161-
init ; shift ;;
162+
init ; exit 0 ;;
162163
-i|--install)
163-
install ; shift ;;
164+
install ; exit 0 ;;
164165
-ia|--install-all)
165-
install_all ; shift ;;
166+
install_all ; exit 0 ;;
166167
-r|--reset)
167-
reset ; shift ;;
168+
reset ; exit 0 ;;
168169
-ra|--reset-all)
169-
reset_all ; shift ;;
170+
reset_all ; exit 0 ;;
170171
-d|--delete)
171-
delete ; shift ;;
172+
delete ; exit 0 ;;
172173
-da|--delete-all)
173-
delete_all ; shift ;;
174+
delete_all ; exit 0 ;;
174175
-m|--man)
175-
usage ; shift ;;
176+
usage ; exit 0 ;;
176177
-h|--help)
177-
usage ; shift ;;
178+
usage ; exit 0 ;;
178179
--)
179180
shift ; break ;;
180181
*)
@@ -183,3 +184,5 @@ while true; do
183184

184185
exit 0
185186
done
187+
188+
exit 0

0 commit comments

Comments
 (0)