Skip to content

UTDTEK-3763 #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
B1nguy1 wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

UTDTEK-3763 #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c8bff50
UTDTEK-3763 Opprettet komponent for visning av kildedato
B1nguy1 Oct 31, 2025
40fcfda
UTDTEK-3763 bygge komponentene
B1nguy1 Oct 31, 2025
2c0340b
UTDTEK-3763 formatting
B1nguy1 Nov 3, 2025
e37ffb8
mer bygging av komponentene
B1nguy1 Nov 3, 2025
756db10
UTDTEK-3763
B1nguy1 Nov 3, 2025
7b235a7
UTDTEK-3763 fikse feil i koden
B1nguy1 Nov 3, 2025
f8ed9e4
UTDTEK-3763 nedgradere fra react 19 til react 17
B1nguy1 Nov 4, 2025
4b8940e
øke avstand mellom punktum og lenke
B1nguy1 Nov 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions build/assets/index-D1bHwcV9.js
View file
Open in desktop

Large diffs are not rendered by default.

49 changes: 0 additions & 49 deletions build/assets/index-D8KEw_JA.js
View file
Open in desktop

This file was deleted.

66 changes: 33 additions & 33 deletions build/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app"
/>
<link rel="apple-touch-icon" href="/logo192.png" />
<link rel="manifest" href="/manifest.json" />
<link rel="stylesheet" href="styles.css" />

<title>React App</title>
<script type="module" crossorigin src="/assets/index-D8KEw_JA.js"></script>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.

You can add webfonts, meta tags, or analytics to this file.
The build step will place the bundled scripts into the <body> tag.

To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
-->
</body>
</html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app"
/>
<link rel="apple-touch-icon" href="/logo192.png" />
<link rel="manifest" href="/manifest.json" />
<link rel="stylesheet" href="styles.css" />
<title>React App</title>
<script type="module" crossorigin src="/assets/index-D1bHwcV9.js"></script>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.
You can add webfonts, meta tags, or analytics to this file.
The build step will place the bundled scripts into the <body> tag.
To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
-->
</body>
</html>
Expand Down
15 changes: 11 additions & 4 deletions es/Context2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@ var _useData = require("./useData");
var _utils = require("./utils");
var _Visualization = _interopRequireDefault(require("./Visualization2"));
var _MissingData = _interopRequireDefault(require("./MissingData"));
var _SourceInfo = require("./SourceInfo");
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
const Context2 = _ref => {
var _item$main;
let {
id = 'y_sykepleier',
direction = 'uno_id2styrk08',
Expand All @@ -27,7 +29,8 @@ const Context2 = _ref => {
missingDataText = 'Missing data',
tooltipStyles,
tooltipCaretStyles,
api_url = 'https://v3.api.utdanning.no'
api_url = 'https://v3.api.utdanning.no',
showKildeDato = false
} = _ref;
const [usedLimit, setUsedLimit] = (0, _react.useState)(limit);
const item = (0, _useData.useData)(id, direction, api_url);
Expand All @@ -43,7 +46,7 @@ const Context2 = _ref => {
const handleClickMore = (0, _react.useCallback)(() => {
setUsedLimit(oldLimit => oldLimit + limit);
}, []);
return /*#__PURE__*/_react.default.createElement(_react.Fragment, null, docs && docs.length ? /*#__PURE__*/_react.default.createElement(_Visualization.default, {
return /*#__PURE__*/_react.default.createElement(_react.Fragment, null, docs && docs.length ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_Visualization.default, {
item: {
parentId: item.main ? item.main.uno_id : id,
subItems: dataset
Expand All @@ -58,7 +61,10 @@ const Context2 = _ref => {
tooltipStyles: tooltipStyles,
tooltipCaretStyles: tooltipCaretStyles,
onClickMore: handleClickMore
}) : /*#__PURE__*/_react.default.createElement(_MissingData.default, {
}), /*#__PURE__*/_react.default.createElement(_SourceInfo.SourceInfo, {
kildedato: (_item$main = item.main) === null || _item$main === void 0 ? void 0 : _item$main.kildedato,
showKildeDato: showKildeDato
})) : /*#__PURE__*/_react.default.createElement(_MissingData.default, {
text: missingDataText
}));
};
Expand All @@ -69,6 +75,7 @@ Context2.propTypes = {
disaggregateBy: _propTypes.default.arrayOf(_propTypes.default.string),
disaggregateLabels: _propTypes.default.arrayOf(_propTypes.default.string),
colors: _propTypes.default.object,
missingDataText: _propTypes.default.string
missingDataText: _propTypes.default.string,
showKildeDato: _propTypes.default.bool
};
var _default = exports.default = Context2;
33 changes: 33 additions & 0 deletions es/SourceInfo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
"use strict";

Object.defineProperty(exports, "__esModule", {
value: true
});
exports.SourceInfo = void 0;
var _react = _interopRequireDefault(require("react"));
var _utils = require("./utils");
var _propTypes = _interopRequireDefault(require("prop-types"));
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
const SourceInfo = _ref => {
let {
kildedato,
showKildeDato = false
} = _ref;
if (!kildedato) {
return null;
}
if (!showKildeDato) {
return null;
}
const dato = new Date(Date.parse(kildedato));
const year = dato.getFullYear();
const month = _utils.months[dato.getMonth()];
return /*#__PURE__*/_react.default.createElement("p", null, "Kilde: Statistisk sentralbyr\xE5 ", year + 1, ". Tall fra ", month, " ", year, ".", " ", /*#__PURE__*/_react.default.createElement("a", {
href: "/tema/om_utdanning.no/om_yrkes-_og_utdanningstatistikken"
}, "Forklaring til statistikken"));
};
exports.SourceInfo = SourceInfo;
SourceInfo.propTypes = {
kildedato: _propTypes.default.string,
showKildeDato: _propTypes.default.bool
};
7 changes: 5 additions & 2 deletions es/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,13 @@ Object.defineProperty(exports, "getData", {
}
});
var _react = _interopRequireDefault(require("react"));
var _reactDom = _interopRequireDefault(require("react-dom"));
var _App = _interopRequireDefault(require("./App"));
var _reactDom = _interopRequireDefault(require("react-dom"));
var _Context = _interopRequireDefault(require("./Context2"));
var _Context2 = _interopRequireDefault(require("./Context3"));
var _useData = require("./useData");
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
_reactDom.default.render(/*#__PURE__*/_react.default.createElement(_react.default.StrictMode, null, /*#__PURE__*/_react.default.createElement(_App.default, null)), document.getElementById('root'));
const container = document.getElementById('root');
if (container) {
_reactDom.default.render(/*#__PURE__*/_react.default.createElement(_react.default.StrictMode, null, /*#__PURE__*/_react.default.createElement(_App.default, null)), container);
}
5 changes: 3 additions & 2 deletions es/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
value: true
});
exports.clamp = clamp;
exports.getColor = exports.defaultColors = void 0;
exports.months = exports.getColor = exports.defaultColors = void 0;
exports.prepareMore = prepareMore;
exports.useResize = void 0;
exports.useTooltip = useTooltip;
Expand Down Expand Up @@ -114,4 +114,5 @@ function prepareMore(docs, limit) {
};
}, {});
return docs.slice(0, limit).concat([more]);
}
}
const months = exports.months = ["januar", "februar", "mars", "april", "mai", "juni", "juli", "august", "september", "oktober", "november", "desember"];
15 changes: 11 additions & 4 deletions lib/Context2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@ var _useData = require("./useData");
var _utils = require("./utils");
var _Visualization = _interopRequireDefault(require("./Visualization2"));
var _MissingData = _interopRequireDefault(require("./MissingData"));
var _SourceInfo = require("./SourceInfo");
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
const Context2 = _ref => {
var _item$main;
let {
id = 'y_sykepleier',
direction = 'uno_id2styrk08',
Expand All @@ -27,7 +29,8 @@ const Context2 = _ref => {
missingDataText = 'Missing data',
tooltipStyles,
tooltipCaretStyles,
api_url = 'https://v3.api.utdanning.no'
api_url = 'https://v3.api.utdanning.no',
showKildeDato = false
} = _ref;
const [usedLimit, setUsedLimit] = (0, _react.useState)(limit);
const item = (0, _useData.useData)(id, direction, api_url);
Expand All @@ -43,7 +46,7 @@ const Context2 = _ref => {
const handleClickMore = (0, _react.useCallback)(() => {
setUsedLimit(oldLimit => oldLimit + limit);
}, []);
return /*#__PURE__*/_react.default.createElement(_react.Fragment, null, docs && docs.length ? /*#__PURE__*/_react.default.createElement(_Visualization.default, {
return /*#__PURE__*/_react.default.createElement(_react.Fragment, null, docs && docs.length ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_Visualization.default, {
item: {
parentId: item.main ? item.main.uno_id : id,
subItems: dataset
Expand All @@ -58,7 +61,10 @@ const Context2 = _ref => {
tooltipStyles: tooltipStyles,
tooltipCaretStyles: tooltipCaretStyles,
onClickMore: handleClickMore
}) : /*#__PURE__*/_react.default.createElement(_MissingData.default, {
}), /*#__PURE__*/_react.default.createElement(_SourceInfo.SourceInfo, {
kildedato: (_item$main = item.main) === null || _item$main === void 0 ? void 0 : _item$main.kildedato,
showKildeDato: showKildeDato
})) : /*#__PURE__*/_react.default.createElement(_MissingData.default, {
text: missingDataText
}));
};
Expand All @@ -69,6 +75,7 @@ Context2.propTypes = {
disaggregateBy: _propTypes.default.arrayOf(_propTypes.default.string),
disaggregateLabels: _propTypes.default.arrayOf(_propTypes.default.string),
colors: _propTypes.default.object,
missingDataText: _propTypes.default.string
missingDataText: _propTypes.default.string,
showKildeDato: _propTypes.default.bool
};
var _default = exports.default = Context2;
33 changes: 33 additions & 0 deletions lib/SourceInfo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
"use strict";

Object.defineProperty(exports, "__esModule", {
value: true
});
exports.SourceInfo = void 0;
var _react = _interopRequireDefault(require("react"));
var _utils = require("./utils");
var _propTypes = _interopRequireDefault(require("prop-types"));
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
const SourceInfo = _ref => {
let {
kildedato,
showKildeDato = false
} = _ref;
if (!kildedato) {
return null;
}
if (!showKildeDato) {
return null;
}
const dato = new Date(Date.parse(kildedato));
const year = dato.getFullYear();
const month = _utils.months[dato.getMonth()];
return /*#__PURE__*/_react.default.createElement("p", null, "Kilde: Statistisk sentralbyr\xE5 ", year + 1, ". Tall fra ", month, " ", year, ".", " ", /*#__PURE__*/_react.default.createElement("a", {
href: "/tema/om_utdanning.no/om_yrkes-_og_utdanningstatistikken"
}, "Forklaring til statistikken"));
};
exports.SourceInfo = SourceInfo;
SourceInfo.propTypes = {
kildedato: _propTypes.default.string,
showKildeDato: _propTypes.default.bool
};
7 changes: 5 additions & 2 deletions lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,13 @@ Object.defineProperty(exports, "getData", {
}
});
var _react = _interopRequireDefault(require("react"));
var _reactDom = _interopRequireDefault(require("react-dom"));
var _App = _interopRequireDefault(require("./App"));
var _reactDom = _interopRequireDefault(require("react-dom"));
var _Context = _interopRequireDefault(require("./Context2"));
var _Context2 = _interopRequireDefault(require("./Context3"));
var _useData = require("./useData");
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
_reactDom.default.render(/*#__PURE__*/_react.default.createElement(_react.default.StrictMode, null, /*#__PURE__*/_react.default.createElement(_App.default, null)), document.getElementById('root'));
const container = document.getElementById('root');
if (container) {
_reactDom.default.render(/*#__PURE__*/_react.default.createElement(_react.default.StrictMode, null, /*#__PURE__*/_react.default.createElement(_App.default, null)), container);
}
5 changes: 3 additions & 2 deletions lib/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
value: true
});
exports.clamp = clamp;
exports.getColor = exports.defaultColors = void 0;
exports.months = exports.getColor = exports.defaultColors = void 0;
exports.prepareMore = prepareMore;
exports.useResize = void 0;
exports.useTooltip = useTooltip;
Expand Down Expand Up @@ -114,4 +114,5 @@ function prepareMore(docs, limit) {
};
}, {});
return docs.slice(0, limit).concat([more]);
}
}
const months = exports.months = ["januar", "februar", "mars", "april", "mai", "juni", "juli", "august", "september", "oktober", "november", "desember"];
Loading