@mjhls/mjh-framework 1.0.995 → 1.0.997

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -1,4 +1,4 @@
1
- # mjh-framework v. 1.0.995
1
+ # mjh-framework v. 1.0.996
2
2
 
3
3
  [![NPM](https://img.shields.io/npm/v/mjh-framework.svg)](https://www.npmjs.com/package/mjh-framework) [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)
4
4
 
@@ -11,6 +11,7 @@ require('react-bootstrap/Form');
11
11
  require('react-bootstrap/FormControl');
12
12
  require('react-bootstrap/Button');
13
13
  var Segment = require('./Segment.js');
14
+ var checkSisterSite = require('./checkSisterSite-b29833b2.js');
14
15
  var Container = require('react-bootstrap/Container');
15
16
  var Nav = require('react-bootstrap/Nav');
16
17
  var Navbar = require('react-bootstrap/Navbar');
@@ -21,7 +22,6 @@ var main = require('./main-6054981e.js');
21
22
  require('./_commonjsHelpers-06173234.js');
22
23
  require('./web.dom.iterable-d98303e0.js');
23
24
  require('./core.get-iterator-method-5643aa10.js');
24
- require('./checkSisterSite-b29833b2.js');
25
25
  require('./react-social-icons-2c5c389a.js');
26
26
  require('prop-types');
27
27
  require('./iconBase-be4097c0.js');
@@ -399,10 +399,10 @@ var HamMagazine = function HamMagazine(props) {
399
399
  if (row.subQuery && row.subQuery.length > 0) {
400
400
  return row.name ? React__default["default"].createElement(
401
401
  'div',
402
- null,
402
+ { key: 'navWrap' + index },
403
403
  React__default["default"].createElement(
404
404
  NavDropdown__default["default"],
405
- { key: index, title: row.name, id: 'basic-nav-dropdown', renderMenuOnMount: true },
405
+ { title: row.name, id: 'basic-nav-dropdown', renderMenuOnMount: true },
406
406
  row.url && React__default["default"].createElement(
407
407
  'a',
408
408
  {
@@ -420,17 +420,17 @@ var HamMagazine = function HamMagazine(props) {
420
420
  ),
421
421
  row.subQuery && row.subQuery.map(function (ddRow, subIndex) {
422
422
  if (ddRow.type === 'divider') {
423
- return React__default["default"].createElement(NavDropdown__default["default"].Divider, { key: subIndex });
423
+ return React__default["default"].createElement(NavDropdown__default["default"].Divider, { key: 'subNav' + subIndex });
424
424
  } else {
425
425
  if (ddRow.url && ddRow.name) {
426
426
  return ddRow.url && ddRow.name ? React__default["default"].createElement(
427
427
  'a',
428
428
  {
429
- key: subIndex,
429
+ key: 'subNav' + subIndex,
430
430
  needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '',
431
431
  href: ddRow.url,
432
432
  target: ddRow.blank ? '_blank' : '_self',
433
- rel: checkSisterSite(row.url) ? '' : 'noopener noreferrer',
433
+ rel: checkSisterSite.checkSisterSite(ddRow.url) ? '' : 'noopener noreferrer',
434
434
  className: 'dropdown-item' },
435
435
  ddRow.name
436
436
  ) : null;
@@ -443,17 +443,17 @@ var HamMagazine = function HamMagazine(props) {
443
443
  null,
444
444
  row.subQuery && row.subQuery.map(function (ddRow, subIndex) {
445
445
  if (ddRow.type === 'divider') {
446
- return React__default["default"].createElement(NavDropdown__default["default"].Divider, { key: subIndex });
446
+ return React__default["default"].createElement(NavDropdown__default["default"].Divider, { key: 'subNav2' + subIndex });
447
447
  } else {
448
448
  if (ddRow.url && ddRow.name) {
449
449
  return ddRow.url && ddRow.name ? React__default["default"].createElement(
450
450
  'a',
451
451
  {
452
- key: subIndex,
452
+ key: 'subNav2' + subIndex,
453
453
  needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '',
454
454
  href: ddRow.url,
455
455
  target: ddRow.blank ? '_blank' : '_self',
456
- rel: checkSisterSite(row.url) ? '' : 'noopener noreferrer',
456
+ rel: checkSisterSite.checkSisterSite(ddRow.url) ? '' : 'noopener noreferrer',
457
457
  className: 'dropdown-item' },
458
458
  ddRow.name
459
459
  ) : null;
@@ -466,11 +466,11 @@ var HamMagazine = function HamMagazine(props) {
466
466
  return row.url && row.name ? React__default["default"].createElement(
467
467
  'a',
468
468
  {
469
- key: index,
469
+ key: 'navlink' + index,
470
470
  needsegmentsupport: row.needSegmentSupport ? 'true' : '',
471
471
  href: row.url,
472
472
  target: row.blank ? '_blank' : '_self',
473
- rel: checkSisterSite(row.url) ? '' : 'noopener noreferrer',
473
+ rel: checkSisterSite.checkSisterSite(row.url) ? '' : 'noopener noreferrer',
474
474
  className: 'nav-link' },
475
475
  row.name
476
476
  ) : null;
@@ -497,22 +497,22 @@ var HamMagazine = function HamMagazine(props) {
497
497
  if (row.subQuery && row.subQuery.length > 0) {
498
498
  return row.name ? React__default["default"].createElement(
499
499
  'div',
500
- null,
500
+ { key: 'navLink3' + index },
501
501
  React__default["default"].createElement(
502
502
  NavDropdown__default["default"],
503
- { key: index, title: row.name, id: 'basic-nav-dropdown', renderMenuOnMount: true },
503
+ { title: row.name, id: 'basic-nav-dropdown', renderMenuOnMount: true },
504
504
  row.subQuery && row.subQuery.map(function (ddRow, subIndex) {
505
505
  if (ddRow.type === 'divider') {
506
- return React__default["default"].createElement(NavDropdown__default["default"].Divider, { key: subIndex });
506
+ return React__default["default"].createElement(NavDropdown__default["default"].Divider, { key: 'navLink4' + subIndex });
507
507
  } else {
508
508
  return ddRow.url && ddRow.name ? React__default["default"].createElement(
509
509
  'a',
510
510
  {
511
- key: subIndex,
511
+ key: 'navLink4' + subIndex,
512
512
  needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '',
513
513
  href: ddRow.url,
514
514
  target: ddRow.blank ? '_blank' : '_self',
515
- rel: checkSisterSite(row.url) ? '' : 'noopener noreferrer',
515
+ rel: checkSisterSite.checkSisterSite(ddRow.url) ? '' : 'noopener noreferrer',
516
516
  className: 'dropdown-item nav-link' },
517
517
  ddRow.name
518
518
  ) : null;
@@ -524,17 +524,17 @@ var HamMagazine = function HamMagazine(props) {
524
524
  null,
525
525
  row.subQuery && row.subQuery.map(function (ddRow, subIndex) {
526
526
  if (ddRow.type === 'divider') {
527
- return React__default["default"].createElement(NavDropdown__default["default"].Divider, { key: subIndex });
527
+ return React__default["default"].createElement(NavDropdown__default["default"].Divider, { key: 'navLink5' + subIndex });
528
528
  } else {
529
529
  if (ddRow.url && ddRow.name) {
530
530
  return ddRow.url && ddRow.name ? React__default["default"].createElement(
531
531
  'a',
532
532
  {
533
- key: subIndex,
533
+ key: 'navLink5' + subIndex,
534
534
  needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '',
535
535
  href: ddRow.url,
536
536
  target: ddRow.blank ? '_blank' : '_self',
537
- rel: checkSisterSite(row.url) ? '' : 'noopener noreferrer',
537
+ rel: checkSisterSite.checkSisterSite(ddRow.url) ? '' : 'noopener noreferrer',
538
538
  className: 'dropdown-item' },
539
539
  ddRow.name
540
540
  ) : null;
@@ -551,7 +551,7 @@ var HamMagazine = function HamMagazine(props) {
551
551
  needsegmentsupport: row.needSegmentSupport ? 'true' : '',
552
552
  href: row.url,
553
553
  target: row.blank ? '_blank' : '_self',
554
- rel: checkSisterSite(row.url) ? '' : 'noopener noreferrer',
554
+ rel: checkSisterSite.checkSisterSite(row.url) ? '' : 'noopener noreferrer',
555
555
  className: 'nav-link' },
556
556
  row.name
557
557
  ) : null;
@@ -103,6 +103,10 @@ var PartnerDetails = function PartnerDetails(_ref) {
103
103
  page = _ref.page,
104
104
  needLargePaginateButtons = _ref.needLargePaginateButtons;
105
105
 
106
+
107
+ var description = partnerDetails && partnerDetails.description ? partnerDetails.description.filter(function (block) {
108
+ return block._type !== 'slideshows' ? block : null;
109
+ }) : null;
106
110
  return React__default["default"].createElement(
107
111
  React__default["default"].Fragment,
108
112
  null,
@@ -154,11 +158,11 @@ var PartnerDetails = function PartnerDetails(_ref) {
154
158
  { jsx: 'true' },
155
159
  '\n @media screen and (max-width: 768px) {\n .partners-logo {\n width: 100%;\n min-width: 100%;\n }\n .partner-logo-wrap {\n flex-wrap: wrap;\n }\n .block-content-partners {\n padding-left: 0 !important;\n }\n }\n '
156
160
  ),
157
- (partnerDetails.description || partnerDetails.linkedin || partnerDetails.twitter && partnerDetails.facebook || !partnerDetails.twitter && partnerDetails.facebook && checkIsFacebookGroup(partnerDetails.facebook)) && React__default["default"].createElement(
161
+ (partnerDetails.description || partnerDetails.linkedin || partnerDetails.instagram || partnerDetails.youtube && partnerDetails.youtubeIcon || partnerDetails.twitter && partnerDetails.twitterIcon || partnerDetails.facebook && !partnerDetails.twitterIcon) && React__default["default"].createElement(
158
162
  'div',
159
163
  { className: 'block-content-partners my-4', style: { maxWidth: '100%', paddingLeft: '2rem', flex: '1 1 auto' } },
160
- partnerDetails.description && React__default["default"].createElement(BlockContent.BlockContent, _extends._extends({ serializers: getSerializers.getSerializers(client), blocks: partnerDetails.description, imageOptions: { w: 320, h: 240, fit: 'max' } }, client.config())),
161
- (partnerDetails.linkedin || partnerDetails.twitter && partnerDetails.facebook || !partnerDetails.twitter && partnerDetails.facebook && checkIsFacebookGroup(partnerDetails.facebook)) && React__default["default"].createElement(
164
+ partnerDetails.description && React__default["default"].createElement(BlockContent.BlockContent, _extends._extends({ serializers: getSerializers.getSerializers(client), blocks: description, imageOptions: { w: 320, h: 240, fit: 'max' } }, client.config())),
165
+ (partnerDetails.linkedin || partnerDetails.instagram || partnerDetails.youtube && partnerDetails.youtubeIcon || partnerDetails.twitter && partnerDetails.twitterIcon || partnerDetails.facebook && !partnerDetails.twitterIcon) && React__default["default"].createElement(
162
166
  'div',
163
167
  null,
164
168
  React__default["default"].createElement(
@@ -173,7 +177,25 @@ var PartnerDetails = function PartnerDetails(_ref) {
173
177
  rel: checkSisterSite.checkSisterSite('' + partnerDetails.linkedin + (partnerDetails.linkedin.slice(-1) === '/' ? '' : '/') + 'posts/?feedView=all') ? '' : 'noopener noreferrer',
174
178
  style: { height: 30, width: 30 }
175
179
  }),
176
- (partnerDetails.twitter && partnerDetails.facebook || !partnerDetails.twitter && partnerDetails.facebook && checkIsFacebookGroup(partnerDetails.facebook)) && React__default["default"].createElement(reactSocialIcons.reactSocialIcons_1, {
180
+ partnerDetails.instagram && React__default["default"].createElement(reactSocialIcons.reactSocialIcons_1, {
181
+ url: '' + partnerDetails.instagram + (partnerDetails.instagram.slice(-1) === '/' ? '' : '/'),
182
+ target: '_blank',
183
+ rel: checkSisterSite.checkSisterSite('' + partnerDetails.instagram + (partnerDetails.instagram.slice(-1) === '/' ? '' : '/')) ? '' : 'noopener noreferrer',
184
+ style: { height: 30, width: 30, marginLeft: '0.25rem' }
185
+ }),
186
+ partnerDetails.youtube && partnerDetails.youtubeIcon && React__default["default"].createElement(reactSocialIcons.reactSocialIcons_1, {
187
+ url: partnerDetails.youtube,
188
+ target: '_blank',
189
+ rel: checkSisterSite.checkSisterSite(partnerDetails.youtube) ? '' : 'noopener noreferrer',
190
+ style: { height: 30, width: 30, marginLeft: '0.25rem' }
191
+ }),
192
+ partnerDetails.twitter && partnerDetails.twitterIcon && React__default["default"].createElement(reactSocialIcons.reactSocialIcons_1, {
193
+ url: partnerDetails.twitter,
194
+ target: '_blank',
195
+ rel: checkSisterSite.checkSisterSite(partnerDetails.twitter) ? '' : 'noopener noreferrer',
196
+ style: { height: 30, width: 30, marginLeft: '0.25rem' }
197
+ }),
198
+ partnerDetails.facebook && !partnerDetails.twitterIcon && React__default["default"].createElement(reactSocialIcons.reactSocialIcons_1, {
177
199
  url: partnerDetails.facebook,
178
200
  target: '_blank',
179
201
  rel: checkSisterSite.checkSisterSite(partnerDetails.facebook) ? '' : 'noopener noreferrer',
@@ -200,7 +222,7 @@ var PartnerDetails = function PartnerDetails(_ref) {
200
222
  (partnerDetails.twitter || partnerDetails.facebook && !checkIsFacebookGroup(partnerDetails.facebook)) && React__default["default"].createElement(
201
223
  'div',
202
224
  { className: 'mb-5', style: { width: '100%', maxWidth: '100%', textAlign: 'center', padding: '15px', border: '2px solid #aaa', borderRadius: '15px' } },
203
- partnerDetails.twitter ? React__default["default"].createElement(reactTwitterEmbed.TwitterTimelineEmbed, { sourceType: 'url', url: partnerDetails.twitter, options: { height: 400 } }) : partnerDetails.facebook && React__default["default"].createElement(
225
+ partnerDetails.twitter && !partnerDetails.twitterIcon ? React__default["default"].createElement(reactTwitterEmbed.TwitterTimelineEmbed, { sourceType: 'url', url: partnerDetails.twitter, options: { height: 400 } }) : partnerDetails.facebook && React__default["default"].createElement(
204
226
  ImageSlider.Facebook,
205
227
  { appId: ' ' },
206
228
  React__default["default"].createElement(ImageSlider.Page, { href: partnerDetails.facebook, rel: checkSisterSite.checkSisterSite(partnerDetails.facebook) ? '' : 'noopener noreferrer', tabs: 'timeline', width: '500', height: '500' })
@@ -254,14 +276,14 @@ PartnerDetails.returnGetInitialProps = function () {
254
276
  switch (_context.prev = _context.next) {
255
277
  case 0:
256
278
  featureQuery = '*[_type == \'feature\' && is_active == true && feature_url == \'/' + partnerPageUrl + '/' + (category ? category + '/' : null) + identifier + '\'] | order(_updatedAt asc)[0..5]{\n ...,\n \'feature_img\' : feature_img.asset->\n }';
257
- partnerQuery = '*[_type == \'documentGroup\' \n && !(_id in path("drafts.**"))\n && references(\'' + partnerDocumentGroupID + '\')\n && identifier.current == \'' + identifier + '\'] | order(name asc) [0] {\n pixelTrackingCode->,\n description,\n name,\n identifier,\n thumbnail{ ..., asset-> },\n twitter,\n facebook,\n linkedin,\n "affiliates": description[_type==\'slideshows\']{\n ...,\n slides->{...}\n }\n }';
279
+ partnerQuery = '*[_type == \'documentGroup\' \n && !(_id in path("drafts.**"))\n && references(\'' + partnerDocumentGroupID + '\')\n && identifier.current == \'' + identifier + '\'] | order(name asc) [0] {\n pixelTrackingCode->,\n description,\n name,\n identifier,\n thumbnail{ ..., asset-> },\n twitter,\n twitterIcon,\n facebook,\n linkedin,\n instagram,\n youtube,\n youtubeIcon,\n "affiliates": description[_type==\'slideshows\']{\n ...,\n slides->{...}\n }\n }';
258
280
 
259
281
 
260
282
  if (category) {
261
283
  // if partners page has a sub category such as onclive
262
284
  // e.g. /sap-partner/[category]/[partner]
263
285
 
264
- partnerQuery = '*[_type == \'documentGroup\' && !(_id in path("drafts.**")) && identifier.current == \'' + category + '\' && references(\'' + partnerDocumentGroupID + '\')] [0] {\n ...,\n \'partner\': *[_type == \'documentGroup\' && identifier.current == \'' + identifier + '\' && references(^._id)] [0] {\n pixelTrackingCode->,\n description,\n name,\n identifier,\n thumbnail{ ..., asset-> },\n twitter,\n facebook,\n linkedin,\n "affiliates": description[_type==\'slideshows\']{\n ...,\n slides->{...}\n }\n \n }\n }';
286
+ partnerQuery = '*[_type == \'documentGroup\' && !(_id in path("drafts.**")) && identifier.current == \'' + category + '\' && references(\'' + partnerDocumentGroupID + '\')] [0] {\n ...,\n \'partner\': *[_type == \'documentGroup\' && identifier.current == \'' + identifier + '\' && references(^._id)] [0] {\n pixelTrackingCode->,\n description,\n name,\n identifier,\n thumbnail{ ..., asset-> },\n twitter,\n twitterIcon,\n instagram,\n facebook,\n linkedin,\n youtube,\n youtubeIcon,\n "affiliates": description[_type==\'slideshows\']{\n ...,\n slides->{...}\n }\n \n }\n }';
265
287
  }
266
288
 
267
289
  taxonomyQuery = '*[_type == \'documentGroup\' \n && !(_id in path("drafts.**"))\n && references(\'' + partnerDocumentGroupID + '\')\n && isShow != false\n && identifier.current == \'' + identifier + '\'] [0] {\n \'id\': _id,\n \'title\': name\n }';
@@ -7,6 +7,7 @@ import 'react-bootstrap/Form';
7
7
  import 'react-bootstrap/FormControl';
8
8
  import 'react-bootstrap/Button';
9
9
  import Segment from './Segment.js';
10
+ import { c as checkSisterSite } from './checkSisterSite-baa4fb6b.js';
10
11
  import Container from 'react-bootstrap/Container';
11
12
  import Nav from 'react-bootstrap/Nav';
12
13
  import Navbar from 'react-bootstrap/Navbar';
@@ -17,7 +18,6 @@ import { m as main_43, c as main_44 } from './main-9f6806ea.js';
17
18
  import './_commonjsHelpers-0c4b6f40.js';
18
19
  import './web.dom.iterable-ab4dea5c.js';
19
20
  import './core.get-iterator-method-ea258bb1.js';
20
- import './checkSisterSite-baa4fb6b.js';
21
21
  import './react-social-icons-9be47857.js';
22
22
  import 'prop-types';
23
23
  import './iconBase-ccc56b97.js';
@@ -387,10 +387,10 @@ var HamMagazine = function HamMagazine(props) {
387
387
  if (row.subQuery && row.subQuery.length > 0) {
388
388
  return row.name ? React__default.createElement(
389
389
  'div',
390
- null,
390
+ { key: 'navWrap' + index },
391
391
  React__default.createElement(
392
392
  NavDropdown,
393
- { key: index, title: row.name, id: 'basic-nav-dropdown', renderMenuOnMount: true },
393
+ { title: row.name, id: 'basic-nav-dropdown', renderMenuOnMount: true },
394
394
  row.url && React__default.createElement(
395
395
  'a',
396
396
  {
@@ -408,17 +408,17 @@ var HamMagazine = function HamMagazine(props) {
408
408
  ),
409
409
  row.subQuery && row.subQuery.map(function (ddRow, subIndex) {
410
410
  if (ddRow.type === 'divider') {
411
- return React__default.createElement(NavDropdown.Divider, { key: subIndex });
411
+ return React__default.createElement(NavDropdown.Divider, { key: 'subNav' + subIndex });
412
412
  } else {
413
413
  if (ddRow.url && ddRow.name) {
414
414
  return ddRow.url && ddRow.name ? React__default.createElement(
415
415
  'a',
416
416
  {
417
- key: subIndex,
417
+ key: 'subNav' + subIndex,
418
418
  needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '',
419
419
  href: ddRow.url,
420
420
  target: ddRow.blank ? '_blank' : '_self',
421
- rel: checkSisterSite(row.url) ? '' : 'noopener noreferrer',
421
+ rel: checkSisterSite(ddRow.url) ? '' : 'noopener noreferrer',
422
422
  className: 'dropdown-item' },
423
423
  ddRow.name
424
424
  ) : null;
@@ -431,17 +431,17 @@ var HamMagazine = function HamMagazine(props) {
431
431
  null,
432
432
  row.subQuery && row.subQuery.map(function (ddRow, subIndex) {
433
433
  if (ddRow.type === 'divider') {
434
- return React__default.createElement(NavDropdown.Divider, { key: subIndex });
434
+ return React__default.createElement(NavDropdown.Divider, { key: 'subNav2' + subIndex });
435
435
  } else {
436
436
  if (ddRow.url && ddRow.name) {
437
437
  return ddRow.url && ddRow.name ? React__default.createElement(
438
438
  'a',
439
439
  {
440
- key: subIndex,
440
+ key: 'subNav2' + subIndex,
441
441
  needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '',
442
442
  href: ddRow.url,
443
443
  target: ddRow.blank ? '_blank' : '_self',
444
- rel: checkSisterSite(row.url) ? '' : 'noopener noreferrer',
444
+ rel: checkSisterSite(ddRow.url) ? '' : 'noopener noreferrer',
445
445
  className: 'dropdown-item' },
446
446
  ddRow.name
447
447
  ) : null;
@@ -454,7 +454,7 @@ var HamMagazine = function HamMagazine(props) {
454
454
  return row.url && row.name ? React__default.createElement(
455
455
  'a',
456
456
  {
457
- key: index,
457
+ key: 'navlink' + index,
458
458
  needsegmentsupport: row.needSegmentSupport ? 'true' : '',
459
459
  href: row.url,
460
460
  target: row.blank ? '_blank' : '_self',
@@ -485,22 +485,22 @@ var HamMagazine = function HamMagazine(props) {
485
485
  if (row.subQuery && row.subQuery.length > 0) {
486
486
  return row.name ? React__default.createElement(
487
487
  'div',
488
- null,
488
+ { key: 'navLink3' + index },
489
489
  React__default.createElement(
490
490
  NavDropdown,
491
- { key: index, title: row.name, id: 'basic-nav-dropdown', renderMenuOnMount: true },
491
+ { title: row.name, id: 'basic-nav-dropdown', renderMenuOnMount: true },
492
492
  row.subQuery && row.subQuery.map(function (ddRow, subIndex) {
493
493
  if (ddRow.type === 'divider') {
494
- return React__default.createElement(NavDropdown.Divider, { key: subIndex });
494
+ return React__default.createElement(NavDropdown.Divider, { key: 'navLink4' + subIndex });
495
495
  } else {
496
496
  return ddRow.url && ddRow.name ? React__default.createElement(
497
497
  'a',
498
498
  {
499
- key: subIndex,
499
+ key: 'navLink4' + subIndex,
500
500
  needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '',
501
501
  href: ddRow.url,
502
502
  target: ddRow.blank ? '_blank' : '_self',
503
- rel: checkSisterSite(row.url) ? '' : 'noopener noreferrer',
503
+ rel: checkSisterSite(ddRow.url) ? '' : 'noopener noreferrer',
504
504
  className: 'dropdown-item nav-link' },
505
505
  ddRow.name
506
506
  ) : null;
@@ -512,17 +512,17 @@ var HamMagazine = function HamMagazine(props) {
512
512
  null,
513
513
  row.subQuery && row.subQuery.map(function (ddRow, subIndex) {
514
514
  if (ddRow.type === 'divider') {
515
- return React__default.createElement(NavDropdown.Divider, { key: subIndex });
515
+ return React__default.createElement(NavDropdown.Divider, { key: 'navLink5' + subIndex });
516
516
  } else {
517
517
  if (ddRow.url && ddRow.name) {
518
518
  return ddRow.url && ddRow.name ? React__default.createElement(
519
519
  'a',
520
520
  {
521
- key: subIndex,
521
+ key: 'navLink5' + subIndex,
522
522
  needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '',
523
523
  href: ddRow.url,
524
524
  target: ddRow.blank ? '_blank' : '_self',
525
- rel: checkSisterSite(row.url) ? '' : 'noopener noreferrer',
525
+ rel: checkSisterSite(ddRow.url) ? '' : 'noopener noreferrer',
526
526
  className: 'dropdown-item' },
527
527
  ddRow.name
528
528
  ) : null;
@@ -97,6 +97,10 @@ var PartnerDetails = function PartnerDetails(_ref) {
97
97
  page = _ref.page,
98
98
  needLargePaginateButtons = _ref.needLargePaginateButtons;
99
99
 
100
+
101
+ var description = partnerDetails && partnerDetails.description ? partnerDetails.description.filter(function (block) {
102
+ return block._type !== 'slideshows' ? block : null;
103
+ }) : null;
100
104
  return React__default.createElement(
101
105
  React__default.Fragment,
102
106
  null,
@@ -148,11 +152,11 @@ var PartnerDetails = function PartnerDetails(_ref) {
148
152
  { jsx: 'true' },
149
153
  '\n @media screen and (max-width: 768px) {\n .partners-logo {\n width: 100%;\n min-width: 100%;\n }\n .partner-logo-wrap {\n flex-wrap: wrap;\n }\n .block-content-partners {\n padding-left: 0 !important;\n }\n }\n '
150
154
  ),
151
- (partnerDetails.description || partnerDetails.linkedin || partnerDetails.twitter && partnerDetails.facebook || !partnerDetails.twitter && partnerDetails.facebook && checkIsFacebookGroup(partnerDetails.facebook)) && React__default.createElement(
155
+ (partnerDetails.description || partnerDetails.linkedin || partnerDetails.instagram || partnerDetails.youtube && partnerDetails.youtubeIcon || partnerDetails.twitter && partnerDetails.twitterIcon || partnerDetails.facebook && !partnerDetails.twitterIcon) && React__default.createElement(
152
156
  'div',
153
157
  { className: 'block-content-partners my-4', style: { maxWidth: '100%', paddingLeft: '2rem', flex: '1 1 auto' } },
154
- partnerDetails.description && React__default.createElement(BlockContent, _extends({ serializers: getSerializers(client), blocks: partnerDetails.description, imageOptions: { w: 320, h: 240, fit: 'max' } }, client.config())),
155
- (partnerDetails.linkedin || partnerDetails.twitter && partnerDetails.facebook || !partnerDetails.twitter && partnerDetails.facebook && checkIsFacebookGroup(partnerDetails.facebook)) && React__default.createElement(
158
+ partnerDetails.description && React__default.createElement(BlockContent, _extends({ serializers: getSerializers(client), blocks: description, imageOptions: { w: 320, h: 240, fit: 'max' } }, client.config())),
159
+ (partnerDetails.linkedin || partnerDetails.instagram || partnerDetails.youtube && partnerDetails.youtubeIcon || partnerDetails.twitter && partnerDetails.twitterIcon || partnerDetails.facebook && !partnerDetails.twitterIcon) && React__default.createElement(
156
160
  'div',
157
161
  null,
158
162
  React__default.createElement(
@@ -167,7 +171,25 @@ var PartnerDetails = function PartnerDetails(_ref) {
167
171
  rel: checkSisterSite('' + partnerDetails.linkedin + (partnerDetails.linkedin.slice(-1) === '/' ? '' : '/') + 'posts/?feedView=all') ? '' : 'noopener noreferrer',
168
172
  style: { height: 30, width: 30 }
169
173
  }),
170
- (partnerDetails.twitter && partnerDetails.facebook || !partnerDetails.twitter && partnerDetails.facebook && checkIsFacebookGroup(partnerDetails.facebook)) && React__default.createElement(reactSocialIcons_1, {
174
+ partnerDetails.instagram && React__default.createElement(reactSocialIcons_1, {
175
+ url: '' + partnerDetails.instagram + (partnerDetails.instagram.slice(-1) === '/' ? '' : '/'),
176
+ target: '_blank',
177
+ rel: checkSisterSite('' + partnerDetails.instagram + (partnerDetails.instagram.slice(-1) === '/' ? '' : '/')) ? '' : 'noopener noreferrer',
178
+ style: { height: 30, width: 30, marginLeft: '0.25rem' }
179
+ }),
180
+ partnerDetails.youtube && partnerDetails.youtubeIcon && React__default.createElement(reactSocialIcons_1, {
181
+ url: partnerDetails.youtube,
182
+ target: '_blank',
183
+ rel: checkSisterSite(partnerDetails.youtube) ? '' : 'noopener noreferrer',
184
+ style: { height: 30, width: 30, marginLeft: '0.25rem' }
185
+ }),
186
+ partnerDetails.twitter && partnerDetails.twitterIcon && React__default.createElement(reactSocialIcons_1, {
187
+ url: partnerDetails.twitter,
188
+ target: '_blank',
189
+ rel: checkSisterSite(partnerDetails.twitter) ? '' : 'noopener noreferrer',
190
+ style: { height: 30, width: 30, marginLeft: '0.25rem' }
191
+ }),
192
+ partnerDetails.facebook && !partnerDetails.twitterIcon && React__default.createElement(reactSocialIcons_1, {
171
193
  url: partnerDetails.facebook,
172
194
  target: '_blank',
173
195
  rel: checkSisterSite(partnerDetails.facebook) ? '' : 'noopener noreferrer',
@@ -194,7 +216,7 @@ var PartnerDetails = function PartnerDetails(_ref) {
194
216
  (partnerDetails.twitter || partnerDetails.facebook && !checkIsFacebookGroup(partnerDetails.facebook)) && React__default.createElement(
195
217
  'div',
196
218
  { className: 'mb-5', style: { width: '100%', maxWidth: '100%', textAlign: 'center', padding: '15px', border: '2px solid #aaa', borderRadius: '15px' } },
197
- partnerDetails.twitter ? React__default.createElement(TwitterTimelineEmbed, { sourceType: 'url', url: partnerDetails.twitter, options: { height: 400 } }) : partnerDetails.facebook && React__default.createElement(
219
+ partnerDetails.twitter && !partnerDetails.twitterIcon ? React__default.createElement(TwitterTimelineEmbed, { sourceType: 'url', url: partnerDetails.twitter, options: { height: 400 } }) : partnerDetails.facebook && React__default.createElement(
198
220
  Facebook,
199
221
  { appId: ' ' },
200
222
  React__default.createElement(Page, { href: partnerDetails.facebook, rel: checkSisterSite(partnerDetails.facebook) ? '' : 'noopener noreferrer', tabs: 'timeline', width: '500', height: '500' })
@@ -248,14 +270,14 @@ PartnerDetails.returnGetInitialProps = function () {
248
270
  switch (_context.prev = _context.next) {
249
271
  case 0:
250
272
  featureQuery = '*[_type == \'feature\' && is_active == true && feature_url == \'/' + partnerPageUrl + '/' + (category ? category + '/' : null) + identifier + '\'] | order(_updatedAt asc)[0..5]{\n ...,\n \'feature_img\' : feature_img.asset->\n }';
251
- partnerQuery = '*[_type == \'documentGroup\' \n && !(_id in path("drafts.**"))\n && references(\'' + partnerDocumentGroupID + '\')\n && identifier.current == \'' + identifier + '\'] | order(name asc) [0] {\n pixelTrackingCode->,\n description,\n name,\n identifier,\n thumbnail{ ..., asset-> },\n twitter,\n facebook,\n linkedin,\n "affiliates": description[_type==\'slideshows\']{\n ...,\n slides->{...}\n }\n }';
273
+ partnerQuery = '*[_type == \'documentGroup\' \n && !(_id in path("drafts.**"))\n && references(\'' + partnerDocumentGroupID + '\')\n && identifier.current == \'' + identifier + '\'] | order(name asc) [0] {\n pixelTrackingCode->,\n description,\n name,\n identifier,\n thumbnail{ ..., asset-> },\n twitter,\n twitterIcon,\n facebook,\n linkedin,\n instagram,\n youtube,\n youtubeIcon,\n "affiliates": description[_type==\'slideshows\']{\n ...,\n slides->{...}\n }\n }';
252
274
 
253
275
 
254
276
  if (category) {
255
277
  // if partners page has a sub category such as onclive
256
278
  // e.g. /sap-partner/[category]/[partner]
257
279
 
258
- partnerQuery = '*[_type == \'documentGroup\' && !(_id in path("drafts.**")) && identifier.current == \'' + category + '\' && references(\'' + partnerDocumentGroupID + '\')] [0] {\n ...,\n \'partner\': *[_type == \'documentGroup\' && identifier.current == \'' + identifier + '\' && references(^._id)] [0] {\n pixelTrackingCode->,\n description,\n name,\n identifier,\n thumbnail{ ..., asset-> },\n twitter,\n facebook,\n linkedin,\n "affiliates": description[_type==\'slideshows\']{\n ...,\n slides->{...}\n }\n \n }\n }';
280
+ partnerQuery = '*[_type == \'documentGroup\' && !(_id in path("drafts.**")) && identifier.current == \'' + category + '\' && references(\'' + partnerDocumentGroupID + '\')] [0] {\n ...,\n \'partner\': *[_type == \'documentGroup\' && identifier.current == \'' + identifier + '\' && references(^._id)] [0] {\n pixelTrackingCode->,\n description,\n name,\n identifier,\n thumbnail{ ..., asset-> },\n twitter,\n twitterIcon,\n instagram,\n facebook,\n linkedin,\n youtube,\n youtubeIcon,\n "affiliates": description[_type==\'slideshows\']{\n ...,\n slides->{...}\n }\n \n }\n }';
259
281
  }
260
282
 
261
283
  taxonomyQuery = '*[_type == \'documentGroup\' \n && !(_id in path("drafts.**"))\n && references(\'' + partnerDocumentGroupID + '\')\n && isShow != false\n && identifier.current == \'' + identifier + '\'] [0] {\n \'id\': _id,\n \'title\': name\n }';
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mjhls/mjh-framework",
3
- "version": "1.0.995",
3
+ "version": "1.0.997",
4
4
  "description": "Foundation Framework",
5
5
  "author": "mjh-framework",
6
6
  "license": "MIT",