Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
35694a76
Commit
35694a76
authored
Aug 01, 2018
by
Tobias Skarhed
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Class to function. Half tests passing
parent
739bee02
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
265 additions
and
113 deletions
+265
-113
public/app/features/dashboard/shareModalCtrl.ts
+111
-113
public/app/features/dashboard/specs/share_modal_ctrl.jest.ts
+154
-0
No files found.
public/app/features/dashboard/shareModalCtrl.ts
View file @
35694a76
...
...
@@ -2,120 +2,118 @@ import angular from 'angular';
import
config
from
'app/core/config'
;
import
moment
from
'moment'
;
export
class
ShareModalCtrl
{
/** @ngInject */
constructor
(
$scope
,
$rootScope
,
$location
,
$timeout
,
timeSrv
,
templateSrv
,
linkSrv
)
{
$scope
.
options
=
{
forCurrent
:
true
,
includeTemplateVars
:
true
,
theme
:
'current'
,
};
$scope
.
editor
=
{
index
:
$scope
.
tabIndex
||
0
};
$scope
.
init
=
function
()
{
$scope
.
modeSharePanel
=
$scope
.
panel
?
true
:
false
;
$scope
.
tabs
=
[{
title
:
'Link'
,
src
:
'shareLink.html'
}];
if
(
$scope
.
modeSharePanel
)
{
$scope
.
modalTitle
=
'Share Panel'
;
$scope
.
tabs
.
push
({
title
:
'Embed'
,
src
:
'shareEmbed.html'
});
}
else
{
$scope
.
modalTitle
=
'Share'
;
}
if
(
!
$scope
.
dashboard
.
meta
.
isSnapshot
)
{
$scope
.
tabs
.
push
({
title
:
'Snapshot'
,
src
:
'shareSnapshot.html'
});
}
if
(
!
$scope
.
dashboard
.
meta
.
isSnapshot
&&
!
$scope
.
modeSharePanel
)
{
$scope
.
tabs
.
push
({
title
:
'Export'
,
src
:
'shareExport.html'
});
}
$scope
.
buildUrl
();
};
$scope
.
buildUrl
=
function
()
{
var
baseUrl
=
$location
.
absUrl
();
var
queryStart
=
baseUrl
.
indexOf
(
'?'
);
if
(
queryStart
!==
-
1
)
{
baseUrl
=
baseUrl
.
substring
(
0
,
queryStart
);
}
var
params
=
angular
.
copy
(
$location
.
search
());
var
range
=
timeSrv
.
timeRange
();
params
.
from
=
range
.
from
.
valueOf
();
params
.
to
=
range
.
to
.
valueOf
();
params
.
orgId
=
config
.
bootData
.
user
.
orgId
;
if
(
$scope
.
options
.
includeTemplateVars
)
{
templateSrv
.
fillVariableValuesForUrl
(
params
);
}
if
(
!
$scope
.
options
.
forCurrent
)
{
delete
params
.
from
;
delete
params
.
to
;
}
if
(
$scope
.
options
.
theme
!==
'current'
)
{
params
.
theme
=
$scope
.
options
.
theme
;
}
if
(
$scope
.
modeSharePanel
)
{
params
.
panelId
=
$scope
.
panel
.
id
;
params
.
fullscreen
=
true
;
}
else
{
delete
params
.
panelId
;
delete
params
.
fullscreen
;
}
$scope
.
shareUrl
=
linkSrv
.
addParamsToUrl
(
baseUrl
,
params
);
var
soloUrl
=
baseUrl
.
replace
(
config
.
appSubUrl
+
'/dashboard/'
,
config
.
appSubUrl
+
'/dashboard-solo/'
);
soloUrl
=
soloUrl
.
replace
(
config
.
appSubUrl
+
'/d/'
,
config
.
appSubUrl
+
'/d-solo/'
);
/** @ngInject */
export
function
ShareModalCtrl
(
$scope
,
$rootScope
,
$location
,
$timeout
,
timeSrv
,
templateSrv
,
linkSrv
)
{
$scope
.
options
=
{
forCurrent
:
true
,
includeTemplateVars
:
true
,
theme
:
'current'
,
};
$scope
.
editor
=
{
index
:
$scope
.
tabIndex
||
0
};
$scope
.
init
=
function
()
{
$scope
.
modeSharePanel
=
$scope
.
panel
?
true
:
false
;
$scope
.
tabs
=
[{
title
:
'Link'
,
src
:
'shareLink.html'
}];
if
(
$scope
.
modeSharePanel
)
{
$scope
.
modalTitle
=
'Share Panel'
;
$scope
.
tabs
.
push
({
title
:
'Embed'
,
src
:
'shareEmbed.html'
});
}
else
{
$scope
.
modalTitle
=
'Share'
;
}
if
(
!
$scope
.
dashboard
.
meta
.
isSnapshot
)
{
$scope
.
tabs
.
push
({
title
:
'Snapshot'
,
src
:
'shareSnapshot.html'
});
}
if
(
!
$scope
.
dashboard
.
meta
.
isSnapshot
&&
!
$scope
.
modeSharePanel
)
{
$scope
.
tabs
.
push
({
title
:
'Export'
,
src
:
'shareExport.html'
});
}
$scope
.
buildUrl
();
};
$scope
.
buildUrl
=
function
()
{
var
baseUrl
=
$location
.
absUrl
();
var
queryStart
=
baseUrl
.
indexOf
(
'?'
);
if
(
queryStart
!==
-
1
)
{
baseUrl
=
baseUrl
.
substring
(
0
,
queryStart
);
}
var
params
=
angular
.
copy
(
$location
.
search
());
var
range
=
timeSrv
.
timeRange
();
params
.
from
=
range
.
from
.
valueOf
();
params
.
to
=
range
.
to
.
valueOf
();
params
.
orgId
=
config
.
bootData
.
user
.
orgId
;
if
(
$scope
.
options
.
includeTemplateVars
)
{
templateSrv
.
fillVariableValuesForUrl
(
params
);
}
if
(
!
$scope
.
options
.
forCurrent
)
{
delete
params
.
from
;
delete
params
.
to
;
}
if
(
$scope
.
options
.
theme
!==
'current'
)
{
params
.
theme
=
$scope
.
options
.
theme
;
}
if
(
$scope
.
modeSharePanel
)
{
params
.
panelId
=
$scope
.
panel
.
id
;
params
.
fullscreen
=
true
;
}
else
{
delete
params
.
panelId
;
delete
params
.
fullscreen
;
delete
params
.
edit
;
soloUrl
=
linkSrv
.
addParamsToUrl
(
soloUrl
,
params
);
$scope
.
iframeHtml
=
'<iframe src="'
+
soloUrl
+
'" width="450" height="200" frameborder="0"></iframe>'
;
$scope
.
imageUrl
=
soloUrl
.
replace
(
config
.
appSubUrl
+
'/dashboard-solo/'
,
config
.
appSubUrl
+
'/render/dashboard-solo/'
);
$scope
.
imageUrl
=
$scope
.
imageUrl
.
replace
(
config
.
appSubUrl
+
'/d-solo/'
,
config
.
appSubUrl
+
'/render/d-solo/'
);
$scope
.
imageUrl
+=
'&width=1000&height=500'
+
$scope
.
getLocalTimeZone
();
};
// This function will try to return the proper full name of the local timezone
// Chrome does not handle the timezone offset (but phantomjs does)
$scope
.
getLocalTimeZone
=
function
()
{
let
utcOffset
=
'&tz=UTC'
+
encodeURIComponent
(
moment
().
format
(
'Z'
));
// Older browser does not the internationalization API
if
(
!
(
<
any
>
window
).
Intl
)
{
return
utcOffset
;
}
const
dateFormat
=
(
<
any
>
window
).
Intl
.
DateTimeFormat
();
if
(
!
dateFormat
.
resolvedOptions
)
{
return
utcOffset
;
}
const
options
=
dateFormat
.
resolvedOptions
();
if
(
!
options
.
timeZone
)
{
return
utcOffset
;
}
return
'&tz='
+
encodeURIComponent
(
options
.
timeZone
);
};
$scope
.
getShareUrl
=
function
()
{
return
$scope
.
shareUrl
;
};
}
}
$scope
.
shareUrl
=
linkSrv
.
addParamsToUrl
(
baseUrl
,
params
);
var
soloUrl
=
baseUrl
.
replace
(
config
.
appSubUrl
+
'/dashboard/'
,
config
.
appSubUrl
+
'/dashboard-solo/'
);
soloUrl
=
soloUrl
.
replace
(
config
.
appSubUrl
+
'/d/'
,
config
.
appSubUrl
+
'/d-solo/'
);
delete
params
.
fullscreen
;
delete
params
.
edit
;
soloUrl
=
linkSrv
.
addParamsToUrl
(
soloUrl
,
params
);
$scope
.
iframeHtml
=
'<iframe src="'
+
soloUrl
+
'" width="450" height="200" frameborder="0"></iframe>'
;
$scope
.
imageUrl
=
soloUrl
.
replace
(
config
.
appSubUrl
+
'/dashboard-solo/'
,
config
.
appSubUrl
+
'/render/dashboard-solo/'
);
$scope
.
imageUrl
=
$scope
.
imageUrl
.
replace
(
config
.
appSubUrl
+
'/d-solo/'
,
config
.
appSubUrl
+
'/render/d-solo/'
);
$scope
.
imageUrl
+=
'&width=1000&height=500'
+
$scope
.
getLocalTimeZone
();
};
// This function will try to return the proper full name of the local timezone
// Chrome does not handle the timezone offset (but phantomjs does)
$scope
.
getLocalTimeZone
=
function
()
{
let
utcOffset
=
'&tz=UTC'
+
encodeURIComponent
(
moment
().
format
(
'Z'
));
// Older browser does not the internationalization API
if
(
!
(
<
any
>
window
).
Intl
)
{
return
utcOffset
;
}
const
dateFormat
=
(
<
any
>
window
).
Intl
.
DateTimeFormat
();
if
(
!
dateFormat
.
resolvedOptions
)
{
return
utcOffset
;
}
const
options
=
dateFormat
.
resolvedOptions
();
if
(
!
options
.
timeZone
)
{
return
utcOffset
;
}
return
'&tz='
+
encodeURIComponent
(
options
.
timeZone
);
};
$scope
.
getShareUrl
=
function
()
{
return
$scope
.
shareUrl
;
};
}
angular
.
module
(
'grafana.controllers'
).
controller
(
'ShareModalCtrl'
,
ShareModalCtrl
);
public/app/features/dashboard/specs/share_modal_ctrl.jest.ts
0 → 100644
View file @
35694a76
import
'../shareModalCtrl'
;
import
{
ShareModalCtrl
}
from
'../shareModalCtrl'
;
import
config
from
'app/core/config'
;
import
{
LinkSrv
}
from
'app/features/panellinks/link_srv'
;
describe
(
'ShareModalCtrl'
,
()
=>
{
var
ctx
=
<
any
>
{
timeSrv
:
{
timeRange
:
()
=>
{
return
{
from
:
new
Date
(
1000
),
to
:
new
Date
(
2000
)
};
},
},
$location
:
{
absUrl
:
()
=>
'http://server/#!/test'
,
search
:
()
=>
{
return
{
from
:
''
,
to
:
''
};
},
},
scope
:
{
dashboard
:
{
meta
:
{
isSnapshot
:
true
,
},
},
},
templateSrv
:
{
fillVariableValuesForUrl
:
()
=>
{},
},
};
// function setTime(range) {
// ctx.timeSrv.timeRange = () => range;
// }
beforeEach
(()
=>
{
config
.
bootData
=
{
user
:
{
orgId
:
1
,
},
};
});
// setTime({ from: new Date(1000), to: new Date(2000) });
// beforeEach(angularMocks.module('grafana.controllers'));
// beforeEach(angularMocks.module('grafana.services'));
// beforeEach(
// angularMocks.module(function($compileProvider) {
// $compileProvider.preAssignBindingsEnabled(true);
// })
// );
// beforeEach(ctx.providePhase());
// beforeEach(ctx.createControllerPhase('ShareModalCtrl'));
beforeEach
(()
=>
{
ctx
.
ctrl
=
new
ShareModalCtrl
(
ctx
.
scope
,
{},
ctx
.
$location
,
{},
ctx
.
timeSrv
,
ctx
.
templateSrv
,
new
LinkSrv
({},
ctx
.
stimeSrv
)
);
});
describe
(
'shareUrl with current time range and panel'
,
()
=>
{
it
(
'should generate share url absolute time'
,
()
=>
{
// ctx.$location.path('/test');
ctx
.
scope
.
panel
=
{
id
:
22
};
ctx
.
scope
.
init
();
expect
(
ctx
.
scope
.
shareUrl
).
toBe
(
'http://server/#!/test?from=1000&to=2000&orgId=1&panelId=22&fullscreen'
);
});
it
(
'should generate render url'
,
()
=>
{
ctx
.
$location
.
absUrl
=
()
=>
'http://dashboards.grafana.com/d/abcdefghi/my-dash'
;
ctx
.
scope
.
panel
=
{
id
:
22
};
ctx
.
scope
.
init
();
var
base
=
'http://dashboards.grafana.com/render/d-solo/abcdefghi/my-dash'
;
var
params
=
'?from=1000&to=2000&orgId=1&panelId=22&width=1000&height=500&tz=UTC'
;
expect
(
ctx
.
scope
.
imageUrl
).
toContain
(
base
+
params
);
});
it
(
'should generate render url for scripted dashboard'
,
()
=>
{
ctx
.
$location
.
absUrl
=
()
=>
'http://dashboards.grafana.com/dashboard/script/my-dash.js'
;
ctx
.
scope
.
panel
=
{
id
:
22
};
ctx
.
scope
.
init
();
var
base
=
'http://dashboards.grafana.com/render/dashboard-solo/script/my-dash.js'
;
var
params
=
'?from=1000&to=2000&orgId=1&panelId=22&width=1000&height=500&tz=UTC'
;
expect
(
ctx
.
scope
.
imageUrl
).
toContain
(
base
+
params
);
});
it
(
'should remove panel id when no panel in scope'
,
()
=>
{
// ctx.$location.path('/test');
ctx
.
$location
.
absUrl
=
()
=>
'http://server/#!/test'
;
ctx
.
scope
.
options
.
forCurrent
=
true
;
ctx
.
scope
.
panel
=
null
;
ctx
.
scope
.
init
();
expect
(
ctx
.
scope
.
shareUrl
).
toBe
(
'http://server/#!/test?from=1000&to=2000&orgId=1'
);
});
it
(
'should add theme when specified'
,
()
=>
{
// ctx.$location.path('/test');
ctx
.
scope
.
options
.
theme
=
'light'
;
ctx
.
scope
.
panel
=
null
;
ctx
.
scope
.
init
();
expect
(
ctx
.
scope
.
shareUrl
).
toBe
(
'http://server/#!/test?from=1000&to=2000&orgId=1&theme=light'
);
});
it
(
'should remove fullscreen from image url when is first param in querystring and modeSharePanel is true'
,
()
=>
{
ctx
.
$location
.
absUrl
=
()
=>
'http://server/#!/test?fullscreen&edit'
;
ctx
.
scope
.
modeSharePanel
=
true
;
ctx
.
scope
.
panel
=
{
id
:
1
};
ctx
.
scope
.
buildUrl
();
expect
(
ctx
.
scope
.
shareUrl
).
toContain
(
'?fullscreen&edit&from=1000&to=2000&orgId=1&panelId=1'
);
expect
(
ctx
.
scope
.
imageUrl
).
toContain
(
'?from=1000&to=2000&orgId=1&panelId=1&width=1000&height=500&tz=UTC'
);
});
it
(
'should remove edit from image url when is first param in querystring and modeSharePanel is true'
,
()
=>
{
ctx
.
$location
.
absUrl
=
()
=>
'http://server/#!/test?edit&fullscreen'
;
ctx
.
scope
.
modeSharePanel
=
true
;
ctx
.
scope
.
panel
=
{
id
:
1
};
ctx
.
scope
.
buildUrl
();
expect
(
ctx
.
scope
.
shareUrl
).
toContain
(
'?edit&fullscreen&from=1000&to=2000&orgId=1&panelId=1'
);
expect
(
ctx
.
scope
.
imageUrl
).
toContain
(
'?from=1000&to=2000&orgId=1&panelId=1&width=1000&height=500&tz=UTC'
);
});
it
(
'should include template variables in url'
,
()
=>
{
ctx
.
$location
.
absUrl
=
()
=>
'http://server/#!/test'
;
ctx
.
scope
.
options
.
includeTemplateVars
=
true
;
ctx
.
templateSrv
.
fillVariableValuesForUrl
=
function
(
params
)
{
params
[
'var-app'
]
=
'mupp'
;
params
[
'var-server'
]
=
'srv-01'
;
};
ctx
.
scope
.
buildUrl
();
expect
(
ctx
.
scope
.
shareUrl
).
toContain
(
'http://server/#!/test?from=1000&to=2000&orgId=1&var-app=mupp&var-server=srv-01'
);
});
});
});
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment