From 4a07a58195c19853ce12ef607ce13230161450da Mon Sep 17 00:00:00 2001 From: Aleh Hutnikau Date: Mon, 15 Feb 2021 15:47:32 +0300 Subject: [PATCH 1/3] refactor: move dependencies to composer --- composer.json | 7 +++++-- manifest.php | 7 ------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 47ea2de..6187265 100644 --- a/composer.json +++ b/composer.json @@ -47,12 +47,15 @@ "extra" : { "tao-extension-name" : "taoGroups" }, - "autoload" : { + "autoload" : { "psr-4" : { "oat\\taoGroups\\" : "" } }, "require" : { - "oat-sa/oatbox-extension-installer" : "~1.1||dev-master" + "oat-sa/oatbox-extension-installer" : "~1.1||dev-master", + "oat-sa/tao-core" : ">=46.14.4", + "oat-sa/generis" : ">=13.14.1", + "oat-sa/extension-tao-testtaker" : ">=7.7.3" } } \ No newline at end of file diff --git a/manifest.php b/manifest.php index 54ccbc7..8b26a9c 100755 --- a/manifest.php +++ b/manifest.php @@ -33,14 +33,7 @@ 'label' => 'Groups core extension', 'description' => 'TAO Groups extension', 'license' => 'GPL-2.0', - 'version' => '6.6.2', 'author' => 'Open Assessment Technologies, CRP Henri Tudor', - 'requires' => [ - 'taoTestTaker' => '>=4.0.0', - 'taoBackOffice' => '>=3.0.0', - 'generis' => '>=12.15.0', - 'tao' => '>=36.1.0' - ], 'models' => [ 'http://www.tao.lu/Ontologies/TAOGroup.rdf' ], From 2a98cf8bf5c08c8fcc6d6c801e7ae019477c4daa Mon Sep 17 00:00:00 2001 From: Aleh Hutnikau Date: Wed, 17 Feb 2021 16:05:57 +0300 Subject: [PATCH 2/3] fix: update dependencies versions --- composer.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 6187265..56f1969 100644 --- a/composer.json +++ b/composer.json @@ -54,8 +54,9 @@ }, "require" : { "oat-sa/oatbox-extension-installer" : "~1.1||dev-master", - "oat-sa/tao-core" : ">=46.14.4", - "oat-sa/generis" : ">=13.14.1", - "oat-sa/extension-tao-testtaker" : ">=7.7.3" + "oat-sa/generis" : ">=14.0.0", + "oat-sa/tao-core" : ">=47.0.0", + "oat-sa/extension-tao-backoffice" : ">=6.0.0", + "oat-sa/extension-tao-testtaker" : ">=8.0.0" } } \ No newline at end of file From 37f3ce142abac0f29fcdeab926e589a786fce20f Mon Sep 17 00:00:00 2001 From: Aleh Hutnikau Date: Wed, 17 Feb 2021 16:29:53 +0300 Subject: [PATCH 3/3] chore: bundle assets --- views/js/loader/taoGroups.min.js.map | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/js/loader/taoGroups.min.js.map b/views/js/loader/taoGroups.min.js.map index ad0e16f..4bddb88 100644 --- a/views/js/loader/taoGroups.min.js.map +++ b/views/js/loader/taoGroups.min.js.map @@ -1 +1 @@ -{"version":3,"sources":["../controller/routes.js","../provider/group.js","module-create.js"],"names":[],"mappings":"AAqBA,MAAA,CAAA,6BAAA,CAAA,EAAA,CAAA,UAAA,CACA,aAEA,MAAA,EAEA,CALA,C,CCDA,MAAA,CAAA,0BAAA,CAAA,CAAA,QAAA,CAAA,QAAA,CAAA,MAAA,CAAA,UAAA,CAAA,cAAA,CAAA,cAAA,CAAA,CAAA,SAAA,CAAA,CAAA,CAAA,CAAA,EAAA,CAAA,OAAA,CAAA,OAAA,CAAA,WAAA,CAAA,CACA,aAQA,MAAA,WAAA,CAKA,MAAA,CAYA,WAZA,sBAYA,MAZA,CAYA,CAUA,MAFA,CAAA,MAAA,CAAA,CAAA,CAAA,QAAA,CAAA,MAAA,EAAA,EAAA,CANA,CACA,QAAA,CAAA,6DADA,CAEA,EAAA,CAAA,iDAFA,CAGA,IAAA,CAAA,UAHA,CAMA,CAEA,CAAA,GAAA,CAAA,OAAA,CAAA,SAAA,OAAA,CAAA,MAAA,CAAA,CACA,WAAA,CAAA,CACA,GAAA,CAAA,OAAA,CAAA,KAAA,CAAA,aAAA,CAAA,QAAA,CAAA,WAAA,CADA,CAEA,MAAA,CAAA,MAFA,CAGA,IAAA,CAAA,MAHA,CAIA,QAAA,CAAA,MAJA,CAAA,CAAA,CAMA,IANA,CAMA,SAAA,KAAA,CAAA,CACA,OAAA,CAAA,KAAA,CACA,CARA,EASA,KATA,CASA,UAAA,CACA,MAAA,CAAA,GAAA,CAAA,KAAA,CAAA,EAAA,CAAA,4BAAA,CAAA,CAAA,CACA,CAXA,CAYA,CAbA,CAcA,CApCA,CA4CA,WA5CA,sBA4CA,GA5CA,CA4CA,CAEA,MAAA,IAAA,CAAA,OAAA,CAAA,SAAA,OAAA,CAAA,MAAA,CAAA,OAEA,CAAA,CAAA,CAAA,QAAA,CAAA,GAAA,CAAA,EAAA,CAAA,CAAA,OAAA,CAAA,GAAA,CAFA,CAGA,MAAA,CAAA,GAAA,CAAA,SAAA,CAAA,EAAA,CAAA,wBAAA,CAAA,CAAA,CAHA,KAMA,CAAA,WAAA,CAAA,CACA,GAAA,CAAA,OAAA,CAAA,KAAA,CAAA,QAAA,CAAA,QAAA,CAAA,WAAA,CADA,CAEA,MAAA,CAAA,MAFA,CAGA,IAAA,CAAA,CAAA,GAAA,CAAA,GAAA,CAHA,CAIA,QAAA,CAAA,MAJA,CAAA,CAAA,CAMA,IANA,CAMA,SAAA,QAAA,CAAA,CACA,OAAA,CAAA,QAAA,CACA,CARA,EASA,KATA,CASA,UAAA,CACA,MAAA,CAAA,GAAA,CAAA,KAAA,CAAA,EAAA,CAAA,wBAAA,CAAA,CAAA,CACA,CAXA,CAYA,CAlBA,CAmBA,CAjEA,CAmEA,CACA,CAlFA,C,CCnBA,MAAA,CAAA,mCAAA,CAAA,UAAA,CAAA,CAAA,C","sourcesContent":["/**\r\n * This program is free software; you can redistribute it and/or\r\n * modify it under the terms of the GNU General Public License\r\n * as published by the Free Software Foundation; under version 2\r\n * of the License (non-upgradable).\r\n *\r\n * This program is distributed in the hope that it will be useful,\r\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\r\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r\n * GNU General Public License for more details.\r\n *\r\n * You should have received a copy of the GNU General Public License\r\n * along with this program; if not, write to the Free Software\r\n * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\r\n *\r\n * Copyright (c) 2014 (original work) Open Assessment Technologies SA (under the project TAO-PRODUCT);\r\n * \r\n * \r\n */\r\n\r\n//@see http://forge.taotesting.com/projects/tao/wiki/Front_js\r\ndefine('taoGroups/controller/routes',[],function(){\r\n 'use strict';\r\n\r\n return {\r\n };\r\n});\r\n\n","/**\r\n * This program is free software; you can redistribute it and/or\r\n * modify it under the terms of the GNU General Public License\r\n * as published by the Free Software Foundation; under version 2\r\n * of the License (non-upgradable).\r\n *\r\n * This program is distributed in the hope that it will be useful,\r\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\r\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r\n * GNU General Public License for more details.\r\n *\r\n * You should have received a copy of the GNU General Public License\r\n * along with this program; if not, write to the Free Software\r\n * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\r\n *\r\n * Copyright (c) 2017-2019 (original work) Open Assessment Technologies SA;\r\n *\r\n * @author Alexander Zagovorichev \r\n */\r\n\r\ndefine('taoGroups/provider/group',['jquery', 'lodash', 'i18n', 'util/url', 'core/promise', 'core/request'], function ($, _, __, urlUtil, Promise, coreRequest) {\r\n 'use strict';\r\n\r\n /**\r\n * Creates a group provider\r\n *\r\n * @typedef {Object} groupProvider\r\n * @type {{addInstance: groupProvider.addInstance}}\r\n */\r\n return function groupProviderFactory () {\r\n\r\n /**\r\n * @returns {groupProvider}\r\n */\r\n return {\r\n\r\n /**\r\n * Create new group\r\n *\r\n * @param config\r\n * @param {String} [config.classUri] - rdf uri of the Group for current environment\r\n * @param {String} [config.id] - id of the Group for current environment\r\n * @param {String} [config.signature] - id signature received from BE, required\r\n * @param {String} [config.type] - Type of the instance\r\n * @return {*}\r\n */\r\n addInstance (config) {\r\n\r\n const _defaults = {\r\n classUri: 'http_2_www_0_tao_0_lu_1_Ontologies_1_TAOGroup_0_rdf_3_Group',\r\n id: 'http://www.tao.lu/Ontologies/TAOGroup.rdf#Group',\r\n type: 'instance'\r\n };\r\n\r\n config = _.defaults(config || {}, _defaults);\r\n\r\n return new Promise((resolve, reject) => {\r\n coreRequest({\r\n url: urlUtil.route('addInstance', 'Groups', 'taoGroups'),\r\n method: 'POST',\r\n data: config,\r\n dataType: 'json',\r\n })\r\n .then(function (group) {\r\n resolve(group);\r\n })\r\n .catch(function () {\r\n reject(new Error(__('Unable to create new group')));\r\n });\r\n });\r\n },\r\n\r\n /**\r\n * Group deleting\r\n *\r\n * @param uri\r\n * @return {*}\r\n */\r\n deleteGroup (uri) {\r\n\r\n return new Promise((resolve, reject) => {\r\n\r\n if (!_.isString(uri) || _.isEmpty(uri)) {\r\n return reject(new TypeError(__('Group uri is not valid')));\r\n }\r\n\r\n coreRequest({\r\n url: urlUtil.route('delete', 'Groups', 'taoGroups'),\r\n method: 'POST',\r\n data: {uri: uri},\r\n dataType: 'json',\r\n })\r\n .then(function (response) {\r\n resolve(response);\r\n })\r\n .catch(function () {\r\n reject(new Error(__('Unable to delete group')));\r\n });\r\n });\r\n }\r\n };\r\n };\r\n});\r\n\n","\ndefine(\"taoGroups/loader/taoGroups.bundle\", function(){});\n"]} \ No newline at end of file +{"version":3,"sources":["../controller/routes.js","../provider/group.js","module-create.js"],"names":[],"mappings":"AAqBA,MAAA,CAAA,6BAAA,CAAA,EAAA,CAAA,UAAA,CACA,aAEA,MAAA,EAEA,CALA,C,CCDA,MAAA,CAAA,0BAAA,CAAA,CAAA,QAAA,CAAA,QAAA,CAAA,MAAA,CAAA,UAAA,CAAA,cAAA,CAAA,cAAA,CAAA,CAAA,SAAA,CAAA,CAAA,CAAA,CAAA,EAAA,CAAA,OAAA,CAAA,OAAA,CAAA,WAAA,CAAA,CACA,aAQA,MAAA,WAAA,CAKA,MAAA,CAYA,WAZA,sBAYA,MAZA,CAYA,CAUA,MAFA,CAAA,MAAA,CAAA,CAAA,CAAA,QAAA,CAAA,MAAA,EAAA,EAAA,CANA,CACA,QAAA,CAAA,6DADA,CAEA,EAAA,CAAA,iDAFA,CAGA,IAAA,CAAA,UAHA,CAMA,CAEA,CAAA,GAAA,CAAA,OAAA,CAAA,SAAA,OAAA,CAAA,MAAA,CAAA,CACA,WAAA,CAAA,CACA,GAAA,CAAA,OAAA,CAAA,KAAA,CAAA,aAAA,CAAA,QAAA,CAAA,WAAA,CADA,CAEA,MAAA,CAAA,MAFA,CAGA,IAAA,CAAA,MAHA,CAIA,QAAA,CAAA,MAJA,CAAA,CAAA,CAMA,IANA,CAMA,SAAA,KAAA,CAAA,CACA,OAAA,CAAA,KAAA,CACA,CARA,EASA,KATA,CASA,UAAA,CACA,MAAA,CAAA,GAAA,CAAA,KAAA,CAAA,EAAA,CAAA,4BAAA,CAAA,CAAA,CACA,CAXA,CAYA,CAbA,CAcA,CApCA,CA4CA,WA5CA,sBA4CA,GA5CA,CA4CA,CAEA,MAAA,IAAA,CAAA,OAAA,CAAA,SAAA,OAAA,CAAA,MAAA,CAAA,OAEA,CAAA,CAAA,CAAA,QAAA,CAAA,GAAA,CAAA,EAAA,CAAA,CAAA,OAAA,CAAA,GAAA,CAFA,CAGA,MAAA,CAAA,GAAA,CAAA,SAAA,CAAA,EAAA,CAAA,wBAAA,CAAA,CAAA,CAHA,KAMA,CAAA,WAAA,CAAA,CACA,GAAA,CAAA,OAAA,CAAA,KAAA,CAAA,QAAA,CAAA,QAAA,CAAA,WAAA,CADA,CAEA,MAAA,CAAA,MAFA,CAGA,IAAA,CAAA,CAAA,GAAA,CAAA,GAAA,CAHA,CAIA,QAAA,CAAA,MAJA,CAAA,CAAA,CAMA,IANA,CAMA,SAAA,QAAA,CAAA,CACA,OAAA,CAAA,QAAA,CACA,CARA,EASA,KATA,CASA,UAAA,CACA,MAAA,CAAA,GAAA,CAAA,KAAA,CAAA,EAAA,CAAA,wBAAA,CAAA,CAAA,CACA,CAXA,CAYA,CAlBA,CAmBA,CAjEA,CAmEA,CACA,CAlFA,C,CCnBA,MAAA,CAAA,mCAAA,CAAA,UAAA,CAAA,CAAA,C","sourcesContent":["/**\n * This program is free software; you can redistribute it and/or\n * modify it under the terms of the GNU General Public License\n * as published by the Free Software Foundation; under version 2\n * of the License (non-upgradable).\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n * along with this program; if not, write to the Free Software\n * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n *\n * Copyright (c) 2014 (original work) Open Assessment Technologies SA (under the project TAO-PRODUCT);\n * \n * \n */\n\n//@see http://forge.taotesting.com/projects/tao/wiki/Front_js\ndefine('taoGroups/controller/routes',[],function(){\n 'use strict';\n\n return {\n };\n});\n\n","/**\n * This program is free software; you can redistribute it and/or\n * modify it under the terms of the GNU General Public License\n * as published by the Free Software Foundation; under version 2\n * of the License (non-upgradable).\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n * along with this program; if not, write to the Free Software\n * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n *\n * Copyright (c) 2017-2019 (original work) Open Assessment Technologies SA;\n *\n * @author Alexander Zagovorichev \n */\n\ndefine('taoGroups/provider/group',['jquery', 'lodash', 'i18n', 'util/url', 'core/promise', 'core/request'], function ($, _, __, urlUtil, Promise, coreRequest) {\n 'use strict';\n\n /**\n * Creates a group provider\n *\n * @typedef {Object} groupProvider\n * @type {{addInstance: groupProvider.addInstance}}\n */\n return function groupProviderFactory () {\n\n /**\n * @returns {groupProvider}\n */\n return {\n\n /**\n * Create new group\n *\n * @param config\n * @param {String} [config.classUri] - rdf uri of the Group for current environment\n * @param {String} [config.id] - id of the Group for current environment\n * @param {String} [config.signature] - id signature received from BE, required\n * @param {String} [config.type] - Type of the instance\n * @return {*}\n */\n addInstance (config) {\n\n const _defaults = {\n classUri: 'http_2_www_0_tao_0_lu_1_Ontologies_1_TAOGroup_0_rdf_3_Group',\n id: 'http://www.tao.lu/Ontologies/TAOGroup.rdf#Group',\n type: 'instance'\n };\n\n config = _.defaults(config || {}, _defaults);\n\n return new Promise((resolve, reject) => {\n coreRequest({\n url: urlUtil.route('addInstance', 'Groups', 'taoGroups'),\n method: 'POST',\n data: config,\n dataType: 'json',\n })\n .then(function (group) {\n resolve(group);\n })\n .catch(function () {\n reject(new Error(__('Unable to create new group')));\n });\n });\n },\n\n /**\n * Group deleting\n *\n * @param uri\n * @return {*}\n */\n deleteGroup (uri) {\n\n return new Promise((resolve, reject) => {\n\n if (!_.isString(uri) || _.isEmpty(uri)) {\n return reject(new TypeError(__('Group uri is not valid')));\n }\n\n coreRequest({\n url: urlUtil.route('delete', 'Groups', 'taoGroups'),\n method: 'POST',\n data: {uri: uri},\n dataType: 'json',\n })\n .then(function (response) {\n resolve(response);\n })\n .catch(function () {\n reject(new Error(__('Unable to delete group')));\n });\n });\n }\n };\n };\n});\n\n","\ndefine(\"taoGroups/loader/taoGroups.bundle\", function(){});\n"]} \ No newline at end of file