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

[BUMP] Lock file maintenance (admin) #9338

Merged
merged 3 commits into from
Jul 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions admin/app/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import 'flatpickr/dist/l10n';

import Application from '@ember/application';
import { dom, library } from '@fortawesome/fontawesome-svg-core';
import Inflector from 'ember-inflector';
import loadInitializers from 'ember-load-initializers';
import config from 'pix-admin/config/environment';

Expand All @@ -16,8 +15,6 @@ class App extends Application {
Resolver = Resolver;
}

Inflector.inflector.irregular('badge-criterion', 'badge-criteria');

library.add(fapixTachometer, fapixPersonExport);
dom.watch();

Expand Down
13 changes: 13 additions & 0 deletions admin/app/initializers/custom-inflector-rules.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import Inflector from 'ember-inflector';

export function initialize() {
const inflector = Inflector.inflector;

inflector.irregular('badge-criterion', 'badge-criteria');
}

export default {
name: 'custom-inflector-rules',
before: 'ember-cli-mirage',
initialize,
};
2 changes: 1 addition & 1 deletion admin/ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ module.exports = function (defaults) {
staticModifiers: true,
packagerOptions: {
webpackConfig: {
devtool: sourceMapConfig[process.env.CI ? 'test' : process.env.NODE_ENV ?? 'default'],
devtool: sourceMapConfig[process.env.CI ? 'test' : (process.env.NODE_ENV ?? 'default')],
},
},
});
Expand Down
16 changes: 11 additions & 5 deletions admin/mirage/handlers/badge-criteria.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
function updateBadgeCriterion(schema, request) {
const badgeCriterionId = request.params.id;
const params = JSON.parse(request.requestBody);
try {
const badgeCriterionId = request.params.id;
const params = JSON.parse(request.requestBody);

const badgeCriterion = schema.badgeCriteria.find(badgeCriterionId);
badgeCriterion.update(params.data.attributes);
console.log(schema);

return badgeCriterion;
const badgeCriterion = schema.badgeCriteria.find(badgeCriterionId);
badgeCriterion.update(params.data.attributes);

return badgeCriterion;
} catch (error) {
console.error(error);
}
}

export { updateBadgeCriterion };
4 changes: 2 additions & 2 deletions admin/mirage/serializers/application.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import Inflector from 'ember-inflector';
import { pluralize } from '@ember-data/request-utils/string';
import { JSONAPISerializer } from 'miragejs';

export default JSONAPISerializer.extend({
typeKeyForModel(model) {
return Inflector.inflector.pluralize(model.modelName);
return pluralize(model.modelName);
},
});
Loading