Skip to content

Commit

Permalink
Remove use of filters in <template> tags
Browse files Browse the repository at this point in the history
  • Loading branch information
Quetzacoalt91 committed Jan 2, 2024
1 parent 99e531f commit ccf03c0
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 50 deletions.
1 change: 0 additions & 1 deletion _dev/apps/ui/.storybook/preview.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ initialize({

// import showdown extension
import '../showdown.js';
import '../src/utils/Filters';

// app.scss all the styles for the module
import '../src/assets/scss/app.scss';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
$t('smartShoppingCampaignCreation.inputDurationLabel1')
}} </span><br>
<span class="text-secondary">
{{ newCampaign.startDate | timeConverterToDate }}
{{ startDate }}
</span>
</b-col>
<b-col
Expand Down Expand Up @@ -74,7 +74,7 @@
{{ $t('smartShoppingCampaignCreation.inputBudgetFeedback') }}
</dt>
<dd class="text-secondary mb-2">
{{ newCampaign.dailyBudget|formatPrice(newCampaign.currencyCode) }}
{{ dailyBudget }}
</dd>
</dl>
<p>
Expand Down Expand Up @@ -111,7 +111,8 @@ import PsModal from '@/components/commons/ps-modal.vue';
import SegmentGenericParams from '@/utils/SegmentGenericParams';
import compareYears from '@/utils/CompareYears';
import {changeCountryNameToCode} from '@/utils/Countries';
import { timeConverterToDate } from '@/utils/Dates';
import {timeConverterToDate} from '@/utils/Dates';
import {formatPrice} from '@/utils/Price';
export default defineComponent({
name: 'SSCCreationPopinRecap',
Expand Down Expand Up @@ -150,6 +151,9 @@ export default defineComponent({
dimensionName() {
return this.$store.state.campaigns.dimensionChosen.name;
},
startDate(): string {
return timeConverterToDate(this.newCampaign.startDate);
},
endDate() {
if (this.newCampaign.endDate) {
const isThereAnEndDate = compareYears(this.newCampaign.endDate);
Expand All @@ -160,6 +164,12 @@ export default defineComponent({
}
return '-';
},
dailyBudget(): string {
return formatPrice(
this.newCampaign.dailyBudget,
this.newCampaign.currencyCode,
);
},
},
methods: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<b-form-group
:label-for="field.label | slugify"
:label-for="slugifiedLabel"
label-class="d-flex align-items-center"
>
<b-dropdown
Expand Down Expand Up @@ -65,6 +65,7 @@
import {PropType, defineComponent} from 'vue';
import googleUrl from '@/assets/json/googleUrl.json';
import {FieldsContent, RecommendedFieldType, arrayEquals} from '@/utils/AttributeMapping';
import slugify from '@/utils/Slugify';
export default defineComponent({
data() {
Expand Down Expand Up @@ -115,6 +116,9 @@ export default defineComponent({
displayEventuallyRequiredMessage() {
return !this.attributesChecked.length && this.field.name !== 'description';
},
slugifiedLabel(): string {
return slugify(this.field.label);
},
},
methods: {
findAttribute(attr) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ import TableRowMapping from '@/components/product-feed/commons/table-row-mapping
import SegmentGenericParams from '@/utils/SegmentGenericParams';
import ProductFeedSummaryCards from '@/components/product-feed/summary/product-feed-summary-cards.vue';
import {getDataFromLocalStorage} from '@/utils/LocalStorage';
import { timeConverterToHour, timeConverterToStringifiedDate } from '@/utils/Dates';
import {timeConverterToHour, timeConverterToStringifiedDate} from '@/utils/Dates';
dayjs.extend(duration);
Expand Down
1 change: 0 additions & 1 deletion _dev/apps/ui/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import store from './store';
import App from './App.vue';
import i18n from './lib/i18n';
import './assets/scss/app.scss';
import './utils/Filters';
// import showdown extension
import '../showdown.js';
import '@/utils/Sentry';
Expand Down
28 changes: 0 additions & 28 deletions _dev/apps/ui/src/utils/Filters.ts

This file was deleted.

13 changes: 13 additions & 0 deletions _dev/apps/ui/src/utils/Slugify.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
export const slugify = (...args: (string | number)[]): string => {
const value = args.join(' ');

return value
.normalize('NFD') // split an accented letter in the base letter and the acent
.replace(/[\u0300-\u036f]/g, '') // remove all previously split accents
.toLowerCase()
.trim()
.replace(/[^a-z0-9 ]/g, '') // remove all chars not letters, numbers and spaces (to be replaced)
.replace(/\s+/g, '-'); // separator
};

export default slugify;
17 changes: 2 additions & 15 deletions _dev/apps/ui/tests/init.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import '../showdown.js';
let windowSpy;
let localVue; // eslint-disable-line
const defaultLocale = 'en';
let filters; // eslint-disable-line
let VBTooltip;

beforeAll(() => {
Expand All @@ -29,19 +28,7 @@ beforeEach(() => {
i18nSettings: {isoCode: 'fr', languageLocale: 'fr'},
}));
VBTooltip = vi.fn();
filters = {
timeConverterToDate: vi.fn(),
timeConverterToHour: vi.fn(),
changeCountriesCodesToNames: vi.fn().mockImplementation(changeCountriesCodesToNames),
timeConverterToStringifiedDate: vi.fn().mockImplementation(() => ''),
slugify: vi.fn().mockImplementation(() => 'foo'),
};

localVue.filter('timeConverterToDate', filters.timeConverterToDate);
localVue.filter('timeConverterToHour', filters.timeConverterToHour);
localVue.filter('changeCountriesCodesToNames', filters.changeCountriesCodesToNames);
localVue.filter('timeConverterToStringifiedDate', filters.timeConverterToStringifiedDate);
localVue.filter('slugify', filters.slugify);

localVue.directive('b-tooltip', VBTooltip);

initOnboardingClient({
Expand Down Expand Up @@ -92,7 +79,7 @@ export default {config};

export {cloneStore} from './store';

export {localVue, filters};
export {localVue};

export const addShowdownToVue = () => {
localVue.use(VueShowdown);
Expand Down

0 comments on commit ccf03c0

Please sign in to comment.