Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions ui/src/components/AccountPage/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ const AccountPage = (props: AccountObj): JSX.Element => {
const { heading, copyrightText } = props.data;

const currentYear = new Date().getFullYear();
const previousYear = currentYear - 1;

return (
// eslint-disable-next-line react/no-unknown-property
Expand All @@ -27,7 +26,7 @@ const AccountPage = (props: AccountObj): JSX.Element => {
</div>
<div className="AccountPage__action">
<div className="AccountPage__content">{props?.children}</div>
<p className="copyright_text">{`© ${previousYear}-${currentYear} ${copyrightText}`}</p>
<p className="copyright_text">{`© ${currentYear} ${copyrightText}`}</p>
</div>
</div>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ export interface ModifiedField {
at: number;
checked: boolean;
id: string;
otherCmsType: string;
backupFieldType: string;
parentId: string;
uid: string;
}
Expand Down
158 changes: 79 additions & 79 deletions ui/src/components/ContentMapper/index.tsx

Large diffs are not rendered by default.

17 changes: 2 additions & 15 deletions ui/src/components/LegacyCms/Actions/LoadUploadFile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -429,22 +429,9 @@ const LoadUploadFile = (props: LoadUploadFileProps) => {
<div className="col-12">
<div className={containerClassName}>
{!isConfigLoading && !isEmptyString(fileDetails?.localPath) ? (
<div className='file-icon-group'>
// <div className='file-icon-group'>
<FileComponent fileDetails={fileDetails || {}} />
{/* {(showMessage && !isCancelLoading) &&
(<Tooltip content='cancel validation' position='top'>
<Icon icon='CloseNoborder' version='v2' onClick={handleCancelValidation}/>

</Tooltip> )
} */}
{/* { isCancelLoading &&
<div style={{justifyContent:'center', alignItems:'center', marginTop:'7px'}}>
<AsyncLoader color='$color-brand-primary-base'/>
</div>
} */}
</div>


// </div>
) :

<div className='loader'>
Expand Down
10 changes: 5 additions & 5 deletions ui/src/components/LegacyCms/legacyCms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,12 @@
margin-left: 10px !important;
border: 1px solid $color-brand-secondary-lightest;
border-radius: var(--TermCount, 5px);

}
.validation-container > * {
margin-right: 10px;
margin-left: 15px;
padding: 10px 15px;
}
// .validation-container > * {
// margin-right: 10px;
// margin-left: 15px;
// }
.error-container{
display: flex;
background-color: $color-base-white-5;
Expand Down
11 changes: 10 additions & 1 deletion ui/src/context/app/app.provider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,9 @@ const AppContextProvider: FC<IProps> = ({ children }) => {

useEffect(() => {
const token = getDataFromLocalStorage('app_token');
setAuthToken(token || '');
if (token) {
setAuthToken(token ?? '');
}

const storedNewMigration = sessionStorage.getItem('newMigration');
if (storedNewMigration) {
Expand All @@ -129,6 +131,13 @@ const AppContextProvider: FC<IProps> = ({ children }) => {
if (!isEmptyString(authToken)) {
getUserDetails();
}

// Debug token issue for hosting
const token = getDataFromLocalStorage('app_token');
if (token) {
setAuthToken(token ?? '');
}

}, [authToken]);

useEffect(() => {
Expand Down
3 changes: 2 additions & 1 deletion upload-api/.env
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@

PORT=4002
NODE_BACKEND_API=http://localhost:5001
NODE_BACKEND_API =http://localhost:5001
5 changes: 2 additions & 3 deletions upload-api/src/config/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ export default {
plan: {
dropdown: { optionLimit: 100 }
},
cmsType: 'Sitecore',
cmsType: 'contentful',
isLocalPath: true,
awsData: {
awsRegion: 'us-east-2',
Expand All @@ -12,7 +12,6 @@ export default {
bucketName: 'migartion-test',
buketKey: 'project/package 45.zip'
},
// localPath: '/Users/shobhit.upadhyay/Downloads/contentful-data.json' //package 45.zip'
localPath: '/Users/shobhit.upadhyay/Downloads/package 47.zip'
localPath: '/Users/sayali.joshi/Downloads/contentfulDummyEmbedData.json' //package 45.zip'
// localPath: '/Users/umesh.more/Documents/ui-migration/migration-v2-node-server/upload-api/extracted_files/package 45.zip'
};