improvment

MyCoRe-Org · Jan 13, 2025 · c005691 · c005691
1 parent e2dd5b7
commit c005691
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 55 deletions.
diff --git a/mir-module/src/main/js/src/common/modal.ts b/mir-module/src/main/js/src/common/modal.ts
@@ -16,8 +16,8 @@
  * along with MyCoRe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import $ from 'jquery';
-import 'bootstrap';
+// import $ from 'jquery';
+// import 'bootstrap';
 
 export abstract class MIRModalHandler {
   private _isBusy = false;
@@ -28,7 +28,7 @@ export abstract class MIRModalHandler {
   ) {
     this._modalDiv = modalDiv;
     this.handleOpenModal = this.handleOpenModal.bind(this);
-    this.bindEvents();
+    this.bindBasicEvents();
   }
 
   protected get isBusy(): boolean {
@@ -43,7 +43,7 @@ export abstract class MIRModalHandler {
     return this.modalDiv;
   }
 
-  protected bindEvents(): void {
+  private bindBasicEvents(): void {
     $(this._modalDiv).on('hide.bs.modal', this.handleClose);
     $(this._modalDiv).on('show.bs.modal', this.handleOpenModal);
   }

diff --git a/mir-module/src/main/js/src/metadata.ts b/mir-module/src/main/js/src/metadata.ts
@@ -45,7 +45,7 @@ const createOrcidExportModalHandler = (accessToken: string): MIROrcidExportModal
 
 let orcidExportModalHandlerInstance: MIROrcidExportModalHandler | null;;
 
-const getOrcidExportModalHandlerInstance = async (): Promise<MIROrcidExportModalHandler> => {
+const getOrcidExportModalHandlerInstance = async (): Promise<MIROrcidExportModalHandler > => {
   if (!orcidExportModalHandlerInstance) {
     const accessToken = await getAccessToken();
     orcidExportModalHandlerInstance = createOrcidExportModalHandler(accessToken);
@@ -78,4 +78,5 @@ const initExportModal = async () => {
     appendMenuButton();
   }
 };
+
 document.addEventListener('DOMContentLoaded', initExportModal);
diff --git a/mir-module/src/main/js/src/orcid/orcid-export-modal-handler.ts b/mir-module/src/main/js/src/orcid/orcid-export-modal-handler.ts
@@ -40,6 +40,7 @@ export class MIROrcidExportModalHandler extends MIRModalHandler {
     alertDiv: HTMLDivElement
   ) {
     super(modalDiv);
+    console.log(exportBtn);
     this._accessToken = accessToken;
     this._orcidWorkService = orcidWorkService;
     this._orcidUserService = orcidUserService;
@@ -60,8 +61,7 @@ export class MIROrcidExportModalHandler extends MIRModalHandler {
     return this._objectId;
   }
 
-  protected bindEvents(): void {
-    super.bindEvents();
+  private bindEvents(): void {
     this._exportBtn.addEventListener('click', this.exportToOrcid);
     this._orcidSelect.addEventListener('change', this.handleSelectChange);
   }

diff --git a/mir-module/src/main/js/vite.config.js b/mir-module/src/main/js/vite.config.js
@@ -4,14 +4,17 @@ export default defineConfig({
   build: {
     rollupOptions: {
       input: {
-        "user": 'src/user.ts',
+        // 'user': 'src/user.ts',
+        // 'result-list': 'src/result-list.ts'
+        'metadata': 'src/metadata.ts',
       },
       output: {
         entryFileNames: '[name].js',  // Jeder Entry Point bekommt eine eigene JavaScript-Datei
         chunkFileNames: '[name].[hash].js',  // Chunks werden mit Hashes benannt (falls vorhanden)
         assetFileNames: '[name].[ext]',  // Assets wie CSS, Bilder etc. bekommen ihren ursprünglichen Namen
         dir: 'dist',  // Alle Bundles werden im Verzeichnis 'dist' abgelegt
       },
+      external: ['jquery', 'bootstrap'],
     },
   },
 });
diff --git a/mir-module/src/main/resources/META-INF/resources/js/mir/user.js b/mir-module/src/main/resources/META-INF/resources/js/mir/user.js
diff --git a/mir-module/src/main/resources/xsl/metadata/mir-orcid.xsl b/mir-module/src/main/resources/xsl/metadata/mir-orcid.xsl
@@ -53,7 +53,7 @@
             <xsl:if test="count($matchingTrustedIds) &gt; 0">
               <xsl:call-template name="printExportToOrcidMenuItem"/>
               <xsl:call-template name="printExportToOrcidModal"/>
-              <script type="module" src="{$WebApplicationBaseURL}js/mir/orcid/orcid-metadata.js"/>
+              <script type="module" src="{$WebApplicationBaseURL}js/mir/metadata.js"/>
             </xsl:if>
           </xsl:if>
         </xsl:if>
@@ -110,4 +110,4 @@
       </a>
     </li>
   </xsl:template>
-</xsl:stylesheet>
+</xsl:stylesheet>
diff --git a/mir-module/src/main/resources/xsl/response-mir.xsl b/mir-module/src/main/resources/xsl/response-mir.xsl
@@ -264,9 +264,7 @@
       </div>
 
     </div>
-    <xsl:if test="$orcidIntegrationEnabled">
-      <script type="module" src="{$WebApplicationBaseURL}js/mir/orcid/orcid-response.js"/>
-    </xsl:if>
+    <script type="module" src="{$WebApplicationBaseURL}js/mir/result-list.js"/>
   </xsl:template>
 
   <xsl:template match="doc" priority="10" mode="resultList">