Skip to content

Conversation

diosmosis
Copy link
Member

Description:

Changes:

  • Remove BaseTemplate::FIELD_* constants and uses.
  • Remove use of scopes and angularjs services from tagManagerHelper.js.
  • Stop using angularjs directives in twig templates.
  • Move twig contents to new components GettingStarted.vue and TrackingCodePage.vue.
  • Remove angularjs adapters.

Review

@diosmosis diosmosis marked this pull request as draft June 22, 2022 03:25
@diosmosis diosmosis modified the milestone: Current sprint Jul 10, 2022
@diosmosis diosmosis marked this pull request as ready for review July 10, 2022 06:04
@sgiehl
Copy link
Member

sgiehl commented Sep 5, 2022

@diosmosis Seems this one needs an update. There are a couple of tests failing. Guess something has been added on 4.x-dev, that is no longer available on this branch or similar...

@diosmosis
Copy link
Member Author

@sgiehl fixed the broken merge

Copy link
Member

@sgiehl sgiehl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Had a look through the code. Besides the comments I left it looks good for me.
Also did a rough testing in the UI. But due to my limited time I'm not able to test every detail.
Maybe @AltamashShaikh has some time to do a more excessive testing.
Or we otherwise merge this one, once my comments are solved, and create bug reports later if anything pops up.

var $scope = piwikHelper.getAngularDependency('$rootScope');
var piwikUrl = piwikHelper.getAngularDependency('piwikUrl');
var containerId = piwikUrl.getSearchParam('idContainer');
var template = $('<div class="ui-confirm"><h2>Select a variable</h2><div></div><input role="no" type="button" value="' + _pk_translate('General_Cancel') +'"/></div>')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be good to make the Select a variable translatable.

var createVueApp = CoreHome.createVueApp;
var VariableSelect = TagManager.VariableSelect;
var MatomoUrl = CoreHome.MatomoUrl;
var containerId = MatomoUrl.parsed.value.containerId;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
var containerId = MatomoUrl.parsed.value.containerId;
var containerId = MatomoUrl.parsed.value.idContainer;

this.editVersion(null, containerId, 0, function () { window.location.reload(); });
};
tagManagerHelper.editVersion = function ($scope, idContainer, idContainerVersion, callback) {
tagManagerHelper.editVersion = function (idContainer, idContainerVersion, callback) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

on line 84, there is another method, where the first parameter needs to be removed.
Otherwise the create new variable link on the edit tag page throws an error.

@diosmosis
Copy link
Member Author

@sgiehl applied the fixes. I tried doing some more testing and fixed one potential issue, but couldn't find anything else.

Copy link
Member

@sgiehl sgiehl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok. As tests are still passing let's merge this one. @AltamashShaikh if vue migration related issue pops up in TagManager when working on the 5.x release, feel free to create new issues and ping @diosmosis so she can provide a fix for it.

@sgiehl sgiehl merged commit 8704c4d into 5.x-dev Sep 7, 2022
@sgiehl sgiehl deleted the vue-remove-angularjs branch September 7, 2022 13:43
@diosmosis
Copy link
Member Author

Hi @sgiehl, please use the correct pronouns when referring to me.

@sgiehl
Copy link
Member

sgiehl commented Sep 7, 2022

Oh sorry. Sure. I hadn't really proofread what I wrote 🙈

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants