From 75023c670ec5b4d56e1292cf1533450019bcee98 Mon Sep 17 00:00:00 2001
From: De Groof <alexandra.de_groof@siemens.com>
Date: Tue, 9 Apr 2019 14:12:21 +0200
Subject: [PATCH] Got rid of duplicate code

---
 plugin.xml                           |   5 +-
 resources/Team.js                    | 171 ++-------------------------
 resources/images/gear.gif            | Bin 816 -> 0 bytes
 resources/images/projectarea_obj.gif | Bin 578 -> 0 bytes
 resources/images/teamarea_obj.gif    | Bin 590 -> 0 bytes
 resources/templates/Team.css         |  13 --
 6 files changed, 11 insertions(+), 178 deletions(-)
 delete mode 100644 resources/images/gear.gif
 delete mode 100644 resources/images/projectarea_obj.gif
 delete mode 100644 resources/images/teamarea_obj.gif

diff --git a/plugin.xml b/plugin.xml
index 5da2b72..5082d0c 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -18,11 +18,11 @@
                 editable="false"
                 gadgetable="true"
                 include-subteams="yes-and-check"
-                icon="resources/images/teamarea_obj.gif"
+                icon=""
                 id="com.siemens.bt.jazz.viewlet.myteams"
                 title="My Teams"
                 widget="com.siemens.bt.jazz.viewlet.myteams.Team"
-                version="1.1"
+                version="1.2"
                 scope-sensitive="true">
             <preference-def
                     default-value="true"
@@ -46,7 +46,6 @@
         <viewlet-entry
                 category="com.siemens.bt.jazz.viewlet.category.btaddons"
                 id="com.siemens.bt.jazz.viewlet.myteams.entry.Team"
-                icon="resources/images/teamarea_obj.gif"
                 title="My Teams"
                 non-jts="true"
                 repo-only="true"
diff --git a/resources/Team.js b/resources/Team.js
index 495f72c..e86f243 100644
--- a/resources/Team.js
+++ b/resources/Team.js
@@ -9,9 +9,7 @@ define(["dojo/_base/declare",
     "dojo/promise/all",
     "dojo/when",
     "./jazzUtilities/SiemensWidget",
-    "jazz.ui.ResourceLink",
-    "jazz.ui.ModeledTree",
-    "jazz.ui.tree.AbstractItem", //this will log as error, but has be so until jazz adapts amd (dojo 1.7+)
+    "com.ibm.team.dashboard.viewlets.web.ui.internal.TeamsViewlet", //logs as error, but has to be like this(Old code loads modules differently)
     "com.ibm.team.dashboard.viewlets.web.client.internal.TeamsClient",
     "com.ibm.team.dashboard.web.util.DashboardUtil",
     "dojox.xml.parser",
@@ -22,64 +20,11 @@ define(["dojo/_base/declare",
     var DashboardUtil = com.ibm.team.dashboard.web.util.DashboardUtil;
     var TeamsClient = com.ibm.team.dashboard.viewlets.web.client.internal.TeamsClient;
     var ServiceResponseHandler = com.ibm.team.repository.web.transport.ServiceResponseHandler;
-    var modeledTree = jazz.ui.ModeledTree;
-    var AbstractItem = jazz.ui.tree.AbstractItem;
-    var SimpleItem = jazz.ui.tree.SimpleItem;
     var LinkItem = jazz.ui.ResourceLink;
+    var TeamsViewlet = com.ibm.team.dashboard.viewlets.web.ui.internal.TeamsViewlet;
 
-    var TeamResourceTreeItem = declare(AbstractItem, {
-        postCreate: function () {
-            this.inherited(arguments);
 
-            this.rl = new LinkItem({
-                uri: this._getResourceURL(),
-                presentationUri: this._getPresenationURL(),
-                label: jazz.util.html.escape(this.team.name),
-                isExternalContent: false,
-                lazyFetch: true
-            });
-            this.domNode = this.rl.domNode;
-        },
-
-        _getResourceURL: function () {
-            // e.g.
-            // https://localhost:9443/jazz/process/project-areas/_WOqPMDujEeCIDJ7vsnU5zQ/team-areas/_Tj9RkDulEeCAZ5rY1YKmyQ
-
-            var url = this.webURL +
-                "/process/project-areas/" +
-                this.project.itemId +
-                "/team-areas/" +
-                this.team.itemId;
-
-            if (djConfig.isDebug) {
-                url = url + "?debug=true";
-            }
-
-            return url;
-        },
-
-        _getPresenationURL: function () {
-            // e.g.
-            // https://localhost:9443/jazz/web/projects/Jazz%20Project#action=com.ibm.team.dashboard.viewDashboard&team=Foundation
-
-            return DashboardUtil.getDashboardHref(DashboardConstants.SCOPE_TEAM_AREA,
-                this.team.path,
-                null,
-                this.project.name,
-                this.webURL);
-        },
-
-        getId: function () {
-            return this.team.itemId;
-        },
-
-        uninitialize: function () {
-            this.rl.destroy();
-        }
-
-    });
-
-    return declare("com.siemens.bt.jazz.viewlet.myteams.Team", SiemensWidget, {
+    return declare("com.siemens.bt.jazz.viewlet.myteams.Team", [SiemensWidget, TeamsViewlet], {
         templatePath: require.toUrl("./templates/Team.html", "./templates/Team.css"),
 
         //change between filtered/not
@@ -115,79 +60,6 @@ define(["dojo/_base/declare",
 
         },
 
-
-        getTAsUnfiltered: function () {
-            var serviceObj = {
-                self: this,
-                success: function (result) {
-                    if (!result || !result.children || result.children.length === 0) {
-                        this.self.getSite().setSecondaryTitle("");
-                        this.self._content.innerHTML = this.self.getScope() === DashboardConstants.SCOPE_PROJECT_AREA ?
-                            "There are no teams for this project area." : "There are no sub-teams for this team area.";
-                    } else {
-                        this.self._checkTeams(result.children);
-                        this.self.getSite().setSecondaryTitle("(" + this.self._count + ")");
-                        var useLinks = this.self.getSite().canViewDashboard(DashboardConstants.SCOPE_TEAM_AREA);
-                        var webURL = this.self.getWebURL();
-                        var param = {
-                            model: result.children, selection: false,
-                            createTreeItem: function (obj) {
-                                if (useLinks) {
-                                    return new TeamResourceTreeItem({
-                                        team: obj,
-                                        project: {
-                                            name: result.projectName,
-                                            itemId: result.projectItemId
-                                        },
-                                        webURL: webURL
-                                    });
-                                }
-                                return new SimpleItem({
-                                    label: html.escape(obj.name), itemId: obj.itemId, getId: function () {
-                                        return this.itemId;
-                                    }
-                                });
-                            },
-                            onStateChange: dojo.hitch(this.self, this.self._treeStateChanged)
-                        };
-                        this.self._teamsTree = new modeledTree(param);
-                        var oldState = this.self.getContributorState().get("treeState");
-                        if (oldState && this.self.getScope() === this.self.getContributorState().get("scope") &&
-                            this.self.getScopeItem().itemId === this.self.getContributorState().get("scopeItemId")) {
-                            this.self._teamsTree.restoreState(oldState);
-                        }
-                        this.self._content.appendChild(this.self._teamsTree.domNode);
-                    }
-                },
-                failure: function (errorObj) {
-                    // read permission
-                    if (errorObj && errorObj.status === 403) {
-                        var span = document.createElement("span");
-                        span.className = "errorText";
-                        var message = this.self._getOperationalErrorText("yey",
-                            "yay",
-                            "yuy"); //permission denied messages
-                        span.appendChild(document.createTextNode(message));
-                        this.self._content.innerHTML = "";
-                        this.self._content.appendChild(span);
-                        this.self.getSite().setSecondaryTitle("");
-                        //this.self.getSite().setLoading(false);
-                        //this.self.getSite().doneRefresh();
-                    }
-                    else {
-                        //this.self.getSite().doneRefresh();
-                        this.self.getSite().error(errorObj);
-                    }
-                }
-            }; //callback with success/failure for rest call
-            var srh = new ServiceResponseHandler(serviceObj, "success", "failure");
-
-            if (this.getScope() === DashboardConstants.SCOPE_PROJECT_AREA)
-                TeamsClient.getTeamsForProjectArea(this.getScopeItem().itemId, this.getScopeSubteams(), srh, this.getServiceTracker());
-            else
-                TeamsClient.getTeamsForTeamArea(this.getScopeItem().itemId, this.getScopeSubteams(), srh, this.getServiceTracker());
-        },
-
         _getRolesAsXML: function () {
             return jazz.client.xhrGet({
                 url: this.webURL +
@@ -197,6 +69,7 @@ define(["dojo/_base/declare",
                 return result;
             });
         },
+
         refresh: function () {
 
             this.debugMessage("refresh()");
@@ -259,7 +132,7 @@ define(["dojo/_base/declare",
             else {
                 this._pseudoButton.innerHTML = "Show only my Teams";
                 domStyle.set(this._rolesButton, 'display', 'none');
-                this.getTAsUnfiltered();
+                this.inherited(arguments);
             }
             this._updateTitle();
             this.update();
@@ -267,26 +140,7 @@ define(["dojo/_base/declare",
             this.getSite().doneRefresh();
 
         },
-        _getOperationalErrorText: function (message, explanation, useraction) {
-            return message + " " +
-                explanation + " " +
-                useraction;
-        },
 
-        _checkTeams: function (teams) {
-            this._count = 0;
-            this._checkSubTeams(teams);
-        },
-
-        _checkSubTeams: function (teams) {
-            this._count += teams.length;
-            teams.sort(this._sortTeams);
-            for (var i = 0; i < teams.length; i++) {
-                if (teams[i].children) {
-                    this._checkSubTeams(teams[i].children);
-                }
-            }
-        },
 
         _createNoScopeMsg: function () {
             domStyle.set('pseudoButton', 'display', 'none');
@@ -350,15 +204,6 @@ define(["dojo/_base/declare",
                 this.update();
         },
 
-        _treeStateChanged: function () {
-            var state = this._teamsTree.getState();
-            this.getContributorState().set("treeState", state);
-            if (this.getContributorState().get("scope") !== this.getScope())
-                this.getContributorState().set("scope", this.getScope());
-            if (this.getContributorState().get("scopeItemId") !== this.getScopeItem().itemId)
-                this.getContributorState().set("scopeItemId", this.getScopeItem().itemId);
-        },
-
         _updateTitle: function () {
             // name can be unavailable if no read permission on scope item
             //use scope item name except if it is user(default minidash)
@@ -498,7 +343,8 @@ define(["dojo/_base/declare",
                     var dashBoardUri = DashboardUtil.getDashboardHref(DashboardConstants.SCOPE_PROJECT_AREA,
                         pname,
                         null,
-                        pname);
+                        pname,
+                        net.jazz.ajax.BootstrapProperties.FRONTSIDE_URL);
                     var teamLink = new LinkItem({
                         uri: popUpUri,
                         label: pname,
@@ -545,7 +391,8 @@ define(["dojo/_base/declare",
                             var dashBoardUri = DashboardUtil.getDashboardHref(DashboardConstants.SCOPE_TEAM_AREA,
                                 path,
                                 null,
-                                pname);
+                                pname,
+                                net.jazz.ajax.BootstrapProperties.FRONTSIDE_URL);
                             var teamLink = new LinkItem({
                                 uri: popUpUri,
                                 label: name,
diff --git a/resources/images/gear.gif b/resources/images/gear.gif
deleted file mode 100644
index a591a9175eb96c308bc358fe38fa166b4cdb7ca4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 816
zcmV-01JC@4P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00004XF*Lt006O%
z3;baP0008#Nkl<ZI8W_UTS${(7<Ot_GA!1JV&Wvd3U`qRd1oSsficGPru4=f4vDa<
zc`-1-Lr__m15cX=WIAVap4&mq1M23`i45JCTT{ne7lo0B#O>?(B0|DVs@r~e`G4N`
zd!P4tp8x$KBK|+WJJ8Y5ab;_3>#5J@dpSQppZLcPRa8_&+H5v14X4w2)nc)T0Os4-
z+1XuPU9DVOTT5JCUQR?UWpZ-z!dU|tOG`^Px3{;IE|*L1cDvOckLSb2#zp`DL45m>
zGoWVldcE&WCR0vtZ*NpM(5TMN&U;p?)nm8YiNoOttgo*Vup;zLgXU>~?dSIP_DA{o
z`7z-D84`))7Nl4JN>)}@2qYiq_4>`Bp&|Fe!onBigEWut&4z{sKENVF0yZ@@of{h)
zD})s9;^HEiot@pQudmnS=H?b=Wn~GaQt2Cm!SK;+HWS3b#Kgq&si~>!p#UTC7bTeN
z1kmyH^mI_IR$KXe{v9+>^J9{dl9HR7o8QjN%mfewgFhj(jg5_`f?n$D>$5;^K&R6Y
z$P6fz%69^RApQh{7`a^j%xE+o{X7#K9Ub+TmX_W=jb*G@EPh;9S7#m=82C0kJWK`$
z2kmWbZ8=z_XxaeJlKcDnbt5Aq0n~zE>ntlPd%@%JP7eKrP0hWWmzQ^6p-?zA8V%8E
zwMS^48y_Ek0#*;<uLi@u(pq<S_b$LH*=#nI8+vuXG6j?8&_J7rN~H<{<PePaVaYMg
z_4M?RuC6YBO-;=MtWDTGWK>sIXF{d}aop0<a)7HBL=fy8p>KG2i2NQ@?AO-TN}=dt
z*gZ^7Pfso>DS0IliBy;_D=#lMf$?E$Yij_ETm=OMa-mT8y12Mlk)55L39ujjhI^v9
zT<$dvhZE0aGTCWqX?Lrts%$cu%wJSgBxSK!oVd6+7Ci%y^JjsbR%fQBrV27LGQ<f9
u2{&+n@i!nRdnf>95*zlK{p*xa{oeuG#jjg~l0vuu0000<MNUMnLSTYU;CjXY

diff --git a/resources/images/projectarea_obj.gif b/resources/images/projectarea_obj.gif
deleted file mode 100644
index 9d1ac3a0dba36bc035c42a10a6c0a4a02ee0e366..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 578
zcmZ?wbhEHb6krfwc*ejmqo{aNL)WCbuA;)pX=$^P(`Sao&kK#8=M}ZoH+o6y#1p!1
z8%=%J+J~%i2wth-wpq_}gQ?%zu!1wDIX7*~@4BTg@yc56o43j*b6!H-wzQ`0-HXq*
zu6$ZD=}^VAqfK*8w9P-|)A_h^`jM%tPfyzUcIN(%T`SH^-f$^;-s^cMzAiZNb@{m;
zb9Y>uck1i%^FOlIe^`9}$C|6Z%JzL*bK}>J)3-L<`@8Y(-wpTwZG8Cm!OPdz?%sX!
z_SMsOuQoibJo|p-+4svXyjiy9V)n$HPLY-Tr4y9uXX~^sGHF|A+Pl)Se~tB&jgFJo
zxy{)Yuw-9!N|jjMG@Yh71|{8!e;*wA^Z3H=?X#D4HO*^l{r~?z!vF!rpDc_F4B-qq
zAp1da!oWViA-t)%rM0cSBRsS_w6iHJI5;STp`D45$w*&AQAC(=!2+gmUKukBbBk50
zEljz1o0tt9y<8lPO{AqvjG3ER^*n9e0u2<blq9uTn%T5G9NnBX<xP|%blICZR8`&m
z?yAa(-{oxPRSB^7byktJ){#)*YZi31bMSQ%v$51s7L(v<`f$X3vZ{~PhlIpOF0HK1
TDmF7bHa>E3moR2yVz34P9}dw*

diff --git a/resources/images/teamarea_obj.gif b/resources/images/teamarea_obj.gif
deleted file mode 100644
index a9a4ac55855c8e9589741f0b07d40b4aca092172..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 590
zcmZ?wbhEHb6krfwc*ekB88z1_d68TC60fY~zIm&BGUp}KZA)v~-o5y2PS5^={sSeG
z4pmG$+BD}x+x%0pjXN?r_modNR5|^~)YYdK@4nT&@@&_NGn3X|nY`iB+#T0;oW8T;
z^sRIE9zS^b`sno=*Y4hZ^7hr!cds@)tvvgF<%&CbXWuW|_n_y(n`LV*W>4JdwEkjV
zWF`NUjUJ^Fl<H^ev@SAfTWH!e&!l&yW&axMDH|OpuXCHTEnvyM=#(n4>M5Fa({!5V
z7|h=qwB}H9Nw;EYhw87F^ZtK5^X>k${~r(if4%wtuh(xbcK?66<o}On|8I5v2a12b
z@&C)6|KA?|zgYVCVD0}8mu_w<Jltt^yxV+Vi^<!YdpB1atS{ByQET+{(yq+~YX8B2
zfnGrICkrD3Lkxos$U;z@FtD#~h-qqWX>AGa2ySbQitdY!>TU{laBy<-5A5t{cbqqW
zfn(QX=cUfBD^|LOHV3(^_s}rW)$ow!V3%$Rao_7}tfX(}%O@|y))e7&+Q&#kU)zUQ
zT8OnN%=4zFw}FNCeIAzPaKEPk)~e>(0o)3b*P6n^BlVQk%{93cWhI4~TdmygtVmRL
s?BEeI;Lw<I_z16<p+dol07a(;Cwq?-FAhF#WakypW0;_#DZpS20J$XbXaE2J

diff --git a/resources/templates/Team.css b/resources/templates/Team.css
index be99660..4636510 100644
--- a/resources/templates/Team.css
+++ b/resources/templates/Team.css
@@ -49,18 +49,6 @@
 }
 
 
-.teamIcon {
-    background-image: url("../images/teamarea_obj.gif");
-    height: 16px;
-    width: 16px;
-}
-
-.projectIcon {
-    background-image: url("../images/projectarea_obj.gif");
-    height: 16px;
-    width: 16px;
-}
-
 .right {
     overflow: auto;
 }
@@ -96,7 +84,6 @@
 }
 
 .cMenuContent{
-    background-image: url("../images/teamarea_obj.gif");
     background-color: gray;
     width: 20px;
     height: 20px;