Merge branch 'andr3-remove-mr-regressions-fixes-from-master' into 'master'

Remove fixes for MR refactor regressions from master

See merge request gitlab-org/gitlab-ce!20920

app/assets/javascripts/notes/stores/mutations.js

@@ -174,19 +174,27 @@ export default {
   [types.UPDATE_NOTE](state, note) {
     const noteObj = utils.findNoteObjectById(state.discussions, note.discussion_id);
+
     if (noteObj.individual_note) {
       noteObj.notes.splice(0, 1, note);
     } else {
       const comment = utils.findNoteObjectById(noteObj.notes, note.id);
-      Object.assign(comment, note);
+      noteObj.notes.splice(noteObj.notes.indexOf(comment), 1, note);
     }
   },
   [types.UPDATE_DISCUSSION](state, noteData) {
     const note = noteData;
-    const selectedDiscussion = state.discussions.find(n => n.id === note.id);
+    let index = 0;
+
+    state.discussions.forEach((n, i) => {
+      if (n.id === note.id) {
+        index = i;
+      }
+    });
+
     note.expanded = true; // override expand flag to prevent collapse
-    Object.assign(selectedDiscussion, note);
+    state.discussions.splice(index, 1, note);
   },
   [types.CLOSE_ISSUE](state) {
@@ -207,9 +215,12 @@ export default {
   [types.SET_DISCUSSION_DIFF_LINES](state, { discussionId, diffLines }) {
     const discussion = utils.findNoteObjectById(state.discussions, discussionId);
-    Object.assign(discussion, {
+    const index = state.discussions.indexOf(discussion);
+    const discussionWithDiffLines = Object.assign({}, discussion, {
       truncated_diff_lines: diffLines,
     });
+
+    state.discussions.splice(index, 1, discussionWithDiffLines);
   },
 };

app/assets/javascripts/notes/stores/utils.js

@@ -2,11 +2,13 @@ import AjaxCache from '~/lib/utils/ajax_cache';
 const REGEX_QUICK_ACTIONS = /^\/\w+.*$/gm;
-export const findNoteObjectById = (notes, id) => notes.find(n => n.id === id);
+export const findNoteObjectById = (notes, id) =>
+  notes.filter(n => n.id === id)[0];
 export const getQuickActionText = note => {
   let text = 'Applying command';
-  const quickActions = AjaxCache.get(gl.GfmAutoComplete.dataSources.commands) || [];
+  const quickActions =
+    AjaxCache.get(gl.GfmAutoComplete.dataSources.commands) || [];
   const executedCommands = quickActions.filter(command => {
     const commandRegex = new RegExp(`/${command.name}`);
@@ -27,4 +29,5 @@ export const getQuickActionText = note => {
 export const hasQuickActions = note => REGEX_QUICK_ACTIONS.test(note);
-export const stripQuickActions = note => note.replace(REGEX_QUICK_ACTIONS, '').trim();
+export const stripQuickActions = note =>
+  note.replace(REGEX_QUICK_ACTIONS, '').trim();

app/serializers/discussion_entity.rb

@@ -6,7 +6,6 @@ class DiscussionEntity < Grape::Entity
   expose :id, :reply_id
   expose :position, if: -> (d, _) { d.diff_discussion? && !d.legacy_diff_discussion? }
-  expose :original_position, if: -> (d, _) { d.diff_discussion? && !d.legacy_diff_discussion? }
   expose :line_code, if: -> (d, _) { d.diff_discussion? }
   expose :expanded?, as: :expanded
   expose :active?, as: :active, if: -> (d, _) { d.diff_discussion? }

locale/gitlab.pot

@@ -3622,9 +3622,6 @@ msgstr ""
 msgid "Note: Consider asking your GitLab administrator to configure %{github_integration_link}, which will allow login via GitHub and allow importing repositories without generating a Personal Access Token."
 msgstr ""
-msgid "Notes|Are you sure you want to cancel creating this comment?"
-msgstr ""
-
 msgid "Notification events"
 msgstr ""

spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb

@@ -342,9 +342,8 @@ describe 'Merge request > User resolves diff notes and discussions', :js do
         end
       end
-      it 'shows jump to next discussion button, apart from the last one' do
-        expect(page).to have_selector('.discussion-reply-holder', count: 2)
-        expect(page).to have_selector('.discussion-reply-holder .discussion-next-btn', count: 1)
+      it 'shows jump to next discussion button' do
+        expect(page.all('.discussion-reply-holder', count: 2)).to all(have_selector('.discussion-next-btn'))
       end
       it 'displays next discussion even if hidden' do

spec/javascripts/autosave_spec.js

@@ -59,10 +59,12 @@ describe('Autosave', () => {
         Autosave.prototype.restore.call(autosave);
-        expect(field.trigger).toHaveBeenCalled();
+        expect(
+          field.trigger,
+        ).toHaveBeenCalled();
       });
-      it('triggers native event', done => {
+      it('triggers native event', (done) => {
         autosave.field.get(0).addEventListener('change', () => {
           done();
         });
@@ -79,7 +81,9 @@ describe('Autosave', () => {
       it('does not trigger event', () => {
         spyOn(field, 'trigger').and.callThrough();
-        expect(field.trigger).not.toHaveBeenCalled();
+        expect(
+          field.trigger,
+        ).not.toHaveBeenCalled();
       });
     });
   });

spec/javascripts/diffs/components/diff_line_gutter_content_spec.js

@@ -18,12 +18,10 @@ describe('DiffLineGutterContent', () => {
   };
   const setDiscussions = component => {
     component.$store.dispatch('setInitialNotes', getDiscussionsMockData());
-    component.$store.commit('diffs/SET_DIFF_DATA', { diffFiles: [getDiffFileMock()] });
   };
   const resetDiscussions = component => {
     component.$store.dispatch('setInitialNotes', []);
-    component.$store.commit('diffs/SET_DIFF_DATA', {});
   };
   describe('computed', () => {
@@ -50,11 +48,7 @@ describe('DiffLineGutterContent', () => {
       it('should return discussions for the given lineCode', () => {
         const { lineCode } = getDiffFileMock().highlightedDiffLines[1];
-        const component = createComponent({
-          lineCode,
-          showCommentButton: true,
-          discussions: getDiscussionsMockData(),
-        });
+        const component = createComponent({ lineCode, showCommentButton: true });
         setDiscussions(component);

spec/javascripts/diffs/components/diff_line_note_form_spec.js

@@ -3,7 +3,6 @@ import DiffLineNoteForm from '~/diffs/components/diff_line_note_form.vue';
 import store from '~/mr_notes/stores';
 import { createComponentWithStore } from 'spec/helpers/vue_mount_component_helper';
 import diffFileMockData from '../mock_data/diff_file';
-import { noteableDataMock } from '../../notes/mock_data';
 describe('DiffLineNoteForm', () => {
   let component;
@@ -22,9 +21,10 @@ describe('DiffLineNoteForm', () => {
       noteTargetLine: diffLines[0],
     });
-    Object.defineProperties(component, {
-      noteableData: { value: noteableDataMock },
-      isLoggedIn: { value: true },
+    Object.defineProperty(component, 'isLoggedIn', {
+      get() {
+        return true;
+      },
     });
     component.$mount();
@@ -32,37 +32,12 @@ describe('DiffLineNoteForm', () => {
   describe('methods', () => {
     describe('handleCancelCommentForm', () => {
-      it('should ask for confirmation when shouldConfirm and isDirty passed as truthy', () => {
-        spyOn(window, 'confirm').and.returnValue(false);
-
-        component.handleCancelCommentForm(true, true);
-        expect(window.confirm).toHaveBeenCalled();
-      });
-
-      it('should ask for confirmation when one of the params false', () => {
-        spyOn(window, 'confirm').and.returnValue(false);
-
-        component.handleCancelCommentForm(true, false);
-        expect(window.confirm).not.toHaveBeenCalled();
-
-        component.handleCancelCommentForm(false, true);
-        expect(window.confirm).not.toHaveBeenCalled();
-      });
-
-      it('should call cancelCommentForm with lineCode', done => {
-        spyOn(window, 'confirm');
+      it('should call cancelCommentForm with lineCode', () => {
         spyOn(component, 'cancelCommentForm');
-        spyOn(component, 'resetAutoSave');
         component.handleCancelCommentForm();
-        expect(window.confirm).not.toHaveBeenCalled();
-        component.$nextTick(() => {
-          expect(component.cancelCommentForm).toHaveBeenCalledWith({
-            lineCode: diffLines[0].lineCode,
-          });
-          expect(component.resetAutoSave).toHaveBeenCalled();
-
-          done();
+        expect(component.cancelCommentForm).toHaveBeenCalledWith({
+          lineCode: diffLines[0].lineCode,
         });
       });
     });
@@ -91,7 +66,7 @@ describe('DiffLineNoteForm', () => {
   describe('mounted', () => {
     it('should init autosave', () => {
-      const key = 'autosave/Note/Issue/98//DiffNote//1c497fbb3a46b78edf04cc2a2fa33f67e3ffbe2a_1_1';
+      const key = 'autosave/Note/issue///DiffNote//1c497fbb3a46b78edf04cc2a2fa33f67e3ffbe2a_1_1';
       expect(component.autosave).toBeDefined();
       expect(component.autosave.key).toEqual(key);

spec/javascripts/diffs/components/inline_diff_view_spec.js

@@ -33,7 +33,6 @@ describe('InlineDiffView', () => {
     it('should render discussions', done => {
       const el = component.$el;
       component.$store.dispatch('setInitialNotes', getDiscussionsMockData());
-      component.$store.commit('diffs/SET_DIFF_DATA', { diffFiles: [getDiffFileMock()] });
       Vue.nextTick(() => {
         expect(el.querySelectorAll('.notes_holder').length).toEqual(1);

spec/javascripts/diffs/mock_data/diff_discussions.js

@@ -12,17 +12,6 @@ export default {
       head_sha: 'c48ee0d1bf3b30453f5b32250ce03134beaa6d13',
     },
   },
-  original_position: {
-    formatter: {
-      old_line: null,
-      new_line: 2,
-      old_path: 'CHANGELOG',
-      new_path: 'CHANGELOG',
-      base_sha: 'e63f41fe459e62e1228fcef60d7189127aeba95a',
-      start_sha: 'd9eaefe5a676b820c57ff18cf5b68316025f7962',
-      head_sha: 'c48ee0d1bf3b30453f5b32250ce03134beaa6d13',
-    },
-  },
   line_code: '1c497fbb3a46b78edf04cc2a2fa33f67e3ffbe2a_1_2',
   expanded: true,
   notes: [

spec/javascripts/diffs/store/getters_spec.js

@@ -2,7 +2,6 @@ import * as getters from '~/diffs/store/getters';
 import state from '~/diffs/store/modules/diff_state';
 import { PARALLEL_DIFF_VIEW_TYPE, INLINE_DIFF_VIEW_TYPE } from '~/diffs/constants';
 import discussion from '../mock_data/diff_discussions';
-import diffFile from '../mock_data/diff_file';
 describe('Diffs Module Getters', () => {
   let localState;
@@ -222,38 +221,4 @@ describe('Diffs Module Getters', () => {
       expect(getters.getDiffFileByHash(localState)('123')).toBeUndefined();
     });
   });
-
-  describe('discussionsByLineCode', () => {
-    let mockState;
-
-    beforeEach(() => {
-      mockState = { diffFiles: [diffFile] };
-    });
-
-    it('should return a map of diff lines with their line codes', () => {
-      const mockGetters = { discussions: [discussionMock] };
-
-      const map = getters.discussionsByLineCode(mockState, {}, {}, mockGetters);
-      expect(map['1c497fbb3a46b78edf04cc2a2fa33f67e3ffbe2a_1_2']).toBeDefined();
-      expect(Object.keys(map).length).toEqual(1);
-    });
-
-    it('should have the diff discussion on the map if the original position matches', () => {
-      discussionMock.position.formatter.base_sha = 'ff9200';
-      const mockGetters = { discussions: [discussionMock] };
-
-      const map = getters.discussionsByLineCode(mockState, {}, {}, mockGetters);
-      expect(map['1c497fbb3a46b78edf04cc2a2fa33f67e3ffbe2a_1_2']).toBeDefined();
-      expect(Object.keys(map).length).toEqual(1);
-    });
-
-    it('should not add an outdated diff discussion to the returned map', () => {
-      discussionMock.position.formatter.base_sha = 'ff9200';
-      discussionMock.original_position.formatter.base_sha = 'ff9200';
-      const mockGetters = { discussions: [discussionMock] };
-
-      const map = getters.discussionsByLineCode(mockState, {}, {}, mockGetters);
-      expect(Object.keys(map).length).toEqual(0);
-    });
-  });
 });

spec/javascripts/diffs/store/utils_spec.js

@@ -207,24 +207,4 @@ describe('DiffsStoreUtils', () => {
       expect(utils.trimFirstCharOfLineContent()).toEqual({});
     });
   });
-
-  describe('getDiffRefsByLineCode', () => {
-    it('should return diffRefs for all highlightedDiffLines', () => {
-      const diffFile = getDiffFileMock();
-      const map = utils.getDiffRefsByLineCode([diffFile]);
-      const { highlightedDiffLines } = diffFile;
-      const lineCodeCount = highlightedDiffLines.reduce(
-        (acc, line) => (line.lineCode ? acc + 1 : acc),
-        0,
-      );
-
-      const { baseSha, headSha, startSha } = diffFile.diffRefs;
-      const targetLine = map[highlightedDiffLines[4].lineCode];
-
-      expect(Object.keys(map).length).toEqual(lineCodeCount);
-      expect(targetLine.baseSha).toEqual(baseSha);
-      expect(targetLine.headSha).toEqual(headSha);
-      expect(targetLine.startSha).toEqual(startSha);
-    });
-  });
 });

spec/javascripts/notes/components/discussion_counter_spec.js

@@ -46,7 +46,7 @@ describe('DiscussionCounter component', () => {
           discussions,
         });
         setFixtures(`
-          <div class="discussion" data-discussion-id="${firstDiscussionId}"></div>
+          <div data-discussion-id="${firstDiscussionId}"></div>
         `);
         vm.jumpToFirstUnresolvedDiscussion();

spec/javascripts/notes/components/noteable_discussion_spec.js

@@ -14,7 +14,6 @@ describe('noteable_discussion component', () => {
   preloadFixtures(discussionWithTwoUnresolvedNotes);
   beforeEach(() => {
-    window.mrTabs = {};
     store = createStore();
     store.dispatch('setNoteableData', noteableDataMock);
     store.dispatch('setNotesData', notesDataMock);
@@ -47,15 +46,10 @@ describe('noteable_discussion component', () => {
     it('should toggle reply form', done => {
       vm.$el.querySelector('.js-vue-discussion-reply').click();
-
       Vue.nextTick(() => {
+        expect(vm.$refs.noteForm).not.toBeNull();
         expect(vm.isReplying).toEqual(true);
-
-        // There is a watcher for `isReplying` which will init autosave in the next tick
-        Vue.nextTick(() => {
-          expect(vm.$refs.noteForm).not.toBeNull();
-          done();
-        });
+        done();
       });
     });
@@ -107,29 +101,33 @@ describe('noteable_discussion component', () => {
   describe('methods', () => {
     describe('jumpToNextDiscussion', () => {
-      it('expands next unresolved discussion', done => {
-        const discussion2 = getJSONFixture(discussionWithTwoUnresolvedNotes)[0];
-        discussion2.resolved = false;
-        discussion2.id = 'next'; // prepare this for being identified as next one (to be jumped to)
-        vm.$store.dispatch('setInitialNotes', [discussionMock, discussion2]);
-        window.mrTabs.currentAction = 'show';
-
-        Vue.nextTick()
-          .then(() => {
-            spyOn(vm, 'expandDiscussion').and.stub();
-
-            const nextDiscussionId = discussion2.id;
-
-            setFixtures(`
-              <div class="discussion" data-discussion-id="${nextDiscussionId}"></div>
-            `);
-            vm.jumpToNextDiscussion();
-            expect(vm.expandDiscussion).toHaveBeenCalledWith({ discussionId: nextDiscussionId });
-          })
-          .then(done)
-          .catch(done.fail);
+      it('expands next unresolved discussion', () => {
+        spyOn(vm, 'expandDiscussion').and.stub();
+        const discussions = [
+          discussionMock,
+          {
+            ...discussionMock,
+            id: discussionMock.id + 1,
+            notes: [{ ...discussionMock.notes[0], resolvable: true, resolved: true }],
+          },
+          {
+            ...discussionMock,
+            id: discussionMock.id + 2,
+            notes: [{ ...discussionMock.notes[0], resolvable: true, resolved: false }],
+          },
+        ];
+        const nextDiscussionId = discussionMock.id + 2;
+        store.replaceState({
+          ...store.state,
+          discussions,
+        });
+        setFixtures(`
+          <div data-discussion-id="${nextDiscussionId}"></div>
+        `);
+        vm.jumpToNextDiscussion();
+        expect(vm.expandDiscussion).toHaveBeenCalledWith({ discussionId: nextDiscussionId });
       });
     });
   });

spec/javascripts/notes/mock_data.js

@@ -1168,87 +1168,3 @@ export const collapsedSystemNotes = [
     diff_discussion: false,
   },
 ];
-
-export const discussion1 = {
-  id: 'abc1',
-  resolvable: true,
-  resolved: false,
-  diff_file: {
-    file_path: 'about.md',
-  },
-  position: {
-    formatter: {
-      new_line: 50,
-      old_line: null,
-    },
-  },
-  notes: [
-    {
-      created_at: '2018-07-04T16:25:41.749Z',
-    },
-  ],
-};
-
-export const resolvedDiscussion1 = {
-  id: 'abc1',
-  resolvable: true,
-  resolved: true,
-  diff_file: {
-    file_path: 'about.md',
-  },
-  position: {
-    formatter: {
-      new_line: 50,
-      old_line: null,
-    },
-  },
-  notes: [
-    {
-      created_at: '2018-07-04T16:25:41.749Z',
-    },
-  ],
-};
-
-export const discussion2 = {
-  id: 'abc2',
-  resolvable: true,
-  resolved: false,
-  diff_file: {
-    file_path: 'README.md',
-  },
-  position: {
-    formatter: {
-      new_line: null,
-      old_line: 20,
-    },
-  },
-  notes: [
-    {
-      created_at: '2018-07-04T12:05:41.749Z',
-    },
-  ],
-};
-
-export const discussion3 = {
-  id: 'abc3',
-  resolvable: true,
-  resolved: false,
-  diff_file: {
-    file_path: 'README.md',
-  },
-  position: {
-    formatter: {
-      new_line: 21,
-      old_line: null,
-    },
-  },
-  notes: [
-    {
-      created_at: '2018-07-05T17:25:41.749Z',
-    },
-  ],
-};
-
-export const unresolvableDiscussion = {
-  resolvable: false,
-};

spec/javascripts/notes/stores/getters_spec.js

@@ -5,11 +5,6 @@ import {
   noteableDataMock,
   individualNote,
   collapseNotesMock,
-  discussion1,
-  discussion2,
-  discussion3,
-  resolvedDiscussion1,
-  unresolvableDiscussion,
 } from '../mock_data';
 const discussionWithTwoUnresolvedNotes = 'merge_requests/resolved_diff_discussion.json';
@@ -114,154 +109,4 @@ describe('Getters Notes Store', () => {
       expect(getters.isNotesFetched(state)).toBeFalsy();
     });
   });
-
-  describe('allResolvableDiscussions', () => {
-    it('should return only resolvable discussions in same order', () => {
-      const localGetters = {
-        allDiscussions: [
-          discussion3,
-          unresolvableDiscussion,
-          discussion1,
-          unresolvableDiscussion,
-          discussion2,
-        ],
-      };
-
-      expect(getters.allResolvableDiscussions(state, localGetters)).toEqual([
-        discussion3,
-        discussion1,
-        discussion2,
-      ]);
-    });
-
-    it('should return empty array if there are no resolvable discussions', () => {
-      const localGetters = {
-        allDiscussions: [unresolvableDiscussion, unresolvableDiscussion],
-      };
-
-      expect(getters.allResolvableDiscussions(state, localGetters)).toEqual([]);
-    });
-  });
-
-  describe('unresolvedDiscussionsIdsByDiff', () => {
-    it('should return all discussions IDs in diff order', () => {
-      const localGetters = {
-        allResolvableDiscussions: [discussion3, discussion1, discussion2],
-      };
-
-      expect(getters.unresolvedDiscussionsIdsByDiff(state, localGetters)).toEqual([
-        'abc1',
-        'abc2',
-        'abc3',
-      ]);
-    });
-
-    it('should return empty array if all discussions have been resolved', () => {
-      const localGetters = {
-        allResolvableDiscussions: [resolvedDiscussion1],
-      };
-
-      expect(getters.unresolvedDiscussionsIdsByDiff(state, localGetters)).toEqual([]);
-    });
-  });
-
-  describe('unresolvedDiscussionsIdsByDate', () => {
-    it('should return all discussions in date ascending order', () => {
-      const localGetters = {
-        allResolvableDiscussions: [discussion3, discussion1, discussion2],
-      };
-
-      expect(getters.unresolvedDiscussionsIdsByDate(state, localGetters)).toEqual([
-        'abc2',
-        'abc1',
-        'abc3',
-      ]);
-    });
-
-    it('should return empty array if all discussions have been resolved', () => {
-      const localGetters = {
-        allResolvableDiscussions: [resolvedDiscussion1],
-      };
-
-      expect(getters.unresolvedDiscussionsIdsByDate(state, localGetters)).toEqual([]);
-    });
-  });
-
-  describe('unresolvedDiscussionsIdsOrdered', () => {
-    const localGetters = {
-      unresolvedDiscussionsIdsByDate: ['123', '456'],
-      unresolvedDiscussionsIdsByDiff: ['abc', 'def'],
-    };
-
-    it('should return IDs ordered by diff when diffOrder param is true', () => {
-      expect(getters.unresolvedDiscussionsIdsOrdered(state, localGetters)(true)).toEqual([
-        'abc',
-        'def',
-      ]);
-    });
-
-    it('should return IDs ordered by date when diffOrder param is not true', () => {
-      expect(getters.unresolvedDiscussionsIdsOrdered(state, localGetters)(false)).toEqual([
-        '123',
-        '456',
-      ]);
-      expect(getters.unresolvedDiscussionsIdsOrdered(state, localGetters)(undefined)).toEqual([
-        '123',
-        '456',
-      ]);
-    });
-  });
-
-  describe('isLastUnresolvedDiscussion', () => {
-    const localGetters = {
-      unresolvedDiscussionsIdsOrdered: () => ['123', '456', '789'],
-    };
-
-    it('should return true if the discussion id provided is the last', () => {
-      expect(getters.isLastUnresolvedDiscussion(state, localGetters)('789')).toBe(true);
-    });
-
-    it('should return false if the discussion id provided is not the last', () => {
-      expect(getters.isLastUnresolvedDiscussion(state, localGetters)('123')).toBe(false);
-      expect(getters.isLastUnresolvedDiscussion(state, localGetters)('456')).toBe(false);
-    });
-  });
-
-  describe('nextUnresolvedDiscussionId', () => {
-    const localGetters = {
-      unresolvedDiscussionsIdsOrdered: () => ['123', '456', '789'],
-    };
-
-    it('should return the ID of the discussion after the ID provided', () => {
-      expect(getters.nextUnresolvedDiscussionId(state, localGetters)('123')).toBe('456');
-      expect(getters.nextUnresolvedDiscussionId(state, localGetters)('456')).toBe('789');
-      expect(getters.nextUnresolvedDiscussionId(state, localGetters)('789')).toBe(undefined);
-    });
-  });
-
-  describe('firstUnresolvedDiscussionId', () => {
-    const localGetters = {
-      unresolvedDiscussionsIdsByDate: ['123', '456'],
-      unresolvedDiscussionsIdsByDiff: ['abc', 'def'],
-    };
-
-    it('should return the first discussion id by diff when diffOrder param is true', () => {
-      expect(getters.firstUnresolvedDiscussionId(state, localGetters)(true)).toBe('abc');
-    });
-
-    it('should return the first discussion id by date when diffOrder param is not true', () => {
-      expect(getters.firstUnresolvedDiscussionId(state, localGetters)(false)).toBe('123');
-      expect(getters.firstUnresolvedDiscussionId(state, localGetters)(undefined)).toBe('123');
-    });
-
-    it('should be falsy if all discussions are resolved', () => {
-      const localGettersFalsy = {
-        unresolvedDiscussionsIdsByDiff: [],
-        unresolvedDiscussionsIdsByDate: [],
-      };
-
-      expect(getters.firstUnresolvedDiscussionId(state, localGettersFalsy)(true)).toBeFalsy();
-      expect(getters.firstUnresolvedDiscussionId(state, localGettersFalsy)(false)).toBeFalsy();
-    });
-  });
 });